update SwaggerUiHome for webflux

Author: bnasslahsen

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

@@ -41,6 +41,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.web.reactive.WebFluxProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
@@ -90,16 +91,18 @@ SwaggerWelcomeWebFlux swaggerWelcome(SwaggerUiConfigProperties swaggerUiConfig,
 	SwaggerConfigResource swaggerConfigResource(SwaggerWelcomeCommon swaggerWelcomeCommon){
 		return new SwaggerConfigResource(swaggerWelcomeCommon);
 	}
+
 	/**
 	 * Swagger ui home swagger ui home.
 	 *
+	 * @param optionalWebFluxProperties the optional web flux properties
 	 * @return the swagger ui home
 	 */
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty(name = SPRINGDOC_USE_ROOT_PATH, havingValue = "true")
-	SwaggerUiHome swaggerUiHome(){
-		return new SwaggerUiHome();
+	SwaggerUiHome swaggerUiHome(Optional<WebFluxProperties> optionalWebFluxProperties){
+		return new SwaggerUiHome(optionalWebFluxProperties);
 	}
 
 	/**

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

@@ -21,11 +21,14 @@
 package org.springdoc.webflux.ui;
 
 import java.net.URI;
+import java.util.Optional;
 
 import io.swagger.v3.oas.annotations.Operation;
+import org.apache.commons.lang3.StringUtils;
 import reactor.core.publisher.Mono;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.web.reactive.WebFluxProperties;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.stereotype.Controller;
@@ -37,17 +40,41 @@
 
 /**
  * Home redirection to swagger api documentation
+ * @author bnasslahsen
  */
 @Controller
 public class SwaggerUiHome {
 
+	/**
+	 * The Swagger ui path.
+	 */
 	@Value(SWAGGER_UI_PATH)
 	private String swaggerUiPath;
 
+	/**
+	 * The Base path.
+	 */
+	private String basePath = StringUtils.EMPTY;
+
+	/**
+	 * Instantiates a new Swagger ui home.
+	 *
+	 * @param optionalWebFluxProperties the optional web flux properties
+	 */
+	public SwaggerUiHome(Optional<WebFluxProperties> optionalWebFluxProperties) {
+		optionalWebFluxProperties.ifPresent(webFluxProperties -> this.basePath = webFluxProperties.getBasePath());
+	}
+
+	/**
+	 * Index mono.
+	 *
+	 * @param response the response
+	 * @return the mono
+	 */
 	@GetMapping(DEFAULT_PATH_SEPARATOR)
 	@Operation(hidden = true)
 	public Mono<Void> index(ServerHttpResponse response) {
-		UriComponentsBuilder uriBuilder =  UriComponentsBuilder.fromUriString(swaggerUiPath);
+		UriComponentsBuilder uriBuilder =  UriComponentsBuilder.fromUriString(this.basePath + swaggerUiPath);
 		response.setStatusCode(HttpStatus.FOUND);
 		response.getHeaders().setLocation(URI.create(uriBuilder.build().encode().toString()));
 		return response.setComplete();

springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app23/HelloController.java

@@ -0,0 +1,36 @@
+/*
+ *
+ *  * 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.app23;
+
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RequestMapping("/foo/bar")
+@RestController
+public class HelloController {
+
+	@GetMapping("/test")
+	public String doSomethingInteresting() {
+		return "OK";
+	}
+
+}

springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app23/SpringDocApp23Test.java

@@ -0,0 +1,67 @@
+/*
+ *
+ *  * 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.app23;
+
+import javax.annotation.PostConstruct;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+import test.org.springdoc.ui.AbstractCommonTest;
+
+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.web.server.LocalServerPort;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.reactive.function.client.WebClient;
+
+
+@SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT,
+		properties = { "spring.webflux.base-path=/test",
+				"springdoc.swagger-ui.use-root-path=true",
+				"server.port=9029" })
+class SpringDocApp23Test extends AbstractCommonTest {
+
+	@LocalServerPort
+	private int port;
+
+	private WebClient webClient;
+
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+
+	@PostConstruct
+	void init() {
+		webClient = WebClient.builder().baseUrl("http://localhost:" + port)
+				.build();
+	}
+
+	@Test
+	public void testIndex() throws Exception {
+		HttpStatus httpStatusRoot = webClient.get().uri("/test/")
+				.exchangeToMono(clientResponse -> Mono.just(clientResponse.statusCode())).block();
+		Assertions.assertThat(httpStatusRoot).isEqualTo(HttpStatus.FOUND);
+
+		HttpStatus httpStatusMono = webClient.get().uri("/test/swagger-ui.html")
+				.exchangeToMono(clientResponse -> Mono.just(clientResponse.statusCode())).block();
+		Assertions.assertThat(httpStatusMono).isEqualTo(HttpStatus.FOUND);
+
+	}
+}