v2 use name for module name

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

@@ -396,9 +396,7 @@ public interface CodegenConfig {
 
     String toRefClass(String ref, String sourceJsonPath);
 
-    CodegenParameter fromRequestBody(RequestBody body, String bodyParameterName, String sourceJsonPath);
-
-    String getBodyParameterName(CodegenOperation co);
+    CodegenRequestBody fromRequestBody(RequestBody body, String sourceJsonPath);
 
     CodegenResponse fromResponse(ApiResponse response, String sourceJsonPath);
 

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

@@ -31,41 +31,24 @@
  * A unique parameter is defined by a combination of a name and location.
  * Parameters may be located in a path, query, header or cookie.
  */
-public class CodegenHeader implements OpenapiComponent {
+public class CodegenHeader extends CodegenRequestBody {
     public boolean isExplode;
-    public String paramName,
-            description, unescapedDescription, style;
+    public String style;
 
-    public String nameInLowerCase; // property name in lower case
-    public String example; // example value (x-example)
-    public String jsonSchema;
-    public Map<String, Object> vendorExtensions = new HashMap<String, Object>();
     public boolean isDeprecated;
     protected CodegenSchema schema;
-    /**
-     * Determines whether this parameter is mandatory. If the parameter is in "path",
-     * this property is required and its value MUST be true. Otherwise, the property
-     * MAY be included and its default value is false.
-     */
-    public boolean required;
-    protected boolean hasMultipleTypes = false;
-    protected LinkedHashMap<String, CodegenMediaType> content;
-    protected String ref;
-    protected String refModule;
-
-    public Set<String> imports = new HashSet<String>();
-
-    protected String componentModule;
 
     public CodegenHeader copy() {
         CodegenHeader output = new CodegenHeader();
-        output.paramName = this.paramName;
         output.description = this.description;
         output.unescapedDescription = this.unescapedDescription;
         output.required = this.required;
         output.jsonSchema = this.jsonSchema;
         output.example = this.example;
 
+        if (this.name != null) {
+            output.setName(this.name);
+        }
         if (this.content != null) {
             output.setContent(this.content);
         }
@@ -120,60 +103,29 @@ public String getSetSchemaJsonPath(String jsonPath) {
         }
         return null;
     }
-    public String getComponentModule() {
-        return componentModule;
-    }
-
-    public void setComponentModule(String componentModule) {
-        this.componentModule = componentModule;
-    }
-
     @Override
     public int hashCode() {
-        return Objects.hash(isExplode, paramName, description, unescapedDescription, style, example, jsonSchema, vendorExtensions, isDeprecated, required, hasMultipleTypes, schema, content, ref, refModule, imports, componentModule);
+        return Objects.hash(name, isExplode, description, unescapedDescription, style, example, jsonSchema, vendorExtensions, isDeprecated, required, schema, content, ref, refModule, imports, componentModule);
     }
 
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof CodegenHeader)) return false;
+        if (! super.equals(o)) return false;
         CodegenHeader that = (CodegenHeader) o;
         return isExplode == that.isExplode &&
                 isDeprecated == that.isDeprecated &&
-                required == that.required &&
-                Objects.equals(componentModule, that.componentModule) &&
-                Objects.equals(ref, that.getRef()) &&
-                Objects.equals(imports, that.imports) &&
-                Objects.equals(refModule, that.getRefModule()) &&
-                Objects.equals(content, that.getContent()) &&
                 Objects.equals(schema, that.getSchema()) &&
-                Objects.equals(paramName, that.paramName) &&
-                Objects.equals(description, that.description) &&
-                Objects.equals(unescapedDescription, that.unescapedDescription) &&
-                Objects.equals(style, that.style) &&
-                Objects.equals(example, that.example) &&
-                Objects.equals(jsonSchema, that.jsonSchema) &&
-                Objects.equals(vendorExtensions, that.vendorExtensions);
+                Objects.equals(style, that.style);
     }
 
     protected void addInstanceInfo(StringBuilder sb) {
+        super.addInstanceInfo(sb);
         sb.append(", isExplode=").append(isExplode);
-        sb.append(", paramName='").append(paramName).append('\'');
-        sb.append(", description='").append(description).append('\'');
-        sb.append(", unescapedDescription='").append(unescapedDescription).append('\'');
         sb.append(", style='").append(style).append('\'');
-        sb.append(", example='").append(example).append('\'');
-        sb.append(", jsonSchema='").append(jsonSchema).append('\'');
-        sb.append(", vendorExtensions=").append(vendorExtensions);
         sb.append(", isDeprecated=").append(isDeprecated);
-        sb.append(", required=").append(required);
-        sb.append(", hasMultipleTypes=").append(hasMultipleTypes);
         sb.append(", schema=").append(schema);
-        sb.append(", content=").append(content);
-        sb.append(", ref=").append(ref);
-        sb.append(", refModule=").append(refModule);
-        sb.append(", imports=").append(imports);
-        sb.append(", componentModule=").append(componentModule);
     }
 
     @Override
