resolve parameter $ref

Author: hauner

src/main/kotlin/io/openapiprocessor/core/parser/openapi4j/OpenApi.kt

@@ -43,7 +43,7 @@ class OpenApi(
                 path = refResolver.resolve(path)
             }
 
-            paths[name] = Path(name, path)
+            paths[name] = Path(name, path, refResolver)
         }
 
         return paths

src/main/kotlin/io/openapiprocessor/core/parser/openapi4j/Operation.kt

@@ -30,7 +30,11 @@ import org.openapi4j.parser.model.v3.Response as O4jResponse
  *
  * @author Martin Hauner
  */
-class Operation(private val method: HttpMethod, private val operation: O4jOperation): ParserOperation {
+class Operation(
+    private val method: HttpMethod,
+    private val operation: O4jOperation,
+    private val refResolver: RefResolverNative
+): ParserOperation {
 
     override fun getMethod(): HttpMethod = method
 
@@ -42,7 +46,12 @@ class Operation(private val method: HttpMethod, private val operation: O4jOperat
         val parameters = mutableListOf<ParserParameter>()
 
         operation.parameters?.map { p: O4jParameter ->
-            parameters.add(Parameter(p))
+            var param = p
+            if(p.isRef) {
+                param = refResolver.resolve(p)
+            }
+
+            parameters.add(Parameter(param))
         }
 
         return parameters

src/main/kotlin/io/openapiprocessor/core/parser/openapi4j/Path.kt

@@ -26,7 +26,11 @@ import org.openapi4j.parser.model.v3.Path as Oa4jPath
  *
  * @author Martin Hauner
  */
-class Path(private val path: String, private val info: Oa4jPath): ParserPath {
+class Path(
+    private val path: String,
+    private val info: Oa4jPath,
+    private val refResolver: RefResolverNative
+): ParserPath {
 
     override fun getPath(): String = path
 
@@ -36,7 +40,7 @@ class Path(private val path: String, private val info: Oa4jPath): ParserPath {
         HttpMethod.values().map {
             val op = info.getOperation(it.method)
             if (op != null) {
-                ops.add (Operation(it, op))
+                ops.add (Operation(it, op, refResolver))
             }
         }
 

src/main/kotlin/io/openapiprocessor/core/parser/openapi4j/RefResolverNative.kt

@@ -7,14 +7,19 @@ package io.openapiprocessor.core.parser.openapi4j
 
 import org.openapi4j.parser.model.v3.OpenApi3
 import org.openapi4j.parser.model.v3.Path as O4jPath
+import org.openapi4j.parser.model.v3.Parameter as O4jParameter
 
 /**
- * openapi4j $ref resolver on o4j types.
+ * openapi4j $ref resolver on o4j types. Resolves non-schema $ref's.
  */
 class RefResolverNative(private val api: OpenApi3) {
 
     fun resolve(path: O4jPath): O4jPath {
         return path.getReference(api.context).getMappedContent(O4jPath::class.java)
     }
 
+    fun resolve(param: O4jParameter): O4jParameter {
+        return param.getReference(api.context).getMappedContent(O4jParameter::class.java)
+    }
+
 }

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

@@ -32,7 +32,8 @@ class ProcessorEndToEndTest extends ProcessorTestBase {
 
     static def testSets = TestSet.ALL + [
         'deprecated',
-        'ref-into-another-file-path'
+        'ref-into-another-file-path',
+        'ref-parameter'
     ]
 
     @Parameterized.Parameters(name = "{0}")

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

@@ -23,16 +23,17 @@ import com.github.hauner.openapi.test.TestSet
 import org.junit.Test
 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: 'ref-array-items-nested', processor: new TestProcessor(), parser: ParserType.OPENAPI4J),
-            new TestSet(name: 'ref-array-items-nested', processor: new TestProcessor(), parser: ParserType.SWAGGER)
+            new TestSet(name: 'ref-parameter', processor: new TestProcessor(), parser: ParserType.OPENAPI4J),
+            new TestSet(name: 'ref-parameter', processor: new TestProcessor(), parser: ParserType.SWAGGER)
         ]
     }