Skip to content

Commit 974c16d

Browse files
author
bnasslahsen
committed
code review
1 parent 6ded07d commit 974c16d

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

springdoc-openapi-common/src/main/java/org/springdoc/core/GenericParameterBuilder.java

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,9 @@ Schema calculateSchema(Components components, ParameterInfo parameterInfo, Reque
197197
Schema schemaN;
198198
String paramName = parameterInfo.getpName();
199199
MethodParameter methodParameter = parameterInfo.getMethodParameter();
200-
Class type = methodParameter.getParameterType();
201200

202201
if (parameterInfo.getParameterModel() == null || parameterInfo.getParameterModel().getSchema() == null) {
203202
if (methodParameter.getGenericParameterType() instanceof ParameterizedType) {
204-
ParameterizedType parameterizedType = (ParameterizedType) methodParameter.getGenericParameterType();
205203
schemaN = SpringDocAnnotationsUtils.extractSchema(components, methodParameter.getGenericParameterType(), jsonView, methodParameter.getParameterAnnotations());
206204
}
207205
else
@@ -215,11 +213,7 @@ Schema calculateSchema(Components components, ParameterInfo parameterInfo, Reque
215213
requestBodyInfo.getMergedSchema().addProperties(paramName, schemaN);
216214
schemaN = requestBodyInfo.getMergedSchema();
217215
}
218-
else if (schemaN instanceof FileSchema) {
219-
schemaN = new ObjectSchema().addProperties(paramName, schemaN);
220-
requestBodyInfo.setMergedSchema(schemaN);
221-
}
222-
else if (schemaN instanceof ArraySchema && ((ArraySchema) schemaN).getItems() instanceof FileSchema) {
216+
else if (schemaN instanceof FileSchema || schemaN instanceof ArraySchema && ((ArraySchema) schemaN).getItems() instanceof FileSchema) {
223217
schemaN = new ObjectSchema().addProperties(paramName, schemaN);
224218
requestBodyInfo.setMergedSchema(schemaN);
225219
}
@@ -236,17 +230,6 @@ public boolean isAnnotationToIgnore(MethodParameter parameter) {
236230
|| AnnotationUtils.findAnnotation(parameter.getParameterType(), annotation) != null);
237231
}
238232

239-
private Schema getFileSchema(RequestBodyInfo requestBodyInfo) {
240-
Schema schemaN;
241-
if (requestBodyInfo.getMergedSchema() != null)
242-
schemaN = requestBodyInfo.getMergedSchema();
243-
else {
244-
schemaN = new ObjectSchema();
245-
requestBodyInfo.setMergedSchema(schemaN);
246-
}
247-
return schemaN;
248-
}
249-
250233
private void setExamples(io.swagger.v3.oas.annotations.Parameter parameterDoc, Parameter parameter) {
251234
Map<String, Example> exampleMap = new HashMap<>();
252235
if (parameterDoc.examples().length == 1 && StringUtils.isBlank(parameterDoc.examples()[0].name())) {

0 commit comments

Comments
 (0)