Merge pull request #362 from fabiobrz/fabiobrz-359_default_object_sch…

…ema_1.1.x Default unknown type to simple type=object schema (1.1.x)
smallrye · Jun 8, 2020 · 1a60b8d · 1a60b8d
2 parents b301228 + b68622c
commit 1a60b8d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/...mentation/src/main/java/io/smallrye/openapi/runtime/scanner/OpenApiDataObjectScanner.java b/...mentation/src/main/java/io/smallrye/openapi/runtime/scanner/OpenApiDataObjectScanner.java
@@ -200,7 +200,7 @@ Schema process() {
         // If top level item is not indexed
         if (rootClassInfo == null && objectStack.isEmpty()) {
             // If there's something on the objectStack stack then pre-scanning may have found something.
-            return null;
+            return new SchemaImpl().type(Schema.SchemaType.OBJECT);
         }
 
         // Create root node.

diff --git a/implementation/src/test/java/io/smallrye/openapi/runtime/scanner/ParameterScanTests.java b/implementation/src/test/java/io/smallrye/openapi/runtime/scanner/ParameterScanTests.java
@@ -55,6 +55,7 @@
 import org.jboss.jandex.Index;
 import org.jboss.resteasy.annotations.providers.multipart.MultipartForm;
 import org.jboss.resteasy.annotations.providers.multipart.PartType;
+import org.jboss.resteasy.plugins.providers.multipart.InputPart;
 import org.json.JSONException;
 import org.junit.Test;
 
@@ -476,6 +477,9 @@ static class Bean {
             @DefaultValue("default2")
             @PartType("text/plain")
             String formField2;
+
+            @FormParam("data")
+            private InputPart data;
         }
 
         @POST

diff --git a/...ntation/src/test/resources/io/smallrye/openapi/runtime/scanner/params.multipart-form.json b/...ntation/src/test/resources/io/smallrye/openapi/runtime/scanner/params.multipart-form.json
@@ -27,7 +27,10 @@
             "multipart/form-data": {
               "schema": {
                 "type": "object",
-                "required": [ "formField4", "f3" ],
+                "required": [
+                  "formField4",
+                  "f3"
+                ],
                 "properties": {
                   "formField1": {
                     "type": "string",
@@ -45,6 +48,9 @@
                   "formField4": {
                     "type": "string",
                     "nullable": false
+                  },
+                  "data": {
+                    "type": "object"
                   }
                 }
               },

diff --git a/...st/resources/io/smallrye/openapi/runtime/scanner/responses.unknown-type.empty-schema.json b/...st/resources/io/smallrye/openapi/runtime/scanner/responses.unknown-type.empty-schema.json
@@ -8,7 +8,9 @@
             "description": "OK",
             "content": {
               "text/plain": {
-
+                "schema": {
+                  "type": "object"
+                }
               }
             }
           }