code review

Author: bnasslahsen

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

@@ -61,7 +61,7 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato
 	private Schema composePolymorphicSchema(AnnotatedType type, Schema schema, Collection<Schema> schemas) {
 		String ref = schema.get$ref();
 		List<Schema> composedSchemas = schemas.stream()
-				.filter(s -> s instanceof ComposedSchema)
+				.filter(ComposedSchema.class::isInstance)
 				.map(ComposedSchema.class::cast)
 				.filter(s -> s.getAllOf() != null)
 				.filter(s -> s.getAllOf().stream().anyMatch(s2 -> ref.equals(s2.get$ref())))

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/core/DataRestResponseService.java

@@ -214,7 +214,7 @@ private Type getType(MethodParameter methodParameterReturn, Class<?> domainType,
 		Type returnType = ReturnTypeParser.resolveType(methodParameterReturn.getGenericParameterType(), methodParameterReturn.getContainingClass());
 		Class returnedEntityType = domainType;
 
-		if (dataRestRepository!=null &&  ControllerType.PROPERTY.equals(dataRestRepository.getControllerType()))
+		if (dataRestRepository != null && ControllerType.PROPERTY.equals(dataRestRepository.getControllerType()))
 			returnedEntityType = dataRestRepository.getPropertyType();
 
 		if (returnType instanceof ParameterizedType) {
@@ -268,10 +268,10 @@ else if ((CollectionModel.class.equals(parameterizedType.getRawType())
 	 * @return the class
 	 */
 	private Class findType(RequestMethod requestMethod, DataRestRepository dataRestRepository) {
-		if (ControllerType.ENTITY.equals(dataRestRepository.getControllerType())
+		if (dataRestRepository != null && ControllerType.ENTITY.equals(dataRestRepository.getControllerType())
 				&& Arrays.stream(requestMethodsEntityModel).anyMatch(requestMethod::equals))
 			return EntityModel.class;
-		else if (dataRestRepository!=null && ControllerType.PROPERTY.equals(dataRestRepository.getControllerType())) {
+		else if (dataRestRepository != null && ControllerType.PROPERTY.equals(dataRestRepository.getControllerType())) {
 			if (dataRestRepository.isCollectionLike())
 				return CollectionModel.class;
 			else if (dataRestRepository.isMap())
@@ -354,6 +354,20 @@ public MapModel(Map<? extends Object, ? extends Object> content, Link... links)
 		public Map<? extends Object, ? extends Object> getContent() {
 			return content;
 		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) return true;
+			if (o == null || getClass() != o.getClass()) return false;
+			if (!super.equals(o)) return false;
+			MapModel mapModel = (MapModel) o;
+			return Objects.equals(getContent(), mapModel.getContent());
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(super.hashCode(), getContent());
+		}
 	}
 
 }

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app22/SpringDocApp22Test.java

@@ -23,9 +23,10 @@
 
 package test.org.springdoc.api.app22;
 
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import test.org.springdoc.api.AbstractSpringDocTest;
 
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
 public class SpringDocApp22Test extends AbstractSpringDocTest {
 
 	@SpringBootApplication

springdoc-openapi-security/src/main/java/org/springdoc/security/SpringDocSecurityConfiguration.java

@@ -114,7 +114,7 @@ OpenApiCustomiser springSecurityLoginEndpointCustomiser(ApplicationContext appli
 				for (SecurityFilterChain filterChain : filterChainProxy.getFilterChains()) {
 					Optional<UsernamePasswordAuthenticationFilter> optionalFilter =
 							filterChain.getFilters().stream()
-									.filter(filterVar -> filterVar instanceof UsernamePasswordAuthenticationFilter)
+									.filter(UsernamePasswordAuthenticationFilter.class::isInstance)
 									.map(UsernamePasswordAuthenticationFilter.class::cast)
 									.findAny();
 					if (optionalFilter.isPresent()) {