Merge pull request #2463 from swagger-api/annotation-encoding

encoding annotation support

Author: frantuma

modules/swagger-annotations/src/main/java/io/swagger/oas/annotations/Operation.java

@@ -17,8 +17,6 @@
 package io.swagger.oas.annotations;
 
 import io.swagger.oas.annotations.extensions.Extension;
-import io.swagger.oas.annotations.extensions.ExtensionProperty;
-import io.swagger.oas.annotations.parameters.RequestBody;
 import io.swagger.oas.annotations.responses.ApiResponse;
 import io.swagger.oas.annotations.security.SecurityRequirement;
 import io.swagger.oas.annotations.servers.Server;
@@ -78,12 +76,6 @@
      **/
     Parameter[] parameters() default {};
 
-    /**
-     * The request body applicable for this operation.
-     * @return the requesty body of this operation
-     **/
-    RequestBody requestBody() default @RequestBody();
-
     /**
      * The list of possible responses as they are returned from executing this operation.
      * @return the list of responses for this operation

modules/swagger-jaxrs2/src/main/java/io/swagger/jaxrs2/OperationParser.java

@@ -15,6 +15,8 @@
 import io.swagger.oas.models.links.Link;
 import io.swagger.oas.models.media.ArraySchema;
 import io.swagger.oas.models.media.Content;
+import io.swagger.oas.models.media.Encoding;
+import io.swagger.oas.models.media.Encoding.StyleEnum;
 import io.swagger.oas.models.media.MediaType;
 import io.swagger.oas.models.media.Schema;
 import io.swagger.oas.models.parameters.Parameter;
@@ -429,6 +431,10 @@ public static Optional<Content> getContent(io.swagger.oas.annotations.media.Cont
             for (ExampleObject example : examples) {
                 ParameterProcessor.getExample(example).ifPresent(exampleObject -> mediaType.addExamples(example.name(), exampleObject));
             }
+            io.swagger.oas.annotations.media.Encoding[] encodings = annotationContent.encoding();
+            for (io.swagger.oas.annotations.media.Encoding encoding : encodings) {
+                addEncodingToMediaType(mediaType, encoding, components);
+            }
             if (StringUtils.isNotBlank(annotationContent.mediaType())) {
                 content.addMediaType(annotationContent.mediaType(), mediaType);
             } else {
@@ -504,6 +510,36 @@ public static Optional<Header> getHeader(io.swagger.oas.annotations.headers.Head
         return Optional.of(headerObject);
     }
 
+    public static void addEncodingToMediaType(MediaType mediaType, io.swagger.oas.annotations.media.Encoding encoding, Components components) {
+        if (encoding == null) {
+            return;
+        }
+        if (StringUtils.isNotBlank(encoding.name())) {
+
+            Encoding encodingObject = new Encoding();
+
+            if (StringUtils.isNotBlank(encoding.contentType())) {
+                encodingObject.setContentType(encoding.contentType());
+            }
+            if (StringUtils.isNotBlank(encoding.style())) {
+                encodingObject.setStyle(StyleEnum.valueOf(encoding.style()));
+            }
+            if (encoding.explode()) {
+                encodingObject.setExplode(encoding.explode());
+            }
+            if (encoding.allowReserved()) {
+                encodingObject.setAllowReserved(encoding.allowReserved());
+            }
+
+            if (encoding.headers() != null) {
+                getHeaders(encoding.headers(), components).ifPresent(encodingObject::headers);
+            }
+
+            mediaType.addEncoding(encoding.name(), encodingObject);
+        }
+
+    }
+
     public static Optional<Schema> getSchema(io.swagger.oas.annotations.media.Content annotationContent, Components components) {
         Class<?> schemaImplementation = annotationContent.schema().implementation();
         Map<String, Schema> schemaMap;
@@ -676,4 +712,4 @@ public static Map<String, String> getLinkParameters(LinkParameter[]
 
         return linkParametersMap;
     }
-}
+}

modules/swagger-jaxrs2/src/main/java/io/swagger/jaxrs2/Reader.java

@@ -66,6 +66,7 @@ public class Reader implements OpenApiReader {
     private Paths paths;
     private Set<Tag> openApiTags;
     javax.ws.rs.Consumes classConsumes;
+
     javax.ws.rs.Produces classProduces;
     javax.ws.rs.Produces methodProduces;