@@ -23,31 +23,33 @@ protected Schema calculateSchemaFromParameterizedType(Components components, Par
23
23
JsonView jsonView ) {
24
24
Schema schemaN = null ;
25
25
if (Mono .class .getName ().contentEquals (parameterizedType .getRawType ().getTypeName ())) {
26
- if (parameterizedType .getActualTypeArguments ()[0 ] instanceof ParameterizedType && ResponseEntity .class
27
- .getName ().contentEquals (((ParameterizedType ) parameterizedType .getActualTypeArguments ()[0 ])
28
- .getRawType ().getTypeName ())) {
26
+ if (parameterizedType .getActualTypeArguments ()[0 ] instanceof ParameterizedType && isResponseTypeToIgnore (((ParameterizedType ) parameterizedType .getActualTypeArguments ()[0 ])
27
+ .getRawType ().getTypeName ())) {
29
28
ParameterizedType parameterizedTypeNew = (ParameterizedType ) parameterizedType
30
29
.getActualTypeArguments ()[0 ];
31
30
schemaN = calculateSchemaParameterizedType (components , parameterizedTypeNew , jsonView );
32
31
} else {
33
32
schemaN = calculateSchemaParameterizedType (components , parameterizedType , jsonView );
34
33
}
35
34
} else if (Flux .class .getName ().contentEquals (parameterizedType .getRawType ().getTypeName ())) {
36
- if (parameterizedType .getActualTypeArguments ()[0 ] instanceof ParameterizedType && ResponseEntity .class
37
- .getName ().contentEquals (((ParameterizedType ) parameterizedType .getActualTypeArguments ()[0 ])
38
- .getRawType ().getTypeName ())) {
35
+ if (parameterizedType .getActualTypeArguments ()[0 ] instanceof ParameterizedType && isResponseTypeToIgnore (((ParameterizedType ) parameterizedType .getActualTypeArguments ()[0 ])
36
+ .getRawType ().getTypeName ())) {
39
37
ParameterizedType parameterizedTypeNew = (ParameterizedType ) parameterizedType
40
38
.getActualTypeArguments ()[0 ];
41
39
schemaN = calculateFluxSchema (components , parameterizedTypeNew , jsonView );
42
40
} else {
43
41
schemaN = calculateFluxSchema (components , parameterizedType , jsonView );
44
42
}
45
- } else if (ResponseEntity . class . getName (). contentEquals ( parameterizedType . getRawType (). getTypeName ()) || HttpEntity . class . getName (). contentEquals (parameterizedType .getRawType ().getTypeName ())) {
43
+ } else if (isResponseTypeToIgnore (parameterizedType .getRawType ().getTypeName ())) {
46
44
schemaN = calculateSchemaParameterizedType (components , parameterizedType , jsonView );
47
45
}
48
46
return schemaN ;
49
47
}
50
48
49
+ private boolean isResponseTypeToIgnore (String typeName ) {
50
+ return ResponseEntity .class .getName ().contentEquals (typeName ) || HttpEntity .class .getName ().contentEquals (typeName );
51
+ }
52
+
51
53
private Schema calculateFluxSchema (Components components , ParameterizedType parameterizedType , JsonView jsonView ) {
52
54
Schema itemsSchema = SpringDocAnnotationsUtils .extractSchema (components , parameterizedType .getActualTypeArguments ()[0 ], jsonView );
53
55
return new ArraySchema ().items (itemsSchema );
0 commit comments