Fix for issue 1916 where document level consumes and produces media types are always added to resource level consumes and produces media types. This change won't add those media types anymore but will make sure default media types are set when no document level media types are defined.

mzeijen · mzeijen · commit 90ccae6fc255 · 2017-07-13T17:46:02.000+02:00
diff --git a/springfox-spi/src/main/java/springfox/documentation/spi/service/contexts/OperationContext.java b/springfox-spi/src/main/java/springfox/documentation/spi/service/contexts/OperationContext.java
@@ -24,7 +24,6 @@
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -43,7 +42,6 @@
 
 import static com.google.common.collect.Lists.*;
 import static springfox.documentation.builders.BuilderDefaults.*;
-import static springfox.documentation.service.MediaTypes.*;
 
 public class OperationContext {
   private final OperationBuilder operationBuilder;
@@ -119,14 +117,12 @@ public ResolvedType alternateFor(ResolvedType resolved) {
     return getAlternateTypeProvider().alternateFor(resolved);
   }
 
-  public Set<MediaType> produces() {
-    return Sets.union(requestContext.produces(),
-        toMediaTypes(getDocumentationContext().getProduces()));
+  public Set<? extends MediaType> produces() {
+    return requestContext.produces();
   }
 
-  public Set<MediaType> consumes() {
-    return Sets.union(requestContext.consumes(),
-        toMediaTypes(getDocumentationContext().getConsumes()));
+  public Set<? extends MediaType> consumes() {
+    return requestContext.consumes();
   }
 
   public ImmutableSet<Class> getIgnorableParameterTypes() {
diff --git a/springfox-spring-web/src/main/java/springfox/documentation/spring/web/scanners/MediaTypeReader.java b/springfox-spring-web/src/main/java/springfox/documentation/spring/web/scanners/MediaTypeReader.java
@@ -31,6 +31,7 @@
 import springfox.documentation.spi.service.ApiListingBuilderPlugin;
 import springfox.documentation.spi.service.OperationBuilderPlugin;
 import springfox.documentation.spi.service.contexts.ApiListingContext;
+import springfox.documentation.spi.service.contexts.DocumentationContext;
 import springfox.documentation.spi.service.contexts.OperationContext;
 
 import java.util.List;
@@ -47,21 +48,23 @@ public class MediaTypeReader implements OperationBuilderPlugin, ApiListingBuilde
   @Override
   public void apply(OperationContext context) {
 
-    Set<String> consumesList = toSet(context.consumes());
-    Set<String> producesList = toSet(context.produces());
+    DocumentationContext documentationContext = context.getDocumentationContext();
+
+    Set<String> operationConsumesList = toSet(context.consumes());
+    Set<String> operationProducesList = toSet(context.produces());
 
     if (handlerMethodHasFileParameter(context)) {
-      consumesList = newHashSet(MediaType.MULTIPART_FORM_DATA_VALUE);
+      operationConsumesList = newHashSet(MediaType.MULTIPART_FORM_DATA_VALUE);
     }
 
-    if (producesList.isEmpty()) {
-      producesList.add(MediaType.ALL_VALUE);
+    if (operationProducesList.isEmpty() && documentationContext.getProduces().isEmpty()) {
+      operationProducesList.add(MediaType.ALL_VALUE);
     }
-    if (consumesList.isEmpty()) {
-      consumesList.add(MediaType.APPLICATION_JSON_VALUE);
+    if (operationConsumesList.isEmpty() && documentationContext.getConsumes().isEmpty()) {
+      operationConsumesList.add(MediaType.APPLICATION_JSON_VALUE);
     }
-    context.operationBuilder().consumes(consumesList);
-    context.operationBuilder().produces(producesList);
+    context.operationBuilder().consumes(operationConsumesList);
+    context.operationBuilder().produces(operationProducesList);
   }
 
   @Override
@@ -93,7 +96,7 @@ private boolean handlerMethodHasFileParameter(OperationContext context) {
     return false;
   }
 
-  private Set<String> toSet(Set<MediaType> mediaTypeSet) {
+  private Set<String> toSet(Set<? extends MediaType> mediaTypeSet) {
     Set<String> mediaTypes = newHashSet();
     for (MediaType mediaType : mediaTypeSet) {
       mediaTypes.add(mediaType.toString());
