fixup 2

Author: andrewwilsonnew

bin/configs/kotlin-misk-config.yaml

@@ -8,4 +8,4 @@ additionalProperties:
   moduleClassName: "PetStoreModule"
   generateStubImplClasses: true
   addModelMoshiJsonAnnotation: true
-  actionPrefix : "samplePrefix"
+  actionPathPrefix : "samplePrefix"

docs/generators/kotlin-misk.md

@@ -18,7 +18,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
-|actionPrefix|Prefix for all action| | null             |
+|actionPathPrefix|Prefix for action path| | null             |
 |addModelMoshiJsonAnnotation|Add a Moshi JSON adapter annotation to all model classes| |true|
 |additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
 |apiSuffix|suffix for api classes| |Api|

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

@@ -50,7 +50,7 @@ public class KotlinMiskServerCodegen extends AbstractKotlinCodegen implements Be
     private final Logger LOGGER = LoggerFactory.getLogger(KotlinMiskServerCodegen.class);
 
     public static final String MODULE_CLASS_NAME = "moduleClassName";
-    public static final String ACTION_PREFIX = "actionPrefix";
+    public static final String ACTION_PATH_PREFIX = "actionPathPrefix";
 
     private static final String ROOT_PACKAGE = "rootPackage";
     public static final String GENERATE_STUB_IMPL_CLASSES = "generateStubImplClasses";
@@ -68,7 +68,7 @@ public class KotlinMiskServerCodegen extends AbstractKotlinCodegen implements Be
     protected String apiVersion = "1.0.0-SNAPSHOT";
 
     @Setter protected String moduleClassName = "OpenApiModule";
-    @Setter protected String actionPrefix = "";
+    @Setter protected String actionPathPrefix = "";
 
     @Override
     public CodegenType getTag() {
@@ -121,7 +121,7 @@ public KotlinMiskServerCodegen() {
         outputFolder = "generated-code" + File.separator + "kotlin-misk";
 
         addOption(MODULE_CLASS_NAME, "Name of the generated module class", moduleClassName);
-        addOption(ACTION_PREFIX, "Prefix for all action", actionPrefix);
+        addOption(ACTION_PATH_PREFIX, "Prefix for action path", actionPathPrefix);
 
         apiTestTemplateFiles.clear();
         apiTestTemplateFiles.put("api_test.mustache", ".kt");
@@ -168,10 +168,10 @@ public void processOpts() {
         }
         additionalProperties.put(MODULE_CLASS_NAME, moduleClassName);
 
-        if (additionalProperties.containsKey(ACTION_PREFIX)) {
-            setActionPrefix((String) additionalProperties.get(ACTION_PREFIX));
+        if (additionalProperties.containsKey(ACTION_PATH_PREFIX)) {
+            setActionPathPrefix((String) additionalProperties.get(ACTION_PATH_PREFIX));
         }
-        additionalProperties.put(ACTION_PREFIX, actionPrefix);
+        additionalProperties.put(ACTION_PATH_PREFIX, actionPathPrefix);
 
         if (additionalProperties.containsKey(USE_BEANVALIDATION)) {
             this.setUseBeanValidation(convertPropertyToBoolean(USE_BEANVALIDATION));

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

@@ -38,7 +38,7 @@ 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).setActionPrefix(KotlinMiskServerCodegenOptionsProvider.ACTION_PREFIX);
+        verify(codegen).setActionPathPrefix(KotlinMiskServerCodegenOptionsProvider.ACTION_PATH_PREFIX);
         verify(codegen).setGenerateStubImplClasses(Boolean.valueOf(KotlinMiskServerCodegenOptionsProvider.GENERATE_STUB_IMPL_CLASSES));
         verify(codegen).setAddModelMoshiJsonAnnotation(Boolean.valueOf(KotlinMiskServerCodegenOptionsProvider.ADD_MODEL_MOSHI_JSON_ANNOTATION));
     }

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

@@ -26,7 +26,7 @@ public class KotlinMiskServerCodegenOptionsProvider implements OptionsProvider {
     public static final String GENERATE_STUB_IMPL_CLASSES = "false";
     public static final String ADD_MODEL_MOSHI_JSON_ANNOTATION = "true";
     public static final String MODULE_CLASS_NAME = "OpenApiModule";
-    public static final String ACTION_PREFIX = "samplePrefix";
+    public static final String ACTION_PATH_PREFIX = "samplePrefix";
 
     @Override
     public String getLanguage() {
@@ -55,7 +55,7 @@ public Map<String, String> createOptions() {
             .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)
-            .put(KotlinMiskServerCodegen.ACTION_PREFIX, ACTION_PREFIX)
+            .put(KotlinMiskServerCodegen.ACTION_PATH_PREFIX, ACTION_PATH_PREFIX)
             .build();
     }