Merge pull request springfox#967 from cbornet/multiple_oauth

dilipkrish · dilipkrish · commit 749bbf798dc1 · 2015-09-10T22:46:02.000-05:00
Allow security scheme of same type in resource listing fixes springfox#959
diff --git a/springfox-core/src/main/java/springfox/documentation/service/ResourceListing.java b/springfox-core/src/main/java/springfox/documentation/service/ResourceListing.java
@@ -19,17 +19,12 @@
 
 package springfox.documentation.service;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 
-import static com.google.common.base.Optional.*;
-import static com.google.common.collect.Lists.*;
-
 public class ResourceListing {
   private final String apiVersion;
   private final List<ApiListingReference> apis;
-  private final LinkedHashMap<String, SecurityScheme> securitySchemes;
+  private final List<SecurityScheme> securitySchemes;
   private final ApiInfo info;
 
   public ResourceListing(String apiVersion,
@@ -39,19 +34,10 @@ public ResourceListing(String apiVersion,
 
     this.apiVersion = apiVersion;
     this.apis = apis;
-    this.securitySchemes = initializeSecuritySchemes(securitySchemes);
+    this.securitySchemes = securitySchemes;
     this.info = info;
   }
 
-  private LinkedHashMap<String, SecurityScheme> initializeSecuritySchemes(List<SecurityScheme> securitySchemes) {
-    LinkedHashMap<String, SecurityScheme> mapped = new LinkedHashMap<String, SecurityScheme>();
-    List<SecurityScheme> emptyList = newArrayList();
-    for (SecurityScheme securityScheme : fromNullable(securitySchemes).or(emptyList)) {
-      mapped.put(securityScheme.getType(), securityScheme);
-    }
-    return mapped;
-  }
-
   public String getApiVersion() {
     return apiVersion;
   }
@@ -61,7 +47,7 @@ public List<ApiListingReference> getApis() {
   }
 
   public List<SecurityScheme> getSecuritySchemes() {
-    return new ArrayList<SecurityScheme>(securitySchemes.values());
+    return securitySchemes;
   }
 
   public ApiInfo getInfo() {
