Merge pull request #49 from openapi-processor/allof-type-less

handle type less schemas, resolve #48

Author: hauner

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/DataTypeConverter.kt

@@ -18,24 +18,7 @@ package io.openapiprocessor.core.converter
 
 import io.openapiprocessor.core.converter.mapping.*
 import io.openapiprocessor.core.model.DataTypes
-import io.openapiprocessor.core.model.datatypes.ArrayDataType
-import io.openapiprocessor.core.model.datatypes.BooleanDataType
-import io.openapiprocessor.core.model.datatypes.ComposedObjectDataType
-import io.openapiprocessor.core.model.datatypes.DataTypeConstraints
-import io.openapiprocessor.core.model.datatypes.LocalDateDataType
-import io.openapiprocessor.core.model.datatypes.MappedCollectionDataType
-import io.openapiprocessor.core.model.datatypes.MappedDataType
-import io.openapiprocessor.core.model.datatypes.MappedMapDataType
-import io.openapiprocessor.core.model.datatypes.ObjectDataType
-import io.openapiprocessor.core.model.datatypes.DataType
-import io.openapiprocessor.core.model.datatypes.DoubleDataType
-import io.openapiprocessor.core.model.datatypes.FloatDataType
-import io.openapiprocessor.core.model.datatypes.IntegerDataType
-import io.openapiprocessor.core.model.datatypes.LongDataType
-import io.openapiprocessor.core.model.datatypes.OffsetDateTimeDataType
-import io.openapiprocessor.core.model.datatypes.LazyDataType
-import io.openapiprocessor.core.model.datatypes.StringDataType
-import io.openapiprocessor.core.model.datatypes.StringEnumDataType
+import io.openapiprocessor.core.model.datatypes.*
 import java.util.*
 
 /**
@@ -79,8 +62,11 @@ class DataTypeConverter(
         } else if (schemaInfo.isObject ()) {
             result = createObjectDataType (schemaInfo, dataTypes)
 
+        } else if (schemaInfo.isTypeLess()) {
+            result = createNoDataType(schemaInfo, dataTypes)
+
         } else {
-            result = createSimpleDataType (schemaInfo, dataTypes)
+            result = createSimpleDataType(schemaInfo, dataTypes)
         }
 
         pop()
@@ -255,6 +241,19 @@ class DataTypeConverter(
         }
     }
 
+    private fun createNoDataType(schemaInfo: SchemaInfo, dataTypes: DataTypes): DataType {
+        val constraints = DataTypeConstraints(
+            nullable = schemaInfo.getNullable(),
+            required = schemaInfo.getRequired()
+        )
+
+        return NoDataType(
+            schemaInfo.getName(),
+            constraints = constraints,
+            deprecated = schemaInfo.getDeprecated()
+        )
+    }
+
     private fun isSupportedFormat(format: String?): Boolean {
         if(format == null)
             return false

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/SchemaInfo.kt

@@ -274,7 +274,7 @@ class SchemaInfo(
     }
 
     override fun isPrimitive(): Boolean {
-        return listOf("boolean", "int", "number", "string").contains(schema?.getType())
+        return listOf("boolean", "integer", "number", "string").contains(schema?.getType())
     }
 
     override fun isArray(): Boolean {
@@ -289,6 +289,10 @@ class SchemaInfo(
         return schema?.getType().equals("composed")
     }
 
+    fun isTypeLess(): Boolean {
+        return schema?.getType() == null
+    }
+
     fun isRefObject(): Boolean {
         return schema?.getRef() != null
     }

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/model/datatypes/ComposedObjectDataType.kt

@@ -46,6 +46,7 @@ class ComposedObjectDataType(
 
     override fun getReferencedImports(): Set<String> {
         return items
+            .filterIsInstance<ObjectDataType>()
             .map { it.getImports() }
             .flatten()
             .toSet()

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/model/datatypes/NoDataType.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2020 https://github.com/openapi-processor/openapi-processor-core
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.model.datatypes
+
+class NoDataType(
+
+    private val type: String,
+    constraints: DataTypeConstraints? = null,
+    deprecated: Boolean = false
+
+): DataTypeBase(constraints, deprecated) {
+
+    override fun getName(): String {
+        return type
+    }
+
+    override fun getPackageName(): String {
+        return "io.openapiprocessor.leaked"
+    }
+
+}
+
+

openapi-processor-core/src/testInt/groovy/com/github/hauner/openapi/processor/core/ProcessorPendingTest.groovy

@@ -25,15 +25,15 @@ import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 import spock.lang.Ignore
 
-@Ignore
+//@Ignore
 @RunWith(Parameterized)
 class ProcessorPendingTest extends ProcessorTestBase {
 
     @Parameterized.Parameters(name = "{0}")
     static Collection<TestSet> sources () {
         return [
-            new TestSet(name: 'schema-composed-allof', processor: new TestProcessor(), parser: ParserType.SWAGGER),
-            new TestSet(name: 'schema-composed-allof', processor: new TestProcessor(), parser: ParserType.OPENAPI4J)
+            new TestSet(name: 'schema-composed-allof-notype', processor: new TestProcessor(), parser: ParserType.SWAGGER),
+            new TestSet(name: 'schema-composed-allof-notype', processor: new TestProcessor(), parser: ParserType.OPENAPI4J)
         ]
     }
 

openapi-processor-core/src/testInt/resources/tests/schema-composed-allof-notype/generated.yaml

@@ -0,0 +1,5 @@
+items:
+  - generated/api/Api.java
+  - generated/model/Foo.java
+  - generated/model/AllOfNoTypeResponse200.java
+  - generated/model/AllOfNoTypeResponse200Foo.java

openapi-processor-core/src/testInt/resources/tests/schema-composed-allof-notype/generated/api/Api.java

@@ -0,0 +1,16 @@
+/*
+ * This class is auto generated by https://github.com/hauner/openapi-processor-core.
+ * TEST ONLY.
+ */
+
+package generated.api;
+
+import annotation.Mapping;
+import generated.model.AllOfNoTypeResponse200;
+
+public interface Api {
+
+    @Mapping("/all-of-no-type")
+    AllOfNoTypeResponse200 getAllOfNoType();
+
+}

