summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2018-06-08 21:30:58 +0000
committerGerrit Code Review <gerrit@onap.org>2018-06-08 21:30:58 +0000
commit071fb8779fd4c8c4abfcb72c1ed266280461bed2 (patch)
tree02ff81aaec044ec624f4673798139e03cf8ec901 /src/main
parent27044693d5d2acf6a6bb994571cb4d78cb27f156 (diff)
parente550a1fe4b234423ac63ffd711f43c413c914350 (diff)
Merge "Simplify & remove duplicated testcases"
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/onap/dcae/commonFunction/CommonStartup.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java b/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java
index 83c81722..f16cdbbc 100644
--- a/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java
+++ b/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java
@@ -140,7 +140,7 @@ public class CommonStartup extends NsaBaseEndpoint implements Runnable {
final String keyAlias = settings.getString(KSETTING_KEYALIAS, KDEFAULT_KEYALIAS);
if (securePort > 0) {
- final String KSETTING_KEYSTOREPASS = readFile(keystorePasswordFile, Charset.defaultCharset());
+ final String KSETTING_KEYSTOREPASS = readFile(keystorePasswordFile);
connectors.add(new ApiServerConnector.Builder(securePort).secure(true)
.keystorePassword(KSETTING_KEYSTOREPASS).keystoreFile(keystoreFile).keyAlias(keyAlias).build());
@@ -265,7 +265,7 @@ public class CommonStartup extends NsaBaseEndpoint implements Runnable {
}
}
- static String readFile(String path, Charset encoding) throws IOException {
+ static String readFile(String path) throws IOException {
byte[] encoded = Files.readAllBytes(Paths.get(path));
String pwd = new String(encoded);
return pwd.substring(0, pwd.length() - 1);