Skip to content

Commit 32b4f67

Browse files
author
bnasslahsen
committed
code review
1 parent 5faf9ac commit 32b4f67

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ public final class Constants {
106106

107107
public static final String OPENAPI_ARRAY_TYPE = "array";
108108

109+
public static final String GRACEFUL_EXCEPTION_OCCURRED = "Graceful exception occurred";
110+
109111
private Constants() {
110112
super();
111113
}

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
import io.swagger.v3.oas.models.media.Schema;
4444
import io.swagger.v3.oas.models.parameters.Parameter;
4545
import org.apache.commons.lang3.StringUtils;
46+
import org.slf4j.Logger;
47+
import org.slf4j.LoggerFactory;
4648

4749
import org.springframework.core.MethodParameter;
4850
import org.springframework.core.ResolvableType;
@@ -57,6 +59,8 @@ public class GenericParameterBuilder {
5759

5860
private static final List<Class> ANNOTATIOSN_TO_IGNORE = new ArrayList<>();
5961

62+
private static final Logger LOGGER = LoggerFactory.getLogger(GenericParameterBuilder.class);
63+
6064
static {
6165
FILE_TYPES.add(MultipartFile.class);
6266
FILE_TYPES.add(Resource.class);
@@ -178,7 +182,13 @@ private void setSchema(io.swagger.v3.oas.annotations.Parameter parameterDoc, Com
178182
if (StringUtils.isNotBlank(parameterDoc.ref()))
179183
parameter.$ref(parameterDoc.ref());
180184
else {
181-
Schema schema = AnnotationsUtils.getSchema(parameterDoc.schema(), null,false,parameterDoc.schema().implementation(),components,jsonView ).orElse(null);
185+
Schema schema = null;
186+
try {
187+
schema = AnnotationsUtils.getSchema(parameterDoc.schema(), null, false, parameterDoc.schema().implementation(), components, jsonView).orElse(null);
188+
}
189+
catch (Exception e) {
190+
LOGGER.warn(Constants.GRACEFUL_EXCEPTION_OCCURRED, e);
191+
}
182192
if (schema == null) {
183193
if (parameterDoc.content().length > 0)
184194
schema = AnnotationsUtils.getSchema(parameterDoc.content()[0], components, jsonView).orElse(null);

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ public class SpringDocAnnotationsUtils extends AnnotationsUtils {
4646

4747
private static final Logger LOGGER = LoggerFactory.getLogger(SpringDocAnnotationsUtils.class);
4848

49-
private static final String GRACEFUL_EXCEPTION_OCCURRED = "Graceful exception occurred";
50-
5149
public static Schema resolveSchemaFromType(Class<?> schemaImplementation, Components components,
5250
JsonView jsonView, Annotation[] annotations) {
5351
Schema schemaObject = extractSchema(components, schemaImplementation, jsonView, annotations);
@@ -68,8 +66,8 @@ public static Schema extractSchema(Components components, Type returnType, JsonV
6866
new AnnotatedType(returnType).resolveAsRef(true).jsonViewAnnotation(jsonView).ctxAnnotations(annotations));
6967
}
7068
catch (Exception e) {
71-
LOGGER.error(GRACEFUL_EXCEPTION_OCCURRED, e);
72-
return new StringSchema();
69+
LOGGER.warn(Constants.GRACEFUL_EXCEPTION_OCCURRED, e);
70+
return null;
7371
}
7472
if (resolvedSchema.schema != null) {
7573
schemaN = resolvedSchema.schema;

0 commit comments

Comments
 (0)