[servicecomb-java-chassis] branch master updated (83ad7df -> 759c708)

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git.


    from 83ad7df  [SCB-1637] fix NPE caused by HystrixPropertiesStrategy registration
     add 759c708  [SCB-1649]RestTemplate result can use a different model than provider (#1455)

No new revisions were added by this update.

Summary of changes:
 demo/assembly/assembly.xml                         | 23 +++-----
 demo/demo-jaxrs/jaxrs-client/pom.xml               |  8 ---
 demo/demo-multiple/multiple-server/pom.xml         |  4 ++
 demo/demo-multiple/pom.xml                         |  8 ---
 .../demo-spring-boot-jaxrs-client/pom.xml          | 12 ----
 .../springboot/jaxrs/client/JaxrsClient.java       |  6 +-
 .../src/main/resources/application.yml             | 16 +++++
 .../src/main/resources/microservice.yaml           | 30 ----------
 .../springboot/jaxrs/SpringBootJaxrsIT.java        | 10 +++-
 .../demo-spring-boot-jaxrs-server/pom.xml          |  4 ++
 .../springboot/jaxrs/server/JaxrsServer.java       |  6 +-
 .../src/main/resources/application.yml             | 19 ++++++
 .../src/main/resources/microservice.yaml           | 34 -----------
 .../demo-spring-boot-springmvc-client/pom.xml      | 38 ++++++++++++
 .../springmvc/client/SpringmvcClient.java          |  6 +-
 .../demo-spring-boot-springmvc-server/pom.xml      | 39 +++++++++++++
 .../springmvc/server/SpringmvcServer.java          |  6 +-
 demo/demo-spring-boot-provider/pom.xml             | 13 +----
 .../demo-spring-boot-pojo-client/pom.xml           |  4 --
 .../springboot/pojo/client/PojoClient.java         |  5 +-
 .../src/main/resources/application.yml             | 22 +++++++
 .../src/main/resources/microservice.yaml           | 36 ------------
 .../demo-spring-boot-pojo-server/pom.xml           |  4 +-
 .../springboot/pojo/server/PojoServer.java         |  5 +-
 .../src/main/resources/application.yml             | 17 ++++++
 .../src/main/resources/microservice.yaml           | 31 ----------
 demo/demo-spring-boot-transport/pom.xml            | 14 +++--
 .../demo/springmvc/client/TestObject.java          |  3 +-
 demo/docker-run-config/pom.xml                     |  2 +-
 demo/pom.xml                                       | 38 +++---------
 .../foundation/common/utils/GenericsUtils.java     | 47 +++++++++++++++
 ...tExceptionUtils.java => TestGenericsUtils.java} | 35 ++++++++---
 .../org/apache/servicecomb/it/ConsumerMain.java    |  3 +
 .../weak/consumer/SpringmvcBasicRequestModel.java  | 17 ++----
 .../weak/consumer/SpringmvcBasicResponseModel.java | 23 ++------
 .../weak/consumer/SpringmvcBasicService.java       | 14 ++---
 .../testcase/weak/consumer/TestSpringmvcBasic.java | 68 ++++++++++++++++++++++
 .../it-producer-deploy-springboot2-servlet/pom.xml | 31 +++++-----
 .../pom.xml                                        | 32 +++++-----
 .../weak/provider/SpringmvcBasicEndpoint.java      | 50 ++++++++++++++++
 .../weak/provider/SpringmvcBasicRequestModel.java  | 22 +++----
 .../weak/provider/SpringmvcBasicResponseModel.java | 20 +++----
 pom.xml                                            | 15 +++++
 providers/provider-springmvc/pom.xml               |  5 ++
 .../springmvc/reference/CseClientHttpRequest.java  | 26 +++++++++
 .../springmvc/reference/CseRequestCallback.java    | 21 ++++++-
 .../springmvc/reference/CseRestTemplate.java       |  4 +-
 .../web/client/CseHttpMessageConverter.java        | 40 +++++++++++--
 .../reference/TestCseRequestCallback.java          |  4 +-
 scripts/travis.sh                                  |  2 +-
 50 files changed, 591 insertions(+), 351 deletions(-)
 delete mode 100644 demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/resources/microservice.yaml
 delete mode 100644 demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/resources/microservice.yaml
 delete mode 100644 demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/microservice.yaml
 delete mode 100644 demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservice.yaml
 create mode 100644 foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/GenericsUtils.java
 copy foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/{TestExceptionUtils.java => TestGenericsUtils.java} (51%)
 copy service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/Framework.java => integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/weak/consumer/SpringmvcBasicRequestModel.java (75%)
 copy demo/demo-schema/src/main/java/org/apache/servicecomb/demo/smartcare/Response.java => integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/weak/consumer/SpringmvcBasicResponseModel.java (73%)
 copy handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/RuleExt.java => integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/weak/consumer/SpringmvcBasicService.java (64%)
 create mode 100644 integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/weak/consumer/TestSpringmvcBasic.java
 create mode 100644 integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/weak/provider/SpringmvcBasicEndpoint.java
 copy common/common-javassist/src/main/java/org/apache/servicecomb/common/javassist/ParameterConfig.java => integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/weak/provider/SpringmvcBasicRequestModel.java (79%)
 copy demo/demo-schema/src/main/java/org/apache/servicecomb/demo/smartcare/Response.java => integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/weak/provider/SpringmvcBasicResponseModel.java (73%)