code review

Author: bnasslahsen

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

@@ -427,7 +427,7 @@ private Locale selectLocale(Locale inputLocale) {
 		if (!CollectionUtils.isEmpty(allowedLocales)) {
 			Locale bestMatchingAllowedLocale = Locale.lookup(
 				Locale.LanguageRange.parse(inputLocale.toLanguageTag()),
-				allowedLocales.stream().map(Locale::forLanguageTag).collect(Collectors.toList())
+				allowedLocales.stream().map(Locale::forLanguageTag).toList()
 			);
 
 			return bestMatchingAllowedLocale == null ? Locale.forLanguageTag(allowedLocales.get(0)) : bestMatchingAllowedLocale;

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

@@ -135,7 +135,9 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato
 					io.swagger.v3.oas.annotations.media.Schema declaredSchema = propertyDef.getAnyAnnotation(io.swagger.v3.oas.annotations.media.Schema.class);
 					if (declaredSchema != null &&
 							(ArrayUtils.isNotEmpty(declaredSchema.oneOf()) || ArrayUtils.isNotEmpty(declaredSchema.allOf()))) {
-						TYPES_TO_SKIP.add(propertyDef.getPrimaryType().getRawClass().getSimpleName());
+						if (propertyDef.getPrimaryType() != null && propertyDef.getPrimaryType().getRawClass() != null) {
+							TYPES_TO_SKIP.add(propertyDef.getPrimaryType().getRawClass().getSimpleName());
+						}
 					}
 				}
 			}