diff options
author | 2017-09-11 03:53:57 +0000 | |
---|---|---|
committer | 2017-09-11 03:53:57 +0000 | |
commit | df53002120bca73d475c38862586296db3526444 (patch) | |
tree | 8bc2ac75e46154e7c2f4648d5d22530bdb795112 /main | |
parent | aed32c570a103c70456371179a410e45d2f42bf3 (diff) | |
parent | 7293d08fcfecc5c66310303a8351f9efd219247e (diff) |
Merge changes Ic267f3f4,I1347393e
* changes:
Add CLI_DEV
Base docker image to openjdk:8-jre-slim
Diffstat (limited to 'main')
-rw-r--r-- | main/src/main/java/org/onap/cli/main/OnapCli.java | 2 | ||||
-rw-r--r-- | main/src/main/java/org/onap/cli/main/utils/OnapCliUtils.java | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/main/src/main/java/org/onap/cli/main/OnapCli.java b/main/src/main/java/org/onap/cli/main/OnapCli.java index c175f67b..0920f84b 100644 --- a/main/src/main/java/org/onap/cli/main/OnapCli.java +++ b/main/src/main/java/org/onap/cli/main/OnapCli.java @@ -19,9 +19,7 @@ package org.onap.cli.main; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.apache.commons.io.IOUtils; import org.onap.cli.fw.OnapCommand; diff --git a/main/src/main/java/org/onap/cli/main/utils/OnapCliUtils.java b/main/src/main/java/org/onap/cli/main/utils/OnapCliUtils.java index be88aed0..3ab4cceb 100644 --- a/main/src/main/java/org/onap/cli/main/utils/OnapCliUtils.java +++ b/main/src/main/java/org/onap/cli/main/utils/OnapCliUtils.java @@ -261,7 +261,13 @@ public class OnapCliUtils { private static String readTextStringFromUrl(String input, String argName) throws OnapCliInvalidArgument { try { - return FileUtils.readFileToString(new File(input)); + File file = new File(input); + if (file.isFile()) { + return FileUtils.readFileToString(file); + } else { + return input; + } + } catch (IOException e) { throw new OnapCliInvalidArgument(argName, e); } |