-
Notifications
You must be signed in to change notification settings - Fork 91
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.
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
Add validation when the input-base-dir is not present #928
Open
mcruzdev
wants to merge
1
commit into
quarkiverse:main
Choose a base branch
from
mcruzdev:issue-871
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -46,16 +46,20 @@ private Path getInputBaseDir(final Path sourceDir, final Config config) { | |||||
|
||||||
@Override | ||||||
public boolean shouldRun(Path sourceDir, Config config) { | ||||||
if (config.getOptionalValue(CodegenConfig.getSpecPropertyName(), String.class).isEmpty()) { | ||||||
return false; | ||||||
boolean specIsPresent = config.getOptionalValue(CodegenConfig.getSpecPropertyName(), String.class).isPresent(); | ||||||
if (!specIsPresent) { | ||||||
log.warn("The {} property is not present, the code generation will be ignored", | ||||||
CodegenConfig.getSpecPropertyName()); | ||||||
} | ||||||
Path path = getInputBaseDir(sourceDir, config); | ||||||
return Files.isDirectory(path); | ||||||
return specIsPresent; | ||||||
} | ||||||
|
||||||
@Override | ||||||
public boolean trigger(CodeGenContext context) throws CodeGenException { | ||||||
final Path openApiDir = getInputBaseDir(context.inputDir(), context.config()); | ||||||
|
||||||
validateOpenApiDir(context, openApiDir); | ||||||
|
||||||
final Path outDir = context.outDir(); | ||||||
final ApicurioCodegenWrapper apicurioCodegenWrapper = new ApicurioCodegenWrapper( | ||||||
context.config(), outDir.toFile()); | ||||||
|
@@ -92,6 +96,19 @@ public boolean trigger(CodeGenContext context) throws CodeGenException { | |||||
return true; | ||||||
} | ||||||
|
||||||
private static void validateOpenApiDir(CodeGenContext context, Path openApiDir) throws CodeGenException { | ||||||
if (!Files.exists(openApiDir)) { | ||||||
throw new CodeGenException( | ||||||
"The OpenAPI input base directory does not exist, please, create the directory on " + context.inputDir()); | ||||||
} | ||||||
|
||||||
if (!Files.isDirectory(openApiDir)) { | ||||||
throw new CodeGenException( | ||||||
"The OpenAPI input base directory is not a directory, please, create the directory on " | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
+ context.inputDir()); | ||||||
} | ||||||
} | ||||||
|
||||||
private File convertToJSON(Path yamlPath) throws CodeGenException { | ||||||
try { | ||||||
ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory()); | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -9,6 +9,7 @@ | |||||
|
||||||
import org.apache.commons.io.FileUtils; | ||||||
import org.eclipse.microprofile.config.Config; | ||||||
import org.junit.jupiter.api.Assertions; | ||||||
import org.junit.jupiter.api.BeforeAll; | ||||||
import org.junit.jupiter.api.Test; | ||||||
|
||||||
|
@@ -60,4 +61,14 @@ public void testInputDir() throws CodeGenException { | |||||
Path.of("target/generated-test-sources/inputDir/io/petstore/PetResource.java"))); | ||||||
} | ||||||
|
||||||
@Test | ||||||
public void shouldGenerateAnErrorWhenInputDirIsNotExist() throws CodeGenException { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
Config config = MockConfigUtils.getTestConfig("doesNotExistDir.application.properties"); | ||||||
CodeGenContext codeGenContext = new CodeGenContext(null, Path.of(OUT_DIR, "inputDir"), WORK_DIR, | ||||||
INPUT_DIR, false, config, true); | ||||||
ApicurioOpenApiServerCodegen apicurioOpenApiServerCodegen = new ApicurioOpenApiServerCodegen(); | ||||||
|
||||||
Assertions.assertThrows(CodeGenException.class, () -> apicurioOpenApiServerCodegen.trigger(codeGenContext)); | ||||||
} | ||||||
|
||||||
} |
2 changes: 2 additions & 0 deletions
2
...io/quarkiverse/openapi/server/generator/deployment/doesNotExistDir.application.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
quarkus.openapi.generator.spec=petstore-openapi-2.json | ||
quarkus.openapi.generator.base-package=io.petstore |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.