diff options
| author |   PawelSzalapski <pawel.szalapski@nokia.com> | 2018-06-06 14:05:57 +0200 |
|---|---|---|
| committer | PawelSzalapski <pawel.szalapski@nokia.com> | 2018-06-06 14:09:23 +0200 |
| commit | e550a1fe4b234423ac63ffd711f43c413c914350 (patch) | |
| tree | 18ca8cf86082ff40302580210d7d7e829e9ee5c7 /src/main/java/org/onap | |
| parent | 0bfbea6f7d7a5fb324dd3e4961239a6dae3fcb0d (diff) | |
Simplify & remove duplicated testcases
Testcases in those files were overengineered, plus there were
duplicates so they got simplified.
Obsolete classes that were unneeded were removed
Change-Id: I9fce325aed4f1a3a6073f0c564adac1ec5a6beae
Issue-ID: DCAEGEN2-524
Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
Diffstat (limited to 'src/main/java/org/onap')
| -rw-r--r-- | src/main/java/org/onap/dcae/commonFunction/CommonStartup.java | 4 |
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);
|