Skip to content

Commit febaf7d

Browse files
chenqpingmichaelpro1
authored andcommitted
fix generate java-inflector crash issue on windows (OpenAPITools#6011)
1 parent 9b361c5 commit febaf7d

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
8282
protected String licenseUrl = "http://unlicense.org";
8383
protected String projectFolder = "src/main";
8484
protected String projectTestFolder = "src/test";
85-
protected String sourceFolder = projectFolder + "/java";
85+
protected String sourceFolder = projectFolder + File.separator +"java";
8686
protected String testFolder = projectTestFolder + "/java";
8787
protected boolean fullJavaUtil;
8888
protected boolean discriminatorCaseSensitive = true; // True if the discriminator value lookup should be case-sensitive.

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public GroovyClientCodegen() {
6060
languageSpecificPrimitives.add("File");
6161
languageSpecificPrimitives.add("Map");
6262

63-
sourceFolder = projectFolder + "/groovy";
63+
sourceFolder = projectFolder + File.separator +"groovy";
6464
outputFolder = "generated-code/groovy";
6565
modelTemplateFiles.put("model.mustache", ".groovy");
6666
apiTemplateFiles.put("api.mustache", ".groovy");

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public JavaCXFClientCodegen() {
5454

5555
supportsInheritance = true;
5656

57-
sourceFolder = "src/gen/java";
57+
sourceFolder = "src"+ File.separator +"gen"+ File.separator +"java";
5858
invokerPackage = "org.openapitools.api";
5959
artifactId = "openapi-jaxrs-client";
6060
dateLibrary = "legacy"; //TODO: add joda support to all jax-rs

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.slf4j.Logger;
2727
import org.slf4j.LoggerFactory;
2828

29+
import java.io.File;
2930
import java.util.*;
3031

3132
import static org.openapitools.codegen.utils.StringUtils.camelize;
@@ -43,7 +44,7 @@ public JavaInflectorServerCodegen() {
4344

4445
modifyFeatureSet(features -> features.includeDocumentationFeatures(DocumentationFeature.Readme));
4546

46-
sourceFolder = "src/gen/java";
47+
sourceFolder = "src"+ File.separator+"gen"+ File.separator +"java";
4748
apiTestTemplateFiles.clear(); // TODO: add test template
4849
embeddedTemplateDir = templateDir = "JavaInflector";
4950
invokerPackage = "org.openapitools.controllers";

0 commit comments

Comments
 (0)