From 158ac6d17829dc6b35e0dfaaf0ff93820e3f41cd Mon Sep 17 00:00:00 2001
From: Vincent Devos <46601673+karismann@users.noreply.github.com>
Date: Fri, 5 Apr 2019 00:22:55 +0200
Subject: [PATCH] [JAVA] remove File.separator use for
 projectFolder/projectTestFolder/sourceFolder/testFolder (#2596)

---
 .../codegen/languages/AbstractJavaCodegen.java            | 8 ++++----
 .../codegen/languages/JavaJAXRSCXFCDIServerCodegen.java   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
index 005e33b7a2c..55ad266f369 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -74,10 +74,10 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
     protected String scmUrl = "https://github.com/openapitools/openapi-generator";
     protected String licenseName = "Unlicense";
     protected String licenseUrl = "http://unlicense.org";
-    protected String projectFolder = "src" + File.separator + "main";
-    protected String projectTestFolder = "src" + File.separator + "test";
-    protected String sourceFolder = projectFolder + File.separator + "java";
-    protected String testFolder = projectTestFolder + File.separator + "java";
+    protected String projectFolder = "src/main";
+    protected String projectTestFolder = "src/test";
+    protected String sourceFolder = projectFolder + "/java";
+    protected String testFolder = projectTestFolder + "/java";
     protected boolean fullJavaUtil;
     protected String javaUtilPrefix = "";
     protected Boolean serializableModel = false;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java
index be828dd0b1c..650eb25eec5 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java
@@ -40,7 +40,7 @@ public class JavaJAXRSCXFCDIServerCodegen extends JavaJAXRSSpecServerCodegen imp
     public JavaJAXRSCXFCDIServerCodegen() {
         outputFolder = "generated-code/JavaJaxRS-CXF-CDI";
         artifactId = "openapi-jaxrs-cxf-cdi-server";
-        sourceFolder = "src" + File.separator + "gen" + File.separator + "java";
+        sourceFolder = "src/gen/java";
         useBeanValidation = true;
 
         // Three API templates to support CDI injection