code cleanup

Author: bnasslahsen

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

@@ -174,7 +174,7 @@ public Operation build(Components components, HandlerMethod handlerMethod, Reque
 
 			if (!isParamToIgnore(parameters[i].getParameter())) {
 				ParameterInfo parameterInfo = new ParameterInfo(pName, parameters[i], parameter, i);
-				parameter = buildParams(parameterInfo, components, handlerMethod, requestMethod,
+				parameter = buildParams(parameterInfo, components, requestMethod,
 						methodAttributes.getJsonViewAnnotation());
 				// Merge with the operation parameters
 				parameter = parameterBuilder.mergeParameter(operationParameters, parameter);
@@ -184,7 +184,7 @@ public Operation build(Components components, HandlerMethod handlerMethod, Reque
 				else if (!RequestMethod.GET.equals(requestMethod)) {
 					if (operation.getRequestBody() != null)
 						requestBodyInfo.setRequestBody(operation.getRequestBody());
-					requestBodyBuilder.calculateRequestBodyInfo(components, handlerMethod, methodAttributes, i,
+					requestBodyBuilder.calculateRequestBodyInfo(components, methodAttributes,
 							parameterInfo, requestBodyInfo);
 					applyBeanValidatorAnnotations(requestBodyInfo.getRequestBody(), Arrays.asList(parameters[i].getParameterAnnotations()));
 				}
@@ -223,7 +223,7 @@ private LinkedHashMap<String, Parameter> getParameterLinkedHashMap(Components co
 
 		for (Map.Entry<String, String> entry : methodAttributes.getHeaders().entrySet()) {
 			Parameter parameter = new Parameter().in(ParameterIn.HEADER.toString()).name(entry.getKey()).schema(new StringSchema().addEnumItem(entry.getValue()));
-			if (map.containsKey(entry.getKey())){
+			if (map.containsKey(entry.getKey())) {
 				parameter = map.get(entry.getKey());
 				parameter.getSchema().addEnumItemObject(entry.getValue());
 				parameter.setSchema(parameter.getSchema());
@@ -262,15 +262,14 @@ private boolean isValidParameter(Parameter parameter) {
 		return parameter != null && (parameter.getName() != null || parameter.get$ref() != null);
 	}
 
-	private Parameter buildParams(ParameterInfo parameterInfo, Components components, HandlerMethod handlerMethod,
+	private Parameter buildParams(ParameterInfo parameterInfo, Components components,
 			RequestMethod requestMethod, JsonView jsonView) {
 		MethodParameter methodParameter = parameterInfo.getMethodParameter();
-		int index = parameterInfo.getIndex();
 
 		RequestHeader requestHeader = methodParameter.getParameterAnnotation(RequestHeader.class);
 		RequestParam requestParam = methodParameter.getParameterAnnotation(RequestParam.class);
 		PathVariable pathVar = methodParameter.getParameterAnnotation(PathVariable.class);
-		CookieValue cookieValue =  methodParameter.getParameterAnnotation(CookieValue.class);
+		CookieValue cookieValue = methodParameter.getParameterAnnotation(CookieValue.class);
 
 		Parameter parameter = null;
 		RequestInfo requestInfo;

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

@@ -31,7 +31,6 @@
 
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.method.HandlerMethod;
 
 public class RequestBodyBuilder {
 
@@ -85,8 +84,8 @@ public Optional<RequestBody> buildRequestBodyFromDoc(
 		return Optional.of(requestBodyObject);
 	}
 
-	public void calculateRequestBodyInfo(Components components, HandlerMethod handlerMethod,
-			MethodAttributes methodAttributes, int i, ParameterInfo parameterInfo, RequestBodyInfo requestBodyInfo) {
+	public void calculateRequestBodyInfo(Components components, MethodAttributes methodAttributes,
+			ParameterInfo parameterInfo, RequestBodyInfo requestBodyInfo) {
 		RequestBody requestBody = requestBodyInfo.getRequestBody();
 		MethodParameter methodParameter = parameterInfo.getMethodParameter();
 		// Get it from parameter level, if not present

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

@@ -0,0 +1,42 @@
+package org.springdoc.ui;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springdoc.core.SwaggerUiOAuthProperties;
+
+public class AbstractSwaggerIndexTransformer {
+
+	protected SwaggerUiOAuthProperties swaggerUiOAuthProperties;
+
+	protected ObjectMapper objectMapper;
+
+	public AbstractSwaggerIndexTransformer(SwaggerUiOAuthProperties swaggerUiOAuthProperties, ObjectMapper objectMapper) {
+		this.swaggerUiOAuthProperties = swaggerUiOAuthProperties;
+		this.objectMapper = objectMapper;
+	}
+
+	protected String addInitOauth(String html) throws JsonProcessingException {
+		StringBuilder stringBuilder = new StringBuilder("window.ui = ui\n");
+		stringBuilder.append("ui.initOAuth(\n");
+		String json = objectMapper.writeValueAsString(swaggerUiOAuthProperties.getConfigParameters());
+		stringBuilder.append(json);
+		stringBuilder.append(")");
+		return html.replace("window.ui = ui", stringBuilder.toString());
+	}
+
+	protected String readFullyAsString(InputStream inputStream)
+			throws IOException {
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		byte[] buffer = new byte[1024];
+		int length;
+		while ((length = inputStream.read(buffer)) != -1) {
+			baos.write(buffer, 0, length);
+		}
+		return baos.toString(StandardCharsets.UTF_8.name());
+	}
+}

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

@@ -18,14 +18,10 @@
 
 package org.springdoc.ui;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springdoc.core.SwaggerUiOAuthProperties;
 
@@ -36,15 +32,10 @@
 import org.springframework.web.servlet.resource.ResourceTransformerChain;
 import org.springframework.web.servlet.resource.TransformedResource;
 
-public class SwaggerIndexTransformer implements ResourceTransformer {
-
-	private SwaggerUiOAuthProperties swaggerUiOAuthProperties;
-
-	private ObjectMapper objectMapper;
+public class SwaggerIndexTransformer extends AbstractSwaggerIndexTransformer implements ResourceTransformer {
 
 	public SwaggerIndexTransformer(SwaggerUiOAuthProperties swaggerUiOAuthProperties, ObjectMapper objectMapper) {
-		this.swaggerUiOAuthProperties = swaggerUiOAuthProperties;
-		this.objectMapper = objectMapper;
+		super(swaggerUiOAuthProperties, objectMapper);
 	}
 
 	@Override
@@ -62,23 +53,4 @@ public Resource transform(HttpServletRequest request, Resource resource,
 		}
 	}
 
-	private String addInitOauth(String html) throws JsonProcessingException {
-		StringBuilder stringBuilder = new StringBuilder("window.ui = ui\n");
-		stringBuilder.append("ui.initOAuth(\n");
-		String json = objectMapper.writeValueAsString(swaggerUiOAuthProperties.getConfigParameters());
-		stringBuilder.append(json);
-		stringBuilder.append(")");
-		return html.replace("window.ui = ui", stringBuilder.toString());
-	}
-
-	private String readFullyAsString(InputStream inputStream)
-			throws IOException {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		byte[] buffer = new byte[1024];
-		int length;
-		while ((length = inputStream.read(buffer)) != -1) {
-			baos.write(buffer, 0, length);
-		}
-		return baos.toString(StandardCharsets.UTF_8.name());
-	}
 }

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

@@ -18,15 +18,7 @@
 
 package org.springdoc.ui;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springdoc.core.SwaggerUiOAuthProperties;
 import reactor.core.publisher.Mono;
 
@@ -38,17 +30,10 @@
 import org.springframework.web.reactive.resource.TransformedResource;
 import org.springframework.web.server.ServerWebExchange;
 
-public class SwaggerIndexTransformer implements ResourceTransformer {
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(SwaggerIndexTransformer.class);
-
-	private SwaggerUiOAuthProperties swaggerUiOAuthProperties;
-
-	private ObjectMapper objectMapper;
+public class SwaggerIndexTransformer extends  AbstractSwaggerIndexTransformer implements ResourceTransformer {
 
 	public SwaggerIndexTransformer(SwaggerUiOAuthProperties swaggerUiOAuthProperties, ObjectMapper objectMapper) {
-		this.swaggerUiOAuthProperties = swaggerUiOAuthProperties;
-		this.objectMapper = objectMapper;
+		super(swaggerUiOAuthProperties, objectMapper);
 	}
 
 	@Override
@@ -67,28 +52,9 @@ public Mono<Resource> transform(ServerWebExchange serverWebExchange, Resource re
 			}
 		}
 		catch (Exception e) {
-			throw new RuntimeException(e);
+			throw new RuntimeException("Failed to transform Index", e);
 		}
 	}
 
-	private String addInitOauth(String html) throws JsonProcessingException {
-		StringBuilder stringBuilder = new StringBuilder("window.ui = ui\n");
-		stringBuilder.append("ui.initOAuth(\n");
-		String json = objectMapper.writeValueAsString(swaggerUiOAuthProperties.getConfigParameters());
-		stringBuilder.append(json);
-		stringBuilder.append(")");
-		return html.replace("window.ui = ui", stringBuilder.toString());
-	}
-
-	private String readFullyAsString(InputStream inputStream)
-			throws IOException {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		byte[] buffer = new byte[1024];
-		int length;
-		while ((length = inputStream.read(buffer)) != -1) {
-			baos.write(buffer, 0, length);
-		}
-		return baos.toString(StandardCharsets.UTF_8.name());
-	}
 
 }