You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2021/02/08 09:40:26 UTC

[freemarker-docgen] branch master updated: Trying to fixed generics inference compilation problem on Travis again.

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 91d8caa  Trying to fixed generics inference compilation problem on Travis again.
91d8caa is described below

commit 91d8caae9854ff141b6f17f683a5faab041ec596
Author: ddekany <dd...@apache.org>
AuthorDate: Mon Feb 8 10:40:10 2021 +0100

    Trying to fixed generics inference compilation problem on Travis again.
---
 .../src/main/java/org/freemarker/docgen/core/Transform.java          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 a9ab6f9..d37876b 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
@@ -672,10 +672,11 @@ public final class Transform {
                                                 settingName.subKey(commandKey,
                                                         SETTING_INSERTABLE_OUTPUT_COMMANDS_DOCGEN_WD_REPLACED_WITH_KEY),
                                                 outputCmdProps.get(
-                                                        SETTING_INSERTABLE_OUTPUT_COMMANDS_DOCGEN_WD_REPLACED_WITH_KEY), DefaultValue.NULL,
+                                                        SETTING_INSERTABLE_OUTPUT_COMMANDS_DOCGEN_WD_REPLACED_WITH_KEY),
+                                                DefaultValue.NULL,
                                                 String.class
                                         )
-                                ).map((String it) -> Paths.get(it).toAbsolutePath().normalize()).orElse(null)
+                                ).map((String it) -> Paths.get(it).toAbsolutePath().normalize()).orElse((Path) null)
                         );
                         insertableOutputCommands.put(commandKey, commandProps);
                     }