loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-08 16:40:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #2737 creates (empty) directories if contained files are ignored (#14433)

Browse Source
This commit is contained in:
Henry Megarry 2023-02-02 20:01:28 -06:00 committed by GitHub
parent a94ad37738
commit 626cd8c0cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
View File

@ -727,15 +727,18 @@ public class DefaultGenerator implements Generator {
outputFolder += File.separator + support.getFolder();
}
File of = new File(outputFolder);
if (!of.isDirectory()) {
if (!dryRun && !of.mkdirs()) {
once(LOGGER).debug("Output directory {} not created. It {}.", outputFolder, of.exists() ? "already exists." : "may not have appropriate permissions.");
}
}
String outputFilename = new File(support.getDestinationFilename()).isAbsolute() // split
? support.getDestinationFilename()
: outputFolder + File.separator + support.getDestinationFilename().replace('/', File.separatorChar);
if (!of.isDirectory()) {
// check that its not a dryrun and the files in the directory aren't ignored before we make the directory
if (!dryRun && ignoreProcessor.allowsFile(new File(outputFilename)) && !of.mkdirs()) {
once(LOGGER).debug("Output directory {} not created. It {}.", outputFolder, of.exists() ? "already exists." : "may not have appropriate permissions.");
}
}
boolean shouldGenerate = true;
if (supportingFilesToGenerate != null && !supportingFilesToGenerate.isEmpty()) {
shouldGenerate = supportingFilesToGenerate.contains(support.getDestinationFilename());

11
modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java
View File

@ -39,6 +39,8 @@ public class DefaultGeneratorTest {
"build.sbt",
"src/main/AndroidManifest.xml",
"pom.xml",
".github/**",
"api/**.yaml",
"src/test/**",
"src/main/java/org/openapitools/client/api/UserApi.java"
);
@ -66,7 +68,7 @@ public class DefaultGeneratorTest {
List<File> files = generator.opts(clientOptInput).generate();
Assert.assertEquals(files.size(), 44);
Assert.assertEquals(files.size(), 42);
// Check expected generated files
// api sanity check
@ -84,8 +86,11 @@ public class DefaultGeneratorTest {
TestUtils.ensureContainsFile(files, output, "build.gradle");
Assert.assertTrue(new File(output, "build.gradle").exists());
TestUtils.ensureContainsFile(files, output, "api/openapi.yaml");
Assert.assertTrue(new File(output, "build.gradle").exists());
TestUtils.ensureDoesNotContainsFile(files, output, "api/openapi.yaml");
Assert.assertFalse(new File(output, "api").exists());
TestUtils.ensureDoesNotContainsFile(files, output, ".github/workflows/");
Assert.assertFalse(new File(output, ".github").exists());
// Check excluded files
TestUtils.ensureDoesNotContainsFile(files, output, ".travis.yml");