Enable useTags for all kotlin-server generators

Author: feczkob

docs/generators/kotlin-server.md

@@ -48,7 +48,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useCoroutines|Whether to use the Coroutines. This option is currently supported only when using jaxrs-spec library.| |false|
 |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
 |useMutiny|Whether to use Mutiny (should not be used with useCoroutines). This option is currently supported only when using jaxrs-spec library.| |false|
-|useTags|use tags for creating interface and controller classnames. This option is currently supported only when using jaxrs-spec library.| |true|
+|useTags|use tags for creating interface and controller classnames.| |true|
 
 ## IMPORT MAPPING
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java

@@ -17,11 +17,9 @@
 
 package org.openapitools.codegen.languages;
 
-import com.google.common.collect.ImmutableMap;
 import io.swagger.v3.oas.models.Operation;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -97,38 +95,6 @@ public class KotlinServerCodegen extends AbstractKotlinCodegen implements BeanVa
     @Setter
     private boolean fixJacksonJsonTypeInfoInheritance = true;
 
-    // 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>>()
-            .put(Constants.KTOR, Arrays.asList(
-                    Constants.AUTOMATIC_HEAD_REQUESTS,
-                    Constants.CONDITIONAL_HEADERS,
-                    Constants.HSTS,
-                    Constants.CORS,
-                    Constants.COMPRESSION,
-                    Constants.RESOURCES,
-                    Constants.METRICS,
-                    Constants.OMIT_GRADLE_WRAPPER
-            ))
-            .put(Constants.KTOR2, Arrays.asList(
-                    Constants.AUTOMATIC_HEAD_REQUESTS,
-                    Constants.CONDITIONAL_HEADERS,
-                    Constants.HSTS,
-                    Constants.CORS,
-                    Constants.COMPRESSION,
-                    Constants.RESOURCES,
-                    Constants.METRICS,
-                    Constants.OMIT_GRADLE_WRAPPER
-            ))
-            .put(Constants.JAXRS_SPEC, Arrays.asList(
-                    USE_BEANVALIDATION,
-                    USE_TAGS,
-                    Constants.USE_COROUTINES,
-                    Constants.USE_MUTINY,
-                    Constants.RETURN_RESPONSE,
-                    Constants.INTERFACE_ONLY
-            ))
-            .build();
-
     /**
      * Constructs an instance of `KotlinServerCodegen`.
      */
@@ -429,7 +395,7 @@ public static class Constants {
         public static final String FIX_JACKSON_JSON_TYPE_INFO_INHERITANCE = "fixJacksonJsonTypeInfoInheritance";
         public static final String FIX_JACKSON_JSON_TYPE_INFO_INHERITANCE_DESC = "When true (default), ensures Jackson polymorphism works correctly by: (1) always setting visible=true on @JsonTypeInfo, and (2) adding the discriminator property to child models with appropriate default values. When false, visible is only set to true if all children already define the discriminator property.";
         public static final String USE_TAGS = "useTags";
-        public static final String USE_TAGS_DESC = "use tags for creating interface and controller classnames. This option is currently supported only when using jaxrs-spec library.";
+        public static final String USE_TAGS_DESC = "use tags for creating interface and controller classnames.";
     }
 
     @Override
@@ -729,7 +695,7 @@ public void postProcess() {
 
     @Override
     public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
-        if (!Objects.equals(library, Constants.JAXRS_SPEC) || useTags) {
+        if (useTags) {
             super.addOperationToGroup(tag, resourcePath, operation, co, operations);
             return;
         }

modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinServerCodegenTest.java

@@ -1,12 +1,15 @@
 package org.openapitools.codegen.kotlin;
 
+import io.swagger.v3.oas.models.Operation;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import org.openapitools.codegen.CodegenOperation;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
@@ -515,33 +518,7 @@ public void fixJacksonJsonTypeInfoInheritance_canBeDisabled() throws IOException
         );
     }
 
-    @Test
-    public void useTags_commonPathIsComputedForJaxrsSpecLibrary() throws IOException {
-        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
-        output.deleteOnExit();
-
-        KotlinServerCodegen codegen = new KotlinServerCodegen();
-        codegen.setOutputDir(output.getAbsolutePath());
-        codegen.additionalProperties().put(LIBRARY, JAXRS_SPEC);
-        codegen.additionalProperties().put(USE_TAGS, true);
-
-        new DefaultGenerator().opts(new ClientOptInput()
-                        .openAPI(TestUtils.parseSpec("src/test/resources/2_0/petstore.yaml"))
-                        .config(codegen))
-                .generate();
-
-        String outputPath = output.getAbsolutePath() + "/src/main/kotlin/org/openapitools/server";
-        Path petApi = Paths.get(outputPath + "/apis/PetApi.kt");
-
-        assertFileContains(
-                petApi,
-                "@Path(\"/pet\")"
-        );
-        assertFileNotContains(
-                petApi,
-                "@Path(\"/\")"
-        );
-    }
+    // ==================== useTags for JAXRS-SPEC ====================
 
     @Test
     public void useTags_false_classNameFromTagsAndRootPathForJaxrsSpecLibrary() throws IOException {
@@ -597,4 +574,57 @@ public void useTags_notSpecified_behavesLikeUseTagsTrueForJaxrsSpecLibrary() thr
         assertFileNotContains(petApi, "@Path(\"/\")");
         assertFileNotContains(petApi, "@Path(\"/store\")");
     }
+
+    // ==================== useTags for all libraries ====================
+
+    @Test
+    public void useTags_false_groupsByFirstPathSegment() {
+        KotlinServerCodegen codegen = new KotlinServerCodegen();
+        codegen.additionalProperties().put(LIBRARY, JAVALIN6);
+        codegen.additionalProperties().put(USE_TAGS, false);
+        codegen.processOpts();
+
+        CodegenOperation co = new CodegenOperation();
+        co.operationId = "findByStatus";
+        Map<String, List<CodegenOperation>> groups = new HashMap<>();
+
+        codegen.addOperationToGroup("Pet", "/pet/findByStatus", new Operation(), co, groups);
+
+        Assert.assertTrue(groups.containsKey("pet"));
+        Assert.assertEquals(co.baseName, "pet");
+    }
+
+    @Test
+    public void useTags_false_rootPath_groupsAsDefault() {
+        KotlinServerCodegen codegen = new KotlinServerCodegen();
+        codegen.additionalProperties().put(LIBRARY, JAVALIN6);
+        codegen.additionalProperties().put(USE_TAGS, false);
+        codegen.processOpts();
+
+        CodegenOperation co = new CodegenOperation();
+        co.operationId = "getRoot";
+        Map<String, List<CodegenOperation>> groups = new HashMap<>();
+
+        codegen.addOperationToGroup("Root", "/", new Operation(), co, groups);
+
+        Assert.assertTrue(groups.containsKey("default"));
+        Assert.assertEquals(co.baseName, "default");
+    }
+
+    @Test
+    public void useTags_false_pathParamOnly_groupsAsDefault() {
+        KotlinServerCodegen codegen = new KotlinServerCodegen();
+        codegen.additionalProperties().put(LIBRARY, JAVALIN6);
+        codegen.additionalProperties().put(USE_TAGS, false);
+        codegen.processOpts();
+
+        CodegenOperation co = new CodegenOperation();
+        co.operationId = "getById";
+        Map<String, List<CodegenOperation>> groups = new HashMap<>();
+
+        codegen.addOperationToGroup("Resource", "/{uuid}", new Operation(), co, groups);
+
+        Assert.assertTrue(groups.containsKey("default"));
+        Assert.assertEquals(co.baseName, "default");
+    }
 }