first pass

Author: andrewwilsonnew

bin/configs/kotlin-misk-config.yaml

@@ -0,0 +1,9 @@
+generatorName: kotlin-misk
+outputDir: samples/server/petstore/kotlin-misk-config
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-misk
+validateSpec: false
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  moduleClassName: "PetStoreModule"
+  generateStubImplClasses: true

bin/configs/kotlin-misk.yaml

@@ -2,7 +2,6 @@ generatorName: kotlin-misk
 outputDir: samples/server/petstore/kotlin-misk
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-misk
-validateSpec: false
 additionalProperties:
   hideGenerationTimestamp: "true"
   moduleClassName: "PetStoreModule"

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

@@ -47,13 +47,18 @@
 
 public class KotlinMiskServerCodegen extends AbstractKotlinCodegen implements BeanValidationFeatures {
 
+    private final Logger LOGGER = LoggerFactory.getLogger(KotlinMiskServerCodegen.class);
+
     public static final String MODULE_CLASS_NAME = "moduleClassName";
 
-    private final Logger LOGGER = LoggerFactory.getLogger(KotlinMiskServerCodegen.class);
     private static final String ROOT_PACKAGE = "rootPackage";
+    public static final String GENERATE_STUB_IMPL_CLASSES = "generateStubImplClasses";
 
     private boolean useBeanValidation = true;
 
+    @Setter
+    private boolean generateStubImplClasses = false;
+
     protected String rootPackage = "org.openapitools.server.api";
     protected String apiVersion = "1.0.0-SNAPSHOT";
 
@@ -78,10 +83,11 @@ public KotlinMiskServerCodegen() {
         super();
 
         addSwitch(USE_BEANVALIDATION, "Use BeanValidation API annotations to validate data types", useBeanValidation);
+        addSwitch(GENERATE_STUB_IMPL_CLASSES, "Generate Stub Impl Classes", generateStubImplClasses);
 
         modifyFeatureSet(features -> features
                 .includeDocumentationFeatures(DocumentationFeature.Readme)
-                .wireFormatFeatures(EnumSet.of(WireFormatFeature.PROTOBUF))
+                .wireFormatFeatures(EnumSet.of(WireFormatFeature.JSON, WireFormatFeature.PROTOBUF))
                 .securityFeatures(EnumSet.noneOf(
                         SecurityFeature.class
                 ))
@@ -122,8 +128,12 @@ public KotlinMiskServerCodegen() {
 
         apiTemplateFiles.clear();
         apiTemplateFiles.put("apiAction.mustache", "Action.kt");
-        apiTemplateFiles.put("apiImpl.mustache", "Impl.kt");
-        apiTemplateFiles.put("apiInterface.mustache", ".kt");
+
+        if (generateStubImplClasses) {
+            apiTemplateFiles.put("apiImpl.mustache", "Impl.kt");
+            apiTemplateFiles.put("apiInterface.mustache", ".kt");
+        }
+
         modelTemplateFiles.put("model.mustache", ".kt");
 
         apiPackage = rootPackage + ".api";
@@ -155,6 +165,11 @@ public void processOpts() {
         }
         writePropertyBack(USE_BEANVALIDATION, useBeanValidation);
 
+        if (additionalProperties.containsKey(GENERATE_STUB_IMPL_CLASSES)) {
+            setGenerateStubImplClasses(convertPropertyToBoolean(GENERATE_STUB_IMPL_CLASSES));
+        }
+        writePropertyBack(GENERATE_STUB_IMPL_CLASSES, generateStubImplClasses);
+
         applyJakartaPackage();
 
         String apiModuleFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);
@@ -211,6 +226,7 @@ private static Map<String, String> getMappings() {
         result.put("application/grpc", "MediaTypes.APPLICATION_GRPC");
         result.put("application/javascript", "MediaTypes.APPLICATION_JAVASCRIPT");
         result.put("application/json", "MediaTypes.APPLICATION_JSON");
+        result.put("application/jwt", "MediaTypes.APPLICATION_JWT");
         result.put("application/octetstream", "MediaTypes.APPLICATION_OCTETSTREAM");
         result.put("application/pdf", "MediaTypes.APPLICATION_OCTETSTREAM");
         result.put("application/x-protobuf", "MediaTypes.APPLICATION_PROTOBUF");

modules/openapi-generator/src/main/resources/kotlin-misk/apiAction.mustache

@@ -33,9 +33,6 @@ import misk.web.mediatype.MediaTypes
 {{/imports}}
 
 {{#operations}}
-/**
- * Generated file, please change {{classname}}Impl.
- */
 @Singleton
 class {{classname}}Action @Inject constructor(
     private val {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}}

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

@@ -62,7 +62,7 @@ public void checkOptionsHelp() {
             Assert.fail(String.format(Locale.ROOT, "These options weren't checked: %s.", StringUtils.join(skipped, ", ")));
         }
         final Set<String> undocumented = new HashSet<String>(testOptions);
-        undocumented.removeAll(cliOptions);
+        cliOptions.forEach(undocumented::remove);
         if (!undocumented.isEmpty()) {
             Assert.fail(String.format(Locale.ROOT, "These options weren't documented: %s. Are you expecting base options and calling cliOptions.clear()?", StringUtils.join(undocumented, ", ")));
         }

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

@@ -38,5 +38,6 @@ protected void verifyOptions() {
         verify(codegen).setAdditionalModelTypeAnnotations(List.of(KotlinMiskServerCodegenOptionsProvider.ADDITIONAL_MODEL_TYPE_ANNOTATIONS_VALUE));
         verify(codegen).setUseBeanValidation(Boolean.valueOf(KotlinMiskServerCodegenOptionsProvider.USE_BEAN_VALIDATION));
         verify(codegen).setModuleClassName(KotlinMiskServerCodegenOptionsProvider.MODULE_CLASS_NAME);
+        verify(codegen).setGenerateStubImplClasses(Boolean.valueOf(KotlinMiskServerCodegenOptionsProvider.GENERATE_STUB_IMPL_CLASSES));
     }
 }

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

@@ -33,7 +33,8 @@ public void testDefaultConfiguration() {
         Assert.assertEquals(codegen.apiPackage(), "org.openapitools.server.api.api");
         Assert.assertEquals(codegen.modelPackage(), "org.openapitools.server.api.model");
 
-        // Test PROTOBUF wire format
+        // Test wire formats
+        Assert.assertTrue(codegen.getFeatureSet().getWireFormatFeatures().contains(WireFormatFeature.JSON));
         Assert.assertTrue(codegen.getFeatureSet().getWireFormatFeatures().contains(WireFormatFeature.PROTOBUF));
     }
 

modules/openapi-generator/src/test/java/org/openapitools/codegen/options/KotlinMiskServerCodegenOptionsProvider.java

@@ -23,6 +23,7 @@ public class KotlinMiskServerCodegenOptionsProvider implements OptionsProvider {
     public static final String API_SUFFIX_VALUE = "Api";
     public static final String ADDITIONAL_MODEL_TYPE_ANNOTATIONS_VALUE = "";
     public static final String USE_BEAN_VALIDATION = "false";
+    public static final String GENERATE_STUB_IMPL_CLASSES = "false";
     public static final String MODULE_CLASS_NAME = "OpenApiModule";
 
     @Override
@@ -51,6 +52,7 @@ public Map<String, String> createOptions() {
                 ADDITIONAL_MODEL_TYPE_ANNOTATIONS_VALUE)
             .put(KotlinMiskServerCodegen.MODULE_CLASS_NAME, MODULE_CLASS_NAME)
             .put(BeanValidationFeatures.USE_BEANVALIDATION, USE_BEAN_VALIDATION)
+            .put(KotlinMiskServerCodegen.GENERATE_STUB_IMPL_CLASSES, GENERATE_STUB_IMPL_CLASSES)
             .build();
     }