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 d64f3fc97005d03f55a1bd9a9c0014c307ba824f Author: KomachiSion <263976...@qq.com> AuthorDate: Tue Aug 21 16:29:28 2018 +0800 SCB-855 extract an empty map constant --- .../servicecomb/saga/format/JacksonFromJsonFormatTest.java | 12 +++++++----- .../apache/servicecomb/saga/format/SagaEventFormatTest.java | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/saga-format/src/test/java/org/apache/servicecomb/saga/format/JacksonFromJsonFormatTest.java b/saga-format/src/test/java/org/apache/servicecomb/saga/format/JacksonFromJsonFormatTest.java index 8214cc1..f2ae724 100644 --- a/saga-format/src/test/java/org/apache/servicecomb/saga/format/JacksonFromJsonFormatTest.java +++ b/saga-format/src/test/java/org/apache/servicecomb/saga/format/JacksonFromJsonFormatTest.java @@ -152,6 +152,8 @@ public class JacksonFromJsonFormatTest { private final TransportFactory transportFactory = Mockito.mock(TransportFactory.class); private final FromJsonFormat<SagaDefinition> format = new JacksonFromJsonFormat(transportFactory); + private final Map<String, Map<String, String>> EMPTY_MAP = Collections.<String, Map<String, String>>emptyMap(); + private final Function<SagaRequest, String> getRequestId = new Function<SagaRequest, String>() { @Override public String apply(SagaRequest sagaRequest) { @@ -195,24 +197,24 @@ public class JacksonFromJsonFormatTest { .thenReturn(response11); when(restTransport.with("aaa", "/rest/as", "delete", singletonMap("query", singletonMap("bar", "as")))) .thenReturn(response12); - when(restTransport.with("aaa", "/rest/as", "put", Collections.<String, Map<String, String>>emptyMap())) + when(restTransport.with("aaa", "/rest/as", "put", EMPTY_MAP)) .thenReturn(response13); when(restTransport .with("bbb", "/rest/bs", "post", mapOf("query", singletonMap("foo", "bs"), "json", singletonMap("body", "{ \"bar\": \"bs\" }")))) .thenReturn(response21); - when(restTransport.with("bbb", "/rest/bs", "delete", Collections.<String, Map<String, String>>emptyMap())) + when(restTransport.with("bbb", "/rest/bs", "delete", EMPTY_MAP)) .thenReturn(response22); - when(restTransport.with("bbb", "/rest/bs", "put", Collections.<String, Map<String, String>>emptyMap())) + when(restTransport.with("bbb", "/rest/bs", "put", EMPTY_MAP)) .thenReturn(response23); when(restTransport .with("ccc", "/rest/cs", "post", mapOf("query", singletonMap("foo", "cs"), "form", singletonMap("bar", "cs")))) .thenReturn(response31); - when(restTransport.with("ccc", "/rest/cs", "delete", Collections.<String, Map<String, String>>emptyMap())) + when(restTransport.with("ccc", "/rest/cs", "delete", EMPTY_MAP)) .thenReturn(response32); - when(restTransport.with("ccc", "/rest/cs", "put", Collections.<String, Map<String, String>>emptyMap())) + when(restTransport.with("ccc", "/rest/cs", "put", EMPTY_MAP)) .thenReturn(response33); } diff --git a/saga-format/src/test/java/org/apache/servicecomb/saga/format/SagaEventFormatTest.java b/saga-format/src/test/java/org/apache/servicecomb/saga/format/SagaEventFormatTest.java index 70bc4b8..fc509e4 100644 --- a/saga-format/src/test/java/org/apache/servicecomb/saga/format/SagaEventFormatTest.java +++ b/saga-format/src/test/java/org/apache/servicecomb/saga/format/SagaEventFormatTest.java @@ -62,13 +62,14 @@ import org.apache.servicecomb.saga.transports.RestTransport; public class SagaEventFormatTest { private final String sagaId = Randomness.uniquify("sagaId"); + private final Map<String, Map<String, String>> EMPTY_MAP = Collections.<String, Map<String, String>>emptyMap(); private final SagaRequest request = new SagaRequestImpl( sagaId, Randomness.uniquify("serviceName"), TYPE_REST, new JacksonRestTransaction("/rest/xxx", "POST", singletonMap("query", singletonMap("foo", "xxx"))), new JacksonRestCompensation("/rest/xxx", "DELETE", singletonMap("query", singletonMap("bar", "xxx"))), - new JacksonRestFallback(TYPE_REST, "/rest/xxx", "PUT", Collections.<String, Map<String, String>>emptyMap()) + new JacksonRestFallback(TYPE_REST, "/rest/xxx", "PUT", EMPTY_MAP) ); private final RestTransport restTransport = Mockito.mock(RestTransport.class);