This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch liubao_master in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit 6bac4296811e8db162085cf96f5f02b8685926c1 Author: liubao <[email protected]> AuthorDate: Sat Jun 29 10:09:55 2024 +0800 Bump com.fasterxml.jackson:jackson-bom from 2.16.1 to 2.17.1 --- dependencies/default/pom.xml | 2 +- .../resources/schemas/ParameterAnnotation.yaml | 6 +- .../src/test/resources/schemas/Schema.yaml | 208 ++++++++++----------- .../src/test/resources/schemas/pojoExample1.yaml | 26 +-- .../test/resources/schemas/ClassAnnotation.yaml | 8 +- .../src/test/resources/schemas/echo.yaml | 26 +-- .../src/test/resources/pageSchema.yaml | 18 +- .../generator/springmvc/TestTwoSameNameModels.java | 10 +- .../resources/schemas/DefaultParameterSchema.yaml | 2 +- .../test/resources/schemas/mixupAnnotations.yaml | 32 ++-- .../src/test/resources/schemas/responseEntity.yaml | 38 ++-- 11 files changed, 188 insertions(+), 188 deletions(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index d99a7866d..4e361048a 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -53,7 +53,7 @@ <hibernate-validator.version>8.0.1.Final</hibernate-validator.version> <httpcomponents.version>4.5.14</httpcomponents.version> <hystrix.version>1.5.18</hystrix.version> - <jackson.version>2.16.1</jackson.version> + <jackson.version>2.17.1</jackson.version> <java-websocket.version>1.5.6</java-websocket.version> <javax-annotation.version>1.3.2</javax-annotation.version> <javax-inject.version>1</javax-inject.version> diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/ParameterAnnotation.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/ParameterAnnotation.yaml index 64e81e853..3b857fa50 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/ParameterAnnotation.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/ParameterAnnotation.yaml @@ -31,13 +31,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/differentNameBody' + $ref: "#/components/schemas/differentNameBody" application/protobuf: schema: - $ref: '#/components/schemas/differentNameBody' + $ref: "#/components/schemas/differentNameBody" text/plain: schema: - $ref: '#/components/schemas/differentNameBody' + $ref: "#/components/schemas/differentNameBody" x-name: differentNameBody responses: "200": diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/Schema.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/Schema.yaml index 0de5a305e..368506b44 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/Schema.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/Schema.yaml @@ -30,13 +30,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ignoreRequestBody' + $ref: "#/components/schemas/ignoreRequestBody" application/protobuf: schema: - $ref: '#/components/schemas/ignoreRequestBody' + $ref: "#/components/schemas/ignoreRequestBody" text/plain: schema: - $ref: '#/components/schemas/ignoreRequestBody' + $ref: "#/components/schemas/ignoreRequestBody" x-name: ignoreRequestBody responses: "200": @@ -48,13 +48,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/nestedListStringBody' + $ref: "#/components/schemas/nestedListStringBody" application/protobuf: schema: - $ref: '#/components/schemas/nestedListStringBody' + $ref: "#/components/schemas/nestedListStringBody" text/plain: schema: - $ref: '#/components/schemas/nestedListStringBody' + $ref: "#/components/schemas/nestedListStringBody" x-name: nestedListStringBody responses: "200": @@ -88,13 +88,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/AllType' + $ref: "#/components/schemas/AllType" application/protobuf: schema: - $ref: '#/components/schemas/AllType' + $ref: "#/components/schemas/AllType" text/plain: schema: - $ref: '#/components/schemas/AllType' + $ref: "#/components/schemas/AllType" x-name: obj responses: "200": @@ -132,13 +132,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testArrayBody' + $ref: "#/components/schemas/testArrayBody" application/protobuf: schema: - $ref: '#/components/schemas/testArrayBody' + $ref: "#/components/schemas/testArrayBody" text/plain: schema: - $ref: '#/components/schemas/testArrayBody' + $ref: "#/components/schemas/testArrayBody" x-name: testArrayBody responses: "200": @@ -150,13 +150,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testBooleanBody' + $ref: "#/components/schemas/testBooleanBody" application/protobuf: schema: - $ref: '#/components/schemas/testBooleanBody' + $ref: "#/components/schemas/testBooleanBody" text/plain: schema: - $ref: '#/components/schemas/testBooleanBody' + $ref: "#/components/schemas/testBooleanBody" x-name: testBooleanBody responses: "200": @@ -168,13 +168,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testByteBody' + $ref: "#/components/schemas/testByteBody" application/protobuf: schema: - $ref: '#/components/schemas/testByteBody' + $ref: "#/components/schemas/testByteBody" text/plain: schema: - $ref: '#/components/schemas/testByteBody' + $ref: "#/components/schemas/testByteBody" x-name: testByteBody responses: "200": @@ -186,13 +186,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testBytesBody' + $ref: "#/components/schemas/testBytesBody" application/protobuf: schema: - $ref: '#/components/schemas/testBytesBody' + $ref: "#/components/schemas/testBytesBody" text/plain: schema: - $ref: '#/components/schemas/testBytesBody' + $ref: "#/components/schemas/testBytesBody" x-name: testBytesBody responses: "200": @@ -204,13 +204,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testCharBody' + $ref: "#/components/schemas/testCharBody" application/protobuf: schema: - $ref: '#/components/schemas/testCharBody' + $ref: "#/components/schemas/testCharBody" text/plain: schema: - $ref: '#/components/schemas/testCharBody' + $ref: "#/components/schemas/testCharBody" x-name: testCharBody responses: "200": @@ -273,13 +273,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testDoubleBody' + $ref: "#/components/schemas/testDoubleBody" application/protobuf: schema: - $ref: '#/components/schemas/testDoubleBody' + $ref: "#/components/schemas/testDoubleBody" text/plain: schema: - $ref: '#/components/schemas/testDoubleBody' + $ref: "#/components/schemas/testDoubleBody" x-name: testDoubleBody responses: "200": @@ -291,13 +291,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testEnumBody' + $ref: "#/components/schemas/testEnumBody" application/protobuf: schema: - $ref: '#/components/schemas/testEnumBody' + $ref: "#/components/schemas/testEnumBody" text/plain: schema: - $ref: '#/components/schemas/testEnumBody' + $ref: "#/components/schemas/testEnumBody" x-name: testEnumBody responses: "200": @@ -309,13 +309,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testFloatBody' + $ref: "#/components/schemas/testFloatBody" application/protobuf: schema: - $ref: '#/components/schemas/testFloatBody' + $ref: "#/components/schemas/testFloatBody" text/plain: schema: - $ref: '#/components/schemas/testFloatBody' + $ref: "#/components/schemas/testFloatBody" x-name: testFloatBody responses: "200": @@ -327,13 +327,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testIntegerBody' + $ref: "#/components/schemas/testIntegerBody" application/protobuf: schema: - $ref: '#/components/schemas/testIntegerBody' + $ref: "#/components/schemas/testIntegerBody" text/plain: schema: - $ref: '#/components/schemas/testIntegerBody' + $ref: "#/components/schemas/testIntegerBody" x-name: testIntegerBody responses: "200": @@ -345,13 +345,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testListBody' + $ref: "#/components/schemas/testListBody" application/protobuf: schema: - $ref: '#/components/schemas/testListBody' + $ref: "#/components/schemas/testListBody" text/plain: schema: - $ref: '#/components/schemas/testListBody' + $ref: "#/components/schemas/testListBody" x-name: testListBody responses: "200": @@ -363,13 +363,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testLongBody' + $ref: "#/components/schemas/testLongBody" application/protobuf: schema: - $ref: '#/components/schemas/testLongBody' + $ref: "#/components/schemas/testLongBody" text/plain: schema: - $ref: '#/components/schemas/testLongBody' + $ref: "#/components/schemas/testLongBody" x-name: testLongBody responses: "200": @@ -381,13 +381,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testMapBody' + $ref: "#/components/schemas/testMapBody" application/protobuf: schema: - $ref: '#/components/schemas/testMapBody' + $ref: "#/components/schemas/testMapBody" text/plain: schema: - $ref: '#/components/schemas/testMapBody' + $ref: "#/components/schemas/testMapBody" x-name: testMapBody responses: "200": @@ -399,13 +399,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testMapListBody' + $ref: "#/components/schemas/testMapListBody" application/protobuf: schema: - $ref: '#/components/schemas/testMapListBody' + $ref: "#/components/schemas/testMapListBody" text/plain: schema: - $ref: '#/components/schemas/testMapListBody' + $ref: "#/components/schemas/testMapListBody" x-name: testMapListBody responses: "200": @@ -417,13 +417,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testMultiParamBody' + $ref: "#/components/schemas/testMultiParamBody" application/protobuf: schema: - $ref: '#/components/schemas/testMultiParamBody' + $ref: "#/components/schemas/testMultiParamBody" text/plain: schema: - $ref: '#/components/schemas/testMultiParamBody' + $ref: "#/components/schemas/testMultiParamBody" x-name: testMultiParamBody responses: "200": @@ -451,13 +451,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/protobuf: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" text/plain: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" x-name: user responses: "200": @@ -469,13 +469,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testOneEnumBody' + $ref: "#/components/schemas/testOneEnumBody" application/protobuf: schema: - $ref: '#/components/schemas/testOneEnumBody' + $ref: "#/components/schemas/testOneEnumBody" text/plain: schema: - $ref: '#/components/schemas/testOneEnumBody' + $ref: "#/components/schemas/testOneEnumBody" x-name: testOneEnumBody responses: "200": @@ -516,13 +516,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testSetBody' + $ref: "#/components/schemas/testSetBody" application/protobuf: schema: - $ref: '#/components/schemas/testSetBody' + $ref: "#/components/schemas/testSetBody" text/plain: schema: - $ref: '#/components/schemas/testSetBody' + $ref: "#/components/schemas/testSetBody" x-name: testSetBody responses: "200": @@ -534,13 +534,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testShortBody' + $ref: "#/components/schemas/testShortBody" application/protobuf: schema: - $ref: '#/components/schemas/testShortBody' + $ref: "#/components/schemas/testShortBody" text/plain: schema: - $ref: '#/components/schemas/testShortBody' + $ref: "#/components/schemas/testShortBody" x-name: testShortBody responses: "200": @@ -552,13 +552,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testStringBody' + $ref: "#/components/schemas/testStringBody" application/protobuf: schema: - $ref: '#/components/schemas/testStringBody' + $ref: "#/components/schemas/testStringBody" text/plain: schema: - $ref: '#/components/schemas/testStringBody' + $ref: "#/components/schemas/testStringBody" x-name: testStringBody responses: "200": @@ -570,13 +570,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testbooleanBody' + $ref: "#/components/schemas/testbooleanBody" application/protobuf: schema: - $ref: '#/components/schemas/testbooleanBody' + $ref: "#/components/schemas/testbooleanBody" text/plain: schema: - $ref: '#/components/schemas/testbooleanBody' + $ref: "#/components/schemas/testbooleanBody" x-name: testbooleanBody responses: "200": @@ -588,13 +588,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testbyteBody' + $ref: "#/components/schemas/testbyteBody" application/protobuf: schema: - $ref: '#/components/schemas/testbyteBody' + $ref: "#/components/schemas/testbyteBody" text/plain: schema: - $ref: '#/components/schemas/testbyteBody' + $ref: "#/components/schemas/testbyteBody" x-name: testbyteBody responses: "200": @@ -606,13 +606,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testbytesBody' + $ref: "#/components/schemas/testbytesBody" application/protobuf: schema: - $ref: '#/components/schemas/testbytesBody' + $ref: "#/components/schemas/testbytesBody" text/plain: schema: - $ref: '#/components/schemas/testbytesBody' + $ref: "#/components/schemas/testbytesBody" x-name: testbytesBody responses: "200": @@ -624,13 +624,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testcharBody' + $ref: "#/components/schemas/testcharBody" application/protobuf: schema: - $ref: '#/components/schemas/testcharBody' + $ref: "#/components/schemas/testcharBody" text/plain: schema: - $ref: '#/components/schemas/testcharBody' + $ref: "#/components/schemas/testcharBody" x-name: testcharBody responses: "200": @@ -642,13 +642,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testdoubleBody' + $ref: "#/components/schemas/testdoubleBody" application/protobuf: schema: - $ref: '#/components/schemas/testdoubleBody' + $ref: "#/components/schemas/testdoubleBody" text/plain: schema: - $ref: '#/components/schemas/testdoubleBody' + $ref: "#/components/schemas/testdoubleBody" x-name: testdoubleBody responses: "200": @@ -660,13 +660,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testfloatBody' + $ref: "#/components/schemas/testfloatBody" application/protobuf: schema: - $ref: '#/components/schemas/testfloatBody' + $ref: "#/components/schemas/testfloatBody" text/plain: schema: - $ref: '#/components/schemas/testfloatBody' + $ref: "#/components/schemas/testfloatBody" x-name: testfloatBody responses: "200": @@ -678,13 +678,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testintBody' + $ref: "#/components/schemas/testintBody" application/protobuf: schema: - $ref: '#/components/schemas/testintBody' + $ref: "#/components/schemas/testintBody" text/plain: schema: - $ref: '#/components/schemas/testintBody' + $ref: "#/components/schemas/testintBody" x-name: testintBody responses: "200": @@ -696,13 +696,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testlongBody' + $ref: "#/components/schemas/testlongBody" application/protobuf: schema: - $ref: '#/components/schemas/testlongBody' + $ref: "#/components/schemas/testlongBody" text/plain: schema: - $ref: '#/components/schemas/testlongBody' + $ref: "#/components/schemas/testlongBody" x-name: testlongBody responses: "200": @@ -714,13 +714,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testshortBody' + $ref: "#/components/schemas/testshortBody" application/protobuf: schema: - $ref: '#/components/schemas/testshortBody' + $ref: "#/components/schemas/testshortBody" text/plain: schema: - $ref: '#/components/schemas/testshortBody' + $ref: "#/components/schemas/testshortBody" x-name: testshortBody responses: "200": @@ -732,13 +732,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/wrapToBodyWithDescBody' + $ref: "#/components/schemas/wrapToBodyWithDescBody" application/protobuf: schema: - $ref: '#/components/schemas/wrapToBodyWithDescBody' + $ref: "#/components/schemas/wrapToBodyWithDescBody" text/plain: schema: - $ref: '#/components/schemas/wrapToBodyWithDescBody' + $ref: "#/components/schemas/wrapToBodyWithDescBody" x-name: wrapToBodyWithDescBody responses: "200": @@ -766,7 +766,7 @@ components: list: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" x-java-class: org.apache.servicecomb.swagger.generator.core.schema.AllType User: type: object @@ -776,7 +776,7 @@ components: friends: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" x-java-class: org.apache.servicecomb.foundation.test.scaffolding.model.User testArrayBody: type: object @@ -846,7 +846,7 @@ components: value: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" testLongBody: type: object properties: @@ -859,7 +859,7 @@ components: value: type: object additionalProperties: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" testMapListBody: type: object properties: @@ -868,12 +868,12 @@ components: additionalProperties: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" testMultiParamBody: type: object properties: obj: - $ref: '#/components/schemas/AllType' + $ref: "#/components/schemas/AllType" bValue: type: boolean byteValue: @@ -919,11 +919,11 @@ components: list: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" map: type: object additionalProperties: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" testOneEnumBody: type: object properties: diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/pojoExample1.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/pojoExample1.yaml index 1ba1c76fc..4744d119c 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/pojoExample1.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/pojoExample1.yaml @@ -30,13 +30,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/testMultiParameterBody' + $ref: "#/components/schemas/testMultiParameterBody" application/protobuf: schema: - $ref: '#/components/schemas/testMultiParameterBody' + $ref: "#/components/schemas/testMultiParameterBody" text/plain: schema: - $ref: '#/components/schemas/testMultiParameterBody' + $ref: "#/components/schemas/testMultiParameterBody" x-name: testMultiParameterBody responses: "200": @@ -44,13 +44,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/XXX' + $ref: "#/components/schemas/XXX" application/protobuf: schema: - $ref: '#/components/schemas/XXX' + $ref: "#/components/schemas/XXX" text/plain: schema: - $ref: '#/components/schemas/XXX' + $ref: "#/components/schemas/XXX" /testOneParameter: post: operationId: testOneParameter @@ -58,13 +58,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/XXX' + $ref: "#/components/schemas/XXX" application/protobuf: schema: - $ref: '#/components/schemas/XXX' + $ref: "#/components/schemas/XXX" text/plain: schema: - $ref: '#/components/schemas/XXX' + $ref: "#/components/schemas/XXX" x-name: testType1 responses: "200": @@ -72,13 +72,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/XXX' + $ref: "#/components/schemas/XXX" application/protobuf: schema: - $ref: '#/components/schemas/XXX' + $ref: "#/components/schemas/XXX" text/plain: schema: - $ref: '#/components/schemas/XXX' + $ref: "#/components/schemas/XXX" components: schemas: XXX: @@ -92,6 +92,6 @@ components: type: object properties: testType1: - $ref: '#/components/schemas/XXX' + $ref: "#/components/schemas/XXX" testString: type: string \ No newline at end of file diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/ClassAnnotation.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/ClassAnnotation.yaml index 46b0d2449..19115e1ec 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/ClassAnnotation.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/ClassAnnotation.yaml @@ -30,7 +30,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" x-name: user responses: "200": @@ -38,10 +38,10 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" text/plain: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" /testForm: post: operationId: testForm @@ -115,5 +115,5 @@ components: friends: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" x-java-class: org.apache.servicecomb.foundation.test.scaffolding.model.User \ No newline at end of file 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 d5227f916..8492c8c65 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 @@ -78,7 +78,7 @@ paths: - name: q in: query schema: - $ref: '#/components/schemas/AggregatedParam' + $ref: "#/components/schemas/AggregatedParam" responses: "200": description: response of 200 @@ -89,7 +89,7 @@ paths: - name: h in: header schema: - $ref: '#/components/schemas/AggregatedParam' + $ref: "#/components/schemas/AggregatedParam" responses: "200": description: response of 200 @@ -188,13 +188,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/DynamicStatusModel' + $ref: "#/components/schemas/DynamicStatusModel" application/protobuf: schema: - $ref: '#/components/schemas/DynamicStatusModel' + $ref: "#/components/schemas/DynamicStatusModel" text/plain: schema: - $ref: '#/components/schemas/DynamicStatusModel' + $ref: "#/components/schemas/DynamicStatusModel" x-name: model responses: "200": @@ -233,13 +233,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/protobuf: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" text/plain: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" x-name: srcUser responses: "200": @@ -340,13 +340,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/JdkStatusModel' + $ref: "#/components/schemas/JdkStatusModel" application/protobuf: schema: - $ref: '#/components/schemas/JdkStatusModel' + $ref: "#/components/schemas/JdkStatusModel" text/plain: schema: - $ref: '#/components/schemas/JdkStatusModel' + $ref: "#/components/schemas/JdkStatusModel" x-name: model responses: "200": @@ -458,7 +458,7 @@ paths: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" responses: "200": description: response of 200 @@ -550,7 +550,7 @@ components: friends: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" x-java-class: org.apache.servicecomb.foundation.test.scaffolding.model.User JdkStatusModel: type: object diff --git a/swagger/swagger-generator/generator-spring-data/src/test/resources/pageSchema.yaml b/swagger/swagger-generator/generator-spring-data/src/test/resources/pageSchema.yaml index 8b9b4b188..49c24f7f5 100644 --- a/swagger/swagger-generator/generator-spring-data/src/test/resources/pageSchema.yaml +++ b/swagger/swagger-generator/generator-spring-data/src/test/resources/pageSchema.yaml @@ -30,13 +30,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/PageString' + $ref: "#/components/schemas/PageString" application/protobuf: schema: - $ref: '#/components/schemas/PageString' + $ref: "#/components/schemas/PageString" text/plain: schema: - $ref: '#/components/schemas/PageString' + $ref: "#/components/schemas/PageString" x-name: page responses: "200": @@ -44,13 +44,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/PageString' + $ref: "#/components/schemas/PageString" application/protobuf: schema: - $ref: '#/components/schemas/PageString' + $ref: "#/components/schemas/PageString" text/plain: schema: - $ref: '#/components/schemas/PageString' + $ref: "#/components/schemas/PageString" components: schemas: PageString: @@ -73,12 +73,12 @@ components: type: integer format: int32 pageable: - $ref: '#/components/schemas/Pageable' + $ref: "#/components/schemas/Pageable" size: type: integer format: int32 sort: - $ref: '#/components/schemas/Sort' + $ref: "#/components/schemas/Sort" totalElements: type: integer format: int64 @@ -101,7 +101,7 @@ components: paged: type: boolean sort: - $ref: '#/components/schemas/Sort' + $ref: "#/components/schemas/Sort" unpaged: type: boolean x-java-class: org.springframework.data.domain.Pageable diff --git a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestTwoSameNameModels.java b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestTwoSameNameModels.java index fdb26fa0a..5bcb3b3fd 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestTwoSameNameModels.java +++ b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestTwoSameNameModels.java @@ -44,7 +44,7 @@ public class TestTwoSameNameModels { content: application/json: schema: - $ref: '#/components/schemas/GenericSameModel' + $ref: "#/components/schemas/GenericSameModel" required: true x-name: param responses: @@ -53,7 +53,7 @@ public class TestTwoSameNameModels { content: application/json: schema: - $ref: '#/components/schemas/GenericSameModel' + $ref: "#/components/schemas/GenericSameModel" /same: post: operationId: service @@ -61,7 +61,7 @@ public class TestTwoSameNameModels { content: application/json: schema: - $ref: '#/components/schemas/SameModel' + $ref: "#/components/schemas/SameModel" required: true x-name: param responses: @@ -70,14 +70,14 @@ public class TestTwoSameNameModels { content: application/json: schema: - $ref: '#/components/schemas/SameModel' + $ref: "#/components/schemas/SameModel" components: schemas: GenericSameModel: type: object properties: data: - $ref: '#/components/schemas/SameModel' + $ref: "#/components/schemas/SameModel" x-java-class: org.apache.servicecomb.swagger.generator.springmvc.model.Generic<org.apache.servicecomb.swagger.generator.springmvc.model.same1.SameModel> SameModel: type: object diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/DefaultParameterSchema.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/DefaultParameterSchema.yaml index 202825a95..f65d956dd 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/DefaultParameterSchema.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/DefaultParameterSchema.yaml @@ -138,7 +138,7 @@ paths: schema: type: array items: - $ref: '#/components/schemas/TestParam' + $ref: "#/components/schemas/TestParam" - name: stringMap in: query schema: 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 bf5794890..35637780e 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 @@ -70,13 +70,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/protobuf: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" text/plain: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" required: true x-name: user responses: @@ -365,10 +365,10 @@ paths: content: text/plain: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" required: true x-name: srcUser responses: @@ -404,10 +404,10 @@ paths: content: text/plain: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" required: true x-name: srcUser responses: @@ -443,10 +443,10 @@ paths: content: text/plain: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" required: true x-name: srcUser responses: @@ -482,10 +482,10 @@ paths: content: text/plain: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" required: true x-name: srcUser responses: @@ -521,10 +521,10 @@ paths: content: text/plain: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" required: true x-name: srcUser responses: @@ -560,10 +560,10 @@ paths: content: text/plain: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" required: true x-name: srcUser responses: @@ -586,5 +586,5 @@ components: friends: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" x-java-class: org.apache.servicecomb.foundation.test.scaffolding.model.User \ No newline at end of file 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 53459a889..e304802b2 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 @@ -34,17 +34,17 @@ paths: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/protobuf: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" text/plain: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" /usingGetMapping: get: operationId: usingGetMapping @@ -56,17 +56,17 @@ paths: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/protobuf: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" text/plain: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" /usingPatchMapping: patch: operationId: usingPatchMapping @@ -78,17 +78,17 @@ paths: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/protobuf: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" text/plain: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" /usingPostMapping: post: operationId: usingPostMapping @@ -100,17 +100,17 @@ paths: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/protobuf: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" text/plain: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" /usingPutMapping: put: operationId: usingPutMapping @@ -122,17 +122,17 @@ paths: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/protobuf: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" text/plain: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" /usingRequestMapping: put: operationId: usingRequestMapping @@ -144,17 +144,17 @@ paths: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" application/protobuf: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" text/plain: schema: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" components: schemas: User: @@ -165,5 +165,5 @@ components: friends: type: array items: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" x-java-class: org.apache.servicecomb.foundation.test.scaffolding.model.User \ No newline at end of file
