loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[kotlin][spring] Remove EOL from template (#16045)

Browse Source 
* remove EOL from template

* better code format
This commit is contained in:
William Cheng 2023-07-10 11:44:29 +08:00 committed by GitHub
parent 75067b2581
commit 852eb956db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 28 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
View File

@ -390,7 +390,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
this.useBeanValidation = useBeanValidation; this.useBeanValidation = useBeanValidation;
} }
public void setUseFeignClient( boolean useFeignClient ) { public void setUseFeignClient(boolean useFeignClient) {
this.useFeignClient = useFeignClient; this.useFeignClient = useFeignClient;
} }

2
modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache vendored
View File

@ -1 +1 @@
@{{javaxPackage}}.annotation.Generated(value = ["{{generatorClass}}"]{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}}) @{{javaxPackage}}.annotation.Generated(value = ["{{generatorClass}}"]{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})

52
modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java
View File

@ -51,33 +51,33 @@ public class KotlinClientCodegenModelTest {
private Schema getArrayTestSchema() { private Schema getArrayTestSchema() {
return new ObjectSchema() return new ObjectSchema()
.description("a sample model") .description("a sample model")
.addProperties("id", new IntegerSchema().format("int64")) .addProperties("id", new IntegerSchema().format("int64"))
.addProperties("examples", new ArraySchema().items(new StringSchema())) .addProperties("examples", new ArraySchema().items(new StringSchema()))
.addRequiredItem("id"); .addRequiredItem("id");
} }
private Schema getSimpleSchema() { private Schema getSimpleSchema() {
return new ObjectSchema() return new ObjectSchema()
.description("a sample model") .description("a sample model")
.addProperties("id", new IntegerSchema().format("int64")) .addProperties("id", new IntegerSchema().format("int64"))
.addProperties("name", new StringSchema()) .addProperties("name", new StringSchema())
.addProperties("createdAt", new DateTimeSchema()) .addProperties("createdAt", new DateTimeSchema())
.addRequiredItem("id") .addRequiredItem("id")
.addRequiredItem("name"); .addRequiredItem("name");
} }
private Schema getMapSchema() { private Schema getMapSchema() {
return new ObjectSchema() return new ObjectSchema()
.description("a sample model") .description("a sample model")
.addProperties("mapping", new MapSchema() .addProperties("mapping", new MapSchema()
.additionalProperties(new StringSchema())); .additionalProperties(new StringSchema()));
} }
private Schema getComplexSchema() { private Schema getComplexSchema() {
return new ObjectSchema() return new ObjectSchema()
.description("a sample model") .description("a sample model")
.addProperties("child", new ObjectSchema().$ref("#/components/schemas/Child")); .addProperties("child", new ObjectSchema().$ref("#/components/schemas/Child"));
} }
@Test(description = "convert a simple model") @Test(description = "convert a simple model")
@ -339,11 +339,11 @@ public class KotlinClientCodegenModelTest {
@DataProvider(name = "modelNames") @DataProvider(name = "modelNames")
public static Object[][] modelNames() { public static Object[][] modelNames() {
return new Object[][]{ return new Object[][]{
{"TestNs.TestClass", new ModelNameTest("TestNs.TestClass", "TestNsTestClass")}, {"TestNs.TestClass", new ModelNameTest("TestNs.TestClass", "TestNsTestClass")},
{"$", new ModelNameTest("$", "Dollar")}, {"$", new ModelNameTest("$", "Dollar")},
{"for", new ModelNameTest("`for`", "For")}, {"for", new ModelNameTest("`for`", "For")},
{"One<Two", new ModelNameTest("One<Two", "OneLessThanTwo")}, {"One<Two", new ModelNameTest("One<Two", "OneLessThanTwo")},
{"this is a test", new ModelNameTest("this is a test", "ThisIsATest")} {"this is a test", new ModelNameTest("this is a test", "ThisIsATest")}
}; };
} }
@ -368,11 +368,11 @@ public class KotlinClientCodegenModelTest {
output.deleteOnExit(); output.deleteOnExit();
final CodegenConfigurator configurator = new CodegenConfigurator() final CodegenConfigurator configurator = new CodegenConfigurator()
.setGeneratorName("kotlin") .setGeneratorName("kotlin")
.setLibrary("jvm-retrofit2") .setLibrary("jvm-retrofit2")
.setAdditionalProperties(properties) .setAdditionalProperties(properties)
.setInputSpec("src/test/resources/3_0/issue4808.yaml") .setInputSpec("src/test/resources/3_0/issue4808.yaml")
.setOutputDir(output.getAbsolutePath().replace("\\", "/")); .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
final ClientOptInput clientOptInput = configurator.toClientOptInput(); final ClientOptInput clientOptInput = configurator.toClientOptInput();
DefaultGenerator generator = new DefaultGenerator(); DefaultGenerator generator = new DefaultGenerator();
@ -380,7 +380,7 @@ public class KotlinClientCodegenModelTest {
Assert.assertEquals(files.size(), 28); Assert.assertEquals(files.size(), 28);
TestUtils.assertFileContains(Paths.get(output + "/src/main/kotlin/xyz/abcdef/api/DefaultApi.kt"), TestUtils.assertFileContains(Paths.get(output + "/src/main/kotlin/xyz/abcdef/api/DefaultApi.kt"),
"fun getSomeValue(@Query(\"since\") since: kotlin.String? = null, @Query(\"sinceBuild\") sinceBuild: kotlin.String? = null, @Query(\"maxBuilds\") maxBuilds: kotlin.Int? = null, @Query(\"maxWaitSecs\") maxWaitSecs: kotlin.Int? = null)" "fun getSomeValue(@Query(\"since\") since: kotlin.String? = null, @Query(\"sinceBuild\") sinceBuild: kotlin.String? = null, @Query(\"maxBuilds\") maxBuilds: kotlin.Int? = null, @Query(\"maxWaitSecs\") maxWaitSecs: kotlin.Int? = null)"
); );
} }

1
samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt
View File

@ -11,7 +11,6 @@ import io.swagger.v3.oas.models.Components
import io.swagger.v3.oas.models.security.SecurityScheme import io.swagger.v3.oas.models.security.SecurityScheme
@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"])
@Configuration @Configuration
class SpringDocConfiguration { class SpringDocConfiguration {

1
samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt
View File

@ -5,7 +5,6 @@ import org.springframework.web.bind.annotation.RequestMapping
import java.util.Optional import java.util.Optional
@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"])
@Controller @Controller
@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") @RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}")
class PetApiController( class PetApiController(

1
samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt
View File

@ -15,7 +15,6 @@ import java.util.Optional
* Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
*/ */
@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"])
interface PetApiDelegate { interface PetApiDelegate {
fun getRequest(): Optional<NativeWebRequest> = Optional.empty() fun getRequest(): Optional<NativeWebRequest> = Optional.empty()

1
samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt
View File

@ -5,7 +5,6 @@ import org.springframework.web.bind.annotation.RequestMapping
import java.util.Optional import java.util.Optional
@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"])
@Controller @Controller
@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") @RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}")
class StoreApiController( class StoreApiController(

1
samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt
View File

@ -14,7 +14,6 @@ import java.util.Optional
* Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
*/ */
@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"])
interface StoreApiDelegate { interface StoreApiDelegate {
fun getRequest(): Optional<NativeWebRequest> = Optional.empty() fun getRequest(): Optional<NativeWebRequest> = Optional.empty()

1
samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt
View File

@ -5,7 +5,6 @@ import org.springframework.web.bind.annotation.RequestMapping
import java.util.Optional import java.util.Optional
@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"])
@Controller @Controller
@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") @RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}")
class UserApiController( class UserApiController(

1
samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt
View File

@ -14,7 +14,6 @@ import java.util.Optional
* Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
*/ */
@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"])
interface UserApiDelegate { interface UserApiDelegate {
fun getRequest(): Optional<NativeWebRequest> = Optional.empty() fun getRequest(): Optional<NativeWebRequest> = Optional.empty()

1
samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt
View File

@ -11,7 +11,6 @@ import io.swagger.v3.oas.models.Components
import io.swagger.v3.oas.models.security.SecurityScheme import io.swagger.v3.oas.models.security.SecurityScheme
@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"])
@Configuration @Configuration
class SpringDocConfiguration { class SpringDocConfiguration {

1
samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/SpringFoxConfiguration.kt
View File

@ -17,7 +17,6 @@ import javax.servlet.ServletContext
@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"])
@Configuration @Configuration
@EnableSwagger2 @EnableSwagger2
class SpringFoxConfiguration { class SpringFoxConfiguration {