This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 8465bddbc9e05e758873bf36bcd48e52f90f7c6f Author: heyile <[email protected]> AuthorDate: Mon Nov 5 22:23:52 2018 +0800 [SCB-1007] not support CustomGeneric<Map<String,String>> : resolve locale problem --- .../java/org/apache/servicecomb/it/ConsumerMain.java | 7 +++++-- .../servicecomb/it/testcase/base/TestGeneric.java | 10 +++++++--- .../apache/servicecomb/it/schema/GenericSchema.java | 18 +++++++++--------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java index 8b0a9b5..2209583 100644 --- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java +++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java @@ -99,8 +99,7 @@ public class ConsumerMain { ITJUnitUtils.runWithHighwayAndRest(TestChangeTransport.class); ITJUnitUtils.runWithHighwayAndRest(TestDataTypePrimitive.class); ITJUnitUtils.runWithHighwayAndRest(TestAnnotatedAttribute.class); - ITJUnitUtils.runWithRest(TestGeneric.class); - ITJUnitUtils.run(TestGenericEdge.class); + // only rest support default value feature ITJUnitUtils.runWithRest(TestDefaultValue.class); @@ -115,6 +114,10 @@ public class ConsumerMain { ITJUnitUtils.runWithHighwayAndRest(TestParamCodec.class); ITJUnitUtils.run(TestParamCodecEdge.class); + //generic + ITJUnitUtils.runWithRest(TestGeneric.class); + ITJUnitUtils.run(TestGenericEdge.class); + ITJUnitUtils.run(TestRequestBodySpringMvcSchema.class); ITJUnitUtils.run(TestDefaultJsonValueJaxrsSchema.class); ITJUnitUtils.run(TestRestController.class); diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/base/TestGeneric.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/base/TestGeneric.java index bf20ccc..276bd37 100644 --- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/base/TestGeneric.java +++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/base/TestGeneric.java @@ -23,7 +23,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; +import java.util.TimeZone; import javax.xml.ws.Holder; @@ -58,7 +60,7 @@ public class TestGeneric { private String expectUserStr = "{\"name\":\"nameA\",\"age\":100,\"index\":0,\"names\":null}"; - private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); + private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US); @Test public void testHolderUser_intf() { @@ -118,7 +120,8 @@ public class TestGeneric { generic.value = new Date(1001); Generic<Date> result = consumers.getIntf().genericDate(generic); assertEquals(result.value.getClass(), Date.class); - assertEquals("1970-01-01T08:00:01.001Z", simpleDateFormat.format(result.value)); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + assertEquals("1970-01-01T00:00:01.001Z", simpleDateFormat.format(result.value)); } @Test @@ -128,7 +131,8 @@ public class TestGeneric { @SuppressWarnings("unchecked") Generic<Date> result = consumers.getSCBRestTemplate().postForObject("/genericDate", generic, Generic.class); assertEquals(result.value.getClass(), Date.class); - assertEquals("1970-01-01T08:00:01.001Z", simpleDateFormat.format(result.value)); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + assertEquals("1970-01-01T00:00:01.001Z", simpleDateFormat.format(result.value)); } @Test diff --git a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/GenericSchema.java b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/GenericSchema.java index 42f9ce0..03bf10f 100644 --- a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/GenericSchema.java +++ b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/GenericSchema.java @@ -33,42 +33,42 @@ import org.springframework.web.bind.annotation.RequestMapping; @RequestMapping(path = "/v1/generic") public class GenericSchema { - @PostMapping(path = "/holderUser") + @PostMapping(path = "holderUser") public Holder<User> holderUser(@RequestBody Holder<User> input) { Assert.isInstanceOf(Holder.class, input); Assert.isInstanceOf(User.class, input.value); return input; } - @PostMapping(path = "/genericUser") + @PostMapping(path = "genericUser") public Generic<User> genericUser(@RequestBody Generic<User> input) { Assert.isInstanceOf(Generic.class, input); Assert.isInstanceOf(User.class, input.value); return input; } - @PostMapping(path = "/genericLong") + @PostMapping(path = "genericLong") public Generic<Long> genericLong(@RequestBody Generic<Long> input) { Assert.isInstanceOf(Generic.class, input); Assert.isInstanceOf(Long.class, input.value); return input; } - @PostMapping(path = "/genericDate") + @PostMapping(path = "genericDate") public Generic<Date> genericDate(@RequestBody Generic<Date> input) { Assert.isInstanceOf(Generic.class, input); Assert.isInstanceOf(Date.class, input.value); return input; } - @PostMapping(path = "/genericEnum") + @PostMapping(path = "genericEnum") public Generic<HttpStatus> genericEnum(@RequestBody Generic<HttpStatus> input) { Assert.isInstanceOf(Generic.class, input); Assert.isInstanceOf(HttpStatus.class, input.value); return input; } - @PostMapping(path = "/genericGenericUser") + @PostMapping(path = "genericGenericUser") public Generic<Generic<User>> genericGenericUser(@RequestBody Generic<Generic<User>> input) { Assert.isInstanceOf(Generic.class, input); Assert.isInstanceOf(Generic.class, input.value); @@ -76,14 +76,14 @@ public class GenericSchema { return input; } - @PostMapping(path = "/genericMap") + @PostMapping(path = "genericMap") public Generic<Map<String, String>> genericMap(@RequestBody Generic<Map<String, String>> mapGeneric) { Assert.isInstanceOf(Generic.class, mapGeneric); Assert.isInstanceOf(Map.class, mapGeneric.value); return mapGeneric; } - @PostMapping(path = "/genericMapList") + @PostMapping(path = "genericMapList") public Generic<Map<String, List<String>>> genericMapList( @RequestBody Generic<Map<String, List<String>>> mapListGeneric) { Assert.isInstanceOf(Generic.class, mapListGeneric); @@ -91,7 +91,7 @@ public class GenericSchema { return mapListGeneric; } - @PostMapping(path = "/genericMapListUser") + @PostMapping(path = "genericMapListUser") public Generic<Map<String, List<User>>> genericMapListUser( @RequestBody Generic<Map<String, List<User>>> mapListUserGeneric) { Assert.isInstanceOf(Generic.class, mapListUserGeneric);
