Changes IJsonSchemaValidationProperties to JsonSchema because that is the interface that it represents

Updates CodegenParameter, removes JsonSchema info

Further updates to fromParameter call sites

Author: spacether

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

@@ -28,7 +28,7 @@
  * CodegenModel represents a schema object in a OpenAPI document.
  */
 @JsonIgnoreProperties({"parentModel", "interfaceModels"})
-public class CodegenModel implements IJsonSchemaValidationProperties {
+public class CodegenModel implements JsonSchema {
     // The parent model name from the schemas. The parent is determined by inspecting the allOf, anyOf and
     // oneOf attributes in the OAS. First codegen inspects 'allOf', then 'anyOf', then 'oneOf'.
     // If there are multiple object references in the attribute ('allOf', 'anyOf', 'oneOf'), and one of the

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

@@ -19,7 +19,7 @@
 
 import java.util.*;
 
-public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperties {
+public class CodegenProperty implements Cloneable, JsonSchema {
     /**
      * The value of the 'type' attribute in the OpenAPI schema.
      * The per-language codegen logic may change to a language-specific type.

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

@@ -19,7 +19,7 @@
 
 import java.util.*;
 
-public class CodegenResponse implements IJsonSchemaValidationProperties {
+public class CodegenResponse implements JsonSchema {
     public final List<CodegenProperty> headers = new ArrayList<CodegenProperty>();
     private List<CodegenParameter> responseHeaders = new ArrayList<CodegenParameter>();
     public String code;

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

@@ -14,7 +14,7 @@
 import org.openapitools.codegen.meta.features.SchemaSupportFeature;
 import org.openapitools.codegen.utils.ModelUtils;
 
-public interface IJsonSchemaValidationProperties {
+public interface JsonSchema {
     CodegenProperty getContains();
 
     void setContains(CodegenProperty contains);
@@ -216,7 +216,7 @@ public interface IJsonSchemaValidationProperties {
     String getFormat();
 
     /**
-     * Syncs all the schema's type properties into the IJsonSchemaValidationProperties instance
+     * Syncs all the schema's type properties into the JsonSchema instance
      * for now this only supports types without format information
      * TODO: in the future move the format handling in here too
      * @param p the schema which contains the type info

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

@@ -28,6 +28,7 @@
 import io.swagger.v3.oas.models.tags.Tag;
 
 import org.apache.commons.io.FileUtils;
+import org.openapitools.codegen.JsonSchema;
 import org.openapitools.codegen.api.TemplatePathLocator;
 import org.openapitools.codegen.ignore.CodegenIgnoreProcessor;
 import org.openapitools.codegen.model.ModelMap;
@@ -67,7 +68,6 @@
 
 import static org.openapitools.codegen.utils.OnceLogger.once;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
-import static org.openapitools.codegen.utils.StringUtils.escape;
 import static org.openapitools.codegen.utils.StringUtils.underscore;
 
 public class PythonClientCodegen extends AbstractPythonCodegen {
@@ -741,7 +741,7 @@ are defined in that schema (x.properties). We do this because validation should
     they are not.
      */
     @Override
-    protected void addVarsRequiredVarsAdditionalProps(Schema schema, IJsonSchemaValidationProperties property, String sourceJsonPath){
+    protected void addVarsRequiredVarsAdditionalProps(Schema schema, JsonSchema property, String sourceJsonPath){
         setAddProps(schema, property, sourceJsonPath);
         if (ModelUtils.isAnyType(schema) && supportsAdditionalPropertiesWithComposedSchema) {
             // if anyType schema has properties then add them
@@ -1128,19 +1128,6 @@ public void updateCodegenPropertyEnum(CodegenProperty var) {
     public CodegenParameter fromRequestBody(RequestBody body, Set<String> imports, String bodyParameterName, String sourceJsonPath) {
         CodegenParameter cp = super.fromRequestBody(body, imports, bodyParameterName, sourceJsonPath);
         cp.baseName = "body";
-        Schema schema = ModelUtils.getSchemaFromRequestBody(body);
-        if (schema.get$ref() == null) {
-            return cp;
-        }
-        Schema unaliasedSchema = unaliasSchema(schema);
-        CodegenProperty unaliasedProp = fromProperty(
-                "body", unaliasedSchema, false, false, sourceJsonPath);
-        Boolean dataTypeMismatch = !cp.dataType.equals(unaliasedProp.dataType);
-        Boolean baseTypeMismatch = !cp.baseType.equals(unaliasedProp.refClass) && unaliasedProp.refClass != null;
-        if (dataTypeMismatch || baseTypeMismatch) {
-            cp.dataType = unaliasedProp.dataType;
-            cp.baseType = unaliasedProp.refClass;
-        }
         return cp;
     }
 
@@ -1183,10 +1170,7 @@ protected void addBodyModelSchema(CodegenParameter codegenParameter, String name
                 codegenParameter.baseName = bodyParameterName;
             }
             codegenParameter.paramName = toParamName(codegenParameter.baseName);
-            codegenParameter.baseType = codegenModel.classname;
-            codegenParameter.dataType = getTypeDeclaration(codegenModel.classname);
             codegenParameter.description = codegenModel.description;
-            codegenParameter.isNullable = codegenModel.isNullable;
         } else {
             CodegenProperty codegenProperty = fromProperty("property", schema, false, false, sourceJsonPath);
 
@@ -1210,13 +1194,8 @@ protected void addBodyModelSchema(CodegenParameter codegenParameter, String name
                 }
 
                 codegenParameter.paramName = toParamName(codegenParameter.baseName);
-                codegenParameter.baseType = codegenModelName;
-                codegenParameter.dataType = getTypeDeclaration(codegenModelName);
                 codegenParameter.description = codegenModelDescription;
             }
-
-            // set nullable
-            setParameterNullable(codegenParameter, codegenProperty);
         }
 
     }
@@ -1374,15 +1353,6 @@ protected List<Map<String, Object>> buildEnumVars(List<Object> values, String da
         return enumVars;
     }
 
-    @Override
-    public void postProcessParameter(CodegenParameter p) {
-        postProcessPattern(p.pattern, p.vendorExtensions);
-        if (p.baseType != null && languageSpecificPrimitives.contains(p.baseType)) {
-            // set baseType to null so the api docs will not point to a model for languageSpecificPrimitives
-            p.baseType = null;
-        }
-    }
-
     /**
      * Sets the value of the 'model.parent' property in CodegenModel
      * We have a custom version of this function so we can add the dataType on the ArrayModel
@@ -2251,7 +2221,7 @@ protected Map<String, Schema> getModelNameToSchemaCache() {
      * @param property the property for the above schema
      */
     @Override
-    protected void setAddProps(Schema schema, IJsonSchemaValidationProperties property, String sourceJsonPath){
+    protected void setAddProps(Schema schema, JsonSchema property, String sourceJsonPath){
         Schema addPropsSchema = getSchemaFromBooleanOrSchema(schema.getAdditionalProperties());
         if (addPropsSchema == null) {
             return;

…gen/IJsonSchemaValidationProperties.java …org/openapitools/codegen/JsonSchema.javamodules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java renamed to modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/JsonSchema.java modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java renamed to modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/JsonSchema.java

@@ -35,7 +35,7 @@
 import io.swagger.v3.parser.util.SchemaTypeUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CodegenModel;
-import org.openapitools.codegen.IJsonSchemaValidationProperties;
+import org.openapitools.codegen.JsonSchema;
 import org.openapitools.codegen.config.GlobalSettings;
 import org.openapitools.codegen.model.ModelMap;
 import org.openapitools.codegen.model.ModelsMap;
@@ -1623,8 +1623,8 @@ public static boolean isAnyType(Schema schema) {
         return (schema.get$ref() == null && schema.getType() == null);
     }
 
-    public static void syncValidationProperties(Schema schema, IJsonSchemaValidationProperties target) {
-        // TODO move this method to IJsonSchemaValidationProperties
+    public static void syncValidationProperties(Schema schema, JsonSchema target) {
+        // TODO move this method to JsonSchema
         if (schema != null && target != null) {
             if (isNullType(schema) || schema.get$ref() != null || isBooleanSchema(schema)) {
                 return;
@@ -1668,25 +1668,25 @@ public static void syncValidationProperties(Schema schema, IJsonSchemaValidation
         }
     }
 
-    private static void setArrayValidations(Integer minItems, Integer maxItems, Boolean uniqueItems, IJsonSchemaValidationProperties target) {
+    private static void setArrayValidations(Integer minItems, Integer maxItems, Boolean uniqueItems, JsonSchema target) {
         if (minItems != null) target.setMinItems(minItems);
         if (maxItems != null) target.setMaxItems(maxItems);
         if (uniqueItems != null) target.setUniqueItems(uniqueItems);
         if (uniqueItems != null) target.setUniqueItemsBoolean(uniqueItems);
     }
 
-    private static void setObjectValidations(Integer minProperties, Integer maxProperties, IJsonSchemaValidationProperties target) {
+    private static void setObjectValidations(Integer minProperties, Integer maxProperties, JsonSchema target) {
         if (minProperties != null) target.setMinProperties(minProperties);
         if (maxProperties != null) target.setMaxProperties(maxProperties);
     }
 
-    private static void setStringValidations(Integer minLength, Integer maxLength, String pattern, IJsonSchemaValidationProperties target) {
+    private static void setStringValidations(Integer minLength, Integer maxLength, String pattern, JsonSchema target) {
         if (minLength != null) target.setMinLength(minLength);
         if (maxLength != null) target.setMaxLength(maxLength);
         if (pattern != null) target.setPattern(pattern);
     }
 
-    private static void setNumericValidations(Schema schema, BigDecimal multipleOf, BigDecimal minimum, BigDecimal maximum, Boolean exclusiveMinimum, Boolean exclusiveMaximum, IJsonSchemaValidationProperties target) {
+    private static void setNumericValidations(Schema schema, BigDecimal multipleOf, BigDecimal minimum, BigDecimal maximum, Boolean exclusiveMinimum, Boolean exclusiveMaximum, JsonSchema target) {
         if (multipleOf != null) target.setMultipleOf(multipleOf);
         if (minimum != null) {
             if (isIntegerSchema(schema)) {