Merge pull request #1317 from swagger-api/issue-1316

fix for issue #1316: ContentType in Encoding Object should not be required.

Author: gracekarina

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java

@@ -1033,7 +1033,7 @@ public Encoding getEncoding(ObjectNode node, String location, ParseResult result
 
         Encoding encoding = new Encoding();
 
-        String value = getString("contentType", node, true, location, result);
+        String value = getString("contentType", node, false, location, result);
         encoding.setContentType(value);
 
         value = getString("style", node, false, location, result);

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java

@@ -66,6 +66,19 @@ public class OpenAPIV3ParserTest {
     protected int serverPort = getDynamicPort();
     protected WireMockServer wireMockServer;
 
+    @Test
+    public void testIssue1316() {
+        OpenAPIV3Parser openApiParser = new OpenAPIV3Parser();
+        ParseOptions options = new ParseOptions();
+        options.setResolve(true);
+        SwaggerParseResult parseResult = openApiParser.readLocation("Issue1316.yaml", null, options);
+
+        OpenAPI openAPI = parseResult.getOpenAPI();
+        assertNotNull(openAPI);
+        assertTrue(parseResult.getMessages().size() == 0);
+
+    }
+
 
     @Test
     public void testFlattenComposedSchema() {

modules/swagger-parser-v3/src/test/resources/Issue1316.yaml

@@ -0,0 +1,25 @@
+---
+openapi: 3.0.1
+info:
+  title: Encoding Issue
+  version: 0.0.2
+paths:
+  "/uploads":
+    post:
+      tags:
+        - Uploads
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                file:
+                  type: string
+                  format: binary
+            encoding:
+              file:
+                style: form
+      responses:
+        '200':
+          description: Success