From 852eb956dbc33e355c09cb1f3b3af1d1577b04c5 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 10 Jul 2023 11:44:29 +0800 Subject: [PATCH] [kotlin][spring] Remove EOL from template (#16045) * remove EOL from template * better code format --- .../languages/KotlinSpringServerCodegen.java | 2 +- .../generatedAnnotation.mustache | 2 +- .../kotlin/KotlinClientCodegenModelTest.java | 52 +++++++++---------- .../openapitools/SpringDocConfiguration.kt | 1 - .../org/openapitools/api/PetApiController.kt | 1 - .../org/openapitools/api/PetApiDelegate.kt | 1 - .../openapitools/api/StoreApiController.kt | 1 - .../org/openapitools/api/StoreApiDelegate.kt | 1 - .../org/openapitools/api/UserApiController.kt | 1 - .../org/openapitools/api/UserApiDelegate.kt | 1 - .../openapitools/SpringDocConfiguration.kt | 1 - .../openapitools/SpringFoxConfiguration.kt | 1 - 12 files changed, 28 insertions(+), 37 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index 5922abafa37..d5e7eee753e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -390,7 +390,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen this.useBeanValidation = useBeanValidation; } - public void setUseFeignClient( boolean useFeignClient ) { + public void setUseFeignClient(boolean useFeignClient) { this.useFeignClient = useFeignClient; } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache index 1fa727fab02..1be8e7554c3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache @@ -1 +1 @@ -@{{javaxPackage}}.annotation.Generated(value = ["{{generatorClass}}"]{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}}) +@{{javaxPackage}}.annotation.Generated(value = ["{{generatorClass}}"]{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}}) \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java index 3f0faf43367..5ce41ea1924 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java @@ -51,33 +51,33 @@ public class KotlinClientCodegenModelTest { private Schema getArrayTestSchema() { return new ObjectSchema() - .description("a sample model") - .addProperties("id", new IntegerSchema().format("int64")) - .addProperties("examples", new ArraySchema().items(new StringSchema())) - .addRequiredItem("id"); + .description("a sample model") + .addProperties("id", new IntegerSchema().format("int64")) + .addProperties("examples", new ArraySchema().items(new StringSchema())) + .addRequiredItem("id"); } private Schema getSimpleSchema() { return new ObjectSchema() - .description("a sample model") - .addProperties("id", new IntegerSchema().format("int64")) - .addProperties("name", new StringSchema()) - .addProperties("createdAt", new DateTimeSchema()) - .addRequiredItem("id") - .addRequiredItem("name"); + .description("a sample model") + .addProperties("id", new IntegerSchema().format("int64")) + .addProperties("name", new StringSchema()) + .addProperties("createdAt", new DateTimeSchema()) + .addRequiredItem("id") + .addRequiredItem("name"); } private Schema getMapSchema() { return new ObjectSchema() - .description("a sample model") - .addProperties("mapping", new MapSchema() - .additionalProperties(new StringSchema())); + .description("a sample model") + .addProperties("mapping", new MapSchema() + .additionalProperties(new StringSchema())); } private Schema getComplexSchema() { return new ObjectSchema() - .description("a sample model") - .addProperties("child", new ObjectSchema().$ref("#/components/schemas/Child")); + .description("a sample model") + .addProperties("child", new ObjectSchema().$ref("#/components/schemas/Child")); } @Test(description = "convert a simple model") @@ -339,11 +339,11 @@ public class KotlinClientCodegenModelTest { @DataProvider(name = "modelNames") public static Object[][] modelNames() { return new Object[][]{ - {"TestNs.TestClass", new ModelNameTest("TestNs.TestClass", "TestNsTestClass")}, - {"$", new ModelNameTest("$", "Dollar")}, - {"for", new ModelNameTest("`for`", "For")}, - {"One = Optional.empty() diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 29c0ae6c7f6..3f52082c4c0 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -5,7 +5,6 @@ import org.springframework.web.bind.annotation.RequestMapping import java.util.Optional @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) - @Controller @RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") class StoreApiController( diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt index ba66864bee1..95f8cde396e 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt @@ -14,7 +14,6 @@ import java.util.Optional * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. */ @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) - interface StoreApiDelegate { fun getRequest(): Optional = Optional.empty() diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt index b4c11c048c7..a9b1b3300c0 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -5,7 +5,6 @@ import org.springframework.web.bind.annotation.RequestMapping import java.util.Optional @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) - @Controller @RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") class UserApiController( diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt index c85d74d410d..274d497f1e9 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt @@ -14,7 +14,6 @@ import java.util.Optional * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. */ @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) - interface UserApiDelegate { fun getRequest(): Optional = Optional.empty() diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt index a89de1b26c3..3243c631ce0 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt @@ -11,7 +11,6 @@ import io.swagger.v3.oas.models.Components import io.swagger.v3.oas.models.security.SecurityScheme @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) - @Configuration class SpringDocConfiguration { diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/SpringFoxConfiguration.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/SpringFoxConfiguration.kt index 1ab4d83bccb..7e793349618 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/SpringFoxConfiguration.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/SpringFoxConfiguration.kt @@ -17,7 +17,6 @@ import javax.servlet.ServletContext @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) - @Configuration @EnableSwagger2 class SpringFoxConfiguration {