Stores refModule in request bodies

Adds request_bodies generation in java

Response body files generated

Moves imports for request body and form params into the model instance

fromParameter update

Consolidates fromParameter imports

Fixes parameter imports

Samples updated

Sample regen _request_body changed to suffix

Author: spacether

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

@@ -21,6 +21,7 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.parameters.RequestBody;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.servers.Server;
 import io.swagger.v3.oas.models.servers.ServerVariable;
@@ -81,6 +82,12 @@ public interface CodegenConfig {
 
     String modelPackage();
 
+    String packageName();
+
+    String requestBodyFileFolder();
+
+    String requestBodyFilename(String componentName);
+
     String toApiName(String name);
 
     String toApiVarName(String name);
@@ -151,6 +158,8 @@ public interface CodegenConfig {
 
     Map<String, String> modelTemplateFiles();
 
+    Map<String, String> requestBodyTemplateFiles();
+
     Map<String, String> apiTestTemplateFiles();
 
     Map<String, String> modelTestTemplateFiles();
@@ -177,6 +186,8 @@ public interface CodegenConfig {
 
     String toModelFilename(String name);
 
+    String toModuleFilename(String name);
+
     String toApiTestFilename(String name);
 
     String toModelTestFilename(String name);
@@ -332,4 +343,8 @@ public interface CodegenConfig {
     boolean getAddSuffixToDuplicateOperationNicknames();
 
     String toRefClass(String ref, String sourceJsonPath);
+
+    CodegenParameter fromRequestBody(RequestBody body, String bodyParameterName, String sourceJsonPath);
+
+    String getBodyParameterName(CodegenOperation co);
 }

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

@@ -25,6 +25,8 @@ public class CodegenConstants {
     // NOTE: We may want to move these to a separate class to avoid confusion or modification.
     public static final String APIS = "apis";
     public static final String MODELS = "models";
+
+    public static final String REQUEST_BODIES = "requestBodies";
     public static final String SUPPORTING_FILES = "supportingFiles";
     public static final String MODEL_TESTS = "modelTests";
     public static final String MODEL_DOCS = "modelDocs";

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

@@ -48,6 +48,8 @@ public class CodegenParameter {
     private String ref;
     private String refModule;
 
+    public Set<String> imports = new HashSet<String>();
+
     public CodegenParameter copy() {
         CodegenParameter output = new CodegenParameter();
         output.baseName = this.baseName;
@@ -79,6 +81,9 @@ public CodegenParameter copy() {
         if (this.refModule != null) {
             output.setRefModule(this.refModule);
         }
+        if (this.imports != null) {
+            output.imports = imports;
+        }
         output.isDeprecated = this.isDeprecated;
         output.isExplode = this.isExplode;
         output.style = this.style;
@@ -90,7 +95,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);
+        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);
     }
 
     @Override
@@ -108,6 +113,7 @@ public boolean equals(Object o) {
                 isDeprecated == that.isDeprecated &&
                 required == that.required &&
                 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()) &&
@@ -150,6 +156,7 @@ public String toString() {
         sb.append(", content=").append(content);
         sb.append(", ref=").append(ref);
         sb.append(", refModule=").append(refModule);
+        sb.append(", imports=").append(imports);
         sb.append('}');
         return sb.toString();
     }