code refactoring

bnasslahsen · bnasslahsen · commit c9b583663531 · 2020-02-02T23:18:14.000+01: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
@@ -251,14 +251,11 @@ private Type getReturnType(Method method) {
 	}
 
 	private Schema<?> calculateSchema(Components components, Type returnType, JsonView jsonView) {
-		Schema<?> schemaN = null;
 		if (isVoid(returnType)) {
 			// if void, no content
 			return null;
 		}
-		if (schemaN == null) {
-			schemaN = SpringDocAnnotationsUtils.extractSchema(components, returnType, jsonView);
-		}
+		Schema<?> schemaN  = SpringDocAnnotationsUtils.extractSchema(components, returnType, jsonView);
 		if (schemaN == null && returnType instanceof Class) {
 			schemaN = AnnotationsUtils.resolveSchemaFromType((Class) returnType, null, jsonView);
 		}

Original file line number	Diff line number	Diff line change
`@@ -251,14 +251,11 @@ private Type getReturnType(Method method) {`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`private Schema<?> calculateSchema(Components components, Type returnType, JsonView jsonView) {`
`254`		`- Schema<?> schemaN = null;`
`255`	`254`	`if (isVoid(returnType)) {`
`256`	`255`	`// if void, no content`
`257`	`256`	`return null;`
`258`	`257`	`}`
`259`		`- if (schemaN == null) {`
`260`		`- schemaN = SpringDocAnnotationsUtils.extractSchema(components, returnType, jsonView);`
`261`		`- }`
	`258`	`+ Schema<?> schemaN = SpringDocAnnotationsUtils.extractSchema(components, returnType, jsonView);`
`262`	`259`	`if (schemaN == null && returnType instanceof Class) {`
`263`	`260`	`schemaN = AnnotationsUtils.resolveSchemaFromType((Class) returnType, null, jsonView);`
`264`	`261`	`}`