@@ -191,22 +143,5 @@ public CodegenSchema getSchema() {
     public void setSchema(CodegenSchema schema) {
         this.schema = schema;
     }
-
-    public LinkedHashMap<String, CodegenMediaType> getContent() {
-        return content;
-    }
-
-    public void setContent(LinkedHashMap<String, CodegenMediaType> content) {
-        this.content = content;
-    }
-
-
-    public String getRef() { return ref; }
-
-    public void setRef(String ref) { this.ref=ref; }
-
-    public String getRefModule() { return refModule; }
-
-    public void setRefModule(String refModule) { this.refModule=refModule; }
 }
 

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

@@ -23,7 +23,7 @@
 import java.util.stream.Collectors;
 
 public class CodegenOperation {
-    public boolean hasAuthMethods, hasConsumes, hasProduces, hasParams, hasOptionalParams, hasRequiredParams,
+    public boolean hasAuthMethods, hasConsumes, hasProduces, hasParams,
             subresourceOperation, isMultipart,
             isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy,
             isRestful, isDeprecated, isCallbackRequest, uniqueItems, hasDefaultResponse = false,
@@ -32,16 +32,15 @@ public class CodegenOperation {
             summary, unescapedNotes, notes, baseName;
     public List<Map<String, String>> consumes, produces, prioritizedContentTypes;
     public List<CodegenServer> servers = new ArrayList<CodegenServer>();
-    public CodegenParameter requestBody;
+    public CodegenRequestBody requestBody;
     public List<CodegenParameter> allParams = new ArrayList<CodegenParameter>();
-    public List<CodegenParameter> bodyParams = new ArrayList<CodegenParameter>();
     public List<CodegenParameter> pathParams = new ArrayList<CodegenParameter>();
     public List<CodegenParameter> queryParams = new ArrayList<CodegenParameter>();
     public List<CodegenParameter> headerParams = new ArrayList<CodegenParameter>();
     public List<CodegenParameter> implicitHeadersParams = new ArrayList<CodegenParameter>();
     public List<CodegenParameter> cookieParams = new ArrayList<CodegenParameter>();
-    public List<CodegenParameter> requiredParams = new ArrayList<CodegenParameter>();
-    public List<CodegenParameter> optionalParams = new ArrayList<CodegenParameter>();
+    public List<CodegenRequestBody> requiredParams = new ArrayList<CodegenRequestBody>();
+    public List<CodegenRequestBody> optionalParams = new ArrayList<CodegenRequestBody>();
     public List<CodegenSecurity> authMethods;
     public Map<String, CodegenTag> tags;
     public TreeMap<String, CodegenResponse> responses = null;
@@ -75,15 +74,6 @@ private static boolean nonEmpty(Map<?, ?> params) {
         return params != null && !params.isEmpty();
     }
 
-    /**
-     * Check if there's at least one body parameter
-     *
-     * @return true if body parameter exists, false otherwise
-     */
-    public boolean getHasBodyParam() {
-        return nonEmpty(bodyParams);
-    }
-
     /**
      * Check if there's at least one query parameter
      *
@@ -120,15 +110,6 @@ public boolean getHasPathParams() {
         return nonEmpty(pathParams);
     }
 
-    /**
-     * Check if there's at least one body parameter or at least one form parameter
-     *
-     * @return true if body or form parameter exists, false otherwise
-     */
-    public boolean getHasBodyOrFormParams() {
-        return getHasBodyParam();
-    }
-
     /**
      * Check if there's at least one form parameter
      *
@@ -299,8 +280,6 @@ public String toString() {
         sb.append(", hasConsumes=").append(hasConsumes);
         sb.append(", hasProduces=").append(hasProduces);
         sb.append(", hasParams=").append(hasParams);
-        sb.append(", hasOptionalParams=").append(hasOptionalParams);
-        sb.append(", hasRequiredParams=").append(hasRequiredParams);
         sb.append(", subresourceOperation=").append(subresourceOperation);
         sb.append(", isMultipart=").append(isMultipart);
         sb.append(", hasDefaultResponse=").append(hasDefaultResponse);
@@ -327,7 +306,6 @@ public String toString() {
         sb.append(", servers=").append(servers);
         sb.append(", requestBody=").append(requestBody);
         sb.append(", allParams=").append(allParams);
-        sb.append(", bodyParams=").append(bodyParams);
         sb.append(", pathParams=").append(pathParams);
         sb.append(", queryParams=").append(queryParams);
         sb.append(", headerParams=").append(headerParams);
@@ -364,8 +342,6 @@ public boolean equals(Object o) {
                 hasConsumes == that.hasConsumes &&
                 hasProduces == that.hasProduces &&
                 hasParams == that.hasParams &&
-                hasOptionalParams == that.hasOptionalParams &&
-                hasRequiredParams == that.hasRequiredParams &&
                 subresourceOperation == that.subresourceOperation &&
                 isMultipart == that.isMultipart &&
                 hasDefaultResponse == that.hasDefaultResponse &&
@@ -392,7 +368,6 @@ public boolean equals(Object o) {
                 Objects.equals(servers, that.servers) &&
                 Objects.equals(requestBody, that.requestBody) &&
                 Objects.equals(allParams, that.allParams) &&
-                Objects.equals(bodyParams, that.bodyParams) &&
                 Objects.equals(pathParams, that.pathParams) &&
                 Objects.equals(queryParams, that.queryParams) &&
                 Objects.equals(headerParams, that.headerParams) &&
@@ -421,13 +396,13 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
 
-        return Objects.hash(hasAuthMethods, hasConsumes, hasProduces, hasParams, hasOptionalParams,
-                hasRequiredParams, subresourceOperation,
+        return Objects.hash(hasAuthMethods, hasConsumes, hasProduces, hasParams,
+                subresourceOperation,
                 isMultipart,
                 hasDefaultResponse, isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy,
                 isRestful, isDeprecated, isCallbackRequest, uniqueItems, path, operationId, httpMethod,
                 summary, unescapedNotes, notes, baseName, defaultResponse,
-                consumes, produces, prioritizedContentTypes, servers, requestBody, allParams, bodyParams,
+                consumes, produces, prioritizedContentTypes, servers, requestBody, allParams,
                 pathParams, queryParams, headerParams, cookieParams, requiredParams, optionalParams,
                 authMethods, tags, responses, callbacks, imports, examples, requestBodyExamples, externalDocs,
                 vendorExtensions, nickname, operationIdOriginal, operationIdLowerCase, operationIdCamelCase,

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

@@ -27,12 +27,12 @@
 public class CodegenParameter extends CodegenHeader {
     public boolean isFormParam, isQueryParam, isPathParam, isHeaderParam,
             isCookieParam, isBodyParam, isAllowEmptyValue, isDeepObject;
+    // stores the openapi name property
     public String baseName;
 
     public CodegenParameter copy() {
         CodegenParameter output = new CodegenParameter();
         output.baseName = this.baseName;
-        output.paramName = this.paramName;
         output.description = this.description;
         output.unescapedDescription = this.unescapedDescription;
         output.isFormParam = this.isFormParam;
@@ -45,6 +45,9 @@ public CodegenParameter copy() {
         output.jsonSchema = this.jsonSchema;
         output.example = this.example;
 
+        if (this.name != null) {
+            output.name = this.name;
+        }
         if (this.content != null) {
             output.setContent(this.content);
         }
@@ -77,7 +80,7 @@ public CodegenParameter copy() {
 
     @Override
     public int hashCode() {
-        return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isExplode, baseName, paramName, description, unescapedDescription, style, isDeepObject, isAllowEmptyValue, example, jsonSchema, vendorExtensions, isDeprecated, required, hasMultipleTypes, schema, content, ref, refModule, imports, componentModule);
+        return Objects.hash(name, isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isExplode, baseName, description, unescapedDescription, style, isDeepObject, isAllowEmptyValue, example, jsonSchema, vendorExtensions, isDeprecated, required, schema, content, ref, refModule, imports, componentModule);
     }
 
     @Override