[freemarker-docgen] branch master updated: Fixed generics inference compilation problem on Travis, and some cleanup.

[ddekany]

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

ddekany pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/freemarker-docgen.git


The following commit(s) were added to refs/heads/master by this push:
     new a2fea22  Fixed generics inference compilation problem on Travis, and 
some cleanup.
a2fea22 is described below

commit a2fea2275b1943dbfb51fcee69452b36985ac5a3
Author: ddekany <ddek...@apache.org>
AuthorDate: Mon Feb 8 09:50:42 2021 +0100

    Fixed generics inference compilation problem on Travis, and some cleanup.
---
 .../docgen/core/PrintTextWithDocgenSubstitutionsDirective.java          | 2 +-
 .../src/main/java/org/freemarker/docgen/core/Transform.java             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/freemarker-docgen-core/src/main/java/org/freemarker/docgen/core/PrintTextWithDocgenSubstitutionsDirective.java
 
b/freemarker-docgen-core/src/main/java/org/freemarker/docgen/core/PrintTextWithDocgenSubstitutionsDirective.java
index 2156bed..3975c43 100644
--- 
a/freemarker-docgen-core/src/main/java/org/freemarker/docgen/core/PrintTextWithDocgenSubstitutionsDirective.java
+++ 
b/freemarker-docgen-core/src/main/java/org/freemarker/docgen/core/PrintTextWithDocgenSubstitutionsDirective.java
@@ -338,7 +338,7 @@ public class PrintTextWithDocgenSubstitutionsDirective 
implements TemplateDirect
                             if (wdSubst == null) {
                                 return cmdArg;
                             }
-                            return cmdArg.replace(DOCGEN_WD_TAG, 
wdSubst.toAbsolutePath().normalize().toString());
+                            return cmdArg.replace(DOCGEN_WD_TAG, 
wdSubst.toString());
                         })
                         .collect(Collectors.toList());
 
diff --git 
a/freemarker-docgen-core/src/main/java/org/freemarker/docgen/core/Transform.java
 
b/freemarker-docgen-core/src/main/java/org/freemarker/docgen/core/Transform.java
index 3d46668..a9ab6f9 100644
--- 
a/freemarker-docgen-core/src/main/java/org/freemarker/docgen/core/Transform.java
+++ 
b/freemarker-docgen-core/src/main/java/org/freemarker/docgen/core/Transform.java
@@ -675,7 +675,7 @@ public final class Transform {
                                                         
SETTING_INSERTABLE_OUTPUT_COMMANDS_DOCGEN_WD_REPLACED_WITH_KEY), 
DefaultValue.NULL,
                                                 String.class
                                         )
-                                ).map(Paths::get).orElse(null)
+                                ).map((String it) -> 
Paths.get(it).toAbsolutePath().normalize()).orElse(null)
                         );
                         insertableOutputCommands.put(commandKey, commandProps);
                     }