code review

Author: bnasslahsen

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/AbstractRequestService.java

@@ -483,7 +483,7 @@ private boolean isRequestBodyWithMapType(MethodParameter parameter) {
 			return false;
 		}
 		Class<?> parameterType = parameter.getParameterType();
-		return parameterType == java.util.Map.class;
+		return Map.class.isAssignableFrom(parameterType);
 	}
 
 	/**

springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyBasePathTest.java

@@ -0,0 +1,89 @@
+/*
+ *
+ *  * Copyright 2019-2020 the original author or authors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package test.org.springdoc.ui.app32;
+
+import jakarta.annotation.PostConstruct;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+import test.org.springdoc.ui.AbstractCommonTest;
+import test.org.springdoc.ui.AbstractSpringDocTest;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
+
+
+@SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT,
+		properties = { "spring.webflux.base-path=/test",
+				"server.forward-headers-strategy=framework",
+				"server.port=9318",
+				"springdoc.swagger-ui.path=/documentation/swagger-ui.html",
+				"springdoc.api-docs.path=/documentation/v3/api-docs",
+				"springdoc.webjars.prefix= /webjars-pref" })
+
+@Import(SpringDocConfig.class)
+public class SpringDocBehindProxyBasePathTest extends AbstractCommonTest {
+
+	private static final String X_FORWARD_PREFIX = "/path/prefix";
+
+	@LocalServerPort
+	private int port;
+
+	private WebClient webClient;
+
+	@PostConstruct
+	void init() {
+		webClient = WebClient.builder().baseUrl("http://localhost:" + port)
+				.build();
+	}
+
+	@Test
+	public void testIndex() throws Exception {
+		HttpStatusCode httpStatusMono = webClient.get().uri("/test/documentation/swagger-ui.html")
+				.header("X-Forwarded-Prefix", X_FORWARD_PREFIX)
+				.exchangeToMono(clientResponse -> Mono.just(clientResponse.statusCode())).block();
+		assertThat(httpStatusMono).isEqualTo(HttpStatus.FOUND);
+
+		httpStatusMono = webClient.get().uri("/test/documentation/webjars-pref/swagger-ui/index.html")
+				.header("X-Forwarded-Prefix", X_FORWARD_PREFIX)
+				.exchangeToMono(clientResponse -> Mono.just(clientResponse.statusCode())).block();
+		assertThat(httpStatusMono).isEqualTo(HttpStatus.OK);
+
+		String contentAsString = webClient.get().uri("/test/documentation/v3/api-docs/swagger-config")
+				.header("X-Forwarded-Prefix", X_FORWARD_PREFIX)
+				.retrieve()
+				.bodyToMono(String.class).block();
+		String expected = getContent("results/app32-1.json");
+		assertEquals(expected, contentAsString, true);
+	}
+	
+
+	
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+}

springdoc-openapi-starter-webflux-ui/src/test/resources/results/app32-1.json

@@ -0,0 +1,6 @@
+{
+  "configUrl": "/path/prefix/documentation/v3/api-docs/swagger-config",
+  "oauth2RedirectUrl": "http://localhost:9318/path/prefix/documentation/webjars-pref/swagger-ui/oauth2-redirect.html",
+  "url": "/path/prefix/documentation/v3/api-docs",
+  "validatorUrl": ""
+}