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 1f5b6614099221a10c1e3cceb9a5a7adf4e3ca81 Author: liubao <[email protected]> AuthorDate: Fri Aug 17 09:51:54 2018 +0800 [SCB-847]fix compile fail --- .../apache/servicecomb/springboot/jaxrs/client/JaxrsClient.java | 9 +++------ .../apache/servicecomb/springboot/jaxrs/server/JaxrsServer.java | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/java/org/apache/servicecomb/springboot/jaxrs/client/JaxrsClient.java b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/java/org/apache/servicecomb/springboot/jaxrs/client/JaxrsClient.java index f35efe5..3e1ea78 100644 --- a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/java/org/apache/servicecomb/springboot/jaxrs/client/JaxrsClient.java +++ b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/java/org/apache/servicecomb/springboot/jaxrs/client/JaxrsClient.java @@ -17,9 +17,9 @@ package org.apache.servicecomb.springboot.jaxrs.client; -import org.apache.servicecomb.common.rest.codec.RestObjectMapper; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; import org.apache.servicecomb.demo.RestObjectMapperWithStringMapper; +import org.apache.servicecomb.demo.RestObjectMapperWithStringMapperNotWriteNull; import org.apache.servicecomb.demo.TestMgr; import org.apache.servicecomb.foundation.common.utils.Log4jUtils; import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb; @@ -31,11 +31,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; public class JaxrsClient { public static void main(String[] args) throws Exception { - RestObjectMapperFactory - .setCustomMapper(RestObjectMapperFactory.KEY_CONSUMER_WRITE, new RestObjectMapperWithStringMapper()); - RestObjectMapperFactory.setCustomMapper(RestObjectMapperFactory.KEY_PROVIDER_WRITE, new RestObjectMapper()); - RestObjectMapperFactory.setCustomMapper(RestObjectMapperFactory.KEY_PROVIDER_READ_OR_CONSUMER_READ, - new RestObjectMapperWithStringMapper()); + RestObjectMapperFactory.setDefaultRestObjectMapper(new RestObjectMapperWithStringMapper()); + RestObjectMapperFactory.setConsumerWriterMapper(new RestObjectMapperWithStringMapperNotWriteNull()); Log4jUtils.init(); SpringApplication.run(JaxrsClient.class, args); org.apache.servicecomb.demo.jaxrs.client.JaxrsClient.run(); diff --git a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/java/org/apache/servicecomb/springboot/jaxrs/server/JaxrsServer.java b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/java/org/apache/servicecomb/springboot/jaxrs/server/JaxrsServer.java index d74ecf0..fc133f6 100644 --- a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/java/org/apache/servicecomb/springboot/jaxrs/server/JaxrsServer.java +++ b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/java/org/apache/servicecomb/springboot/jaxrs/server/JaxrsServer.java @@ -17,9 +17,9 @@ package org.apache.servicecomb.springboot.jaxrs.server; -import org.apache.servicecomb.common.rest.codec.RestObjectMapper; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; import org.apache.servicecomb.demo.RestObjectMapperWithStringMapper; +import org.apache.servicecomb.demo.RestObjectMapperWithStringMapperNotWriteNull; import org.apache.servicecomb.foundation.common.utils.Log4jUtils; import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb; import org.springframework.boot.SpringApplication; @@ -29,11 +29,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableServiceComb public class JaxrsServer { public static void main(final String[] args) throws Exception { - RestObjectMapperFactory - .setCustomMapper(RestObjectMapperFactory.KEY_CONSUMER_WRITE, new RestObjectMapperWithStringMapper()); - RestObjectMapperFactory.setCustomMapper(RestObjectMapperFactory.KEY_PROVIDER_WRITE, new RestObjectMapper()); - RestObjectMapperFactory.setCustomMapper(RestObjectMapperFactory.KEY_PROVIDER_READ_OR_CONSUMER_READ, - new RestObjectMapperWithStringMapper()); + RestObjectMapperFactory.setDefaultRestObjectMapper(new RestObjectMapperWithStringMapper()); + RestObjectMapperFactory.setConsumerWriterMapper(new RestObjectMapperWithStringMapperNotWriteNull()); Log4jUtils.init(); SpringApplication.run(JaxrsServer.class, args); }
