This is an automated email from the ASF dual-hosted git repository. sgoeschl pushed a commit to branch FREEMARKER-172 in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 98cc8e4f5642c8258bee7f55a4d7739d332ab89f Author: Siegfried Goeschl <[email protected]> AuthorDate: Fri Feb 5 19:31:13 2021 +0100 FREEMARKER-172 [freemarker-generator] Cleanup of changes --- .../org/apache/freemarker/generator/cli/config/DataModelSupplier.java | 2 +- .../freemarker/generator/cli/picocli/OutputGeneratorDefinition.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/DataModelSupplier.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/DataModelSupplier.java index 0684dc6..57591d6 100644 --- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/DataModelSupplier.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/DataModelSupplier.java @@ -66,7 +66,7 @@ public class DataModelSupplier implements Supplier<Map<String, Object>> { public Map<String, Object> get() { return sources.stream() .filter(StringUtils::isNotEmpty) - .map(source -> toDataModel(source)) + .map(this::toDataModel) .flatMap(map -> map.entrySet().stream()) .collect(Collectors.toMap(Entry::getKey, Entry::getValue)); } diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputGeneratorDefinition.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputGeneratorDefinition.java index 78352ec..a8fb389 100644 --- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputGeneratorDefinition.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputGeneratorDefinition.java @@ -103,10 +103,8 @@ public class OutputGeneratorDefinition { private static boolean isFileSource(String source) { if (source.contains("file://")) { return true; - } else if (source.contains("://")) { - return false; } else { - return true; + return !source.contains("://"); } } }
