Servers OpenAPI block resets after customizing with GroupedOpenApi. Fixes #695

Author: bnasslahsen

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

@@ -145,7 +145,7 @@ public static void addHiddenRestControllers(String... classes) {
 				hiddenClasses.add(Class.forName(aClass));
 			}
 			catch (ClassNotFoundException e) {
-				LOGGER.warn("The following class doesn't exist and cannot be hidden: " + aClass);
+				LOGGER.warn("The following class doesn't exist and cannot be hidden: {}",  aClass);
 			}
 		}
 		HIDDEN_REST_CONTROLLERS.addAll(hiddenClasses);

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

@@ -194,7 +194,7 @@ static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor() {
 	@ConditionalOnMissingClass(value = BINDRESULT_CLASS)
 	@Lazy(false)
 	static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor2() {
-		return beanFactory -> SpringdocBeanFactoryConfigurer.initBeanFactoryPostProcessor(beanFactory);
+		return SpringdocBeanFactoryConfigurer::initBeanFactoryPostProcessor;
 	}
 
 }

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

@@ -28,7 +28,6 @@
 
 import io.swagger.v3.oas.models.OpenAPI;
 
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.context.properties.bind.BindResult;
@@ -52,7 +51,7 @@ public void setEnvironment(Environment environment) {
 	}
 
 	@Override
