project review

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/core/SwaggerUiConfigProperties.java

@@ -19,10 +19,12 @@
 package org.springdoc.core;
 
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
@@ -51,7 +53,7 @@ public class SwaggerUiConfigProperties {
 
 	public static final String CONFIG_URL_PROPERTY = "configUrl";
 
-	private static List<SwaggerUrl> swaggerUrls = new ArrayList<>();
+	private static Set<SwaggerUrl> swaggerUrls = new HashSet<>();
 
 	/**
 	 * The path for the Swagger UI pages to load. Will redirect to the springdoc.webjars.prefix property.
@@ -165,11 +167,11 @@ public static void addGroup(String group, String url) {
 		swaggerUrls.add(swaggerUrl);
 	}
 
-	public static List<SwaggerUrl> getSwaggerUrls() {
+	public static Set<SwaggerUrl> getSwaggerUrls() {
 		return swaggerUrls;
 	}
 
-	public static void setSwaggerUrls(List<SwaggerUrl> swaggerUrls) {
+	public static void setSwaggerUrls(Set<SwaggerUrl> swaggerUrls) {
 		SwaggerUiConfigProperties.swaggerUrls = swaggerUrls;
 	}
 
@@ -374,14 +376,14 @@ public boolean isValidUrl(String url) {
 		}
 	}
 
-	private void put(String urls, List<SwaggerUrl> swaggerUrls, Map<String, Object> params) {
+	private void put(String urls, Set<SwaggerUrl> swaggerUrls, Map<String, Object> params) {
 		Comparator<SwaggerUrl> swaggerUrlComparator;
 		if (groupsOrder.isAscending())
 			swaggerUrlComparator = (h1, h2) -> h1.getName().compareTo(h2.getName());
 		else
 			swaggerUrlComparator = (h1, h2) -> h2.getName().compareTo(h1.getName());
 
-		swaggerUrls = swaggerUrls.stream().sorted(swaggerUrlComparator).filter(elt -> StringUtils.isNotEmpty(elt.getUrl())).collect(Collectors.toList());
+		swaggerUrls = swaggerUrls.stream().sorted(swaggerUrlComparator).filter(elt -> StringUtils.isNotEmpty(elt.getUrl())).collect(Collectors.toSet());
 		if (!CollectionUtils.isEmpty(swaggerUrls)) {
 			params.put(urls, swaggerUrls);
 		}
@@ -416,6 +418,19 @@ public String getName() {
 		public void setName(String name) {
 			this.name = name;
 		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) return true;
+			if (o == null || getClass() != o.getClass()) return false;
+			SwaggerUrl that = (SwaggerUrl) o;
+			return name.equals(that.name);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(name);
+		}
 	}
 
 	static enum Direction {

springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app4/SpringDocApp4Test.java

@@ -19,6 +19,7 @@
 package test.org.springdoc.ui.app4;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -49,6 +50,6 @@ public void swagger_config_for_multiple_groups() throws Exception {
 
 	@AfterEach
 	public void reset() {
-		SwaggerUiConfigProperties.setSwaggerUrls(new ArrayList<>());
+		SwaggerUiConfigProperties.setSwaggerUrls(new HashSet<>());
 	}
 }

springdoc-openapi-webflux-ui/src/main/java/org/springdoc/ui/SwaggerWelcome.java

@@ -75,9 +75,9 @@ public class SwaggerWelcome {
 	@Bean
 	@ConditionalOnProperty(name = SPRINGDOC_SWAGGER_UI_ENABLED, matchIfMissing = true)
 	RouterFunction<ServerResponse> routerFunction() {
+		buildConfigUrl();
 		String baseUrl = webJarsPrefixUrl + SWAGGER_UI_URL;
 		UriComponentsBuilder uriBuilder = UriComponentsBuilder.fromUriString(baseUrl);
-		buildConfigUrl();
 		uriBuilder.queryParam(SwaggerUiConfigProperties.CONFIG_URL_PROPERTY, swaggerUiConfig.getConfigUrl());
 		return route(GET(uiPath),
 				req -> ServerResponse.temporaryRedirect(URI.create(uriBuilder.build().encode().toString())).build());