Merge pull request #32 from openapi-processor/ref-loop-array

fix null pointer with array items ref loop

Author: hauner

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

@@ -360,7 +360,9 @@ class DataTypeConverter(
      */
     private fun isLoop(info: SchemaInfo): Boolean {
         val found = current.find {
-            it.getName() == info.getName()
+            // $ref and non-ref SchemaInfo have the same name.
+            // We are only interested if we have seen a non-ref!
+            it.getName() == info.getName() && !it.isRefObject()
         }
         return found != null
     }

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

@@ -255,13 +255,18 @@ class SchemaInfo(
      * @return a new {@link SchemaInfo}
      */
     fun buildForItem(): SchemaInfo {
+        val name = if (schema?.getItem()?.getRef() != null) {
+            getRefName(schema.getItem())
+        } else {
+            schema?.getItem()?.getType()
+        }
+
         return SchemaInfo(
             path = path,
-            name = schema?.getItem()?.getRef() ?: schema?.getItem()?.getType()!!,
+            name = name!!,
             schema = schema?.getItem(),
             resolver = resolver
         )
-
     }
 
     override fun isPrimitive(): Boolean {

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

@@ -34,6 +34,7 @@ class ProcessorEndToEndTest extends ProcessorTestBase {
         'deprecated',
         'ref-into-another-file-path',
         'ref-is-relative-to-current-file',
+        'ref-loop-array',
         'ref-parameter',
         'ref-parameter-with-primitive-mapping',
         'response-content-multiple-no-content'

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

@@ -32,8 +32,8 @@ class ProcessorPendingTest extends ProcessorTestBase {
     @Parameterized.Parameters(name = "{0}")
     static Collection<TestSet> sources () {
         return [
-            new TestSet(name: 'response-content-multiple-no-content', processor: new TestProcessor(), parser: ParserType.SWAGGER),
-            new TestSet(name: 'response-content-multiple-no-content', processor: new TestProcessor(), parser: ParserType.OPENAPI4J)
+            new TestSet(name: 'ref-loop-array', processor: new TestProcessor(), parser: ParserType.SWAGGER),
+            new TestSet(name: 'ref-loop-array', processor: new TestProcessor(), parser: ParserType.OPENAPI4J)
         ]
     }
 

openapi-processor-core/src/testInt/resources/tests/ref-loop-array/generated.yaml

@@ -0,0 +1,4 @@
+items:
+  - generated/api/Api.java
+  - generated/model/Foo.java
+  - generated/model/Foos.java

openapi-processor-core/src/testInt/resources/tests/ref-loop-array/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.Foo;
+
+public interface Api {
+
+    @Mapping("/response-ref")
+    Foo[] getResponseRef();
+
+}

openapi-processor-core/src/testInt/resources/tests/ref-loop-array/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("foos")
+    private Foos foos;
+
+    public Foos getFoos() {
+        return foos;
+    }
+
+    public void setFoos(Foos foos) {
+        this.foos = foos;
+    }
+
+}

openapi-processor-core/src/testInt/resources/tests/ref-loop-array/generated/model/Foos.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 Foos {
+
+    @JsonProperty("items")
+    private Foo[] items;
+
+    public Foo[] getItems() {
+        return items;
+    }
+
+    public void setItems(Foo[] items) {
+        this.items = items;
+    }
+
+}

openapi-processor-core/src/testInt/resources/tests/ref-loop-array/inputs.yaml

@@ -0,0 +1,3 @@
+items:
+  - inputs/openapi.yaml
+

openapi-processor-core/src/testInt/resources/tests/ref-loop-array/inputs/openapi.yaml

@@ -0,0 +1,75 @@
+openapi: 3.0.2
+info:
+  title: test array item $ref loop
+  version: 1.0.0
+
+paths:
+  /response-ref:
+    get:
+      responses:
+        200:
+          description: array item $ref
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Foo'
+
+components:
+  schemas:
+    Foo:
+      type: object
+      properties:
+        foos:
+          $ref: '#/components/schemas/Foos'
+
+    Foos:
+      type: object
+      properties:
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Foo'
+
+#   Response
+#     todoItems: TodoItem[]
+#
+#   TodoItem {
+#     todoList: TodoList
+#   }
+#
+#   TodoList {
+#     todoItems: TodoItem[]
+#   }
+
+#   ItemsResponse200 array
+#     #/components/schemas/TodoItemResource $ref
+#       TodoItemResource object
+#         TodoItemResourceTodoList $ref
+#           TodoListResource object
+#             TodoListResourceTodoItem array
+#               #/components/schemas/TodoItemResource lazy
+#
+#           TodoListResource => dataTypes
+#
+#       TodoItemResource => dataTypes
+#
+#
+#   ItemsResponse200 array
+#     TodoItemResource $ref
+#       TodoItemResource lazy
+
+
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#