openapi-processor-core/src/testInt/resources/tests/schema-composed-allof-notype/generated/model/AllOfNoTypeResponse200.java

@@ -0,0 +1,23 @@
+/*
+ * This class is auto generated by https://github.com/hauner/openapi-processor-core.
+ * TEST ONLY.
+ */
+
+package generated.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class AllOfNoTypeResponse200 {
+
+    @JsonProperty("foo")
+    private AllOfNoTypeResponse200Foo foo;
+
+    public AllOfNoTypeResponse200Foo getFoo() {
+        return foo;
+    }
+
+    public void setFoo(AllOfNoTypeResponse200Foo foo) {
+        this.foo = foo;
+    }
+
+}

openapi-processor-core/src/testInt/resources/tests/schema-composed-allof-notype/generated/model/AllOfNoTypeResponse200Foo.java

@@ -0,0 +1,23 @@
+/*
+ * This class is auto generated by https://github.com/hauner/openapi-processor-core.
+ * TEST ONLY.
+ */
+
+package generated.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class AllOfNoTypeResponse200Foo {
+
+    @JsonProperty("foo")
+    private String foo;
+
+    public String getFoo() {
+        return foo;
+    }
+
+    public void setFoo(String foo) {
+        this.foo = foo;
+    }
+
+}

openapi-processor-core/src/testInt/resources/tests/schema-composed-allof-notype/generated/model/Foo.java

@@ -0,0 +1,23 @@
+/*
+ * This class is auto generated by https://github.com/hauner/openapi-processor-core.
+ * TEST ONLY.
+ */
+
+package generated.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class Foo {
+
+    @JsonProperty("foo")
+    private String foo;
+
+    public String getFoo() {
+        return foo;
+    }
+
+    public void setFoo(String foo) {
+        this.foo = foo;
+    }
+
+}