v2 codegenProperty cleanup (#102)

* Adds allOf anyOf oneOf not to codegenProp + Model

* Replaces all template usage of composedSchemas with allOf/anyOf/oneOf

* Removes CodegenComposedSchemas

* Removes usage of getComposedSchemas

* Removes getter and setter

* Removes more unused methods

* Removes dataFormat + datatypeWithEnum

* Removes dataTupe template usage

* Removes dataType

* Removes isModel

* Removes isPrimitiveType

* Further isPrimitiveType removal

* Removes defaultValueWithParam

* Removes containerType

* Removes jsonSchema

* Removes min + max

* Removes hasMoreNonReadOnly

* Removes isContainer

* Removes isFreeFormObject

* Removes isInnerEnum

* Removes mostInnerItems

* Removes isInherited

* Removes enumName

* Removes additionalPropertiesIsAnyType

* Adds spec version comment in JsonSchema.java

* Exports python code to defaultCodegen

* Removes uniqueItemsBoolean

* Removes updatePropertyForArray

* Renames getRequiredVarsMap to getRequiredProperties

* Adds properties + optionalProperties

* Switches some vars to properties

* Uses LinkedHashMap for property maps to preserve insertion order, uses optionalProperties in schema_doc.handlebars

* Removes hasVars

* Removes hasRequired

* Uses more properties and optionalProperties

* Partial update using new data sources

* getitem type hint tweaks

* Improves type hints

* Fixes composed property json paths

* Removes schemaIsFromAdditionalProperties from fromProperty

* Removes name from fromProperty

* Fixes tempate typo

* Removes required from fromProperty

* Removes required from fromProperty

* Removes vars + requiredVars and unusedmethods from DefaultCodegen

* Regenerates sample

* Tweaks required object property docs

* Generates docs for required properties with no defining schema, addProps unset

* Fixes new type hint definitions

* Renames composed schemas

* Fixes schema definition names for content schemas

* Adds CodegenKey

* Stops special handling of additionalProperties baseName

* Removes nameInCamelCase + nameInSnakeCase, uses CodegenKey in templates

* Fixes composed schema names

* Removes codegenProperty.baseName

* name.name -> name.getName, removes addPropsUnset template var

* Changes key on properties/requiredProperties/optionalProperties form String to CodegenKey

* Uses key info to prevent invalid names in required property type hints and new signatures

* Removes generateAliasAsModel

* Further removal of GenerateAliasAsModel

* Fixes 3 python tests

* Partial java test fixes

* Adds getKey, fixes more java tests

* Removes generate alias as model, updates more java tests

* Fixes more java tests

* Syntax errors in java tests reduced to 49

* Reduces java syntax errors down to 40

* Reduces java syntax errors down to 30

* Reduces java syntax errors down to 20

* Reduces java syntax errors down to 7

* Reduces java syntax errors down to 0

* Reduces java syntax errors down to 240

* Reduces java syntax errors down to 212

* Reduces java syntax errors down to 198

* Reduces java syntax errors down to 184

* Reduces java syntax errors down to 158

* Reduces java syntax errors down to 136

* Reduces java syntax errors down to 98

* Reduces java syntax errors down to 76

* Reduces java syntax errors down to 50

* Fixes all syntax errors

* Removes JavaClient codegentest

* Removes JavaInheritancetest

* Removes JavaModelEnumtest

* Fixes 2 tests

* Reduces test failure qty to 33

* Reduces test failure qty to 23

* Reduces test failure qty to 11

* Reduces test failure qty to 7

* Reduces test failure qty to 3

* Reduces test failure qty to 2

* Reduces test failure qty to 1

* Fixes all java tests

* Removes unused java client tests

* Samples regenerated

* Regenerates samples

* Samples regen again

Author: spacether

modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java

@@ -263,9 +263,6 @@ public class Generate extends OpenApiGeneratorCommand {
     @Option(name = {"--enable-post-process-file"}, title = "enable post-processing of files (in generators supporting it)", description = CodegenConstants.ENABLE_POST_PROCESS_FILE_DESC)
     private Boolean enablePostProcessFile;
 
-    @Option(name = {"--generate-alias-as-model"}, title = "generate alias (array, map) as model", description = CodegenConstants.GENERATE_ALIAS_AS_MODEL_DESC)
-    private Boolean generateAliasAsModel;
-
     @Option(name = {"--legacy-discriminator-behavior"}, title = "Support legacy logic for evaluating discriminators", description = CodegenConstants.LEGACY_DISCRIMINATOR_BEHAVIOR_DESC)
     private Boolean legacyDiscriminatorBehavior;
 
@@ -427,10 +424,6 @@ public void execute() {
             configurator.setEnablePostProcessFile(enablePostProcessFile);
         }
 
-        if (generateAliasAsModel != null) {
-            configurator.setGenerateAliasAsModel(generateAliasAsModel);
-        }
-
         if (minimalUpdate != null) {
             configurator.setEnableMinimalUpdate(minimalUpdate);
         }

modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java

@@ -45,7 +45,6 @@ public class WorkflowSettings {
     public static final boolean DEFAULT_ENABLE_POST_PROCESS_FILE = false;
     public static final boolean DEFAULT_ENABLE_MINIMAL_UPDATE = false;
     public static final boolean DEFAULT_STRICT_SPEC_BEHAVIOR = true;
-    public static final boolean DEFAULT_GENERATE_ALIAS_AS_MODEL = false;
     public static final String DEFAULT_TEMPLATING_ENGINE_NAME = null; // this is set by the generator
     public static final Map<String, String> DEFAULT_GLOBAL_PROPERTIES = Collections.unmodifiableMap(new HashMap<>());
 
@@ -60,7 +59,6 @@ public class WorkflowSettings {
     private boolean enablePostProcessFile = DEFAULT_ENABLE_POST_PROCESS_FILE;
     private boolean enableMinimalUpdate = DEFAULT_ENABLE_MINIMAL_UPDATE;
     private boolean strictSpecBehavior = DEFAULT_STRICT_SPEC_BEHAVIOR;
-    private boolean generateAliasAsModel = DEFAULT_GENERATE_ALIAS_AS_MODEL;
     private String templateDir;
     private String templatingEngineName = DEFAULT_TEMPLATING_ENGINE_NAME;
     private String ignoreFileOverride;
@@ -82,7 +80,6 @@ private WorkflowSettings(Builder builder) {
         this.templatingEngineName = builder.templatingEngineName;
         this.ignoreFileOverride = builder.ignoreFileOverride;
         this.globalProperties = Collections.unmodifiableMap(builder.globalProperties);
-        this.generateAliasAsModel = builder.generateAliasAsModel;
     }
 
     /**
@@ -109,7 +106,6 @@ public static Builder newBuilder(WorkflowSettings copy) {
         builder.validateSpec = copy.isValidateSpec();
         builder.enablePostProcessFile = copy.isEnablePostProcessFile();
         builder.enableMinimalUpdate = copy.isEnableMinimalUpdate();
-        builder.generateAliasAsModel = copy.isGenerateAliasAsModel();
         builder.strictSpecBehavior = copy.isStrictSpecBehavior();
         builder.templatingEngineName = copy.getTemplatingEngineName();
         builder.ignoreFileOverride = copy.getIgnoreFileOverride();
@@ -227,15 +223,6 @@ public boolean isEnableMinimalUpdate() {
         return enableMinimalUpdate;
     }
 
-    /**
-     * Indicates whether or not the generation should convert aliases (primitives defined as schema for use within documents) as models.
-     *
-     * @return <code>true</code> if generate-alias-as-model is enabled, otherwise <code>false</code>.
-     */
-    public boolean isGenerateAliasAsModel() {
-        return generateAliasAsModel;
-    }
-
     /**
      * Indicates whether or not 'MUST' and 'SHALL' wording in the api specification is strictly adhered to.
      * For example, when <code>false</code>, no automatic 'fixes' will be applied to documents which pass validation but don't follow the spec.
@@ -308,7 +295,6 @@ public static final class Builder {
         private Boolean enablePostProcessFile = DEFAULT_ENABLE_POST_PROCESS_FILE;
         private Boolean enableMinimalUpdate = DEFAULT_ENABLE_MINIMAL_UPDATE;
         private Boolean strictSpecBehavior = DEFAULT_STRICT_SPEC_BEHAVIOR;
-        private Boolean generateAliasAsModel = DEFAULT_GENERATE_ALIAS_AS_MODEL;
         private String templateDir;
         private String templatingEngineName = DEFAULT_TEMPLATING_ENGINE_NAME;
         private String ignoreFileOverride;
@@ -447,18 +433,6 @@ public Builder withStrictSpecBehavior(Boolean strictSpecBehavior) {
             return this;
         }
 
-        /**
-         * Sets the {@code generateAliasAsModel} and returns a reference to this Builder so that the methods can be chained together.
-         * An 'alias' is a primitive type defined as a schema, and this option will attempt to construct a model for that primitive.
-         *
-         * @param generateAliasAsModel the {@code generateAliasAsModel} to set
-         * @return a reference to this Builder
-         */
-        public Builder withGenerateAliasAsModel(Boolean generateAliasAsModel) {
-            this.generateAliasAsModel = generateAliasAsModel != null ? generateAliasAsModel : Boolean.valueOf(DEFAULT_GENERATE_ALIAS_AS_MODEL);
-            return this;
-        }
-
         /**
          * Sets the {@code templateDir} and returns a reference to this Builder so that the methods can be chained together.
          *
@@ -586,7 +560,6 @@ public String toString() {
                 ", templatingEngineName='" + templatingEngineName + '\'' +
                 ", ignoreFileOverride='" + ignoreFileOverride + '\'' +
                 ", globalProperties=" + globalProperties +
-                ", generateAliasAsModel=" + generateAliasAsModel +
                 '}';
     }
 
@@ -604,7 +577,6 @@ public boolean equals(Object o) {
                 isEnablePostProcessFile() == that.isEnablePostProcessFile() &&
                 isEnableMinimalUpdate() == that.isEnableMinimalUpdate() &&
                 isStrictSpecBehavior() == that.isStrictSpecBehavior() &&
-                isGenerateAliasAsModel() == that.isGenerateAliasAsModel() &&
                 Objects.equals(getInputSpec(), that.getInputSpec()) &&
                 Objects.equals(getOutputDir(), that.getOutputDir()) &&
                 Objects.equals(getTemplateDir(), that.getTemplateDir()) &&
@@ -624,7 +596,6 @@ public int hashCode() {
                 isSkipOperationExample(),
                 isLogToStderr(),
                 isValidateSpec(),
-                isGenerateAliasAsModel(),
                 isEnablePostProcessFile(),
                 isEnableMinimalUpdate(),
                 isStrictSpecBehavior(),

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenComposedSchemas.java

@@ -125,8 +125,6 @@ public interface CodegenConfig {
 
     String getTypeDeclaration(Schema schema);
 
-    String getTypeDeclaration(String name);
-
     void processOpts();
 
     List<CliOption> cliOptions();
@@ -348,12 +346,6 @@ public interface CodegenConfig {
 
     String getIgnoreFilePathOverride();
 
-    String toBooleanGetter(String name);
-
-    String toSetter(String name);
-
-    String toGetter(String name);
-
     String sanitizeName(String name);
 
     void postProcessFile(File file, String fileType);

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

@@ -366,12 +366,6 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case,
 
     public static final String OPEN_API_SPEC_NAME = "openAPISpecName";
 
-    public static final String GENERATE_ALIAS_AS_MODEL = "generateAliasAsModel";
-    public static final String GENERATE_ALIAS_AS_MODEL_DESC = "Generate model implementation for aliases to map and array schemas. " +
-        "An 'alias' is an array, map, or list which is defined inline in a OpenAPI document and becomes a model in the generated code. " +
-        "A 'map' schema is an object that can have undeclared properties, i.e. the 'additionalproperties' attribute is set on that object. " +
-        "An 'array' schema is a list of sub schemas in a OAS document";
-
     public static final String USE_COMPARE_NET_OBJECTS = "useCompareNetObjects";
     public static final String USE_COMPARE_NET_OBJECTS_DESC = "Use KellermanSoftware.CompareNetObjects for deep recursive object comparison. WARNING: this option incurs potential performance impact.";
 

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java

@@ -19,7 +19,6 @@ public class CodegenDiscriminator {
     // This is the propertyName as specified in the OpenAPI discriminator object.
     private String propertyName;
     private String propertyBaseName;
-    private String propertyGetter;
     private String propertyType;
     private Map<String, String> mapping;
     private boolean isEnum;
@@ -49,14 +48,6 @@ public void setPropertyName(String propertyName) {
         this.propertyName = propertyName;
     }
 
-    public String getPropertyGetter() {
-        return propertyGetter;
-    }
-
-    public void setPropertyGetter(String propertyGetter) {
-        this.propertyGetter = propertyGetter;
-    }
-
     public String getPropertyBaseName() {
         return propertyBaseName;
     }

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenDiscriminator.java

@@ -0,0 +1,38 @@
+package org.openapitools.codegen;
+
+import java.util.Objects;
+
+public class CodegenKey {
+    public CodegenKey(String name, boolean nameIsValid, String snakeCaseName, String camelCaseName) {
+        this.name = name;
+        this.nameIsValid = nameIsValid;
+        this.snakeCaseName = snakeCaseName;
+        this.camelCaseName = camelCaseName;
+    }
+
+    private String name;
+    private boolean nameIsValid;
+    private String snakeCaseName;
+    private String camelCaseName;
+
+    public String getName() { return name; }
+    public boolean getNameIsValid() { return nameIsValid; }
+    public String getSnakeCaseName() { return snakeCaseName; }
+    public String getCamelCaseName() { return camelCaseName; }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        CodegenKey that = (CodegenKey) o;
+        return Objects.equals(name, that.name) &&
+                Objects.equals(nameIsValid, that.nameIsValid) &&
+                Objects.equals(snakeCaseName, that.snakeCaseName) &&
+                Objects.equals(camelCaseName, that.camelCaseName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, nameIsValid, snakeCaseName, camelCaseName);
+    }
+}