loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fixed additional property omitGradleWrapper for kotlin generator (#15584)

Browse Source
This commit is contained in:
Stefan Koppier 2023-05-20 17:29:24 +02:00 committed by GitHub
parent e7039f434e
commit 08bb0f42fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java
View File

@ -99,10 +99,11 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
protected boolean doNotUseRxAndCoroutines = true; protected boolean doNotUseRxAndCoroutines = true;
protected boolean generateRoomModels = false; protected boolean generateRoomModels = false;
protected String roomModelPackage = ""; protected String roomModelPackage = "";
protected boolean omitGradleWrapper = false;
protected String authFolder; protected String authFolder;
public enum DateLibrary { public enum DateLibrary {
STRING("string"), STRING("string"),
THREETENBP("threetenbp"), THREETENBP("threetenbp"),
@ -265,6 +266,10 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
return generateRoomModels; return generateRoomModels;
} }
public boolean getOmitGradleWrapper() {
return omitGradleWrapper;
}
public void setGenerateRoomModels(Boolean generateRoomModels) { public void setGenerateRoomModels(Boolean generateRoomModels) {
this.generateRoomModels = generateRoomModels; this.generateRoomModels = generateRoomModels;
} }
@ -336,6 +341,10 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
this.roomModelPackage = roomModelPackage; this.roomModelPackage = roomModelPackage;
} }
public void setOmitGradleWrapper(boolean omitGradleWrapper) {
this.omitGradleWrapper = omitGradleWrapper;
}
@Override @Override
public String modelFilename(String templateName, String modelName) { public String modelFilename(String templateName, String modelName) {
String suffix = modelTemplateFiles().get(templateName); String suffix = modelTemplateFiles().get(templateName);
@ -426,6 +435,10 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
setRequestDateConverter(additionalProperties.get(REQUEST_DATE_CONVERTER).toString()); setRequestDateConverter(additionalProperties.get(REQUEST_DATE_CONVERTER).toString());
} }
if (additionalProperties.containsKey(OMIT_GRADLE_WRAPPER)) {
setOmitGradleWrapper(Boolean.parseBoolean(additionalProperties.get(OMIT_GRADLE_WRAPPER).toString()));
}
commonSupportingFiles(); commonSupportingFiles();
switch (getLibrary()) { switch (getLibrary()) {
@ -787,11 +800,13 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
} }
// gradle wrapper supporting files // gradle wrapper supporting files
if (!getOmitGradleWrapper()) {
supportingFiles.add(new SupportingFile("gradlew.mustache", "", "gradlew")); supportingFiles.add(new SupportingFile("gradlew.mustache", "", "gradlew"));
supportingFiles.add(new SupportingFile("gradlew.bat.mustache", "", "gradlew.bat")); supportingFiles.add(new SupportingFile("gradlew.bat.mustache", "", "gradlew.bat"));
supportingFiles.add(new SupportingFile("gradle-wrapper.properties.mustache", "gradle.wrapper".replace(".", File.separator), "gradle-wrapper.properties")); supportingFiles.add(new SupportingFile("gradle-wrapper.properties.mustache", "gradle.wrapper".replace(".", File.separator), "gradle-wrapper.properties"));
supportingFiles.add(new SupportingFile("gradle-wrapper.jar", "gradle.wrapper".replace(".", File.separator), "gradle-wrapper.jar")); supportingFiles.add(new SupportingFile("gradle-wrapper.jar", "gradle.wrapper".replace(".", File.separator), "gradle-wrapper.jar"));
} }
}
@Override @Override
public ModelsMap postProcessModels(ModelsMap objs) { public ModelsMap postProcessModels(ModelsMap objs) {

21
modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java
View File

@ -384,6 +384,27 @@ public class KotlinClientCodegenModelTest {
); );
} }
@Test
public void testOmitGradleWrapperDoesNotGenerateWrapper() throws IOException {
File output = Files.createTempDirectory("test").toFile();
String path = output.getAbsolutePath();
output.deleteOnExit();
final CodegenConfigurator configurator = new CodegenConfigurator()
.setGeneratorName("kotlin")
.setInputSpec("src/test/resources/3_0/ping.yaml")
.addAdditionalProperty("omitGradleWrapper", true)
.setOutputDir(output.getAbsolutePath().replace("\\", "/"));
DefaultGenerator generator = new DefaultGenerator();
generator.opts(configurator.toClientOptInput()).generate();
TestUtils.assertFileNotExists(Paths.get(path, "gradlew"));
TestUtils.assertFileNotExists(Paths.get(path, "gradlew.bat"));
TestUtils.assertFileNotExists(Paths.get(path, "gradle", "wrapper", "gradle-wrapper.properties"));
TestUtils.assertFileNotExists(Paths.get(path, "gradle", "wrapper", "gradle-wrapper.jar"));
}
private static class ModelNameTest { private static class ModelNameTest {
private final String expectedName; private final String expectedName;
private final String expectedClassName; private final String expectedClassName;