Merge pull request #8881 from swagger-api/issue-8679

Issue 8679
swagger-api · Oct 30, 2018 · a60d106 · a60d106
2 parents add9a40 + 1b0d918
commit a60d106
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenConstants.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenConstants.java
@@ -279,6 +279,8 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case,
     public static final String IS_RESTFUL_EXT_NAME = PREFIX_IS + "restful";
     public static final String IS_DEPRECATED_EXT_NAME = PREFIX_IS + "deprecated";
 
+    public static final String IS_FORM_EXT_NAME = PREFIX_IS + "form";
+
     public static final String IS_FORM_PARAM_EXT_NAME = PREFIX_IS + "form-param";
     public static final String IS_QUERY_PARAM_EXT_NAME = PREFIX_IS + "query-param";
     public static final String IS_PATH_PARAM_EXT_NAME = PREFIX_IS + "path-param";

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenContent.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenContent.java
@@ -0,0 +1,28 @@
+package io.swagger.codegen.v3;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class CodegenContent implements VendorExtendable {
+
+    private List<CodegenParameter> parameters = new ArrayList<CodegenParameter>();
+    private Map<String, Object> vendorExtensions = new HashMap<>();
+
+    public boolean getIsForm() {
+        if (vendorExtensions.get(CodegenConstants.IS_FORM_EXT_NAME) == null) {
+            return Boolean.FALSE;
+        }
+        return Boolean.parseBoolean(vendorExtensions.get(CodegenConstants.IS_FORM_EXT_NAME).toString());
+    }
+
+    public List<CodegenParameter> getParameters() {
+        return parameters;
+    }
+
+    @Override
+    public Map<String, Object> getVendorExtensions() {
+        return vendorExtensions;
+    }
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenOperation.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenOperation.java
@@ -7,7 +7,6 @@
 import io.swagger.v3.oas.models.tags.Tag;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -21,6 +20,7 @@ public class CodegenOperation extends CodegenObject {
     public Discriminator discriminator;
     public List<Map<String, String>> consumes, produces, prioritizedContentTypes;
     public CodegenParameter bodyParam;
+    public List<CodegenContent> contents = new ArrayList<>();
     public List<CodegenParameter> allParams = new ArrayList<CodegenParameter>();
     public List<CodegenParameter> bodyParams = new ArrayList<CodegenParameter>();
     public List<CodegenParameter> pathParams = new ArrayList<CodegenParameter>();
@@ -230,6 +230,8 @@ public boolean equals(Object o) {
             return false;
         if (bodyParam != null ? !bodyParam.equals(that.bodyParam) : that.bodyParam != null)
             return false;
+        if (contents != null ? !contents.equals(that.contents) : that.contents != null)
+            return false;
         if (allParams != null ? !allParams.equals(that.allParams) : that.allParams != null)
             return false;
         if (bodyParams != null ? !bodyParams.equals(that.bodyParams) : that.bodyParams != null)
@@ -284,6 +286,7 @@ public int hashCode() {
         result = 31 * result + (consumes != null ? consumes.hashCode() : 0);
         result = 31 * result + (produces != null ? produces.hashCode() : 0);
         result = 31 * result + (bodyParam != null ? bodyParam.hashCode() : 0);
+        result = 31 * result + (contents != null ? contents.hashCode() : 0);
         result = 31 * result + (allParams != null ? allParams.hashCode() : 0);
         result = 31 * result + (bodyParams != null ? bodyParams.hashCode() : 0);
         result = 31 * result + (pathParams != null ? pathParams.hashCode() : 0);
@@ -376,6 +379,10 @@ public CodegenParameter getBodyParam() {
         return bodyParam;
     }
 
+    public List<CodegenContent> getContents() {
+        return contents;
+    }
+
     public List<CodegenParameter> getAllParams() {
         return allParams;
     }