Improve isParamToIgnore

bnasslahsen · bnasslahsen · commit e529a47ba84a · 2020-03-20T13:24:44.000+01:00
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/AbstractRequestBuilder.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/AbstractRequestBuilder.java
@@ -243,10 +243,11 @@ protected Parameter customiseParameter(Parameter parameter, ParameterInfo parame
 	}
 
 	protected boolean isParamToIgnore(MethodParameter parameter) {
-		if (parameter.getParameterAnnotation(PathVariable.class) !=null || parameter.getParameterAnnotation(RequestParam.class) !=null) {
+		if(parameterBuilder.isAnnotationToIgnore(parameter))
+			return true;
+		if (parameter.getParameterAnnotation(PathVariable.class) !=null || parameter.getParameterAnnotation(RequestParam.class) !=null)
 			return false;
-		}
-		return parameterBuilder.isAnnotationToIgnore(parameter) || PARAM_TYPES_TO_IGNORE.contains(parameter.getParameterType());
+		return PARAM_TYPES_TO_IGNORE.contains(parameter.getParameterType());
 	}
 
 	private void setParams(Operation operation, List<Parameter> operationParameters, RequestBodyInfo requestBodyInfo) {

Original file line number	Diff line number	Diff line change
`@@ -243,10 +243,11 @@ protected Parameter customiseParameter(Parameter parameter, ParameterInfo parame`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`protected boolean isParamToIgnore(MethodParameter parameter) {`
`246`		`- if (parameter.getParameterAnnotation(PathVariable.class) !=null \|\| parameter.getParameterAnnotation(RequestParam.class) !=null) {`
	`246`	`+ if(parameterBuilder.isAnnotationToIgnore(parameter))`
	`247`	`+ return true;`
	`248`	`+ if (parameter.getParameterAnnotation(PathVariable.class) !=null \|\| parameter.getParameterAnnotation(RequestParam.class) !=null)`
`247`	`249`	`return false;`
`248`		`- }`
`249`		`- return parameterBuilder.isAnnotationToIgnore(parameter) \|\| PARAM_TYPES_TO_IGNORE.contains(parameter.getParameterType());`
	`250`	`+ return PARAM_TYPES_TO_IGNORE.contains(parameter.getParameterType());`
`250`	`251`	`}`
`251`	`252`
`252`	`253`	`private void setParams(Operation operation, List<Parameter> operationParameters, RequestBodyInfo requestBodyInfo) {`