add tests for additionalProperties false/true (#370)

Author: hauner

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/openapi/v30/Schema.kt

@@ -76,12 +76,13 @@ class Schema(val schema: Schema30) : OpenApiSchema {
     override fun getAdditionalProperties(): Schema? {
         val additional = schema.additionalProperties
 
-        // null, boolean, schema
+        // schema
         if(additional is Schema30) {
             return Schema(additional)
         }
 
-        return null;
+        // null, boolean
+        return null
     }
 
     override fun getItems(): List<OpenApiSchema> {

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/openapi/v31/Schema.kt

@@ -73,15 +73,16 @@ class Schema(val schema: Schema31) : OpenApiSchema {
         return props
     }
 
-    override fun getAdditionalProperties(): Schema? {
+    override fun getAdditionalProperties(): OpenApiSchema? {
         val additional = schema.additionalProperties
 
-        // null, boolean, schema
+        // schema
         if(additional is Schema31) {
             return Schema(additional)
         }
 
-        return null;
+        // null, boolean
+        return null
     }
 
     override fun getItems(): List<OpenApiSchema> {

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/openapi/v32/Schema.kt

@@ -73,15 +73,16 @@ class Schema(val schema: Schema32) : OpenApiSchema {
         return props
     }
 
-    override fun getAdditionalProperties(): Schema? {
+    override fun getAdditionalProperties(): OpenApiSchema? {
         val additional = schema.additionalProperties
 
-        // null, boolean, schema
+        // schema
         if(additional is Schema32) {
             return Schema(additional)
         }
 
-        return null;
+        // null, boolean
+        return null
     }
 
     override fun getItems(): List<OpenApiSchema> {

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/parser/swagger/AdditionalPropertiesSpec.kt

@@ -40,7 +40,8 @@ class AdditionalPropertiesSpec: StringSpec({
         additional.shouldNotBeNull()
     }
 
-    "additionalProperties of boolean object is null  (OpenAPI 3.0)" {
+    // creates empty object
+    "additionalProperties of boolean object is null (OpenAPI 3.0)" {
         val openApi = parseApi( """
            openapi: 3.0.2
            info:

openapi-processor-core/src/testInt/kotlin/io/openapiprocessor/core/ProcessorPendingSpec.kt

@@ -48,7 +48,11 @@ class ProcessorPendingSpec: StringSpec({
 
 private fun sources(): Collection<TestSet> {
     return listOf(
-        testSet("params-request-body-form-urlencoded", "INTERNAL", API_30, model = "model"),
-//        testSet("endpoint-http-mapping-32", "INTERNAL", API_32, model = "record"),
+        testSet("object-without-properties", "INTERNAL", API_30, model = "model"),
+        testSet("object-without-properties", "INTERNAL", API_31, model = "model"),
+        testSet("object-without-properties", "INTERNAL", API_32, model = "model"),
+        testSet("object-without-properties", "INTERNAL", API_30, model = "record"),
+        testSet("object-without-properties", "INTERNAL", API_31, model = "record"),
+        testSet("object-without-properties", "INTERNAL", API_32, model = "record"),
     )
 }

openapi-processor-core/src/testInt/resources/tests/object-without-properties/inputs/openapi30.yaml

@@ -9,15 +9,43 @@ paths:
     get:
       responses:
         '200':
-          description: the foo result
+          description: the foo object result
           content:
             application/json:
                 schema:
                   $ref: '#/components/schemas/Foo'
 
+  /foo-true:
+    get:
+      responses:
+        '200':
+          description: the foo true result
+          content:
+            application/json:
+                schema:
+                  $ref: '#/components/schemas/FooTrue'
+
+  /foo-false:
+    get:
+      responses:
+        '200':
+          description: the foo false result
+          content:
+            application/json:
+                schema:
+                  $ref: '#/components/schemas/FooFalse'
+
 components:
   schemas:
 
     Foo:
       type: object
       additionalProperties: {}
+
+    FooTrue:
+      type: object
+      additionalProperties: true
+
+    FooFalse:
+      type: object
+      additionalProperties: false

openapi-processor-core/src/testInt/resources/tests/object-without-properties/inputs/openapi31.yaml

@@ -9,15 +9,43 @@ paths:
     get:
       responses:
         '200':
-          description: the foo result
+          description: the foo object result
           content:
             application/json:
                 schema:
                   $ref: '#/components/schemas/Foo'
 
+  /foo-true:
+    get:
+      responses:
+        '200':
+          description: the foo true result
+          content:
+            application/json:
+                schema:
+                  $ref: '#/components/schemas/FooTrue'
+
+  /foo-false:
+    get:
+      responses:
+        '200':
+          description: the foo false result
+          content:
+            application/json:
+                schema:
+                  $ref: '#/components/schemas/FooFalse'
+
 components:
   schemas:
 
     Foo:
       type: object
       additionalProperties: {}
+
+    FooTrue:
+      type: object
+      additionalProperties: true
+
+    FooFalse:
+      type: object
+      additionalProperties: false

openapi-processor-core/src/testInt/resources/tests/object-without-properties/inputs/openapi32.yaml

@@ -7,13 +7,42 @@ paths:
     get:
       responses:
         "200":
-          description: the foo result
+          description: the foo object result
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/Foo"
+
+  /foo-true:
+    get:
+      responses:
+        '200':
+          description: the foo true result
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/FooTrue'
+
+  /foo-false:
+    get:
+      responses:
+        '200':
+          description: the foo false result
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/FooFalse'
+
 components:
   schemas:
     Foo:
       type: object
       additionalProperties: {}
+
+    FooTrue:
+      type: object
+      additionalProperties: true
+
+    FooFalse:
+      type: object
+      additionalProperties: false

openapi-processor-core/src/testInt/resources/tests/object-without-properties/outputs.yaml

@@ -2,3 +2,5 @@ prefix: generated
 items:
   - outputs/api/Api.java
   - outputs/model/<model>/Foo.java
+  - outputs/model/<model>/FooFalse.java
+  - outputs/model/<model>/FooTrue.java

openapi-processor-core/src/testInt/resources/tests/object-without-properties/outputs/api/Api.java

@@ -2,6 +2,8 @@
 
 import annotation.Mapping;
 import generated.model.Foo;
+import generated.model.FooFalse;
+import generated.model.FooTrue;
 import generated.support.Generated;
 
 @Generated(value = "openapi-processor-core", version = "test")
@@ -10,4 +12,10 @@ public interface Api {
     @Mapping("/foo")
     Foo getFoo();
 
+    @Mapping("/foo-true")
+    FooTrue getFooTrue();
+
+    @Mapping("/foo-false")
+    FooFalse getFooFalse();
+
 }