[cayenne] branch master updated: CAY-2727 Modeler cgen destDir Unix platform path separator

[ntimofeev]

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new 13501cf  CAY-2727 Modeler cgen destDir Unix platform path separator
     new 4ae3756  Merge pull request #482 from 
Ivan-nikitko/CAY-2727_Modeler_cgen_testDir_platform_path_separator_
13501cf is described below

commit 13501cf6c5628386f6265890e46b4dac8b2018a5
Author: ivannikitka <nikitko.i...@gmail.com>
AuthorDate: Mon Jan 24 14:39:43 2022 +0300

    CAY-2727 Modeler cgen destDir Unix platform path separator
---
 .../org/apache/cayenne/gen/CgenConfiguration.java  | 23 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git 
a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java 
b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
index 7889325..76bad4a 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
@@ -414,20 +414,20 @@ public class CgenConfiguration implements Serializable, 
XMLSerializable {
                 .attribute("xmlns", CgenExtension.NAMESPACE)
                 .simpleTag("excludeEntities", getExcludeEntites())
                 .simpleTag("excludeEmbeddables", getExcludeEmbeddables())
-                .simpleTag("destDir", buildRelPath())
+                .simpleTag("destDir", separatorsToUnix(buildRelPath()))
                 .simpleTag("mode", this.artifactsGenerationMode.getLabel())
-                .simpleTag("template", this.template)
-                .simpleTag("superTemplate", this.superTemplate)
-                .simpleTag("embeddableTemplate", this.embeddableTemplate)
-                .simpleTag("embeddableSuperTemplate", 
this.embeddableSuperTemplate)
-                .simpleTag("queryTemplate", this.queryTemplate)
-                .simpleTag("querySuperTemplate", this.querySuperTemplate)
+                .simpleTag("template", separatorsToUnix(this.template))
+                .simpleTag("superTemplate", 
separatorsToUnix(this.superTemplate))
+                .simpleTag("embeddableTemplate", 
separatorsToUnix(this.embeddableTemplate))
+                .simpleTag("embeddableSuperTemplate", 
separatorsToUnix(this.embeddableSuperTemplate))
+                .simpleTag("queryTemplate", 
separatorsToUnix(this.queryTemplate))
+                .simpleTag("querySuperTemplate", 
separatorsToUnix(this.querySuperTemplate))
                 .simpleTag("outputPattern", this.outputPattern)
                 .simpleTag("makePairs", Boolean.toString(this.makePairs))
                 .simpleTag("usePkgPath", Boolean.toString(this.usePkgPath))
                 .simpleTag("overwrite", Boolean.toString(this.overwrite))
                 .simpleTag("createPropertyNames", 
Boolean.toString(this.createPropertyNames))
-                .simpleTag("superPkg", this.superPkg)
+                .simpleTag("superPkg", separatorsToUnix(this.superPkg))
                 .simpleTag("createPKProperties", 
Boolean.toString(this.createPKProperties))
                 .simpleTag("client", Boolean.toString(client))
                 .simpleTag("externalToolConfig", this.externalToolConfig)
@@ -454,4 +454,11 @@ public class CgenConfiguration implements Serializable, 
XMLSerializable {
                 && (externalToolConfig == null
                 || externalToolConfig.isEmpty());
     }
+
+    private String separatorsToUnix (String path){
+        if (path!=null) {
+            return path.replace('\\', '/');
+        }
+        return null;
+    }
 }