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.

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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 "
+ context.inputDir());
}
}

private File convertToJSON(Path yamlPath) throws CodeGenException {
try {
ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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 {
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));
}

}
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
Loading