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

#1434 added repeatable prompt for output path of OpenApi generation #1445

Merged
merged 8 commits into from
Dec 27, 2021
Merged

#1434 added repeatable prompt for output path of OpenApi generation #1445

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bb64c68
#1434 added repeatable prompt for output path of OpenApi generation i…
jan-vcapgemini Dec 15, 2021
0396643
#1434 fixed typo, removed unnecessary toString
jan-vcapgemini Dec 15, 2021
9cf8888
#1434 set picocli version from 4.5.1 to 4.6.2
jan-vcapgemini Dec 16, 2021
242128b
#1434 replaced prompt for output directory with yes/no prompt
jan-vcapgemini Dec 17, 2021
41e859d
Merge branch 'master' into 1434-cli-output-path-check
maybeec Dec 17, 2021
912a79a
#1434 moved yes no prompt logic to new method
jan-vcapgemini Dec 20, 2021
1cdf68f
Merge branch '1434-cli-output-path-check' of https://github.com/jan-v…
jan-vcapgemini Dec 20, 2021
1e08227
#1434 removed cancellation when user provided more than one input file
jan-vcapgemini Dec 22, 2021
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
27 changes: 26 additions & 1 deletion cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/GenerateCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,31 @@ private <T extends GenerableArtifact> Tuple<List<Object>, List<T>> preprocess(Co
boolean isJavaInput = extension.endsWith(".java");
boolean isOpenApiInput = extension.endsWith(".yaml") || extension.endsWith(".yml");

// checks for OpenApi input file, output root path and project root being detectable
if (isOpenApiInput && this.outputRootPath == null
jan-vcapgemini marked this conversation as resolved.
Show resolved Hide resolved
&& MavenUtil.getProjectRoot(inputFile.toPath(), false) == null) {

LOG.info(
"No output directory was found. Please specify an output path or just press enter to generate your files to this directory: {}",
inputFile.getAbsoluteFile().getParent());

String userInput = getUserInput();
jan-vcapgemini marked this conversation as resolved.
Show resolved Hide resolved

File preprocessedFile = Paths.get(userInput).toFile();

if (!userInput.isEmpty()) {
while (!ValidationUtils.isOutputRootPathValid(preprocessedFile)) {
File userFolder = Paths.get(getUserInput()).toFile();
preprocessedFile = preprocessInputFile(userFolder);
}
this.outputRootPath = preprocessedFile;
LOG.info("Your output directory was successfully set to: {}",
Paths.get(this.outputRootPath.getAbsolutePath()).toString());
} else {
setOutputRootPath(inputFile.toPath().toAbsolutePath().getParent());
}
}

try {
Object input = cg.read(inputFile.toPath(), StandardCharsets.UTF_8);
List<T> matching = (List<T>) (isIncrements ? cg.getMatchingIncrements(input) : cg.getMatchingTemplates(input));
Expand Down Expand Up @@ -294,7 +319,7 @@ private void setOutputRootPath(Path inputProject) {
"As you did not specify where the code will be generated, we will use the project of your current Input file.");
LOG.debug("Generating to: {}", inputProject);

this.outputRootPath = inputProject.toFile();
this.outputRootPath = inputProject.toFile().getAbsoluteFile();
jan-vcapgemini marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down