Rename some packages to improve Java 9 Modules support. Fixes #461

bnasslahsen · bnasslahsen · commit db730c107eb8 · 2020-04-05T13:38:06.000+02:00
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/GenericResponseBuilder.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/GenericResponseBuilder.java
@@ -67,7 +67,7 @@ public class GenericResponseBuilder {
 
 	private final PropertyResolverUtils propertyResolverUtils;
 
-	GenericResponseBuilder(OperationBuilder operationBuilder, List<ReturnTypeParser> returnTypeParsers,
+	public GenericResponseBuilder(OperationBuilder operationBuilder, List<ReturnTypeParser> returnTypeParsers,
 			SpringDocConfigProperties springDocConfigProperties,
 			PropertyResolverUtils propertyResolverUtils) {
 		super();
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/converters/ConverterUtils.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/converters/ConverterUtils.java
@@ -51,7 +51,7 @@ public static void addResponseTypeToIgnore(Class<?> cls) {
 		RESPONSE_TYPES_TO_IGNORE.add(cls);
 	}
 
-	static boolean isResponseTypeWrapper(Class<?> rawClass) {
+	public static boolean isResponseTypeWrapper(Class<?> rawClass) {
 		return RESULT_WRAPPERS_TO_IGNORE.stream().anyMatch(clazz -> clazz.isAssignableFrom(rawClass));
 	}
 
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/ui/AbstractSwaggerWelcome.java b/springdoc-openapi-common/src/main/java/org/springdoc/ui/AbstractSwaggerWelcome.java
@@ -97,8 +97,8 @@ protected UriComponentsBuilder getUriComponentsBuilder(String sbUrl) {
 		return uriBuilder;
 	}
 
-	abstract void calculateOauth2RedirectUrl(UriComponentsBuilder uriComponentsBuilder);
+	protected abstract void calculateOauth2RedirectUrl(UriComponentsBuilder uriComponentsBuilder);
 
-	abstract void calculateUiRootPath(StringBuilder... sbUrls);
+	protected abstract void calculateUiRootPath(StringBuilder... sbUrls);
 
 }
diff --git a/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/HalProvider.java b/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/HalProvider.java
@@ -16,13 +16,13 @@
  *
  */
 
-package org.springdoc.core;
+package org.springdoc.data.rest;
 
 import javax.annotation.PostConstruct;
 
 import io.swagger.v3.core.converter.ModelConverters;
 import io.swagger.v3.core.util.Json;
-import org.springdoc.core.converters.CollectionModelContentConverter;
+import org.springdoc.data.rest.converters.CollectionModelContentConverter;
 
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
diff --git a/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringDocDataRestConfiguration.java b/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringDocDataRestConfiguration.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.core;
+package org.springdoc.data.rest;
 
 import java.util.Optional;
 
@@ -30,9 +30,9 @@
 import io.swagger.v3.oas.models.media.MapSchema;
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.StringSchema;
-import org.springdoc.core.converters.Pageable;
-import org.springdoc.core.converters.RepresentationModelLinksOASMixin;
-import org.springdoc.core.customisers.QuerydslPredicateOperationCustomizer;
+import org.springdoc.data.rest.converters.RepresentationModelLinksOASMixin;
+import org.springdoc.data.rest.customisers.QuerydslPredicateOperationCustomizer;
+import org.springdoc.data.rest.converters.Pageable;
 import org.springdoc.core.customizers.OpenApiCustomiser;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
diff --git a/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/converters/CollectionModelContentConverter.java b/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/converters/CollectionModelContentConverter.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.core.converters;
+package org.springdoc.data.rest.converters;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/converters/Pageable.java b/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/converters/Pageable.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.core.converters;
+package org.springdoc.data.rest.converters;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/converters/PageableAsQueryParam.java b/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/converters/PageableAsQueryParam.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.core.converters;
+package org.springdoc.data.rest.converters;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/converters/RepresentationModelLinksOASMixin.java b/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/converters/RepresentationModelLinksOASMixin.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.core.converters;
+package org.springdoc.data.rest.converters;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
diff --git a/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/customisers/QuerydslPredicateOperationCustomizer.java b/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/customisers/QuerydslPredicateOperationCustomizer.java
@@ -1,4 +1,4 @@
-package org.springdoc.core.customisers;
+package org.springdoc.data.rest.customisers;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
diff --git a/springdoc-openapi-data-rest/src/main/resources/META-INF/spring.factories b/springdoc-openapi-data-rest/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springdoc.core.SpringDocDataRestConfiguration
+org.springdoc.data.rest.SpringDocDataRestConfiguration
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/AbstractSpringDocTest.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/AbstractSpringDocTest.java
@@ -30,7 +30,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springdoc.core.Constants;
-import org.springdoc.core.converters.CollectionModelContentConverter;
+import org.springdoc.data.rest.converters.CollectionModelContentConverter;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app3/HelloController.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app3/HelloController.java
@@ -18,7 +18,7 @@
 
 package test.org.springdoc.api.app3;
 
-import org.springdoc.core.converters.PageableAsQueryParam;
+import org.springdoc.data.rest.converters.PageableAsQueryParam;
 
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/springdoc-openapi-kotlin/src/main/java/org/springdoc/kotlin/KotlinCoroutinesReturnTypeParser.java b/springdoc-openapi-kotlin/src/main/java/org/springdoc/kotlin/KotlinCoroutinesReturnTypeParser.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.core;
+package org.springdoc.kotlin;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
@@ -27,6 +27,7 @@
 import java.util.Optional;
 
 import kotlin.coroutines.Continuation;
+import org.springdoc.core.ReturnTypeParser;
 
 import org.springframework.core.MethodParameter;
 
diff --git a/springdoc-openapi-kotlin/src/main/java/org/springdoc/kotlin/SpringDocKotlinConfiguration.java b/springdoc-openapi-kotlin/src/main/java/org/springdoc/kotlin/SpringDocKotlinConfiguration.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.core;
+package org.springdoc.kotlin;
 
 import com.fasterxml.jackson.module.kotlin.KotlinModule;
 import io.swagger.v3.core.util.Json;
diff --git a/springdoc-openapi-kotlin/src/main/resources/META-INF/spring.factories b/springdoc-openapi-kotlin/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springdoc.core.SpringDocKotlinConfiguration
+org.springdoc.kotlin.SpringDocKotlinConfiguration
diff --git a/springdoc-openapi-security/src/main/java/org/springdoc/security/SpringDocSecurityConfiguration.java b/springdoc-openapi-security/src/main/java/org/springdoc/security/SpringDocSecurityConfiguration.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.core;
+package org.springdoc.security;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/springdoc-openapi-security/src/main/java/org/springdoc/security/SpringSecurityOAuth2Provider.java b/springdoc-openapi-security/src/main/java/org/springdoc/security/SpringSecurityOAuth2Provider.java
@@ -16,10 +16,12 @@
  *
  */
 
-package org.springdoc.core;
+package org.springdoc.security;
 
 import java.util.Map;
 
+import org.springdoc.core.SecurityOAuth2Provider;
+
 import org.springframework.security.oauth2.provider.endpoint.FrameworkEndpoint;
 import org.springframework.security.oauth2.provider.endpoint.FrameworkEndpointHandlerMapping;
 import org.springframework.web.method.HandlerMethod;
diff --git a/springdoc-openapi-security/src/main/resources/META-INF/spring.factories b/springdoc-openapi-security/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springdoc.core.SpringDocSecurityConfiguration
+org.springdoc.security.SpringDocSecurityConfiguration
diff --git a/springdoc-openapi-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfig.java b/springdoc-openapi-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfig.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.ui;
+package org.springdoc.webmvc.ui;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springdoc.core.SpringDocConfigProperties;
diff --git a/springdoc-openapi-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerIndexTransformer.java b/springdoc-openapi-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerIndexTransformer.java
@@ -16,14 +16,15 @@
  *
  */
 
-package org.springdoc.ui;
+package org.springdoc.webmvc.ui;
 
 import java.io.IOException;
 
 import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springdoc.core.SwaggerUiOAuthProperties;
+import org.springdoc.ui.AbstractSwaggerIndexTransformer;
 
 import org.springframework.core.io.Resource;
 import org.springframework.util.AntPathMatcher;
diff --git a/springdoc-openapi-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcome.java b/springdoc-openapi-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcome.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.ui;
+package org.springdoc.webmvc.ui;
 
 import java.util.Map;
 
@@ -28,6 +28,7 @@
 import org.springdoc.core.SpringDocConfigProperties;
 import org.springdoc.core.SpringDocConfiguration;
 import org.springdoc.core.SwaggerUiConfigProperties;
+import org.springdoc.ui.AbstractSwaggerWelcome;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -78,7 +79,7 @@ public Map<String, Object> openapiYaml(HttpServletRequest request) {
 	}
 
 	@Override
-	void calculateUiRootPath(StringBuilder... sbUrls) {
+	protected void calculateUiRootPath(StringBuilder... sbUrls) {
 		StringBuilder sbUrl = new StringBuilder();
 		if (StringUtils.isNotBlank(mvcServletPath))
 			sbUrl.append(mvcServletPath);
@@ -98,7 +99,7 @@ protected String buildUrl(String contextPath, final String docsUrl) {
 	}
 
 	@Override
-	void calculateOauth2RedirectUrl(UriComponentsBuilder uriComponentsBuilder) {
+	protected void calculateOauth2RedirectUrl(UriComponentsBuilder uriComponentsBuilder) {
 		if (StringUtils.isEmpty(oauth2RedirectUrl))
 			swaggerUiConfig.setOauth2RedirectUrl(uriComponentsBuilder.path(this.uiRootPath).path(SWAGGER_UI_OAUTH_REDIRECT_URL).build().toString());
 		else if (!swaggerUiConfig.isValidUrl(swaggerUiConfig.getOauth2RedirectUrl()))
diff --git a/springdoc-openapi-ui/src/main/resources/META-INF/spring.factories b/springdoc-openapi-ui/src/main/resources/META-INF/spring.factories
@@ -1,4 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springdoc.ui.SwaggerConfig,\
+org.springdoc.webmvc.ui.SwaggerConfig,\
 org.springdoc.core.SwaggerUiConfigProperties,\
 org.springdoc.core.SwaggerUiOAuthProperties
diff --git a/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/api/MultipleOpenApiResource.java b/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/api/MultipleOpenApiResource.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.api;
+package org.springdoc.webflux.api;
 
 import java.util.List;
 import java.util.Map;
diff --git a/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/api/OpenApiResource.java b/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/api/OpenApiResource.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.api;
+package org.springdoc.webflux.api;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -30,6 +30,7 @@
 import io.swagger.v3.core.util.Yaml;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.models.OpenAPI;
+import org.springdoc.api.AbstractOpenApiResource;
 import org.springdoc.core.AbstractRequestBuilder;
 import org.springdoc.core.GenericResponseBuilder;
 import org.springdoc.core.OpenAPIBuilder;
diff --git a/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/MultipleOpenApiWebFluxConfiguration.java b/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/MultipleOpenApiWebFluxConfiguration.java
@@ -16,11 +16,18 @@
  *
  */
 
-package org.springdoc.core;
+package org.springdoc.webflux.core;
 
 import java.util.List;
 
-import org.springdoc.api.MultipleOpenApiResource;
+import org.springdoc.core.AbstractRequestBuilder;
+import org.springdoc.core.GenericResponseBuilder;
+import org.springdoc.core.GroupedOpenApi;
+import org.springdoc.core.MultipleOpenApiSupportCondition;
+import org.springdoc.core.OpenAPIBuilder;
+import org.springdoc.core.OperationBuilder;
+import org.springdoc.core.SpringDocConfigProperties;
+import org.springdoc.webflux.api.MultipleOpenApiResource;
 
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/RequestBuilder.java b/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/RequestBuilder.java
@@ -16,11 +16,15 @@
  *
  */
 
-package org.springdoc.core;
+package org.springdoc.webflux.core;
 
 import java.util.List;
 import java.util.Optional;
 
+import org.springdoc.core.AbstractRequestBuilder;
+import org.springdoc.core.GenericParameterBuilder;
+import org.springdoc.core.OperationBuilder;
+import org.springdoc.core.RequestBodyBuilder;
 import org.springdoc.core.customizers.OperationCustomizer;
 import org.springdoc.core.customizers.ParameterCustomizer;
 
diff --git a/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/SpringDocWebFluxConfiguration.java b/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/SpringDocWebFluxConfiguration.java
@@ -16,13 +16,22 @@
  *
  */
 
-package org.springdoc.core;
+package org.springdoc.webflux.core;
 
 import java.util.List;
 import java.util.Optional;
 
-import org.springdoc.api.OpenApiResource;
-import org.springdoc.core.converters.WebFluxSupportConverter;
+import org.springdoc.core.AbstractRequestBuilder;
+import org.springdoc.core.GenericParameterBuilder;
+import org.springdoc.core.GenericResponseBuilder;
+import org.springdoc.core.OpenAPIBuilder;
+import org.springdoc.core.OperationBuilder;
+import org.springdoc.core.PropertyResolverUtils;
+import org.springdoc.core.RequestBodyBuilder;
+import org.springdoc.core.ReturnTypeParser;
+import org.springdoc.core.SpringDocConfigProperties;
+import org.springdoc.webflux.api.OpenApiResource;
+import org.springdoc.webflux.core.converters.WebFluxSupportConverter;
 import org.springdoc.core.customizers.OpenApiCustomiser;
 import org.springdoc.core.customizers.OperationCustomizer;
 import org.springdoc.core.customizers.ParameterCustomizer;
diff --git a/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/converters/WebFluxSupportConverter.java b/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/converters/WebFluxSupportConverter.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.core.converters;
+package org.springdoc.webflux.core.converters;
 
 import java.util.Iterator;
 
diff --git a/springdoc-openapi-webflux-core/src/main/resources/META-INF/spring.factories b/springdoc-openapi-webflux-core/src/main/resources/META-INF/spring.factories
@@ -1,3 +1,3 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springdoc.core.SpringDocWebFluxConfiguration,\
-org.springdoc.core.MultipleOpenApiWebFluxConfiguration
+org.springdoc.webflux.core.SpringDocWebFluxConfiguration,\
+org.springdoc.webflux.core.MultipleOpenApiWebFluxConfiguration
diff --git a/springdoc-openapi-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerConfig.java b/springdoc-openapi-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerConfig.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.springdoc.ui;
+package org.springdoc.webflux.ui;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springdoc.core.SpringDocConfiguration;
diff --git a/springdoc-openapi-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerIndexTransformer.java b/springdoc-openapi-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerIndexTransformer.java
@@ -16,10 +16,12 @@
  *
  */
 
-package org.springdoc.ui;
+package org.springdoc.webflux.ui;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springdoc.core.SwaggerUiOAuthProperties;
+import org.springdoc.ui.AbstractSwaggerIndexTransformer;
+import org.springdoc.ui.SpringDocUIException;
 import reactor.core.publisher.Mono;
 
 import org.springframework.core.io.Resource;
diff --git a/springdoc-openapi-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcome.java b/springdoc-openapi-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcome.java
diff --git a/springdoc-openapi-webflux-ui/src/main/resources/META-INF/spring.factories b/springdoc-openapi-webflux-ui/src/main/resources/META-INF/spring.factories
diff --git a/springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/AbstractSpringDocTest.java b/springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/AbstractSpringDocTest.java
diff --git a/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/api/ActuatorProvider.java b/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/api/ActuatorProvider.java
diff --git a/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiResource.java b/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiResource.java
diff --git a/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/api/OpenApiResource.java b/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/api/OpenApiResource.java
diff --git a/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/core/MultipleOpenApiSupportConfiguration.java b/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/core/MultipleOpenApiSupportConfiguration.java
diff --git a/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/core/RequestBuilder.java b/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/core/RequestBuilder.java
diff --git a/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/core/SpringDocWebMvcConfiguration.java b/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/core/SpringDocWebMvcConfiguration.java
diff --git a/springdoc-openapi-webmvc-core/src/main/resources/META-INF/spring.factories b/springdoc-openapi-webmvc-core/src/main/resources/META-INF/spring.factories
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app94/SpringDocApp94Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app94/SpringDocApp94Test.java

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public static void addResponseTypeToIgnore(Class<?> cls) {`
`51`	`51`	`RESPONSE_TYPES_TO_IGNORE.add(cls);`
`52`	`52`	`}`
`53`	`53`
`54`		`- static boolean isResponseTypeWrapper(Class<?> rawClass) {`
	`54`	`+ public static boolean isResponseTypeWrapper(Class<?> rawClass) {`
`55`	`55`	`return RESULT_WRAPPERS_TO_IGNORE.stream().anyMatch(clazz -> clazz.isAssignableFrom(rawClass));`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ protected UriComponentsBuilder getUriComponentsBuilder(String sbUrl) {`
`97`	`97`	`return uriBuilder;`
`98`	`98`	`}`
`99`	`99`
`100`		`- abstract void calculateOauth2RedirectUrl(UriComponentsBuilder uriComponentsBuilder);`
	`100`	`+ protected abstract void calculateOauth2RedirectUrl(UriComponentsBuilder uriComponentsBuilder);`
`101`	`101`
`102`		`- abstract void calculateUiRootPath(StringBuilder... sbUrls);`
	`102`	`+ protected abstract void calculateUiRootPath(StringBuilder... sbUrls);`
`103`	`103`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`*/`
`18`	`18`
`19`		`-package org.springdoc.core.converters;`
	`19`	`+package org.springdoc.data.rest.converters;`
`20`	`20`
`21`	`21`	`import java.util.Collection;`
`22`	`22`	`import java.util.Iterator;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.springdoc.core.customisers;`
	`1`	`+package org.springdoc.data.rest.customisers;`
`2`	`2`
`3`	`3`	`import java.lang.reflect.Field;`
`4`	`4`	`import java.lang.reflect.Modifier;`