Improve support of HttpEntity on webflux. Fixes #280

Author: bnasslahsen

springdoc-openapi-webflux-core/src/main/java/org/springdoc/core/ResponseBuilder.java

@@ -23,31 +23,33 @@ protected Schema calculateSchemaFromParameterizedType(Components components, Par
                                                           JsonView jsonView) {
         Schema schemaN = null;
         if (Mono.class.getName().contentEquals(parameterizedType.getRawType().getTypeName())) {
-            if (parameterizedType.getActualTypeArguments()[0] instanceof ParameterizedType && ResponseEntity.class
-                    .getName().contentEquals(((ParameterizedType) parameterizedType.getActualTypeArguments()[0])
-                            .getRawType().getTypeName())) {
+            if (parameterizedType.getActualTypeArguments()[0] instanceof ParameterizedType && isResponseTypeToIgnore(((ParameterizedType) parameterizedType.getActualTypeArguments()[0])
+                    .getRawType().getTypeName())) {
                 ParameterizedType parameterizedTypeNew = (ParameterizedType) parameterizedType
                         .getActualTypeArguments()[0];
                 schemaN = calculateSchemaParameterizedType(components, parameterizedTypeNew, jsonView);
             } else {
                 schemaN = calculateSchemaParameterizedType(components, parameterizedType, jsonView);
             }
         } else if (Flux.class.getName().contentEquals(parameterizedType.getRawType().getTypeName())) {
-            if (parameterizedType.getActualTypeArguments()[0] instanceof ParameterizedType && ResponseEntity.class
-                    .getName().contentEquals(((ParameterizedType) parameterizedType.getActualTypeArguments()[0])
-                            .getRawType().getTypeName())) {
+            if (parameterizedType.getActualTypeArguments()[0] instanceof ParameterizedType && isResponseTypeToIgnore(((ParameterizedType) parameterizedType.getActualTypeArguments()[0])
+                    .getRawType().getTypeName())) {
                 ParameterizedType parameterizedTypeNew = (ParameterizedType) parameterizedType
                         .getActualTypeArguments()[0];
                 schemaN = calculateFluxSchema(components, parameterizedTypeNew, jsonView);
             } else {
                 schemaN = calculateFluxSchema(components, parameterizedType, jsonView);
             }
-        } else if (ResponseEntity.class.getName().contentEquals(parameterizedType.getRawType().getTypeName()) || HttpEntity.class.getName().contentEquals(parameterizedType.getRawType().getTypeName())) {
+        } else if (isResponseTypeToIgnore(parameterizedType.getRawType().getTypeName())) {
             schemaN = calculateSchemaParameterizedType(components, parameterizedType, jsonView);
         }
         return schemaN;
     }
 
+    private boolean isResponseTypeToIgnore(String typeName) {
+        return ResponseEntity.class.getName().contentEquals(typeName) || HttpEntity.class.getName().contentEquals(typeName);
+    }
+
     private Schema calculateFluxSchema(Components components, ParameterizedType parameterizedType, JsonView jsonView) {
         Schema itemsSchema = SpringDocAnnotationsUtils.extractSchema(components, parameterizedType.getActualTypeArguments()[0], jsonView);
         return new ArraySchema().items(itemsSchema);

springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app5/HelloController.java

@@ -1,6 +1,8 @@
 package test.org.springdoc.api.app5;
 
+import org.springframework.http.HttpEntity;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -14,4 +16,9 @@ public Mono<Tweet> postNotWorks(@RequestBody Mono<Tweet> tweet) {
         return tweet;
     }
 
+    @GetMapping("/test")
+    public Mono<HttpEntity<String>> demo2() {
+        return null;
+    }
+
 }

springdoc-openapi-webflux-core/src/test/resources/results/app5.json

@@ -43,6 +43,26 @@
           }
         }
       }
+    },
+    "/test": {
+      "get": {
+        "tags": [
+          "hello-controller"
+        ],
+        "operationId": "demo2",
+        "responses": {
+          "200": {
+            "description": "default response",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
     }
   },
   "components": {