Merge pull request #5 from hauner/openapi4j

resolves #4
openapi-processor · Jun 13, 2020 · 57b3bd7 · 57b3bd7
2 parents 2115cdd + 68c08de
commit 57b3bd7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -75,7 +75,7 @@ dependencies {
 
     compileOnly "com.github.hauner.openapi:openapi-processor-api:$processorApiVersion"
 
-    implementation 'org.openapi4j:openapi-parser:0.9'
+    implementation 'org.openapi4j:openapi-parser:1.0'
     implementation ('io.swagger.parser.v3:swagger-parser:2.0.20') {
         exclude group: 'io.swagger.parser.v3', module: 'swagger-parser-v2-converter'
         exclude group: 'io.swagger.core.v3', module: 'swagger-annotations'

diff --git a/src/main/groovy/com/github/hauner/openapi/core/parser/openapi4j/RefResolver.groovy b/src/main/groovy/com/github/hauner/openapi/core/parser/openapi4j/RefResolver.groovy
@@ -44,7 +44,7 @@ class RefResolver implements ParserRefResolver {
             resolved = o4jCompSchema
         } else {
             O4jSchema o4jSchema = (ref as Schema).schema
-            resolved = o4jSchema.copy (api.context, true)
+            resolved = o4jSchema.getReference(api.getContext()).getMappedContent(O4jSchema)
         }
 
         new Schema (resolved)

diff --git a/src/testInt/groovy/com/github/hauner/openapi/processor/core/ProcessorPendingTest.groovy b/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: 'params-simple-data-types-micronaut', processor: new TestProcessor(), parser: ParserType.SWAGGER),
-            new TestSet(name: 'params-simple-data-types-micronaut', processor: new TestProcessor(), parser: ParserType.OPENAPI4J)
+//            new TestSet(name: 'ref-into-another-file', processor: new TestProcessor(), parser: ParserType.SWAGGER),
+            new TestSet(name: 'ref-into-another-file', processor: new TestProcessor(), parser: ParserType.OPENAPI4J),
         ]
     }