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

[cli][gradle] Validate now uses parseOptions w/setResolve #5471

Merged
merged 2 commits into from
Mar 1, 2020
Merged

[cli][gradle] Validate now uses parseOptions w/setResolve #5471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
377927f
[cli] Validate now uses parseOptions w/setResolve
jimschubert Feb 28, 2020
32a4685
[gradle] Validate now uses parseOptions w/setResolve
jimschubert Feb 28, 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
6 changes: 4 additions & 2 deletions modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Validate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.core.models.SwaggerParseResult;
import org.apache.commons.lang3.text.WordUtils;
import org.openapitools.codegen.validation.ValidationResult;
Expand All @@ -45,8 +46,9 @@ public class Validate implements Runnable {
@Override
public void run() {
System.out.println("Validating spec (" + spec + ")");

SwaggerParseResult result = new OpenAPIParser().readLocation(spec, null, null);
ParseOptions options = new ParseOptions();
options.setResolve(true);
SwaggerParseResult result = new OpenAPIParser().readLocation(spec, null, options);
List<String> messageList = result.getMessages();
Set<String> errors = new HashSet<>(messageList);
Set<String> warnings = new HashSet<>();
Expand Down
9 changes: 7 additions & 2 deletions ...dle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/ValidateTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@
package org.openapitools.generator.gradle.plugin.tasks

import io.swagger.parser.OpenAPIParser
import io.swagger.v3.parser.core.models.ParseOptions
import org.gradle.api.DefaultTask
import org.gradle.api.GradleException
import org.gradle.api.logging.Logging
import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.TaskAction
import org.gradle.api.tasks.options.Option
import org.gradle.api.logging.Logging
import org.gradle.internal.logging.text.StyledTextOutput
import org.gradle.internal.logging.text.StyledTextOutputFactory
import org.gradle.kotlin.dsl.property
Expand Down Expand Up @@ -71,7 +72,11 @@ open class ValidateTask : DefaultTask() {
val recommendations = recommend.get()

logger.quiet("Validating spec $spec")
val result = OpenAPIParser().readLocation(spec, null, null)

val options = ParseOptions()
options.isResolve = true

val result = OpenAPIParser().readLocation(spec, null, options)
val messages = result.messages.toSet()
val out = services.get(StyledTextOutputFactory::class.java).create("openapi")

Expand Down