Adjust maven plugin to updated openapi-generator

Author: jjjasper

boat-maven-plugin/src/it/example/boat-generate/java-server/models/pom.xml

@@ -73,6 +73,11 @@
             <artifactId>swagger-annotations</artifactId>
             <version>2.2.7</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
     </dependencies>
 
     <packaging>jar</packaging>

boat-maven-plugin/src/it/example/pom.xml

@@ -11,7 +11,6 @@
     <properties>
 
         <boat-maven-plugin.version>@pom.version@</boat-maven-plugin.version>
-<!--        <boat-maven-plugin.version>0.12.0-SNAPS§HOT</boat-maven-plugin.version>-->
         <jackson-databind-nullable-version>0.2.3</jackson-databind-nullable-version>
 
         <jackson.version>2.13.3</jackson.version>

boat-maven-plugin/src/main/java/com/backbase/oss/boat/GenerateMojo.java

@@ -13,7 +13,6 @@
 import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyInstantiationTypesKvpList;
 import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyLanguageSpecificPrimitivesCsv;
 import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyLanguageSpecificPrimitivesCsvList;
-import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyOpenAPINormalizerKvpList;
 import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyReservedWordsMappingsKvp;
 import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyReservedWordsMappingsKvpList;
 import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applySchemaMappingsKvp;
@@ -74,6 +73,7 @@
 import org.openapitools.codegen.auth.AuthParser;
 import org.openapitools.codegen.config.CodegenConfigurator;
 import org.openapitools.codegen.config.GlobalSettings;
+import org.openapitools.codegen.utils.OptionUtils;
 import org.sonatype.plexus.build.incremental.BuildContext;
 import org.sonatype.plexus.build.incremental.DefaultBuildContext;
 
@@ -573,13 +573,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 java.nio.file.Files.copy(inputSpecFile.toPath(), copyTo.toPath(), StandardCopyOption.REPLACE_EXISTING);
             }
 
-            // attempt to read from config file
-            CodegenConfigurator configurator = CodegenConfigurator.fromFile(configurationFile);
-
-            // if a config file wasn't specified or we were unable to read it
-            if (configurator == null) {
-                configurator = new CodegenConfigurator();
-            }
+            final CodegenConfigurator configurator = loadCodegenConfigurator();
 
             configurator.setVerbose(verbose);
 
@@ -857,7 +851,10 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             }
 
             if (openapiNormalizer != null && (configOptions == null || !configOptions.containsKey("openapi-normalizer"))) {
-                applyOpenAPINormalizerKvpList(openapiNormalizer, configurator);
+                for (String propString: openapiNormalizer) {
+                    OptionUtils.parseCommaSeparatedTuples(propString)
+                            .forEach(p -> {configurator.addOpenapiNormalizer(p.getLeft(), p.getRight());});
+                }
             }
 
             // Apply Schema Mappings
@@ -953,6 +950,16 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         }
     }
 
+    /**
+     * Attempt to read from config file, return default otherwise.
+     *
+     * @return The CodegenConfigurator loaded from file or a default.
+     */
+    private CodegenConfigurator loadCodegenConfigurator() {
+        CodegenConfigurator configurator = CodegenConfigurator.fromFile(configurationFile);
+        return configurator != null ? configurator : new CodegenConfigurator();
+    }
+
     protected Collection<String> getGeneratorSpecificSupportingFiles() {
         return Collections.emptySet();
     }