Removes defaultIncludes

Author: spacether

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

@@ -477,18 +477,6 @@ public ClientOptInput toClientOptInput() {
         // regardless of entrypoint (CLI sets properties on this type, config deserialization sets on generatorSettings).
         Generator config = GeneratorLoader.getGenerator(generatorSettings.getGeneratorName(), generatorSettings, workflowSettings);
 
-        // TODO: Work toward Generator having a "WorkflowSettings" property, or better a "Workflow" object which itself has a "WorkflowSettings" property.
-        config.additionalProperties().put(CodegenConstants.TEMPLATING_ENGINE, workflowSettings.getTemplatingEngineName());
-
-        // TODO: Work toward Generator having a "GeneratorSettings" property.
-        config.additionalProperties().putAll(generatorSettings.getAdditionalProperties());
-
-        // any other additional properties?
-        String templateDir = workflowSettings.getTemplateDir();
-        if (templateDir != null) {
-            config.additionalProperties().put(CodegenConstants.TEMPLATE_DIR, workflowSettings.getTemplateDir());
-        }
-
         return new ClientOptInput(
                 (OpenAPI)context.getSpecDocument(),
                 config,

src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java

@@ -143,25 +143,20 @@ public class DefaultGenerator implements Generator {
         "################################################################################"
     );
 
+    private static Map<String, Object> getInitialAdditionalProperties(GeneratorSettings generatorSettings, CodeGeneratorSettings codeGeneratorSettings) {
+        Map<String, Object> initialAddProps = new HashMap<>();
+        initialAddProps.putAll(generatorSettings.getAdditionalProperties());
+        initialAddProps.put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, codeGeneratorSettings.hideGenerationTimestamp);
+        initialAddProps.put(CodegenConstants.TEMPLATING_ENGINE, codeGeneratorSettings.templateEngineName);
+        if (codeGeneratorSettings.templateDir != null) {
+            initialAddProps.put(CodegenConstants.TEMPLATE_DIR, codeGeneratorSettings.templateDir);
+        }
+        return initialAddProps;
+    }
 
     protected DefaultGenerator(GeneratorSettings generatorSettings, WorkflowSettings workflowSettings, String embeddedTemplateDir, String packageNameDefault, String outputFolderDefault) {
         this.generatorSettings = CodeGeneratorSettings.of(generatorSettings, workflowSettings, embeddedTemplateDir, packageNameDefault, outputFolderDefault);
-        defaultIncludes = new HashSet<>(
-            Arrays.asList("double",
-                "int",
-                "long",
-                "short",
-                "char",
-                "float",
-                "String",
-                "boolean",
-                "Boolean",
-                "Double",
-                "Void",
-                "Integer",
-                "Long",
-                "Float")
-        );
+        additionalProperties = getInitialAdditionalProperties(generatorSettings, this.generatorSettings);
 
         // name formatting options
         cliOptions.add(CliOption.newBoolean(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, CodegenConstants
@@ -182,7 +177,6 @@ public DefaultGenerator(GeneratorSettings generatorSettings, WorkflowSettings wo
             "openapiclient",
             "generated-code" + File.separator + "java"
         );
-        additionalProperties.put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, this.generatorSettings.hideGenerationTimestamp);
     }
 
     private final Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class);
@@ -263,7 +257,6 @@ public DefaultGenerator(GeneratorSettings generatorSettings, WorkflowSettings wo
         .languageSpecificPrimitives(Set.of())
         .build();
     protected String inputSpec;
-    protected Set<String> defaultIncludes;
     protected Map<String, String> typeMapping;
     protected String modelPackage = "components.schema";
     protected String modelNamePrefix = "", modelNameSuffix = "";
@@ -3437,8 +3430,7 @@ protected String getOrGenerateOperationId(Operation operation, String path, Stri
      * @return true if the library/module/package of the corresponding type needs to be imported
      */
     protected boolean needToImport(String type) {
-        return StringUtils.isNotBlank(type) && !defaultIncludes.contains(type)
-                && !generatorMetadata.getLanguageSpecificPrimitives().contains(type);
+        return true;
     }
 
     protected void addImports(Set<String> importsToBeAddedTo, Set<String> importsToAdd) {
@@ -4227,20 +4219,6 @@ protected EnumInfo getEnumInfo(ArrayList<Object> values, Schema<?> schema, Strin
         return new EnumInfo(enumValueToName, typeToValues, jsonPathPiece);
     }
 
-    /**
-     * reads propertyKey from additionalProperties, converts it to a boolean and
-     * writes it back to additionalProperties to be usable as a boolean in
-     * mustache files.
-     *
-     * @param propertyKey property key
-     * @return property value as boolean
-     */
-    public boolean convertPropertyToBooleanAndWriteBack(String propertyKey) {
-        boolean result = convertPropertyToBoolean(propertyKey);
-        writePropertyBack(propertyKey, result);
-        return result;
-    }
-
     /**
      * Provides an override location, if any is specified, for the .openapi-generator-ignore.
      * <p>
@@ -4253,24 +4231,7 @@ public String getIgnoreFilePathOverride() {
         return ignoreFilePathOverride;
     }
 
-    public boolean convertPropertyToBoolean(String propertyKey) {
-        final Object booleanValue = additionalProperties.get(propertyKey);
-        boolean result = Boolean.FALSE;
-        if (booleanValue instanceof Boolean) {
-            result = (Boolean) booleanValue;
-        } else if (booleanValue instanceof String) {
-            result = Boolean.parseBoolean((String) booleanValue);
-        } else {
-            LOGGER.warn("The value (generator's option) must be either boolean or string. Default to `false`.");
-        }
-        return result;
-    }
-
-    public void writePropertyBack(String propertyKey, boolean value) {
-        additionalProperties.put(propertyKey, value);
-    }
-
-//    private List<Map<String, Object>> getScopes(Scopes scopes) {
+    //    private List<Map<String, Object>> getScopes(Scopes scopes) {
 //        if (scopes != null && !scopes.isEmpty()) {
 //            List<Map<String, Object>> newScopes = new ArrayList<>();
 //            for (Map.Entry<String, String> scopeEntry : scopes.entrySet()) {

src/main/java/org/openapijsonschematools/codegen/generators/Generator.java

@@ -70,7 +70,7 @@ public interface Generator extends OpenApiProcessor, Comparable<Generator> {
 
     String escapeQuotationMark(String input);
 
-    // todo remove this and move it into new
+    // todo remove this and move it into the generator constructor
     void processOpts();
 
     List<CliOption> cliOptions();
@@ -81,10 +81,10 @@ public interface Generator extends OpenApiProcessor, Comparable<Generator> {
 
     HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> getJsonPathTemplateFiles(GeneratedFileType type);
 
-    // todo remove + move this into the new constructor
+    // todo remove this and move it into the generator constructor
     void preprocessOpenAPI(OpenAPI openAPI);
 
-    // todo remove and move this into the new constructor
+    // todo remove this and move it into the generator constructor
     void processOpenAPI(OpenAPI openAPI);
 
     String toApiFilename(String name);

src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java

@@ -3204,7 +3204,18 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
         }
         // must be sequential after initial setting above
         if (additionalProperties.containsKey(CodegenConstants.SNAPSHOT_VERSION)) {
-            if (convertPropertyToBooleanAndWriteBack(CodegenConstants.SNAPSHOT_VERSION)) {
+            final Object booleanValue = additionalProperties.get(CodegenConstants.SNAPSHOT_VERSION);
+            boolean result1 = Boolean.FALSE;
+            if (booleanValue instanceof Boolean) {
+                result1 = (Boolean) booleanValue;
+            } else if (booleanValue instanceof String) {
+                result1 = Boolean.parseBoolean((String) booleanValue);
+            } else {
+                LOGGER.warn("The value (generator's option) must be either boolean or string. Default to `false`.");
+            }
+            boolean result = result1;
+            additionalProperties.put(CodegenConstants.SNAPSHOT_VERSION, result);
+            if (result) {
                 this.setArtifactVersion(this.buildSnapshotVersion(this.getArtifactVersion()));
             }
         }