This is an automated email from the ASF dual-hosted git repository. sgoeschl pushed a commit to branch feature/FREEMARKER-140 in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 2e280e84e1c39d3a4d5c4a88ff5094e43948859b Author: Siegfried Goeschl <[email protected]> AuthorDate: Sun Apr 5 20:38:27 2020 +0200 FREEMARKER-140 freemarker-cli: Expose DataSources directly in the data model --- .../apache/freemarker/generator/base/util/UriUtils.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/UriUtils.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/UriUtils.java index cbc401b..71ed654 100644 --- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/UriUtils.java +++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/UriUtils.java @@ -20,6 +20,8 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import static org.apache.freemarker.generator.base.util.StringUtils.isNotEmpty; + public class UriUtils { public static URI toURI(String str) { @@ -39,18 +41,27 @@ public class UriUtils { } public static boolean isUri(String str) { - return str.contains("://"); + return isNotEmpty(str) && str.contains("://"); } public static boolean isHttpURI(URI uri) { - return uri.getScheme().equalsIgnoreCase("http") || uri.getScheme().equalsIgnoreCase("https"); + if (uri == null) { + return false; + } + return "http".equals(uri.getScheme()) || "https".equals(uri.getScheme()); } public static boolean isFileUri(URI uri) { + if (uri == null) { + return false; + } return "file".equalsIgnoreCase(uri.getScheme()); } public static boolean isEnvUri(URI uri) { + if (uri == null) { + return false; + } return "env".equalsIgnoreCase(uri.getScheme()); } }
