remove unnecessary relative url configuration

Author: m-kay

springdoc-openapi-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java

@@ -304,13 +304,4 @@ protected static String decode(String requestURI) {
             return requestURI;
         }
     }
-
-    protected static String getRelativeUrl(String url){
-        try {
-            URI uri = new URI(url);
-            return StringUtils.appendIfMissing(new URI(null, null, uri.getPath(), null).toString(), "/");
-        } catch (URISyntaxException e) {
-            return url;
-        }
-    }
 }

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

@@ -14,8 +14,6 @@ public final class Constants {
     public static final String SPRINGDOC_SWAGGER_UI_ENABLED = "springdoc.swagger-ui.enabled";
     public static final String SPRINGDOC_SHOW_ACTUATOR = "springdoc.show-actuator";
     public static final String SPRINGDOC_SHOW_ACTUATOR_VALUE = "${" + SPRINGDOC_SHOW_ACTUATOR + ":false}";
-    public static final String SPRINGDOC_RELATIVE_BASEURL = "springdoc.relative-baseurl";
-    public static final String SPRINGDOC_RELATIVE_BASEURL_VALUE = "${" + SPRINGDOC_RELATIVE_BASEURL + ":false}";
     public static final String SPRINGDOC_PACKAGES_TO_SCAN = "${springdoc.packagesToScan:#{null}}";
     public static final String SPRINGDOC_PATHS_TO_MATCH = "${springdoc.pathsToMatch:#{null}}";
     public static final String SPRINGDOC_ACTUATOR_TAG = "Actuator";

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

@@ -14,7 +14,6 @@
 public class SpringDocConfigProperties {
 
     private Boolean showActuator = false;
-    private Boolean relativeBaseurl = false;
     private Webjars webjars = new Webjars();
     private ApiDocs apiDocs = new ApiDocs();
     private List<String> packagesToScan;
@@ -36,14 +35,6 @@ public void setShowActuator(Boolean showActuator) {
         this.showActuator = showActuator;
     }
 
-    public Boolean getRelativeBaseurl() {
-        return relativeBaseurl;
-    }
-
-    public void setRelativeBaseurl(Boolean relativeBaseurl) {
-        this.relativeBaseurl = relativeBaseurl;
-    }
-
     public Webjars getWebjars() {
         return webjars;
     }

springdoc-openapi-webflux-core/src/main/java/org/springdoc/api/OpenApiResource.java

@@ -32,9 +32,6 @@
 @RestController
 public class OpenApiResource extends AbstractOpenApiResource {
 
-    @Value(SPRINGDOC_RELATIVE_BASEURL_VALUE)
-    private boolean relativeBaseurl;
-
     private final RequestMappingInfoHandlerMapping requestMappingHandlerMapping;
 
     public OpenApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
@@ -87,7 +84,7 @@ protected void getPaths(Map<String, Object> restControllers) {
     private void calculateServerUrl(ServerHttpRequest serverHttpRequest, String apiDocsUrl) {
         String requestUrl = decode(serverHttpRequest.getURI().toString());
         String serverBaseUrl = requestUrl.substring(0, requestUrl.length() - apiDocsUrl.length());
-        openAPIBuilder.setServerBaseUrl(relativeBaseurl ? getRelativeUrl(serverBaseUrl) : serverBaseUrl);
+        openAPIBuilder.setServerBaseUrl(serverBaseUrl);
     }
 
 }

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/api/MultipleOpenApiResource.java

@@ -36,9 +36,6 @@ public class MultipleOpenApiResource implements InitializingBean {
     @Value(SPRINGDOC_SHOW_ACTUATOR_VALUE)
     private boolean showActuator;
 
-    @Value(SPRINGDOC_RELATIVE_BASEURL_VALUE)
-    private boolean protocolRelativBaseurl;
-
     public MultipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
                                    ObjectFactory<OpenAPIBuilder> defaultOpenAPIBuilder, AbstractRequestBuilder requestBuilder,
                                    AbstractResponseBuilder responseBuilder, OperationBuilder operationParser,
@@ -65,7 +62,7 @@ public void afterPropertiesSet() throws Exception {
                                 requestMappingHandlerMapping,
                                 servletContextProvider,
                                 Optional.of(item.getOpenApiCustomisers()), item.getPathsToMatch(), item.getPackagesToScan(),
-                                showActuator, protocolRelativBaseurl
+                                showActuator
                         )
                 ));
     }

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/api/OpenApiResource.java

@@ -41,9 +41,6 @@ public class OpenApiResource extends AbstractOpenApiResource {
     @Value(SPRINGDOC_SHOW_ACTUATOR_VALUE)
     private boolean showActuator;
 
-    @Value(SPRINGDOC_RELATIVE_BASEURL_VALUE)
-    private boolean relativBaseurl;
-
     public OpenApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
                            AbstractResponseBuilder responseBuilder, OperationBuilder operationParser,
                            RequestMappingInfoHandlerMapping requestMappingHandlerMapping, Optional<ActuatorProvider> servletContextProvider,
@@ -57,12 +54,11 @@ public OpenApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder req
                            AbstractResponseBuilder responseBuilder, OperationBuilder operationParser,
                            RequestMappingInfoHandlerMapping requestMappingHandlerMapping, Optional<ActuatorProvider> servletContextProvider,
                            Optional<List<OpenApiCustomiser>> openApiCustomisers, List<String> pathsToMatch, List<String> packagesToScan,
-                           boolean showActuator, boolean relativBaseurl) {
+                           boolean showActuator) {
         super(openAPIBuilder, requestBuilder, responseBuilder, operationParser, openApiCustomisers, pathsToMatch, packagesToScan);
         this.requestMappingHandlerMapping = requestMappingHandlerMapping;
         this.servletContextProvider = servletContextProvider;
         this.showActuator = showActuator;
-        this.relativBaseurl = relativBaseurl;
     }
 
 
@@ -135,6 +131,6 @@ private boolean isRestController(Map<String, Object> restControllers, HandlerMet
     private void calculateServerUrl(HttpServletRequest request, String apiDocsUrl) {
         String requestUrl = decode(request.getRequestURL().toString());
         String calculatedUrl = requestUrl.substring(0, requestUrl.length() - apiDocsUrl.length());
-        openAPIBuilder.setServerBaseUrl(relativBaseurl ? getRelativeUrl(calculatedUrl) : calculatedUrl);
+        openAPIBuilder.setServerBaseUrl(calculatedUrl);
     }
 }