This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit f20f1442af4e79ac8f3dd0bb2568e147d3355cd4
Author: Willem Jiang <jiangni...@huawei.com>
AuthorDate: Tue Jul 31 15:15:45 2018 +0800
SCB-648 Update the omega-transport modules
---
.../src/test/java/SagaDubboConsumerFilterTest.java | 9 ++++++++-
.../src/test/java/SagaDubboProviderFilterTest.java | 8 +++++++-
.../transport/feign/FeignAutoConfigurationTest.java | 19 +++++++++++++++----
.../TransactionHandlerInterceptorTest.java | 9 ++++++++-
.../servicecomb/SagaConsumerHandlerTest.java | 8 +++++++-
.../servicecomb/SagaProviderHandlerTest.java | 12 ++++++++++--
6 files changed, 55 insertions(+), 10 deletions(-)
diff --git
a/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboConsumerFilterTest.java
b/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboConsumerFilterTest.java
index 3fcb1b1..dc1875b 100644
---
a/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboConsumerFilterTest.java
+++
b/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboConsumerFilterTest.java
@@ -19,6 +19,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import
org.apache.servicecomb.saga.omega.transport.dubbo.SagaDubboConsumerFilter;
import org.junit.Before;
@@ -36,7 +37,13 @@ public class SagaDubboConsumerFilterTest {
private static final String globalTxId = UUID.randomUUID().toString();
private static final String localTxId = UUID.randomUUID().toString();
- private final OmegaContext omegaContext = new OmegaContext(() -> "ignored");
+ private final OmegaContext omegaContext = new OmegaContext(new
IdGenerator<String>() {
+
+ @Override
+ public String nextId() {
+ return "ignored";
+ }
+ });
private final Invocation invocation = mock(Invocation.class);
private final SagaDubboConsumerFilter filter = new SagaDubboConsumerFilter();
diff --git
a/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboProviderFilterTest.java
b/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboProviderFilterTest.java
index be00e69..1d0e8ad 100644
---
a/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboProviderFilterTest.java
+++
b/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboProviderFilterTest.java
@@ -17,6 +17,7 @@
import java.util.UUID;
+import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import
org.apache.servicecomb.saga.omega.transport.dubbo.SagaDubboProviderFilter;
import org.junit.Before;
@@ -34,7 +35,12 @@ public class SagaDubboProviderFilterTest {
private static final String globalTxId = UUID.randomUUID().toString();
private static final String localTxId = UUID.randomUUID().toString();
- private final OmegaContext omegaContext = new OmegaContext(() -> "ignored");
+ private final OmegaContext omegaContext = new OmegaContext(new
IdGenerator<String>() {
+ @Override
+ public String nextId() {
+ return "ignored";
+ }
+ });
private final Invocation invocation = mock(Invocation.class);
private final SagaDubboProviderFilter filter = new SagaDubboProviderFilter();
diff --git
a/omega/omega-transport/omega-transport-feign/src/test/java/org/apache/servicecomb/saga/omega/transport/feign/FeignAutoConfigurationTest.java
b/omega/omega-transport/omega-transport-feign/src/test/java/org/apache/servicecomb/saga/omega/transport/feign/FeignAutoConfigurationTest.java
index f10f89a..4fa35ac 100644
---
a/omega/omega-transport/omega-transport-feign/src/test/java/org/apache/servicecomb/saga/omega/transport/feign/FeignAutoConfigurationTest.java
+++
b/omega/omega-transport/omega-transport-feign/src/test/java/org/apache/servicecomb/saga/omega/transport/feign/FeignAutoConfigurationTest.java
@@ -27,7 +27,10 @@ import java.util.UUID;
import feign.RequestInterceptor;
import feign.RequestTemplate;
+
+import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Test;
@@ -37,7 +40,13 @@ public class FeignAutoConfigurationTest{
private static final String localTxId = UUID.randomUUID().toString();
- private final OmegaContext omegaContext = new OmegaContext(() ->
"ignored");
+ private final OmegaContext omegaContext = new OmegaContext(new
IdGenerator<String>() {
+
+ @Override
+ public String nextId() {
+ return "ignored";
+ }
+ });
private RequestTemplate requestTemplate = new RequestTemplate(); //
mock(RequestTemplate.class);
@@ -55,8 +64,10 @@ public class FeignAutoConfigurationTest{
feignClientRequestInterceptor.apply(requestTemplate); //
.preHandle(request, response, null);
- assertThat((new
ArrayList(requestTemplate.headers().get(OmegaContext.GLOBAL_TX_ID_KEY))).get(0),
is(globalTxId));
- assertThat((new
ArrayList(requestTemplate.headers().get(OmegaContext.LOCAL_TX_ID_KEY))).get(0),
is(localTxId));
+ assertThat((new
ArrayList(requestTemplate.headers().get(OmegaContext.GLOBAL_TX_ID_KEY))).get(0),
+ Matchers.<Object>is(globalTxId));
+ assertThat((new
ArrayList(requestTemplate.headers().get(OmegaContext.LOCAL_TX_ID_KEY))).get(0),
+ Matchers.<Object>is(localTxId));
}
@Test
@@ -69,4 +80,4 @@ public class FeignAutoConfigurationTest{
assertThat(requestTemplate.headers().get(OmegaContext.GLOBAL_TX_ID_KEY),
is(nullValue()));
assertThat(requestTemplate.headers().get(OmegaContext.LOCAL_TX_ID_KEY),
is(nullValue()));
}
-}
\ No newline at end of file
+}
diff --git
a/omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionHandlerInterceptorTest.java
b/omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionHandlerInterceptorTest.java
index 7b41540..16cbe6d 100644
---
a/omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionHandlerInterceptorTest.java
+++
b/omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionHandlerInterceptorTest.java
@@ -30,6 +30,7 @@ import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.junit.Before;
import org.junit.Test;
@@ -41,7 +42,13 @@ public class TransactionHandlerInterceptorTest {
private static final String localTxId = UUID.randomUUID().toString();
- private final OmegaContext omegaContext = new OmegaContext(() -> "ignored");
+ private final OmegaContext omegaContext = new OmegaContext(new
IdGenerator<String>() {
+
+ @Override
+ public String nextId() {
+ return "ignored";
+ }
+ });
private HandlerInterceptor requestInterceptor = new
TransactionHandlerInterceptor(omegaContext);
diff --git
a/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandlerTest.java
b/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandlerTest.java
index d66e3ee..18b57ac 100644
---
a/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandlerTest.java
+++
b/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandlerTest.java
@@ -42,7 +42,13 @@ public class SagaConsumerHandlerTest {
@SuppressWarnings("unchecked")
private final IdGenerator<String> idGenerator = mock(IdGenerator.class);
- private final OmegaContext omegaContext = new OmegaContext(() -> "ignored");
+ private final OmegaContext omegaContext = new OmegaContext(new
IdGenerator<String>() {
+
+ @Override
+ public String nextId() {
+ return "ignored";
+ }
+ });
private final Invocation invocation = mock(Invocation.class);
diff --git
a/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandlerTest.java
b/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandlerTest.java
index 24c277b..41fc049 100644
---
a/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandlerTest.java
+++
b/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandlerTest.java
@@ -26,11 +26,13 @@ import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import org.apache.servicecomb.core.Invocation;
+import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.apache.servicecomb.swagger.invocation.AsyncResponse;
import org.junit.Before;
@@ -42,7 +44,13 @@ public class SagaProviderHandlerTest {
private static final String localTxId = UUID.randomUUID().toString();
- private final OmegaContext omegaContext = new OmegaContext(() -> "ignored");
+ private final OmegaContext omegaContext = new OmegaContext(new
IdGenerator<String>() {
+
+ @Override
+ public String nextId() {
+ return "ignored";
+ }
+ });
private final Invocation invocation = mock(Invocation.class);
@@ -70,7 +78,7 @@ public class SagaProviderHandlerTest {
@Test
public void doNothingInNonTransactionRequest() throws Exception {
- when(invocation.getContext()).thenReturn(emptyMap());
+ when(invocation.getContext()).thenReturn(Collections.EMPTY_MAP);
handler.handle(invocation, asyncResponse);
