Merge branch 'nathankooij-master'

Author: bnasslahsen

Diff for: springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocAnnotationsUtils.java

@@ -42,14 +42,7 @@ public class SpringDocAnnotationsUtils extends AnnotationsUtils {
 
 	public static Schema resolveSchemaFromType(Class<?> schemaImplementation, Components components,
 			JsonView jsonView) {
-		Schema schemaObject;
-		PrimitiveType primitiveType = PrimitiveType.fromType(schemaImplementation);
-		if (primitiveType != null) {
-			schemaObject = primitiveType.createProperty();
-		}
-		else {
-			schemaObject = extractSchema(components, schemaImplementation, jsonView);
-		}
+		Schema schemaObject = extractSchema(components, schemaImplementation, jsonView);
 		if (schemaObject != null && StringUtils.isBlank(schemaObject.get$ref())
 				&& StringUtils.isBlank(schemaObject.getType())) {
 			// default to string

Diff for: springdoc-openapi-kotlin/src/test/resources/application-test.yml

@@ -1,4 +1,3 @@
 spring:
   main:
-    allow-bean-definition-overriding: true
     banner-mode: "off"

Diff for: springdoc-openapi-webflux-core/src/test/resources/application-test.yml

@@ -1,6 +1,5 @@
 spring:
   main:
-    allow-bean-definition-overriding: true
     banner-mode: "off"
 logging:
   level: