Fixes setting package name

Author: spacether

src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java

@@ -255,10 +255,6 @@ public void execute() {
             configurator.setTemplateDir(templateDir);
         }
 
-        if (isNotEmpty(packageName)) {
-            configurator.setPackageName(packageName);
-        }
-
         if (isNotEmpty(templatingEngine)) {
             configurator.setTemplatingEngineName(templatingEngine);
         }
@@ -350,8 +346,20 @@ public void execute() {
         if (globalProperties != null && !globalProperties.isEmpty()) {
             CodegenConfiguratorUtils.applyGlobalPropertiesKvpList(globalProperties, configurator);
         }
+
+        if (isNotEmpty(packageName)) {
+            configurator.setPackageName(packageName);
+        }
+
         CodegenConfiguratorUtils.applyAdditionalPropertiesKvpList(additionalProperties, configurator);
 
+        if (!isNotEmpty(packageName) && (configurator.getAdditionalProperties() != null && configurator.getAdditionalProperties().containsKey("packageName"))) {
+            // if packageName is passed as an additional property warn them
+            System.out.println("packageName should be passed in using --package-name from now on");
+            packageName = (String) configurator.getAdditionalProperties().get("packageName");
+            configurator.setPackageName(packageName);
+        }
+
         try {
             final ClientOptInput clientOptInput = configurator.toClientOptInput();
 

src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java

@@ -468,6 +468,10 @@ public Context<?> toContext() {
         return new Context<>(specification, generatorSettings, workflowSettings);
     }
 
+    public Map<String, Object> getAdditionalProperties() {
+        return additionalProperties;
+    }
+
     public ClientOptInput toClientOptInput() {
         Context<?> context = toContext();
         WorkflowSettings workflowSettings = context.getWorkflowSettings();