Skip to content

Fix crash issue on windows #6011

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

Merged
wing328 merged 1 commit into from
Apr 23, 2020
Merged

Fix crash issue on windows #6011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
protected String licenseUrl = "http://unlicense.org";
protected String projectFolder = "src/main";
protected String projectTestFolder = "src/test";
protected String sourceFolder = projectFolder + "/java";
protected String sourceFolder = projectFolder + File.separator +"java";
protected String testFolder = projectTestFolder + "/java";
protected boolean fullJavaUtil;
protected boolean discriminatorCaseSensitive = true; // True if the discriminator value lookup should be case-sensitive.
Expand Down
2 changes: 1 addition & 1 deletion ...enapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public GroovyClientCodegen() {
languageSpecificPrimitives.add("File");
languageSpecificPrimitives.add("Map");

sourceFolder = projectFolder + "/groovy";
sourceFolder = projectFolder + File.separator +"groovy";
outputFolder = "generated-code/groovy";
modelTemplateFiles.put("model.mustache", ".groovy");
apiTemplateFiles.put("api.mustache", ".groovy");
Expand Down
2 changes: 1 addition & 1 deletion ...napi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public JavaCXFClientCodegen() {

supportsInheritance = true;

sourceFolder = "src/gen/java";
sourceFolder = "src"+ File.separator +"gen"+ File.separator +"java";
invokerPackage = "org.openapitools.api";
artifactId = "openapi-jaxrs-client";
dateLibrary = "legacy"; //TODO: add joda support to all jax-rs
Expand Down
3 changes: 2 additions & 1 deletion ...enerator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.util.*;

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

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

sourceFolder = "src/gen/java";
sourceFolder = "src"+ File.separator+"gen"+ File.separator +"java";
apiTestTemplateFiles.clear(); // TODO: add test template
embeddedTemplateDir = templateDir = "JavaInflector";
invokerPackage = "org.openapitools.controllers";
Expand Down