fixup processOpts

Author: andrewwilsonnew

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

@@ -84,6 +84,7 @@ public class KotlinMiskServerCodegen extends AbstractKotlinCodegen implements Be
     @Setter protected String actionRequestContentType = "@RequestContentType";
     @Setter protected String actionRequestContentTypePrefix = "MediaTypes";
     @Setter protected String testingModule = moduleClassName;
+    @Setter protected String testingModuleName;
 
     @Override
     public CodegenType getTag() {
@@ -184,56 +185,21 @@ public KotlinMiskServerCodegen() {
     public void processOpts() {
         super.processOpts();
 
-        if (additionalProperties.containsKey(MODULE_CLASS_NAME)) {
-            setModuleClassName((String) additionalProperties.get(MODULE_CLASS_NAME));
-        }
-        writePropertyBack(MODULE_CLASS_NAME, moduleClassName);
-
-        if (additionalProperties.containsKey(ACTION_PATH_PREFIX)) {
-            setActionPathPrefix((String) additionalProperties.get(ACTION_PATH_PREFIX));
-        }
-        writePropertyBack(ACTION_PATH_PREFIX, actionPathPrefix);
-
         convertPropertyToTypeAndWriteBack(ACTION_ANNOTATIONS,
                 it -> Arrays.asList(it.split(";")), this::setActionAnnotations);
 
         convertPropertyToTypeAndWriteBack(ACTION_IMPORTS,
                 it -> Arrays.asList(it.split(";")), this::setActionImports);
 
-        if (additionalProperties.containsKey(ACTION_PARENT_CLASS)) {
-            setActionParentClass((String) additionalProperties.get(ACTION_PARENT_CLASS));
-        }
-        writePropertyBack(ACTION_PARENT_CLASS, actionParentClass);
-
-        if (additionalProperties.containsKey(ACTION_REQUEST_CONTENT_TYPE)) {
-            setActionRequestContentType((String) additionalProperties.get(ACTION_REQUEST_CONTENT_TYPE));
-        }
-        writePropertyBack(ACTION_REQUEST_CONTENT_TYPE, actionRequestContentType);
-
-        if (additionalProperties.containsKey(ACTION_REQUEST_CONTENT_TYPE_PREFIX)) {
-            setActionRequestContentTypePrefix((String) additionalProperties.get(ACTION_REQUEST_CONTENT_TYPE_PREFIX));
-        }
-        writePropertyBack(ACTION_REQUEST_CONTENT_TYPE_PREFIX, actionRequestContentTypePrefix);
-
-        if (additionalProperties.containsKey(TESTING_MODULE)) {
-            setTestingModule((String) additionalProperties.get(TESTING_MODULE));
-        }
-        writePropertyBack(TESTING_MODULE, testingModule);
-
-        if (additionalProperties.containsKey(USE_BEANVALIDATION)) {
-            this.setUseBeanValidation(convertPropertyToBoolean(USE_BEANVALIDATION));
-        }
-        writePropertyBack(USE_BEANVALIDATION, useBeanValidation);
-
-        if (additionalProperties.containsKey(GENERATE_STUB_IMPL_CLASSES)) {
-            setGenerateStubImplClasses(convertPropertyToBoolean(GENERATE_STUB_IMPL_CLASSES));
-        }
-        writePropertyBack(GENERATE_STUB_IMPL_CLASSES, generateStubImplClasses);
-
-        if (additionalProperties.containsKey(ADD_MODEL_MOSHI_JSON_ANNOTATION)) {
-            setAddModelMoshiJsonAnnotation(convertPropertyToBoolean(ADD_MODEL_MOSHI_JSON_ANNOTATION));
-        }
-        writePropertyBack(ADD_MODEL_MOSHI_JSON_ANNOTATION, addModelMoshiJsonAnnotation);
+        convertPropertyToStringAndWriteBack(MODULE_CLASS_NAME, this::setModuleClassName);
+        convertPropertyToStringAndWriteBack(ACTION_PATH_PREFIX, this::setActionPathPrefix);
+        convertPropertyToStringAndWriteBack(ACTION_PARENT_CLASS, this::setActionParentClass);
+        convertPropertyToStringAndWriteBack(ACTION_REQUEST_CONTENT_TYPE, this::setActionRequestContentType);
+        convertPropertyToStringAndWriteBack(ACTION_REQUEST_CONTENT_TYPE_PREFIX, this::setActionRequestContentTypePrefix);
+        convertPropertyToStringAndWriteBack(TESTING_MODULE, this::setTestingModule);
+        convertPropertyToBooleanAndWriteBack(USE_BEANVALIDATION, this::setUseBeanValidation);
+        convertPropertyToBooleanAndWriteBack(GENERATE_STUB_IMPL_CLASSES, this::setGenerateStubImplClasses);
+        convertPropertyToBooleanAndWriteBack(ADD_MODEL_MOSHI_JSON_ANNOTATION, this::setAddModelMoshiJsonAnnotation);
 
         applyJakartaPackage();
 
@@ -281,6 +247,11 @@ private String mapMediaType(String mediaType) {
         return MEDIA_MAPPING.getOrDefault(mediaType, "APPLICATION_OCTETSTREAM /* @todo(unknown) -> " + mediaType + " */ ");
     }
 
+    public String getTestingModuleName() {
+        System.out.println("***" + testingModule.substring(testingModule.lastIndexOf(".")));
+        return testingModule.substring(testingModule.lastIndexOf("."));
+    }
+
     private final static Map<String, String> MEDIA_MAPPING = getMappings();
 
     private static Map<String, String> getMappings() {