Merge pull request springfox#3063 from wojciech-soltys/feature/3062

dilipkrish · web-flow · commit 4d4577b3a75d · 2019-08-03T06:25:19.000-05:00
Feature/3062 : Possibility to define order of produces and consumes attribute by Docket configuration
diff --git a/springfox-spi/src/main/java/springfox/documentation/spi/service/contexts/DocumentationContextBuilder.java b/springfox-spi/src/main/java/springfox/documentation/spi/service/contexts/DocumentationContextBuilder.java
@@ -44,6 +44,7 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -64,8 +65,8 @@ public class DocumentationContextBuilder {
   private final List<AlternateTypeRule> rules = new ArrayList<>();
   private final Map<RequestMethod, List<ResponseMessage>> defaultResponseMessages = new HashMap<>();
   private final Set<String> protocols = new HashSet<>();
-  private final Set<String> produces = new HashSet<>();
-  private final Set<String> consumes = new HashSet<>();
+  private final Set<String> produces = new LinkedHashSet<>();
+  private final Set<String> consumes = new LinkedHashSet<>();
   private final Set<ResolvedType> additionalModels = new HashSet<>();
   private final Set<Tag> tags = new TreeSet<>(Tags.tagComparator());
   private List<VendorExtension> vendorExtensions = new ArrayList<VendorExtension>();
diff --git a/springfox-spring-web/src/main/java/springfox/documentation/spring/web/plugins/Docket.java b/springfox-spring-web/src/main/java/springfox/documentation/spring/web/plugins/Docket.java
@@ -50,6 +50,7 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -77,8 +78,8 @@ public class Docket implements DocumentationPlugin {
   private final List<Function<TypeResolver, AlternateTypeRule>> ruleBuilders = new ArrayList<>();
   private final Set<Class> ignorableParameterTypes = new HashSet<>();
   private final Set<String> protocols = new HashSet<>();
-  private final Set<String> produces = new HashSet<>();
-  private final Set<String> consumes = new HashSet<>();
+  private final Set<String> produces = new LinkedHashSet<>();
+  private final Set<String> consumes = new LinkedHashSet<>();
   private final Set<ResolvedType> additionalModels = new HashSet<>();
   private final Set<Tag> tags = new HashSet<>();
 
