Merge branch 'master' of https://github.com/springdoc/springdoc-openapi

bnasslahsen · bnasslahsen · commit 239e4f9ecf5b · 2020-03-19T16:33:39.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
@@ -279,8 +279,7 @@ private Parameter buildParams(ParameterInfo parameterInfo, Components components
 
 		}
 		else if (requestParam != null && !parameterBuilder.isFile(parameterInfo.getParameter())) {
-			boolean isOptional = Optional.class.equals(methodParameter.getParameterType());
-			requestInfo = new RequestInfo(ParameterIn.QUERY.toString(), requestParam.value(), requestParam.required() && !isOptional,
+			requestInfo = new RequestInfo(ParameterIn.QUERY.toString(), requestParam.value(), requestParam.required() && !methodParameter.isOptional(),
 					requestParam.defaultValue());
 			parameter = buildParam(parameterInfo, components, requestInfo, jsonView);
 		}

Original file line number	Diff line number	Diff line change
`@@ -279,8 +279,7 @@ private Parameter buildParams(ParameterInfo parameterInfo, Components components`
`279`	`279`
`280`	`280`	`}`
`281`	`281`	`else if (requestParam != null && !parameterBuilder.isFile(parameterInfo.getParameter())) {`
`282`		`- boolean isOptional = Optional.class.equals(methodParameter.getParameterType());`
`283`		`- requestInfo = new RequestInfo(ParameterIn.QUERY.toString(), requestParam.value(), requestParam.required() && !isOptional,`
	`282`	`+ requestInfo = new RequestInfo(ParameterIn.QUERY.toString(), requestParam.value(), requestParam.required() && !methodParameter.isOptional(),`
`284`	`283`	`requestParam.defaultValue());`
`285`	`284`	`parameter = buildParam(parameterInfo, components, requestInfo, jsonView);`
`286`	`285`	`}`