Use canonical path for template dir (#7388)

OpenAPITools · Sep 14, 2020 · 8dd3e56 · 8dd3e56
1 parent 4e05912
commit 8dd3e56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...penapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java b/...penapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java
@@ -442,7 +442,7 @@ public Builder withTemplateDir(String templateDir) {
                 // check to see if the folder exists
                 if (f.exists() && f.isDirectory()) {
                     uri = f.toURI();
-                    this.templateDir =  Paths.get(uri).toAbsolutePath().toString();
+                    this.templateDir =  Paths.get(uri).toAbsolutePath().normalize().toString();
                 } else {
                     URL url = this.getClass().getClassLoader().getResource(templateDir);
                     if (url != null) {

diff --git a/.../openapi-generator/src/test/java/org/openapitools/codegen/config/DynamicSettingsTest.java b/.../openapi-generator/src/test/java/org/openapitools/codegen/config/DynamicSettingsTest.java
@@ -74,7 +74,7 @@ public void testDynamicSettingsWithBuilderSideEffects() throws Exception {
         assertNotNull(workflowSettings);
 
         assertEquals(generatorSettings.getGeneratorName(), "none");
-        assertEquals(workflowSettings.getTemplateDir(), current.getAbsolutePath());
+        assertEquals(workflowSettings.getTemplateDir(), current.getCanonicalPath());
         assertNotEquals(workflowSettings.getTemplateDir(), input);
 
         assertEquals(generatorSettings.getAdditionalProperties().size(), 4);