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

fix generate java-inflector crash issue on windows (#6011)

Browse Source
This commit is contained in:
chenqping 2020-04-23 13:31:42 +08:00 committed by GitHub
parent 00ffcea6ef
commit 140f823465
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
protected String licenseUrl = "http://unlicense.org"; protected String licenseUrl = "http://unlicense.org";
protected String projectFolder = "src/main"; protected String projectFolder = "src/main";
protected String projectTestFolder = "src/test"; protected String projectTestFolder = "src/test";
protected String sourceFolder = projectFolder + "/java"; protected String sourceFolder = projectFolder + File.separator +"java";
protected String testFolder = projectTestFolder + "/java"; protected String testFolder = projectTestFolder + "/java";
protected boolean fullJavaUtil; protected boolean fullJavaUtil;
protected boolean discriminatorCaseSensitive = true; // True if the discriminator value lookup should be case-sensitive. protected boolean discriminatorCaseSensitive = true; // True if the discriminator value lookup should be case-sensitive.

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

@ -60,7 +60,7 @@ public class GroovyClientCodegen extends AbstractJavaCodegen {
languageSpecificPrimitives.add("File"); languageSpecificPrimitives.add("File");
languageSpecificPrimitives.add("Map"); languageSpecificPrimitives.add("Map");
sourceFolder = projectFolder + "/groovy"; sourceFolder = projectFolder + File.separator +"groovy";
outputFolder = "generated-code/groovy"; outputFolder = "generated-code/groovy";
modelTemplateFiles.put("model.mustache", ".groovy"); modelTemplateFiles.put("model.mustache", ".groovy");
apiTemplateFiles.put("api.mustache", ".groovy"); apiTemplateFiles.put("api.mustache", ".groovy");

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

@ -54,7 +54,7 @@ public class JavaCXFClientCodegen extends AbstractJavaCodegen
supportsInheritance = true; supportsInheritance = true;
sourceFolder = "src/gen/java"; sourceFolder = "src"+ File.separator +"gen"+ File.separator +"java";
invokerPackage = "org.openapitools.api"; invokerPackage = "org.openapitools.api";
artifactId = "openapi-jaxrs-client"; artifactId = "openapi-jaxrs-client";
dateLibrary = "legacy"; //TODO: add joda support to all jax-rs dateLibrary = "legacy"; //TODO: add joda support to all jax-rs

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

@ -26,6 +26,7 @@ import org.openapitools.codegen.meta.features.DocumentationFeature;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.*; import java.util.*;
import static org.openapitools.codegen.utils.StringUtils.camelize; import static org.openapitools.codegen.utils.StringUtils.camelize;
@ -43,7 +44,7 @@ public class JavaInflectorServerCodegen extends AbstractJavaCodegen {
modifyFeatureSet(features -> features.includeDocumentationFeatures(DocumentationFeature.Readme)); modifyFeatureSet(features -> features.includeDocumentationFeatures(DocumentationFeature.Readme));
sourceFolder = "src/gen/java"; sourceFolder = "src"+ File.separator+"gen"+ File.separator +"java";
apiTestTemplateFiles.clear(); // TODO: add test template apiTestTemplateFiles.clear(); // TODO: add test template
embeddedTemplateDir = templateDir = "JavaInflector"; embeddedTemplateDir = templateDir = "JavaInflector";
invokerPackage = "org.openapitools.controllers"; invokerPackage = "org.openapitools.controllers";