forked from loafle/openapi-generator-original
[kotlin][spring] Remove EOL from template (#16045)
* remove EOL from template * better code format
This commit is contained in:
William Cheng
GitHub
parent
75067b2581
commit
852eb956db
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
@{{javaxPackage}}.annotation.Generated(value = ["{{generatorClass}}"]{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
|
||||
@{{javaxPackage}}.annotation.Generated(value = ["{{generatorClass}}"]{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
|
||||
@ -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<Two", new ModelNameTest("One<Two", "OneLessThanTwo")},
|
||||
{"this is a test", new ModelNameTest("this is a test", "ThisIsATest")}
|
||||
{"TestNs.TestClass", new ModelNameTest("TestNs.TestClass", "TestNsTestClass")},
|
||||
{"$", new ModelNameTest("$", "Dollar")},
|
||||
{"for", new ModelNameTest("`for`", "For")},
|
||||
{"One<Two", new ModelNameTest("One<Two", "OneLessThanTwo")},
|
||||
{"this is a test", new ModelNameTest("this is a test", "ThisIsATest")}
|
||||
};
|
||||
}
|
||||
|
||||
@ -368,11 +368,11 @@ public class KotlinClientCodegenModelTest {
|
||||
output.deleteOnExit();
|
||||
|
||||
final CodegenConfigurator configurator = new CodegenConfigurator()
|
||||
.setGeneratorName("kotlin")
|
||||
.setLibrary("jvm-retrofit2")
|
||||
.setAdditionalProperties(properties)
|
||||
.setInputSpec("src/test/resources/3_0/issue4808.yaml")
|
||||
.setOutputDir(output.getAbsolutePath().replace("\\", "/"));
|
||||
.setGeneratorName("kotlin")
|
||||
.setLibrary("jvm-retrofit2")
|
||||
.setAdditionalProperties(properties)
|
||||
.setInputSpec("src/test/resources/3_0/issue4808.yaml")
|
||||
.setOutputDir(output.getAbsolutePath().replace("\\", "/"));
|
||||
|
||||
final ClientOptInput clientOptInput = configurator.toClientOptInput();
|
||||
DefaultGenerator generator = new DefaultGenerator();
|
||||
@ -380,7 +380,7 @@ public class KotlinClientCodegenModelTest {
|
||||
|
||||
Assert.assertEquals(files.size(), 28);
|
||||
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)"
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@ -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 {
|
||||
|
||||
|
||||
@ -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 PetApiController(
|
||||
|
||||
@ -15,7 +15,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 PetApiDelegate {
|
||||
|
||||
fun getRequest(): Optional<NativeWebRequest> = Optional.empty()
|
||||
|
||||
@ -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(
|
||||
|
||||
@ -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<NativeWebRequest> = Optional.empty()
|
||||
|
||||
@ -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(
|
||||
|
||||
@ -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<NativeWebRequest> = Optional.empty()
|
||||
|
||||
@ -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 {
|
||||
|
||||
|
||||
@ -17,7 +17,6 @@ import javax.servlet.ServletContext
|
||||
|
||||
|
||||
@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"])
|
||||
|
||||
@Configuration
|
||||
@EnableSwagger2
|
||||
class SpringFoxConfiguration {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user