clean up kotlin spring samples (#20445)

* clean up samples * use 3.0 petstore test spec * update samples * better code format
OpenAPITools · Jan 11, 2025 · a6cfef5 · a6cfef5
1 parent 358e8af
commit a6cfef5
Show file tree

Hide file tree

Showing 51 changed files with 250 additions and 3,113 deletions.
diff --git a/.github/workflows/samples-kotlin-server.yaml b/.github/workflows/samples-kotlin-server.yaml
@@ -34,7 +34,6 @@ jobs:
           - samples/server/petstore/kotlin-springboot-delegate
           - samples/server/petstore/kotlin-springboot-modelMutable
           - samples/server/petstore/kotlin-springboot-reactive
-          - samples/server/petstore/kotlin-springboot-reactive-with-flow
           - samples/server/petstore/kotlin-springboot-reactive-without-flow
           - samples/server/petstore/kotlin-springboot-source-swagger1
           - samples/server/petstore/kotlin-springboot-source-swagger2

diff --git a/bin/configs/kotlin-spring-boot-reactive-with-flow.yaml b/bin/configs/kotlin-spring-boot-reactive-with-flow.yaml
diff --git a/bin/configs/kotlin-spring-boot-reactive.yaml b/bin/configs/kotlin-spring-boot-reactive.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin-spring
 outputDir: samples/server/petstore/kotlin-springboot-reactive
 library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
 additionalProperties:
   documentationProvider: springdoc
@@ -10,3 +10,5 @@ additionalProperties:
   serviceImplementation: "true"
   reactive: "true"
   beanValidations: "true"
+  # the following option is set to true by default
+  #useFlowForArrayReturnType: "true"
diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java
@@ -40,26 +40,34 @@ public class KotlinServerCodegen extends AbstractKotlinCodegen implements BeanVa
     public static final String DEFAULT_LIBRARY = Constants.KTOR;
     private final Logger LOGGER = LoggerFactory.getLogger(KotlinServerCodegen.class);
 
-    @Getter @Setter
+    @Getter
+    @Setter
     private Boolean autoHeadFeatureEnabled = true;
-    @Getter @Setter
+    @Getter
+    @Setter
     private Boolean conditionalHeadersFeatureEnabled = false;
-    @Getter @Setter
+    @Getter
+    @Setter
     private Boolean hstsFeatureEnabled = true;
-    @Getter @Setter
+    @Getter
+    @Setter
     private Boolean corsFeatureEnabled = false;
-    @Getter @Setter
+    @Getter
+    @Setter
     private Boolean compressionFeatureEnabled = true;
-    @Getter @Setter
+    @Getter
+    @Setter
     private Boolean resourcesFeatureEnabled = true;
-    @Getter @Setter
+    @Getter
+    @Setter
     private Boolean metricsFeatureEnabled = true;
     private boolean interfaceOnly = false;
     private boolean useBeanValidation = false;
     private boolean useCoroutines = false;
     private boolean useMutiny = false;
     private boolean returnResponse = false;
-    @Setter private boolean omitGradleWrapper = false;
+    @Setter
+    private boolean omitGradleWrapper = false;
 
     // This is here to potentially warn the user when an option is not supported by the target framework.
     private Map<String, List<String>> optionsSupportedPerFramework = new ImmutableMap.Builder<String, List<String>>()

diff --git a/...r/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/...r/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java
@@ -924,12 +924,12 @@ public void reactiveWithoutFlow() throws Exception {
         codegen.additionalProperties().put(KotlinSpringServerCodegen.DELEGATE_PATTERN, true);
 
         List<File> files = new DefaultGenerator()
-            .opts(
-                new ClientOptInput()
-                    .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/issue16130-add-useFlowForArrayReturnType-param.yaml"))
-                    .config(codegen)
-            )
-            .generate();
+                .opts(
+                        new ClientOptInput()
+                                .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/issue16130-add-useFlowForArrayReturnType-param.yaml"))
+                                .config(codegen)
+                )
+                .generate();
 
         Assertions.assertThat(files).contains(
                 new File(output, "src/main/kotlin/org/openapitools/api/TestV1Api.kt"),
@@ -969,12 +969,12 @@ public void reactiveWithFlow() throws Exception {
         codegen.additionalProperties().put(KotlinSpringServerCodegen.DELEGATE_PATTERN, true);
 
         List<File> files = new DefaultGenerator()
-            .opts(
-                new ClientOptInput()
-                    .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/issue16130-add-useFlowForArrayReturnType-param.yaml"))
-                    .config(codegen)
-            )
-            .generate();
+                .opts(
+                        new ClientOptInput()
+                                .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/issue16130-add-useFlowForArrayReturnType-param.yaml"))
+                                .config(codegen)
+                )
+                .generate();
 
         Assertions.assertThat(files).contains(
                 new File(output, "src/main/kotlin/org/openapitools/api/TestV1Api.kt"),
@@ -1015,12 +1015,12 @@ public void reactiveWithDefaultValueFlow() throws Exception {
         codegen.additionalProperties().put(KotlinSpringServerCodegen.DELEGATE_PATTERN, true);
 
         List<File> files = new DefaultGenerator()
-            .opts(
-                new ClientOptInput()
-                    .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/issue16130-add-useFlowForArrayReturnType-param.yaml"))
-                    .config(codegen)
-            )
-            .generate();
+                .opts(
+                        new ClientOptInput()
+                                .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/issue16130-add-useFlowForArrayReturnType-param.yaml"))
+                                .config(codegen)
+                )
+                .generate();
 
         Assertions.assertThat(files).contains(
                 new File(output, "src/main/kotlin/org/openapitools/api/TestV1Api.kt"),
@@ -1060,12 +1060,12 @@ public void nonReactiveWithoutFlow() throws Exception {
         codegen.additionalProperties().put(KotlinSpringServerCodegen.DELEGATE_PATTERN, true);
 
         List<File> files = new DefaultGenerator()
-            .opts(
-                new ClientOptInput()
-                    .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/issue16130-add-useFlowForArrayReturnType-param.yaml"))
-                    .config(codegen)
-            )
-            .generate();
+                .opts(
+                        new ClientOptInput()
+                                .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/issue16130-add-useFlowForArrayReturnType-param.yaml"))
+                                .config(codegen)
+                )
+                .generate();
 
         Assertions.assertThat(files).contains(
                 new File(output, "src/main/kotlin/org/openapitools/api/TestV1Api.kt"),
@@ -1105,12 +1105,12 @@ public void nonReactiveWithFlow() throws Exception {
         codegen.additionalProperties().put(KotlinSpringServerCodegen.DELEGATE_PATTERN, true);
 
         List<File> files = new DefaultGenerator()
-            .opts(
-                new ClientOptInput()
-                    .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/issue16130-add-useFlowForArrayReturnType-param.yaml"))
-                    .config(codegen)
-            )
-            .generate();
+                .opts(
+                        new ClientOptInput()
+                                .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/issue16130-add-useFlowForArrayReturnType-param.yaml"))
+                                .config(codegen)
+                )
+                .generate();
 
         Assertions.assertThat(files).contains(
                 new File(output, "src/main/kotlin/org/openapitools/api/TestV1Api.kt"),

diff --git a/samples/server/petstore/kotlin-springboot-reactive-with-flow/.openapi-generator-ignore b/samples/server/petstore/kotlin-springboot-reactive-with-flow/.openapi-generator-ignore
diff --git a/samples/server/petstore/kotlin-springboot-reactive-with-flow/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-reactive-with-flow/.openapi-generator/FILES
diff --git a/samples/server/petstore/kotlin-springboot-reactive-with-flow/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-reactive-with-flow/.openapi-generator/VERSION
diff --git a/samples/server/petstore/kotlin-springboot-reactive-with-flow/README.md b/samples/server/petstore/kotlin-springboot-reactive-with-flow/README.md
diff --git a/samples/server/petstore/kotlin-springboot-reactive-with-flow/build.gradle.kts b/samples/server/petstore/kotlin-springboot-reactive-with-flow/build.gradle.kts
diff --git a/...es/server/petstore/kotlin-springboot-reactive-with-flow/gradle/wrapper/gradle-wrapper.jar b/...es/server/petstore/kotlin-springboot-reactive-with-flow/gradle/wrapper/gradle-wrapper.jar
diff --git a/...er/petstore/kotlin-springboot-reactive-with-flow/gradle/wrapper/gradle-wrapper.properties b/...er/petstore/kotlin-springboot-reactive-with-flow/gradle/wrapper/gradle-wrapper.properties