This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit c5d673bc39be5ffee63d3a7fff5aa21040358349 Author: AngLi2 <[email protected]> AuthorDate: Mon Nov 11 10:28:35 2019 +0800 [SCB-1582] Bump jackson version from 2.9.8 to 2.10.0 and fix incompatible issues --- .../common/rest/codec/fix/TestDoSFix.java | 8 +-- .../definition/schema/StaticSchemaFactoryTest.java | 4 +- core/src/test/resources/test/test/schema.yaml | 2 +- .../src/main/resources/schemas/helloworld.yaml | 2 +- .../src/main/resources/schemas/helloworld.yaml | 2 +- .../resources/microservices/jaxrs/compute.yaml | 20 +++---- .../microservices/pojo/helloworld.Greeter.yaml | 4 +- .../main/resources/microservices/pojo/server.yaml | 18 +++--- .../resources/microservices/pojo/tcc-server.yaml | 4 +- .../microservices/springmvc/controller.yaml | 10 ++-- .../microservices/pojo/helloworld.Greeter.yaml | 4 +- .../main/resources/microservices/pojo/server.yaml | 14 ++--- .../resources/microservices/pojo/tcc-server.yaml | 4 +- .../springmvc/server/ProducerTestsAfterBootup.java | 4 +- .../config/client/ConfigCenterClient.java | 2 +- inspector/src/test/resources/schema1.yaml | 2 +- inspector/src/test/resources/schema2.yaml | 4 +- .../resources/microservices/jaxrs/schemaFirst.yaml | 30 +++++----- java-chassis-dependencies/default/pom.xml | 13 +++- java-chassis-dependencies/springboot2/pom.xml | 64 ++++++++++++++++++++ java-chassis-distribution/src/release/LICENSE | 20 +++---- .../metrics/core/publish/DefaultLogPublisher.java | 6 +- .../src/test/resources/schemas/allMethod.yaml | 70 +++++++++++----------- .../src/test/resources/schemas/allType.yaml | 2 +- .../src/test/resources/schemas/apiOperation.yaml | 2 +- .../src/test/resources/schemas/apiResponse.yaml | 2 +- .../src/test/resources/schemas/array.yaml | 2 +- .../src/test/resources/schemas/boolean.yaml | 2 +- .../src/test/resources/schemas/booleanObject.yaml | 2 +- .../src/test/resources/schemas/byte.yaml | 2 +- .../src/test/resources/schemas/byteObject.yaml | 2 +- .../src/test/resources/schemas/bytes.yaml | 2 +- .../src/test/resources/schemas/bytesObject.yaml | 2 +- .../src/test/resources/schemas/char.yaml | 2 +- .../src/test/resources/schemas/charObject.yaml | 2 +- .../test/resources/schemas/completableFuture.yaml | 2 +- .../src/test/resources/schemas/date.yaml | 2 +- .../src/test/resources/schemas/double.yaml | 2 +- .../src/test/resources/schemas/doubleObject.yaml | 2 +- .../src/test/resources/schemas/enum.yaml | 2 +- .../src/test/resources/schemas/float.yaml | 2 +- .../src/test/resources/schemas/floatObject.yaml | 2 +- .../src/test/resources/schemas/int.yaml | 2 +- .../src/test/resources/schemas/intObject.yaml | 2 +- .../src/test/resources/schemas/list.yaml | 2 +- .../src/test/resources/schemas/long.yaml | 2 +- .../src/test/resources/schemas/longObject.yaml | 2 +- .../src/test/resources/schemas/map.yaml | 2 +- .../src/test/resources/schemas/mapList.yaml | 2 +- .../src/test/resources/schemas/multiParam.yaml | 2 +- .../src/test/resources/schemas/object.yaml | 2 +- .../src/test/resources/schemas/responseHeader.yaml | 2 +- .../src/test/resources/schemas/set.yaml | 2 +- .../src/test/resources/schemas/short.yaml | 2 +- .../src/test/resources/schemas/shortObject.yaml | 2 +- .../src/test/resources/schemas/string.yaml | 2 +- .../schemas/testCompletableFutureOptional.yaml | 2 +- .../src/test/resources/schemas/testOptional.yaml | 2 +- .../src/test/resources/swagger1.yaml | 2 +- .../src/test/resources/swagger2.yaml | 2 +- .../src/test/resources/schemas/cookie.yaml | 2 +- .../src/test/resources/schemas/echo.yaml | 2 +- .../src/test/resources/schemas/emptyPath.yaml | 2 +- .../src/test/resources/schemas/enumBody.yaml | 2 +- .../src/test/resources/schemas/form.yaml | 2 +- .../src/test/resources/schemas/query.yaml | 2 +- .../resources/schemas/rawJsonStringMethod.yaml | 2 +- .../src/test/resources/schemas/response.yaml | 2 +- .../test/resources/schemas/MethodEmptyPath.yaml | 10 ++-- .../resources/schemas/asyncResponseEntity.yaml | 2 +- .../test/resources/schemas/defaultParameter.yaml | 12 ++-- .../src/test/resources/schemas/emptyPath.yaml | 2 +- .../src/test/resources/schemas/enumBody.yaml | 2 +- .../test/resources/schemas/inheritHttpMethod.yaml | 2 +- .../test/resources/schemas/mixupAnnotations.yaml | 12 ++-- .../resources/schemas/rawJsonStringMethod.yaml | 2 +- .../src/test/resources/schemas/responseEntity.yaml | 12 ++-- ...estCompletableFutureResponseEntityOptional.yaml | 2 +- .../schemas/testResponseEntityOptional.yaml | 2 +- .../client/http/TestDefaultHttpClientFilter.java | 4 +- 80 files changed, 270 insertions(+), 195 deletions(-) diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java index 2692cb3..a8b175a 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java @@ -26,7 +26,7 @@ import org.apache.servicecomb.foundation.test.scaffolding.model.Color; import org.junit.Assert; import org.junit.Test; -import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.exc.InputCoercionException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.InvalidFormatException; @@ -108,7 +108,7 @@ public class TestDoSFix { } void batFastFail(Class<?> cls) { - batFastFail(cls, JsonParseException.class, InvalidFormatException.class); + batFastFail(cls, InputCoercionException.class, InvalidFormatException.class); } void batFastFail(String fieldName, Class<?> e1, Class<?> e2) { @@ -130,8 +130,8 @@ public class TestDoSFix { @Test public void testChar() { - batFastFail(char.class, JsonParseException.class, MismatchedInputException.class); - batFastFail(Character.class, JsonParseException.class, MismatchedInputException.class); + batFastFail(char.class, InputCoercionException.class, MismatchedInputException.class); + batFastFail(Character.class, InputCoercionException.class, MismatchedInputException.class); batFastFail("cValue", JsonMappingException.class, MismatchedInputException.class); batFastFail("cObjValue", JsonMappingException.class, MismatchedInputException.class); diff --git a/core/src/test/java/org/apache/servicecomb/core/definition/schema/StaticSchemaFactoryTest.java b/core/src/test/java/org/apache/servicecomb/core/definition/schema/StaticSchemaFactoryTest.java index 4468ada..068acb7 100644 --- a/core/src/test/java/org/apache/servicecomb/core/definition/schema/StaticSchemaFactoryTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/definition/schema/StaticSchemaFactoryTest.java @@ -138,7 +138,7 @@ public class StaticSchemaFactoryTest { + " default: 0\n" + " format: \"int32\"\n" + " responses:\n" - + " 200:\n" + + " \"200\":\n" + " description: \"response of 200\"\n" + " schema:\n" + " type: \"integer\"\n" @@ -160,7 +160,7 @@ public class StaticSchemaFactoryTest { + " default: 0\n" + " format: \"int32\"\n" + " responses:\n" - + " 200:\n" + + " \"200\":\n" + " description: \"response of 200\"\n" + " schema:\n" + " type: \"integer\"\n" diff --git a/core/src/test/resources/test/test/schema.yaml b/core/src/test/resources/test/test/schema.yaml index b3e6aaa..1fc4b15 100644 --- a/core/src/test/resources/test/test/schema.yaml +++ b/core/src/test/resources/test/test/schema.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testintBody" responses: - 200: + "200": description: "response of 200" definitions: testintBody: diff --git a/demo/demo-crossapp/crossapp-client/src/main/resources/schemas/helloworld.yaml b/demo/demo-crossapp/crossapp-client/src/main/resources/schemas/helloworld.yaml index a00b21c..4a98f86 100644 --- a/demo/demo-crossapp/crossapp-client/src/main/resources/schemas/helloworld.yaml +++ b/demo/demo-crossapp/crossapp-client/src/main/resources/schemas/helloworld.yaml @@ -30,7 +30,7 @@ paths: get: operationId: sayHello responses: - 200: + "200": description: say hello schema: type: string diff --git a/demo/demo-crossapp/crossapp-server/src/main/resources/schemas/helloworld.yaml b/demo/demo-crossapp/crossapp-server/src/main/resources/schemas/helloworld.yaml index a00b21c..4a98f86 100644 --- a/demo/demo-crossapp/crossapp-server/src/main/resources/schemas/helloworld.yaml +++ b/demo/demo-crossapp/crossapp-server/src/main/resources/schemas/helloworld.yaml @@ -30,7 +30,7 @@ paths: get: operationId: sayHello responses: - 200: + "200": description: say hello schema: type: string diff --git a/demo/demo-schema/src/main/resources/microservices/jaxrs/compute.yaml b/demo/demo-schema/src/main/resources/microservices/jaxrs/compute.yaml index 66eb476..badbda8 100644 --- a/demo/demo-schema/src/main/resources/microservices/jaxrs/compute.yaml +++ b/demo/demo-schema/src/main/resources/microservices/jaxrs/compute.yaml @@ -51,7 +51,7 @@ paths: type: integer format: int32 responses: - 200: + "200": description: add numer schema: type: integer @@ -71,7 +71,7 @@ paths: type: integer format: int32 responses: - 200: + "200": description: reduce schema: type: integer @@ -86,7 +86,7 @@ paths: schema: $ref: '#/definitions/Person' responses: - 200: + "200": description: say hello schema: $ref: '#/definitions/Person' @@ -100,7 +100,7 @@ paths: x-raw-json: true type: string responses: - 200: + "200": description: test RawJson String schema: type: string @@ -118,7 +118,7 @@ paths: schema: $ref: '#/definitions/Person' responses: - 200: + "200": description: say something schema: type: string @@ -131,7 +131,7 @@ paths: required: true type: string responses: - 200: + "200": description: say hi schema: type: string @@ -148,7 +148,7 @@ paths: required: true type: string responses: - 200: + "200": description: say hi schema: type: string @@ -161,7 +161,7 @@ paths: required: true type: string responses: - 200: + "200": description: say hi schema: type: string @@ -169,7 +169,7 @@ paths: get: operationId: isTrue responses: - 200: + "200": description: is true schema: type: boolean @@ -186,7 +186,7 @@ paths: items: type: string responses: - 200: + "200": description: add string schema: type: string diff --git a/demo/demo-schema/src/main/resources/microservices/pojo/helloworld.Greeter.yaml b/demo/demo-schema/src/main/resources/microservices/pojo/helloworld.Greeter.yaml index c3272c1..d503f15 100644 --- a/demo/demo-schema/src/main/resources/microservices/pojo/helloworld.Greeter.yaml +++ b/demo/demo-schema/src/main/resources/microservices/pojo/helloworld.Greeter.yaml @@ -46,7 +46,7 @@ paths: schema: type: string responses: - 200: + "200": description: asdf schema: type: string @@ -64,7 +64,7 @@ paths: schema: type: string responses: - 200: + "200": description: asdf schema: type: string diff --git a/demo/demo-schema/src/main/resources/microservices/pojo/server.yaml b/demo/demo-schema/src/main/resources/microservices/pojo/server.yaml index 15b1d82..d521ccd 100644 --- a/demo/demo-schema/src/main/resources/microservices/pojo/server.yaml +++ b/demo/demo-schema/src/main/resources/microservices/pojo/server.yaml @@ -47,7 +47,7 @@ paths: items: type: string responses: - 200: + "200": description: asdf schema: type: string @@ -60,7 +60,7 @@ paths: required: false type: string responses: - 200: + "200": description: asdf schema: type: string @@ -73,7 +73,7 @@ paths: type: integer format: int32 responses: - 200: + "200": description: asdf schema: type: string @@ -86,7 +86,7 @@ paths: type: integer format: int32 responses: - 200: + "200": description: asdf schema: type: string @@ -100,7 +100,7 @@ paths: type: integer format: int32 responses: - 200: + "200": description: asdf schema: type: string @@ -136,7 +136,7 @@ paths: schema: $ref: '#/definitions/User' responses: - 200: + "200": description: asdf schema: $ref: '#/definitions/User' @@ -154,7 +154,7 @@ paths: schema: $ref: '#/definitions/TestRequest' responses: - 200: + "200": description: asdf schema: $ref: '#/definitions/User' @@ -173,7 +173,7 @@ paths: items: type: string responses: - 200: + "200": description: add string schema: type: string @@ -181,7 +181,7 @@ paths: get: operationId: testTraceId responses: - 200: + "200": description: get trace id schema: type: string diff --git a/demo/demo-schema/src/main/resources/microservices/pojo/tcc-server.yaml b/demo/demo-schema/src/main/resources/microservices/pojo/tcc-server.yaml index 677cce1..4af831b 100644 --- a/demo/demo-schema/src/main/resources/microservices/pojo/tcc-server.yaml +++ b/demo/demo-schema/src/main/resources/microservices/pojo/tcc-server.yaml @@ -49,7 +49,7 @@ paths: schema: $ref: '#/definitions/User' responses: - 200: + "200": description: asdf schema: $ref: '#/definitions/User' @@ -67,7 +67,7 @@ paths: schema: $ref: '#/definitions/TestRequest' responses: - 200: + "200": description: asdf schema: $ref: '#/definitions/User' diff --git a/demo/demo-schema/src/main/resources/microservices/springmvc/controller.yaml b/demo/demo-schema/src/main/resources/microservices/springmvc/controller.yaml index bc18418..9bea47b 100644 --- a/demo/demo-schema/src/main/resources/microservices/springmvc/controller.yaml +++ b/demo/demo-schema/src/main/resources/microservices/springmvc/controller.yaml @@ -51,7 +51,7 @@ paths: type: integer format: int32 responses: - 200: + "200": description: add numer schema: type: integer @@ -66,7 +66,7 @@ paths: required: true type: string responses: - 200: + "200": description: say hello schema: type: string @@ -84,7 +84,7 @@ paths: schema: $ref: '#/definitions/Person' responses: - 200: + "200": description: say something schema: type: string @@ -97,7 +97,7 @@ paths: required: true type: string responses: - 200: + "200": description: say hi schema: type: string @@ -110,7 +110,7 @@ paths: required: true type: string responses: - 200: + "200": description: say hei schema: type: string diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/helloworld.Greeter.yaml b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/helloworld.Greeter.yaml index c3272c1..d503f15 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/helloworld.Greeter.yaml +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/helloworld.Greeter.yaml @@ -46,7 +46,7 @@ paths: schema: type: string responses: - 200: + "200": description: asdf schema: type: string @@ -64,7 +64,7 @@ paths: schema: type: string responses: - 200: + "200": description: asdf schema: type: string diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/server.yaml b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/server.yaml index 876bb19..16602e5 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/server.yaml +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/server.yaml @@ -47,7 +47,7 @@ paths: items: type: string responses: - 200: + "200": description: asdf schema: type: string @@ -60,7 +60,7 @@ paths: required: true type: string responses: - 200: + "200": description: asdf schema: type: string @@ -73,7 +73,7 @@ paths: type: integer format: int32 responses: - 200: + "200": description: asdf schema: type: string @@ -87,7 +87,7 @@ paths: type: integer format: int32 responses: - 200: + "200": description: asdf schema: type: string @@ -122,7 +122,7 @@ paths: schema: $ref: '#/definitions/User' responses: - 200: + "200": description: asdf schema: $ref: '#/definitions/User' @@ -140,7 +140,7 @@ paths: schema: $ref: '#/definitions/TestRequest' responses: - 200: + "200": description: asdf schema: $ref: '#/definitions/User' @@ -159,7 +159,7 @@ paths: items: type: string responses: - 200: + "200": description: add string schema: type: string diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/tcc-server.yaml b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/tcc-server.yaml index 677cce1..4af831b 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/tcc-server.yaml +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservices/pojo/tcc-server.yaml @@ -49,7 +49,7 @@ paths: schema: $ref: '#/definitions/User' responses: - 200: + "200": description: asdf schema: $ref: '#/definitions/User' @@ -67,7 +67,7 @@ paths: schema: $ref: '#/definitions/TestRequest' responses: - 200: + "200": description: asdf schema: $ref: '#/definitions/User' diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java index 6023d1d..1d4ad5c 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java @@ -53,9 +53,9 @@ public class ProducerTestsAfterBootup implements BootListener { CodeFirstSpringmvcForSchema.class, new CodeFirstSpringmvcForSchema()); String codeFirst = getSwaggerContent(meta.getSwagger()); - TestMgr.check("2986daa46b229ec125443122dd7b51ee9a64879f1750d0996f948ce0718685c7", + TestMgr.check("608f6cbb3554839de311d90d16a44ffc41ef66575101e172eb54ccc255e8675d", RegistryUtils.calcSchemaSummary(codeFirst)); - TestMgr.check(codeFirst.length(), 889); + TestMgr.check(codeFirst.length(), 891); } public void testRegisteredBasePath() { diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java index eed0d7d..ac0f88a 100644 --- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java +++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java @@ -384,7 +384,7 @@ public class ConfigCenterClient { try { parseConfigUtils .refreshConfigItems(JsonUtils.OBJ_MAPPER.readValue(buf.toString(), - new TypeReference<LinkedHashMap<String, Map<String, String>>>() { + new TypeReference<LinkedHashMap<String, Map<String, Object>>>() { })); EventManager.post(new ConnSuccEvent()); } catch (IOException e) { diff --git a/inspector/src/test/resources/schema1.yaml b/inspector/src/test/resources/schema1.yaml index 040caa4..6bf42c9 100644 --- a/inspector/src/test/resources/schema1.yaml +++ b/inspector/src/test/resources/schema1.yaml @@ -37,7 +37,7 @@ paths: description: "illegal request content" schema: type: "string" - 200: + "200": description: "response of 200" schema: type: "object" diff --git a/inspector/src/test/resources/schema2.yaml b/inspector/src/test/resources/schema2.yaml index 2bf360e..eee3fab 100644 --- a/inspector/src/test/resources/schema2.yaml +++ b/inspector/src/test/resources/schema2.yaml @@ -33,7 +33,7 @@ paths: operationId: "checkHealth" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "boolean" @@ -42,7 +42,7 @@ paths: operationId: "checkHealthDetails" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "object" diff --git a/integration-tests/jaxrs-tests/src/test/resources/microservices/jaxrs/schemaFirst.yaml b/integration-tests/jaxrs-tests/src/test/resources/microservices/jaxrs/schemaFirst.yaml index c9ccda1..e401a48 100644 --- a/integration-tests/jaxrs-tests/src/test/resources/microservices/jaxrs/schemaFirst.yaml +++ b/integration-tests/jaxrs-tests/src/test/resources/microservices/jaxrs/schemaFirst.yaml @@ -40,7 +40,7 @@ paths: type: integer format: int32 responses: - 200: + "200": description: add numer schema: type: integer @@ -60,7 +60,7 @@ paths: type: integer format: int32 responses: - 200: + "200": description: reduce schema: type: integer @@ -75,7 +75,7 @@ paths: schema: $ref: '#/definitions/Person' responses: - 200: + "200": description: say hello schema: $ref: '#/definitions/Person' @@ -89,7 +89,7 @@ paths: x-raw-json: true type: string responses: - 200: + "200": description: test RawJson String schema: type: string @@ -107,7 +107,7 @@ paths: schema: $ref: '#/definitions/Person' responses: - 200: + "200": description: say something schema: type: string @@ -125,7 +125,7 @@ paths: schema: $ref: '#/definitions/Person' responses: - 200: + "200": description: say something schema: type: string @@ -138,7 +138,7 @@ paths: required: true type: string responses: - 200: + "200": description: say hi schema: type: string @@ -155,7 +155,7 @@ paths: required: true type: string responses: - 200: + "200": description: say hi schema: type: string @@ -163,7 +163,7 @@ paths: get: operationId: isTrue responses: - 200: + "200": description: is true schema: type: boolean @@ -180,7 +180,7 @@ paths: items: type: string responses: - 200: + "200": description: add string schema: type: string @@ -197,7 +197,7 @@ paths: additionalProperties: $ref: '#/definitions/User' responses: - 200: + "200": description: response of 200 schema: type: object @@ -218,7 +218,7 @@ paths: type: integer format: int64 responses: - 200: + "200": description: response of 200 schema: type: string @@ -235,7 +235,7 @@ paths: schema: type: string responses: - 200: + "200": description: response of 200 schema: type: string @@ -244,7 +244,7 @@ paths: operationId: defaultPath parameters: [] responses: - 200: + "200": description: response of 200 schema: type: integer @@ -260,7 +260,7 @@ paths: type: string format: byte responses: - 200: + "200": description: response of 200 schema: type: string diff --git a/java-chassis-dependencies/default/pom.xml b/java-chassis-dependencies/default/pom.xml index 3413ad5..58d06e5 100644 --- a/java-chassis-dependencies/default/pom.xml +++ b/java-chassis-dependencies/default/pom.xml @@ -59,7 +59,7 @@ <hibernate-validator.version>6.0.14.Final</hibernate-validator.version> <httpcomponents.version>4.5.7</httpcomponents.version> <hystrix.version>1.5.18</hystrix.version> - <jackson.version>2.9.8</jackson.version> + <jackson.version>2.10.0</jackson.version> <javassist.version>3.24.0-GA</javassist.version> <javakaffee.version>0.26</javakaffee.version> <javax-annotation.version>1.3.2</javax-annotation.version> @@ -210,6 +210,17 @@ </dependency> <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jaxb-annotations</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-afterburner</artifactId> + <version>${jackson.version}</version> + </dependency> + + <dependency> <groupId>com.github.seanyinx</groupId> <artifactId>unit-scaffolding</artifactId> <version>${seanyinx.version}</version> diff --git a/java-chassis-dependencies/springboot2/pom.xml b/java-chassis-dependencies/springboot2/pom.xml index 1cb053b..1e7d366 100644 --- a/java-chassis-dependencies/springboot2/pom.xml +++ b/java-chassis-dependencies/springboot2/pom.xml @@ -32,6 +32,7 @@ <properties> <!-- Dependency versions --> + <jackson.version>2.10.0</jackson.version> <spring-boot.version>2.1.6.RELEASE</spring-boot.version> <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version> <!-- Plugin versions --> @@ -40,6 +41,69 @@ <dependencyManagement> <dependencies> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> + </dependency> + + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-protobuf</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-xml</artifactId> + <version>${jackson.version}</version> + <exclusions> + <exclusion> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jdk8</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jsr310</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-afterburner</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-parameter-names</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + <version>${jackson.version}</version> + </dependency> + + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jaxb-annotations</artifactId> + <version>${jackson.version}</version> + </dependency> <!-- Error occur when changing the sequence of dependencies --> <dependency> <groupId>org.springframework.cloud</groupId> diff --git a/java-chassis-distribution/src/release/LICENSE b/java-chassis-distribution/src/release/LICENSE index 3b7b0f8..9a0d073 100644 --- a/java-chassis-distribution/src/release/LICENSE +++ b/java-chassis-distribution/src/release/LICENSE @@ -491,16 +491,16 @@ For details, see their respective project links. * hystrix-serialization (com.netflix.hystrix:hystrix-serialization:1.5.18 - https://github.com/Netflix/Hystrix) * invokebinder (com.headius:invokebinder:1.11 - http://maven.apache.org) * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.1 - https://github.com/google/j2objc/) -* Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.9.8 - http://github.com/FasterXML/jackson) -* Jackson-core (com.fasterxml.jackson.core:jackson-core:2.9.8 - https://github.com/FasterXML/jackson-core) -* jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.9.8 - http://github.com/FasterXML/jackson) -* Jackson-dataformat-XML (com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.8 - http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding) -* Jackson-dataformat-YAML (com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.8 - https://github.com/FasterXML/jackson-dataformats-text) -* Jackson datatype: jdk8 (com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.11 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8) -* Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.11 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310) -* Jackson module: Afterburner (com.fasterxml.jackson.module:jackson-module-afterburner:2.8.11 - https://github.com/FasterXML/jackson-modules-base) -* Jackson module: JAXB-annotations (com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.8.11 - http://github.com/FasterXML/jackson-module-jaxb-annotations) -* Jackson-module-parameter-names (com.fasterxml.jackson.module:jackson-module-parameter-names:2.8.11 - https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names) +* Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.10.0 - http://github.com/FasterXML/jackson) +* Jackson-core (com.fasterxml.jackson.core:jackson-core:2.10.0 - https://github.com/FasterXML/jackson-core) +* jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.10.0 - http://github.com/FasterXML/jackson) +* Jackson-dataformat-XML (com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.10.0 - http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding) +* Jackson-dataformat-YAML (com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.0 - https://github.com/FasterXML/jackson-dataformats-text) +* Jackson datatype: jdk8 (com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.0 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8) +* Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.0 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310) +* Jackson module: Afterburner (com.fasterxml.jackson.module:jackson-module-afterburner:2.10.0 - https://github.com/FasterXML/jackson-modules-base) +* Jackson module: JAXB-annotations (com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.10.0 - http://github.com/FasterXML/jackson-module-jaxb-annotations) +* Jackson-module-parameter-names (com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.0 - https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names) * javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/) * JBoss Logging 3 (org.jboss.logging:jboss-logging:3.3.2.Final - http://www.jboss.org) * JCommander (com.beust:jcommander:1.35 - http://beust.com/jcommander) diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java index e49e9ff..4ede81a 100644 --- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java +++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java @@ -350,7 +350,7 @@ public class DefaultLogPublisher implements MetricsInitializer { private StringBuilder printProducerDetailsPerf(OperationPerfGroup perfGroup) { StringBuilder sb = new StringBuilder(); - //append rest.200: + //append rest."200": sb.append(" ") .append(perfGroup.getTransport()) .append(".") @@ -391,7 +391,7 @@ public class DefaultLogPublisher implements MetricsInitializer { private StringBuilder printConsumerDetailsPerf(OperationPerfGroup perfGroup) { StringBuilder sb = new StringBuilder(); - //append rest.200: + //append rest."200": sb.append(" ") .append(perfGroup.getTransport()) .append(".") @@ -438,7 +438,7 @@ public class DefaultLogPublisher implements MetricsInitializer { private StringBuilder printEdgeDetailsPerf(OperationPerfGroup perfGroup) { StringBuilder sb = new StringBuilder(); - //append rest.200: + //append rest."200": sb.append(" ") .append(perfGroup.getTransport()) .append(".") diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/allMethod.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/allMethod.yaml index 7fb1207..eefd555 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/allMethod.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/allMethod.yaml @@ -37,14 +37,14 @@ paths: schema: $ref: "#/definitions/AllType" responses: - 200: + "200": description: "response of 200" /testApiOperation: post: operationId: "testApiOperation" parameters: [] responses: - 200: + "200": description: "response of 200" headers: h: @@ -54,7 +54,7 @@ paths: operationId: "testApiResponse" parameters: [] responses: - 200: + "200": description: "response of 200" headers: h: @@ -69,7 +69,7 @@ paths: schema: $ref: "#/definitions/testArrayBody" responses: - 200: + "200": description: "response of 200" /testBoolean: post: @@ -81,7 +81,7 @@ paths: schema: $ref: "#/definitions/testBooleanBody" responses: - 200: + "200": description: "response of 200" /testByte: post: @@ -93,7 +93,7 @@ paths: schema: $ref: "#/definitions/testByteBody" responses: - 200: + "200": description: "response of 200" /testBytes: post: @@ -105,7 +105,7 @@ paths: schema: $ref: "#/definitions/testBytesBody" responses: - 200: + "200": description: "response of 200" /testChar: post: @@ -117,14 +117,14 @@ paths: schema: $ref: "#/definitions/testCharBody" responses: - 200: + "200": description: "response of 200" /testCompletableFuture: post: operationId: "testCompletableFuture" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "string" @@ -133,7 +133,7 @@ paths: operationId: "testCompletableFutureOptional" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "string" @@ -142,7 +142,7 @@ paths: operationId: "testDate" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "string" @@ -157,7 +157,7 @@ paths: schema: $ref: "#/definitions/testDoubleBody" responses: - 200: + "200": description: "response of 200" /testEnum: post: @@ -169,7 +169,7 @@ paths: schema: $ref: "#/definitions/testEnumBody" responses: - 200: + "200": description: "response of 200" /testFloat: post: @@ -181,7 +181,7 @@ paths: schema: $ref: "#/definitions/testFloatBody" responses: - 200: + "200": description: "response of 200" /testInteger: post: @@ -193,7 +193,7 @@ paths: schema: $ref: "#/definitions/testIntegerBody" responses: - 200: + "200": description: "response of 200" /testList: post: @@ -205,7 +205,7 @@ paths: schema: $ref: "#/definitions/testListBody" responses: - 200: + "200": description: "response of 200" /testLong: post: @@ -217,7 +217,7 @@ paths: schema: $ref: "#/definitions/testLongBody" responses: - 200: + "200": description: "response of 200" /testMap: post: @@ -229,7 +229,7 @@ paths: schema: $ref: "#/definitions/testMapBody" responses: - 200: + "200": description: "response of 200" /testMapList: post: @@ -241,7 +241,7 @@ paths: schema: $ref: "#/definitions/testMapListBody" responses: - 200: + "200": description: "response of 200" /testMultiParam: post: @@ -253,7 +253,7 @@ paths: schema: $ref: "#/definitions/testMultiParamBody" responses: - 200: + "200": description: "response of 200" schema: type: "array" @@ -269,14 +269,14 @@ paths: schema: $ref: "#/definitions/User" responses: - 200: + "200": description: "response of 200" /testOptional: post: operationId: "testOptional" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "string" @@ -285,7 +285,7 @@ paths: operationId: "testResponseHeader" parameters: [] responses: - 200: + "200": description: "response of 200" headers: h: @@ -300,7 +300,7 @@ paths: schema: $ref: "#/definitions/testSetBody" responses: - 200: + "200": description: "response of 200" /testShort: post: @@ -312,7 +312,7 @@ paths: schema: $ref: "#/definitions/testShortBody" responses: - 200: + "200": description: "response of 200" /testString: post: @@ -324,7 +324,7 @@ paths: schema: $ref: "#/definitions/testStringBody" responses: - 200: + "200": description: "response of 200" /testboolean: post: @@ -336,7 +336,7 @@ paths: schema: $ref: "#/definitions/testbooleanBody" responses: - 200: + "200": description: "response of 200" /testbyte: post: @@ -348,7 +348,7 @@ paths: schema: $ref: "#/definitions/testbyteBody" responses: - 200: + "200": description: "response of 200" /testbytes: post: @@ -360,7 +360,7 @@ paths: schema: $ref: "#/definitions/testbytesBody" responses: - 200: + "200": description: "response of 200" /testchar: post: @@ -372,7 +372,7 @@ paths: schema: $ref: "#/definitions/testcharBody" responses: - 200: + "200": description: "response of 200" /testdouble: post: @@ -384,7 +384,7 @@ paths: schema: $ref: "#/definitions/testdoubleBody" responses: - 200: + "200": description: "response of 200" /testfloat: post: @@ -396,7 +396,7 @@ paths: schema: $ref: "#/definitions/testfloatBody" responses: - 200: + "200": description: "response of 200" /testint: post: @@ -408,7 +408,7 @@ paths: schema: $ref: "#/definitions/testintBody" responses: - 200: + "200": description: "response of 200" /testlong: post: @@ -420,7 +420,7 @@ paths: schema: $ref: "#/definitions/testlongBody" responses: - 200: + "200": description: "response of 200" /testshort: post: @@ -432,7 +432,7 @@ paths: schema: $ref: "#/definitions/testshortBody" responses: - 200: + "200": description: "response of 200" definitions: AllType: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/allType.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/allType.yaml index 0cf6e85..12f1f8f 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/allType.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/allType.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/AllType" responses: - 200: + "200": description: "response of 200" definitions: AllType: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiOperation.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiOperation.yaml index 84cdcb4..9e32433 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiOperation.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiOperation.yaml @@ -32,7 +32,7 @@ paths: operationId: "testApiOperation" parameters: [] responses: - 200: + "200": description: "response of 200" headers: h: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiResponse.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiResponse.yaml index 9a01043..51d9e6d 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiResponse.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiResponse.yaml @@ -32,7 +32,7 @@ paths: operationId: "testApiResponse" parameters: [] responses: - 200: + "200": description: "response of 200" headers: h: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/array.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/array.yaml index d82251d..1786c4f 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/array.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/array.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testArrayBody" responses: - 200: + "200": description: "response of 200" definitions: testArrayBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/boolean.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/boolean.yaml index f142dd4..481f990 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/boolean.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/boolean.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testbooleanBody" responses: - 200: + "200": description: "response of 200" definitions: testbooleanBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/booleanObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/booleanObject.yaml index b3d688e..89d45be 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/booleanObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/booleanObject.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testBooleanBody" responses: - 200: + "200": description: "response of 200" definitions: testBooleanBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/byte.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/byte.yaml index 26fdbd2..37145cd 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/byte.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/byte.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testbyteBody" responses: - 200: + "200": description: "response of 200" definitions: testbyteBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/byteObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/byteObject.yaml index 5093836..30e4f38 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/byteObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/byteObject.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testByteBody" responses: - 200: + "200": description: "response of 200" definitions: testByteBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytes.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytes.yaml index 823c709..4226256 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytes.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytes.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testbytesBody" responses: - 200: + "200": description: "response of 200" definitions: testbytesBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytesObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytesObject.yaml index 3b4986c..5b6754f 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytesObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytesObject.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testBytesBody" responses: - 200: + "200": description: "response of 200" definitions: testBytesBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/char.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/char.yaml index 9bc81cb..16965f7 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/char.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/char.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testcharBody" responses: - 200: + "200": description: "response of 200" definitions: testcharBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/charObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/charObject.yaml index 4e1b55c..990a2c9 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/charObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/charObject.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testCharBody" responses: - 200: + "200": description: "response of 200" definitions: testCharBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/completableFuture.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/completableFuture.yaml index ffbdc84..212ceca 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/completableFuture.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/completableFuture.yaml @@ -32,7 +32,7 @@ paths: operationId: "testCompletableFuture" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "string" diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/date.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/date.yaml index fdb3aa3..a6d1763 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/date.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/date.yaml @@ -32,7 +32,7 @@ paths: operationId: "testDate" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "string" diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/double.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/double.yaml index 23274d0..b58aa2c 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/double.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/double.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testdoubleBody" responses: - 200: + "200": description: "response of 200" definitions: testdoubleBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/doubleObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/doubleObject.yaml index 030554f..f1f2a83 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/doubleObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/doubleObject.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testDoubleBody" responses: - 200: + "200": description: "response of 200" definitions: testDoubleBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/enum.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/enum.yaml index b9c30be..91e0a67 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/enum.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/enum.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testEnumBody" responses: - 200: + "200": description: "response of 200" definitions: testEnumBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/float.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/float.yaml index 49d606e..500cdb2 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/float.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/float.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testfloatBody" responses: - 200: + "200": description: "response of 200" definitions: testfloatBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/floatObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/floatObject.yaml index e7757ba..56d1967 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/floatObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/floatObject.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testFloatBody" responses: - 200: + "200": description: "response of 200" definitions: testFloatBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/int.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/int.yaml index b3e6aaa..1fc4b15 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/int.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/int.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testintBody" responses: - 200: + "200": description: "response of 200" definitions: testintBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/intObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/intObject.yaml index bbf92af..ed16f26 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/intObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/intObject.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testIntegerBody" responses: - 200: + "200": description: "response of 200" definitions: testIntegerBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/list.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/list.yaml index 8266177..c894e8b 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/list.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/list.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testListBody" responses: - 200: + "200": description: "response of 200" definitions: User: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/long.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/long.yaml index c5e6c1b..1de9207 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/long.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/long.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testlongBody" responses: - 200: + "200": description: "response of 200" definitions: testlongBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/longObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/longObject.yaml index a3c8c7e..eeb67d3 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/longObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/longObject.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testLongBody" responses: - 200: + "200": description: "response of 200" definitions: testLongBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/map.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/map.yaml index 229c90f..cd7f812 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/map.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/map.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testMapBody" responses: - 200: + "200": description: "response of 200" definitions: User: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/mapList.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/mapList.yaml index a5cecd7..c94873c 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/mapList.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/mapList.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testMapListBody" responses: - 200: + "200": description: "response of 200" definitions: User: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/multiParam.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/multiParam.yaml index fe39c2d..3f80849 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/multiParam.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/multiParam.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testMultiParamBody" responses: - 200: + "200": description: "response of 200" schema: type: "array" diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/object.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/object.yaml index 9cff4cd..0679237 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/object.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/object.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/User" responses: - 200: + "200": description: "response of 200" definitions: User: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/responseHeader.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/responseHeader.yaml index 061f81d..bbefa65 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/responseHeader.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/responseHeader.yaml @@ -32,7 +32,7 @@ paths: operationId: "testResponseHeader" parameters: [] responses: - 200: + "200": description: "response of 200" headers: h: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/set.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/set.yaml index a3c585a..aec0806 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/set.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/set.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testSetBody" responses: - 200: + "200": description: "response of 200" definitions: testSetBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/short.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/short.yaml index 5832aa5..5c07dc5 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/short.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/short.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testshortBody" responses: - 200: + "200": description: "response of 200" definitions: testshortBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/shortObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/shortObject.yaml index b7d0ce7..b24bc53 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/shortObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/shortObject.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testShortBody" responses: - 200: + "200": description: "response of 200" definitions: testShortBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/string.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/string.yaml index b7d10f3..3b0ce3d 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/string.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/string.yaml @@ -37,7 +37,7 @@ paths: schema: $ref: "#/definitions/testStringBody" responses: - 200: + "200": description: "response of 200" definitions: testStringBody: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/testCompletableFutureOptional.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/testCompletableFutureOptional.yaml index 731cbc7..e6a8e0f 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/testCompletableFutureOptional.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/testCompletableFutureOptional.yaml @@ -32,7 +32,7 @@ paths: operationId: "testCompletableFutureOptional" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "string" diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/testOptional.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/testOptional.yaml index c1afc4c..8778e96 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/testOptional.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/testOptional.yaml @@ -32,7 +32,7 @@ paths: operationId: "testOptional" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "string" diff --git a/swagger/swagger-generator/generator-core/src/test/resources/swagger1.yaml b/swagger/swagger-generator/generator-core/src/test/resources/swagger1.yaml index 14d10c4..ef32763 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/swagger1.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/swagger1.yaml @@ -33,7 +33,7 @@ paths: required: true type: string responses: - 200: + "200": description: say hello schema: type: string \ No newline at end of file diff --git a/swagger/swagger-generator/generator-core/src/test/resources/swagger2.yaml b/swagger/swagger-generator/generator-core/src/test/resources/swagger2.yaml index 5f2f23f..329ec35 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/swagger2.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/swagger2.yaml @@ -34,7 +34,7 @@ paths: schema: type: string responses: - 200: + "200": description: say hello schema: type: string \ No newline at end of file diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/cookie.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/cookie.yaml index 13c4e1d..896793e 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/cookie.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/cookie.yaml @@ -36,7 +36,7 @@ paths: required: false type: "string" responses: - 200: + "200": description: "response of 200" schema: type: "string" diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml index e6e943c..3849665 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml @@ -55,7 +55,7 @@ paths: required: false type: "string" responses: - 200: + "200": description: "response of 200" schema: type: "string" diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/emptyPath.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/emptyPath.yaml index ed7dd88..f76bd99 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/emptyPath.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/emptyPath.yaml @@ -32,5 +32,5 @@ paths: operationId: "emptyPath" parameters: [] responses: - 200: + "200": description: "response of 200" diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/enumBody.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/enumBody.yaml index 65c4731..b5b78b0 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/enumBody.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/enumBody.yaml @@ -41,5 +41,5 @@ paths: - "YELLOW" - "BLUE" responses: - 200: + "200": description: "response of 200" diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/form.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/form.yaml index 46d7c82..911269c 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/form.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/form.yaml @@ -36,7 +36,7 @@ paths: required: false type: "string" responses: - 200: + "200": description: "response of 200" schema: type: "string" diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/query.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/query.yaml index 78b36ea..be256d1 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/query.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/query.yaml @@ -36,7 +36,7 @@ paths: required: false type: "string" responses: - 200: + "200": description: "response of 200" schema: type: "string" diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/rawJsonStringMethod.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/rawJsonStringMethod.yaml index 27f968f..a482f6c 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/rawJsonStringMethod.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/rawJsonStringMethod.yaml @@ -38,5 +38,5 @@ paths: type: "string" x-raw-json: true responses: - 200: + "200": description: "response of 200" diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/response.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/response.yaml index 01398bf..b4db5ae 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/response.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/response.yaml @@ -32,7 +32,7 @@ paths: operationId: "response" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "integer" diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/MethodEmptyPath.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/MethodEmptyPath.yaml index cab4658..958dc7d 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/MethodEmptyPath.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/MethodEmptyPath.yaml @@ -32,29 +32,29 @@ paths: operationId: "usingGetMapping" parameters: [] responses: - 200: + "200": description: "response of 200" post: operationId: "usingPostMapping" parameters: [] responses: - 200: + "200": description: "response of 200" put: operationId: "usingPutMapping" parameters: [] responses: - 200: + "200": description: "response of 200" delete: operationId: "usingDeleteMapping" parameters: [] responses: - 200: + "200": description: "response of 200" patch: operationId: "usingPatchMapping" parameters: [] responses: - 200: + "200": description: "response of 200" diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/asyncResponseEntity.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/asyncResponseEntity.yaml index 05c2848..cb3125f 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/asyncResponseEntity.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/asyncResponseEntity.yaml @@ -34,7 +34,7 @@ paths: operationId: "asyncResponseEntity" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "array" diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/defaultParameter.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/defaultParameter.yaml index b793167..f8f4de1 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/defaultParameter.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/defaultParameter.yaml @@ -37,7 +37,7 @@ paths: type: "integer" format: "int32" responses: - 200: + "200": description: "response of 200" /usingGetMapping: get: @@ -49,7 +49,7 @@ paths: type: "integer" format: "int32" responses: - 200: + "200": description: "response of 200" /usingPatchMapping: patch: @@ -61,7 +61,7 @@ paths: type: "integer" format: "int32" responses: - 200: + "200": description: "response of 200" /usingPostMapping: post: @@ -73,7 +73,7 @@ paths: type: "integer" format: "int32" responses: - 200: + "200": description: "response of 200" /usingPutMapping: put: @@ -85,7 +85,7 @@ paths: type: "integer" format: "int32" responses: - 200: + "200": description: "response of 200" /usingRequestMapping: put: @@ -97,5 +97,5 @@ paths: type: "integer" format: "int32" responses: - 200: + "200": description: "response of 200" diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/emptyPath.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/emptyPath.yaml index 6b76052..7b292cb 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/emptyPath.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/emptyPath.yaml @@ -34,5 +34,5 @@ paths: operationId: "emptyPath" parameters: [] responses: - 200: + "200": description: "response of 200" diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/enumBody.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/enumBody.yaml index b7e877b..449ac41 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/enumBody.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/enumBody.yaml @@ -43,5 +43,5 @@ paths: - "YELLOW" - "BLUE" responses: - 200: + "200": description: "response of 200" diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/inheritHttpMethod.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/inheritHttpMethod.yaml index 86f5c57..69f8051 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/inheritHttpMethod.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/inheritHttpMethod.yaml @@ -39,5 +39,5 @@ paths: type: "integer" format: "int32" responses: - 200: + "200": description: "response of 200" diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/mixupAnnotations.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/mixupAnnotations.yaml index 3b5fe1d..ae7adc8 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/mixupAnnotations.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/mixupAnnotations.yaml @@ -59,7 +59,7 @@ paths: required: true type: "string" responses: - 200: + "200": description: "response of 200" schema: type: "string" @@ -95,7 +95,7 @@ paths: required: true type: "string" responses: - 200: + "200": description: "response of 200" schema: type: "string" @@ -131,7 +131,7 @@ paths: required: true type: "string" responses: - 200: + "200": description: "response of 200" schema: type: "string" @@ -167,7 +167,7 @@ paths: required: true type: "string" responses: - 200: + "200": description: "response of 200" schema: type: "string" @@ -203,7 +203,7 @@ paths: required: true type: "string" responses: - 200: + "200": description: "response of 200" schema: type: "string" @@ -239,7 +239,7 @@ paths: required: true type: "string" responses: - 200: + "200": description: "response of 200" schema: type: "string" diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/rawJsonStringMethod.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/rawJsonStringMethod.yaml index bed74e2..94c17f0 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/rawJsonStringMethod.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/rawJsonStringMethod.yaml @@ -40,5 +40,5 @@ paths: type: "string" x-raw-json: true responses: - 200: + "200": description: "response of 200" diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/responseEntity.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/responseEntity.yaml index 455afb4..8784ffe 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/responseEntity.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/responseEntity.yaml @@ -32,7 +32,7 @@ paths: operationId: "usingDeleteMapping" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "array" @@ -43,7 +43,7 @@ paths: operationId: "usingGetMapping" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "array" @@ -54,7 +54,7 @@ paths: operationId: "usingPatchMapping" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "array" @@ -65,7 +65,7 @@ paths: operationId: "usingPostMapping" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "array" @@ -76,7 +76,7 @@ paths: operationId: "usingPutMapping" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "array" @@ -87,7 +87,7 @@ paths: operationId: "usingRequestMapping" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "array" diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testCompletableFutureResponseEntityOptional.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testCompletableFutureResponseEntityOptional.yaml index c1df298..d7970e1 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testCompletableFutureResponseEntityOptional.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testCompletableFutureResponseEntityOptional.yaml @@ -34,7 +34,7 @@ paths: operationId: "testCompletableFutureResponseEntityOptional" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "string" diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testResponseEntityOptional.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testResponseEntityOptional.yaml index bf4ae81..b31a173 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testResponseEntityOptional.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testResponseEntityOptional.yaml @@ -34,7 +34,7 @@ paths: operationId: "testResponseEntityOptional" parameters: [] responses: - 200: + "200": description: "response of 200" schema: type: "string" diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java index 9c0028b..f8d0a04 100644 --- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java +++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java @@ -161,7 +161,7 @@ public class TestDefaultHttpClientFilter { Assert.assertEquals( "InvocationException: code=400;msg=CommonExceptionData [message=method null, path null, statusCode 400, reasonPhrase null, response content-type null is not supported]", invocationException.getMessage()); - Assert.assertEquals("Unrecognized token 'abc': was expecting ('true', 'false' or 'null')\n" + Assert.assertEquals("Unrecognized token 'abc': was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n" + " at [Source: (org.apache.servicecomb.foundation.vertx.stream.BufferInputStream); line: 1, column: 7]", invocationException.getCause().getMessage()); Assert.assertEquals(CommonExceptionData.class, invocationException.getErrorData().getClass()); @@ -209,7 +209,7 @@ public class TestDefaultHttpClientFilter { Assert.assertEquals( "InvocationException: code=400;msg=CommonExceptionData [message=method null, path null, statusCode 200, reasonPhrase null, response content-type null is not supported]", invocationException.getMessage()); - Assert.assertEquals("Unrecognized token 'abc': was expecting ('true', 'false' or 'null')\n" + Assert.assertEquals("Unrecognized token 'abc': was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n" + " at [Source: (org.apache.servicecomb.foundation.vertx.stream.BufferInputStream); line: 1, column: 7]", invocationException.getCause().getMessage()); Assert.assertEquals(CommonExceptionData.class, invocationException.getErrorData().getClass());
