From c6eeb90ff403df19a4c61ad8eb2c7668b7e8c00b Mon Sep 17 00:00:00 2001 From: liubao Date: Tue, 22 Aug 2023 22:21:53 +0800 Subject: [PATCH] [SCB-2803]fix checkstyle and test fails --- ci/checkstyle/checkstyle.xml | 4 + .../schema/TestSchemaToProtoGenerator.java | 14 ++- .../RestProducerInvocationCreatorTest.java | 2 - pom.xml | 2 +- .../servicecomb/swagger/SwaggerUtils.java | 4 +- .../swagger/generator/springmvc/Echo.java | 11 ++- .../springmvc/MethodMixupAnnotations.java | 24 ++--- .../model/DefaultParameterSchema.java | 4 +- .../schemas/DefaultParameterSchema.yaml | 13 +-- .../src/test/resources/schemas/echo.yaml | 32 ------- .../resources/schemas/mixupAnnotations.yaml | 90 +++++-------------- 11 files changed, 58 insertions(+), 142 deletions(-) diff --git a/ci/checkstyle/checkstyle.xml b/ci/checkstyle/checkstyle.xml index 8c34ac08b3..3813950a5c 100644 --- a/ci/checkstyle/checkstyle.xml +++ b/ci/checkstyle/checkstyle.xml @@ -41,6 +41,10 @@ + + + + diff --git a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/schema/TestSchemaToProtoGenerator.java b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/schema/TestSchemaToProtoGenerator.java index c1b5f029aa..4c0e0321f9 100644 --- a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/schema/TestSchemaToProtoGenerator.java +++ b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/schema/TestSchemaToProtoGenerator.java @@ -31,6 +31,7 @@ import io.swagger.v3.oas.models.media.StringSchema; import jakarta.ws.rs.core.MediaType; +//CHECKSTYLE:OFF @SuppressWarnings("unused") public class TestSchemaToProtoGenerator { @Test @@ -117,8 +118,7 @@ public void test_springmvc_int_schema_correct() { message testIntRequest { int32 value = 1; } - - """, new ProtoToStringGenerator(proto).protoToString()); + """.trim(), new ProtoToStringGenerator(proto).protoToString().trim()); protoGenerator = new SchemaToProtoGenerator("test.int", openAPI, @@ -134,8 +134,7 @@ public void test_springmvc_int_schema_correct() { message testIntResponse { int32 value = 1; } - - """, new ProtoToStringGenerator(proto).protoToString()); + """.trim(), new ProtoToStringGenerator(proto).protoToString().trim()); } @@ -163,8 +162,7 @@ public void test_springmvc_model_schema_correct() { message testModelRequest { Model value = 1; } - - """, new ProtoToStringGenerator(proto).protoToString()); + """.trim(), new ProtoToStringGenerator(proto).protoToString().trim()); protoGenerator = new SchemaToProtoGenerator("test.model", openAPI, @@ -185,7 +183,7 @@ public void test_springmvc_model_schema_correct() { message testIntResponse { Model value = 1; } - - """, new ProtoToStringGenerator(proto).protoToString()); + """.trim(), new ProtoToStringGenerator(proto).protoToString().trim()); } } +//CHECKSTYLE:ON diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java index 108fb8722b..ecc21f73fd 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java @@ -17,7 +17,6 @@ package org.apache.servicecomb.common.rest; -import static jakarta.ws.rs.core.Response.Status.NOT_ACCEPTABLE; import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; @@ -50,7 +49,6 @@ import io.vertx.core.json.Json; import io.vertx.ext.web.RoutingContext; -import jakarta.ws.rs.core.HttpHeaders; public class RestProducerInvocationCreatorTest { diff --git a/pom.xml b/pom.xml index 0f40c29727..0f8b4bb0c1 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ - 3.2.2 + 3.3.0 4.3.0 8.3.1 0.43.3 diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/SwaggerUtils.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/SwaggerUtils.java index b8da1ed615..6f6a591c63 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/SwaggerUtils.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/SwaggerUtils.java @@ -300,8 +300,8 @@ public static boolean propertiesEquals(Map properties1, Map item : properties1.entrySet()) { + if (!schemaEquals(item.getValue(), properties2.get(item.getKey()))) { result = false; break; } diff --git a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/Echo.java b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/Echo.java index 92d6d450b1..48ac1256c5 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/Echo.java +++ b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/Echo.java @@ -80,28 +80,27 @@ public void part(@RequestPart MultipartFile part) { } - // TODO: this should fail. RequestMapping not parse consumes and produces. - @RequestMapping("partArray") + @RequestMapping(value = "partArray", consumes = MediaType.MULTIPART_FORM_DATA) public void partArray(@RequestPart MultipartFile[] part) { } - @RequestMapping("partList") + @RequestMapping(value = "partList", consumes = MediaType.MULTIPART_FORM_DATA) public void partList(@RequestPart List part) { } - @RequestMapping("partAnnotation") + @RequestMapping(value = "partAnnotation", consumes = MediaType.MULTIPART_FORM_DATA) public void partAnnotation(@RequestPart MultipartFile part) { } - @RequestMapping("partArrayAnnotation") + @RequestMapping(value = "partArrayAnnotation", consumes = MediaType.MULTIPART_FORM_DATA) public void partArrayAnnotation(@RequestPart MultipartFile[] part) { } - @RequestMapping("partListAnnotation") + @RequestMapping(value = "partListAnnotation", consumes = MediaType.MULTIPART_FORM_DATA) public void partListAnnotation(@RequestPart List part) { } diff --git a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/MethodMixupAnnotations.java b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/MethodMixupAnnotations.java index 2513b4e911..5d93a2862f 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/MethodMixupAnnotations.java +++ b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/MethodMixupAnnotations.java @@ -54,8 +54,8 @@ public class MethodMixupAnnotations { @RequestMapping( path = "usingRequestMapping/{targetName}", method = {RequestMethod.POST}, - consumes = {"text/plain", "application/*"}, - produces = {"text/plain", "application/*"}) + consumes = {"text/plain", "application/json"}, + produces = {"text/plain", "application/json"}) public String usingRequestMapping(@RequestBody User srcUser, @RequestHeader String header, @PathVariable String targetName, @RequestParam(name = "word") String word) { return String.format("%s %s %s %s", srcUser.name, header, targetName, word); @@ -63,8 +63,8 @@ public String usingRequestMapping(@RequestBody User srcUser, @RequestHeader Stri @GetMapping( path = "usingGetMapping/{targetName}", - consumes = {"text/plain", "application/*"}, - produces = {"text/plain", "application/*"}) + consumes = {"text/plain", "application/json"}, + produces = {"text/plain", "application/json"}) public String usingGetMapping(@RequestBody User srcUser, @RequestHeader String header, @PathVariable String targetName, @RequestParam(name = "word") String word) { return String.format("%s %s %s %s", srcUser.name, header, targetName, word); @@ -72,8 +72,8 @@ public String usingGetMapping(@RequestBody User srcUser, @RequestHeader String h @PutMapping( path = "usingPutMapping/{targetName}", - consumes = {"text/plain", "application/*"}, - produces = {"text/plain", "application/*"}) + consumes = {"text/plain", "application/json"}, + produces = {"text/plain", "application/json"}) public String usingPutMapping(@RequestBody User srcUser, @RequestHeader String header, @PathVariable String targetName, @RequestParam(name = "word") String word) { return String.format("%s %s %s %s", srcUser.name, header, targetName, word); @@ -81,8 +81,8 @@ public String usingPutMapping(@RequestBody User srcUser, @RequestHeader String h @PostMapping( path = "usingPostMapping/{targetName}", - consumes = {"text/plain", "application/*"}, - produces = {"text/plain", "application/*"}) + consumes = {"text/plain", "application/json"}, + produces = {"text/plain", "application/json"}) public String usingPostMapping(@RequestBody User srcUser, @RequestHeader String header, @PathVariable String targetName, @RequestParam(name = "word") String word) { return String.format("%s %s %s %s", srcUser.name, header, targetName, word); @@ -90,8 +90,8 @@ public String usingPostMapping(@RequestBody User srcUser, @RequestHeader String @PatchMapping( path = "usingPatchMapping/{targetName}", - consumes = {"text/plain", "application/*"}, - produces = {"text/plain", "application/*"}) + consumes = {"text/plain", "application/json"}, + produces = {"text/plain", "application/json"}) public String usingPatchMapping(@RequestBody User srcUser, @RequestHeader String header, @PathVariable String targetName, @RequestParam(name = "word") String word) { return String.format("%s %s %s %s", srcUser.name, header, targetName, word); @@ -99,8 +99,8 @@ public String usingPatchMapping(@RequestBody User srcUser, @RequestHeader String @DeleteMapping( path = "usingDeleteMapping/{targetName}", - consumes = {"text/plain", "application/*"}, - produces = {"text/plain", "application/*"}) + consumes = {"text/plain", "application/json"}, + produces = {"text/plain", "application/json"}) public String usingDeleteMapping(@RequestBody User srcUser, @RequestHeader String header, @PathVariable String targetName, @RequestParam(name = "word") String word) { return String.format("%s %s %s %s", srcUser.name, header, targetName, word); diff --git a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/model/DefaultParameterSchema.java b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/model/DefaultParameterSchema.java index bb987bc59b..9a2bae4d56 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/model/DefaultParameterSchema.java +++ b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/model/DefaultParameterSchema.java @@ -43,7 +43,7 @@ public String testUnsupportedParamType(int i, List integerList, Map