factorize default UI transformation behavior

Author: natrem

springdoc-openapi-common/src/main/java/org/springdoc/ui/AbstractSwaggerIndexTransformer.java

@@ -31,6 +31,8 @@
 import org.springdoc.core.Constants;
 import org.springdoc.core.SwaggerUiConfigProperties;
 import org.springdoc.core.SwaggerUiOAuthProperties;
+import org.springframework.core.io.Resource;
+import org.springframework.util.CollectionUtils;
 
 /**
  * The type Abstract swagger index transformer.
@@ -109,4 +111,21 @@ protected String readFullyAsString(InputStream inputStream)
 	protected String overwriteSwaggerDefaultUrl(String html) {
 		return html.replace(Constants.SWAGGER_UI_DEFAULT_URL, StringUtils.EMPTY);
 	}
+
+	protected boolean hasDefaultTransformations() {
+		boolean oauth2Configured = !CollectionUtils.isEmpty(swaggerUiOAuthProperties.getConfigParameters());
+		return oauth2Configured || swaggerUiConfig.isDisableSwaggerDefaultUrl();
+	}
+
+	protected String defaultTransformations(InputStream inputStream) throws IOException {
+		String html = readFullyAsString(inputStream);
+		if (!CollectionUtils.isEmpty(swaggerUiOAuthProperties.getConfigParameters())) {
+			html = addInitOauth(html);
+		}
+		if (swaggerUiConfig.isDisableSwaggerDefaultUrl()) {
+			html = overwriteSwaggerDefaultUrl(html);
+		}
+
+		return html;
+	}
 }

springdoc-openapi-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerIndexTransformer.java

@@ -57,20 +57,9 @@ public Resource transform(HttpServletRequest request, Resource resource,
 			ResourceTransformerChain transformerChain) throws IOException {
 		final AntPathMatcher antPathMatcher = new AntPathMatcher();
 		boolean isIndexFound = antPathMatcher.match("**/swagger-ui/**/index.html", resource.getURL().toString());
-		if (isIndexFound && !CollectionUtils.isEmpty(swaggerUiOAuthProperties.getConfigParameters()) && swaggerUiConfig.isDisableSwaggerDefaultUrl()) {
-			String html = readFullyAsString(resource.getInputStream());
-			html = addInitOauth(html);
-			html = overwriteSwaggerDefaultUrl(html);
-			return new TransformedResource(resource, html.getBytes());
-		}
-		else if (isIndexFound && !CollectionUtils.isEmpty(swaggerUiOAuthProperties.getConfigParameters())) {
-			String html = readFullyAsString(resource.getInputStream());
-			html = addInitOauth(html);
-			return new TransformedResource(resource, html.getBytes());
-		}
-		else if (isIndexFound && swaggerUiConfig.isDisableSwaggerDefaultUrl()) {
-			String html = readFullyAsString(resource.getInputStream());
-			html = overwriteSwaggerDefaultUrl(html);
+
+		if (isIndexFound && hasDefaultTransformations()) {
+			String html = defaultTransformations(resource.getInputStream());
 			return new TransformedResource(resource, html.getBytes());
 		}
 		else

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

@@ -54,23 +54,11 @@ public SwaggerIndexTransformer(SwaggerUiConfigProperties swaggerUiConfig, Swagge
 	@Override
 	public Mono<Resource> transform(ServerWebExchange serverWebExchange, Resource resource, ResourceTransformerChain resourceTransformerChain) {
 		final AntPathMatcher antPathMatcher = new AntPathMatcher();
-		boolean isIndexFound = false;
+
 		try {
-			isIndexFound = antPathMatcher.match("**/swagger-ui/**/index.html", resource.getURL().toString());
-			if (isIndexFound && !CollectionUtils.isEmpty(swaggerUiOAuthProperties.getConfigParameters()) && swaggerUiConfig.isDisableSwaggerDefaultUrl()) {
-				String html = readFullyAsString(resource.getInputStream());
-				html = addInitOauth(html);
-				html = overwriteSwaggerDefaultUrl(html);
-				return Mono.just(new TransformedResource(resource, html.getBytes()));
-			}
-			else if (isIndexFound && !CollectionUtils.isEmpty(swaggerUiOAuthProperties.getConfigParameters())) {
-				String html = readFullyAsString(resource.getInputStream());
-				html = addInitOauth(html);
-				return Mono.just(new TransformedResource(resource, html.getBytes()));
-			}
-			else if (isIndexFound && swaggerUiConfig.isDisableSwaggerDefaultUrl()) {
-				String html = readFullyAsString(resource.getInputStream());
-				html = overwriteSwaggerDefaultUrl(html);
+			boolean isIndexFound = antPathMatcher.match("**/swagger-ui/**/index.html", resource.getURL().toString());
+			if (isIndexFound && hasDefaultTransformations()) {
+				String html = defaultTransformations(resource.getInputStream());
 				return Mono.just(new TransformedResource(resource, html.getBytes()));
 			}
 			else {