-	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
+	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)  {
 		final BindResult<SpringDocConfigProperties> result = Binder.get(environment)
 				.bind(SPRINGDOC_PREFIX, SpringDocConfigProperties.class);
 		if (result.isBound()) {

springdoc-openapi-common/src/main/java/org/springdoc/core/converters/models/DefaultPageable.java

@@ -21,92 +21,13 @@
 package org.springdoc.core.converters.models;
 
 import java.util.List;
-import java.util.Objects;
 
-import javax.validation.constraints.Min;
-
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Schema;
 import org.springdoc.api.annotations.ParameterObject;
 
 @ParameterObject
-public class DefaultPageable {
-
-	@Min(0)
-	@Parameter(description = "Zero-based page index (0..N)", schema = @Schema(type = "integer", defaultValue = "0"))
-	private Integer page;
-
-	@Min(1)
-	@Parameter(description = "The size of the page to be returned", schema = @Schema(type = "integer", defaultValue = "20"))
-	private Integer size;
-
-	@Parameter(description = "Sorting criteria in the format: property(,asc|desc). "
-			+ "Default sort order is ascending. " + "Multiple sort criteria are supported."
-			, name = "sort"
-			, array = @ArraySchema(schema = @Schema(type = "string")))
-	private List<String> sort;
+public class DefaultPageable extends Pageable {
 
 	public DefaultPageable(int page, int size, List<String> sort) {
-		this.page = page;
-		this.size = size;
-		this.sort = sort;
-	}
-
-	public Integer getPage() {
-		return page;
-	}
-
-	public void setPage(Integer page) {
-		this.page = page;
-	}
-
-	public Integer getSize() {
-		return size;
-	}
-
-	public void setSize(Integer size) {
-		this.size = size;
-	}
-
-	public List<String> getSort() {
-		return sort;
-	}
-
-	public void setSort(List<String> sort) {
-		if (sort == null) {
-			this.sort.clear();
-		}
-		else {
-			this.sort = sort;
-		}
-	}
-
-	public void addSort(String sort) {
-		this.sort.add(sort);
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
-		DefaultPageable pageable = (DefaultPageable) o;
-		return Objects.equals(page, pageable.page) &&
-				Objects.equals(size, pageable.size) &&
-				Objects.equals(sort, pageable.sort);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(page, size, sort);
-	}
-
-	@Override
-	public String toString() {
-		return "Pageable{" +
-				"page=" + page +
-				", size=" + size +
-				", sort=" + sort +
-				'}';
+		super(page, size, sort);
 	}
 }

springdoc-openapi-common/src/main/java/org/springdoc/core/fn/RouterOperation.java

@@ -20,7 +20,9 @@
 
 package org.springdoc.core.fn;
 
+import java.util.Arrays;
 import java.util.Map;
+import java.util.Objects;
 
 import io.swagger.v3.oas.annotations.Operation;
 import org.apache.commons.lang3.ArrayUtils;
@@ -182,4 +184,33 @@ public int compareTo(RouterOperation routerOperation) {
 			result = operation.operationId().compareTo(routerOperation.getOperation().operationId());
 		return result;
 	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+		RouterOperation that = (RouterOperation) o;
+		return Objects.equals(path, that.path) &&
+				Arrays.equals(methods, that.methods) &&
+				Arrays.equals(consumes, that.consumes) &&
+				Arrays.equals(produces, that.produces) &&
+				Arrays.equals(headers, that.headers) &&
+				Objects.equals(beanClass, that.beanClass) &&
+				Objects.equals(beanMethod, that.beanMethod) &&
+				Arrays.equals(parameterTypes, that.parameterTypes) &&
+				Objects.equals(queryParams, that.queryParams) &&
+				Objects.equals(operation, that.operation) &&
+				Objects.equals(operationModel, that.operationModel);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = Objects.hash(path, beanClass, beanMethod, queryParams, operation, operationModel);
+		result = 31 * result + Arrays.hashCode(methods);
+		result = 31 * result + Arrays.hashCode(consumes);
+		result = 31 * result + Arrays.hashCode(produces);
+		result = 31 * result + Arrays.hashCode(headers);
+		result = 31 * result + Arrays.hashCode(parameterTypes);
+		return result;
+	}
 }

springdoc-openapi-hateoas/src/main/java/org/springdoc/hateoas/converters/CollectionModelContentConverter.java

@@ -26,6 +26,7 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.type.CollectionType;
+import com.fasterxml.jackson.databind.type.TypeBindings;
 import io.swagger.v3.core.converter.AnnotatedType;
 import io.swagger.v3.core.converter.ModelConverter;
 import io.swagger.v3.core.converter.ModelConverterContext;
@@ -35,6 +36,7 @@
 
 import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.server.LinkRelationProvider;
+import org.springframework.util.CollectionUtils;
 
 /**
  * Override resolved schema as there is a custom serializer that converts the data to a map before serializing it.
@@ -69,11 +71,10 @@ public Schema<?> resolve(AnnotatedType type, ModelConverterContext context, Iter
 
 	private Class<?> getEntityType(AnnotatedType type) {
 		Class<?> containerEntityType = ((CollectionType) (type.getType())).getContentType().getRawClass();
-
-		if(((CollectionType) type.getType()).getContentType().getBindings().getTypeParameters().size()==0)
-			return containerEntityType;
 		if (containerEntityType.isAssignableFrom(EntityModel.class)) {
-			return ((CollectionType) type.getType()).getContentType().getBindings().getBoundType(0).getRawClass();
+			TypeBindings typeBindings = ((CollectionType) type.getType()).getContentType().getBindings() ;
+			if (!CollectionUtils.isEmpty(typeBindings.getTypeParameters()))
+				return typeBindings.getBoundType(0).getRawClass();
 		}
 		return containerEntityType;
 	}

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

@@ -158,8 +158,8 @@ protected void getPaths(Map<String, Object> restControllers) {
 				.ifPresent(routerBeans -> routerBeans.forEach(this::getRouterFunctionPaths)));
 
 		if(repositoryRestResourceProvider.isPresent()){
-			RepositoryRestResourceProvider repositoryRestResourceProvider = this.repositoryRestResourceProvider.get();
-			List<RouterOperation>  operationList = repositoryRestResourceProvider.getRouterOperations(openAPIBuilder.getCalculatedOpenAPI());
+			RepositoryRestResourceProvider restResourceProvider = this.repositoryRestResourceProvider.get();
+			List<RouterOperation>  operationList = restResourceProvider.getRouterOperations(openAPIBuilder.getCalculatedOpenAPI());
 			calculatePath(operationList);
 		}
 	}