Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Openapi4j #5

Merged
merged 3 commits into from
Jun 13, 2020
Merged

Openapi4j #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5204de6
update openapi4j
hauner Jun 9, 2020
cc83479
run failing test in isolation
hauner Jun 9, 2020
68c08de
fixed flattening of ref schema
hauner Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/com/github/hauner/openapi/core/parser/openapi4j/RefResolver.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/testInt/groovy/com/github/hauner/openapi/processor/core/ProcessorPendingTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
]
}

Expand Down