Skip to content

Commit b913bfe

Browse files
author
springdoc
committed
project update
1 parent 67bf170 commit b913bfe

File tree

5 files changed

+7
-20
lines changed

5 files changed

+7
-20
lines changed

release.properties

Lines changed: 0 additions & 12 deletions
This file was deleted.

springdoc-openapi-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ protected void calculatePath(OpenAPIBuilder openAPIBuilder, HandlerMethod handle
9696
mediaAttributes.setClassProduces(reqMappringClass.produces());
9797
}
9898

99-
mediaAttributes.calculateConsumesProduces(requestMethod, handlerMethod.getMethod());
99+
mediaAttributes.calculateConsumesProduces(handlerMethod.getMethod());
100100

101101
Operation operation = new Operation();
102102

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.springframework.web.bind.annotation.PostMapping;
1010
import org.springframework.web.bind.annotation.PutMapping;
1111
import org.springframework.web.bind.annotation.RequestMapping;
12-
import org.springframework.web.bind.annotation.RequestMethod;
1312

1413
import io.swagger.v3.core.util.ReflectionUtils;
1514

@@ -52,7 +51,7 @@ public void setMethodConsumes(String[] methodConsumes) {
5251
this.methodConsumes = methodConsumes;
5352
}
5453

55-
public void calculateConsumesProduces(RequestMethod requestMethod, Method method) {
54+
public void calculateConsumesProduces(Method method) {
5655
PostMapping reqPostMappringMethod = ReflectionUtils.getAnnotation(method, PostMapping.class);
5756
if (reqPostMappringMethod != null) {
5857
fillMethods(reqPostMappringMethod.produces(), reqPostMappringMethod.consumes());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ public Optional<Map<String, Callback>> buildCallbacks(
140140
callbacks.putAll(callbackMap);
141141
}
142142

143-
if (CollectionUtils.isEmpty(callbacks)) {
143+
if (CollectionUtils.isEmpty(callbacks))
144144
return Optional.empty();
145-
} else
145+
else
146146
return Optional.of(callbacks);
147147
}
148148

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ private SpringDocAnnotationsUtils() {
2929

3030
static final String COMPONENTS_REF = "#/components/schemas/";
3131

32-
public static Schema resolveSchemaFromType(Class<?> schemaImplementation, Components components,
33-
JsonView jsonViewAnnotation) {
32+
public static Schema resolveSchemaFromType(Class<?> schemaImplementation, Components components) {
3433
Schema schemaObject = null;
3534
PrimitiveType primitiveType = PrimitiveType.fromType(schemaImplementation);
3635
if (primitiveType != null) {
3736
schemaObject = primitiveType.createProperty();
3837
} else {
3938
schemaObject = extractSchema(components, schemaImplementation);
4039
}
41-
if (StringUtils.isBlank(schemaObject.get$ref()) && StringUtils.isBlank(schemaObject.getType())) {
40+
if (StringUtils.isBlank(schemaObject.get$ref()) && schemaObject != null
41+
&& StringUtils.isBlank(schemaObject.getType())) {
4242
// default to string
4343
schemaObject.setType("string");
4444
}

0 commit comments

Comments
 (0)