diff options
| author |   Tschaen, Brendan <ctschaen@att.com> | 2020-04-14 13:27:20 -0400 |
|---|---|---|
| committer | Brendan Tschaen <ctschaen@att.com> | 2020-04-15 14:19:20 +0000 |
| commit | fd5224f4aaf68e6ae186ef8a163edd7f5b2966f7 (patch) | |
| tree | 4a4273c9fd88263e63a346b3a8dda6fc8436f72b | |
| parent | ced536da6f83f8ab0978411877c86acf12006382 (diff) | |
Remove requirement for encryption cipher
Issue-ID: MUSIC-582
Signed-off-by: Tschaen, Brendan <ctschaen@att.com>
Change-Id: I0ee6b753dea08c02d199410247d6c1f1d06574b7
| -rwxr-xr-x | music-core/src/main/java/org/onap/music/datastore/MusicDataStore.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/music-core/src/main/java/org/onap/music/datastore/MusicDataStore.java b/music-core/src/main/java/org/onap/music/datastore/MusicDataStore.java index cb22c0f4..9ce73cc8 100755 --- a/music-core/src/main/java/org/onap/music/datastore/MusicDataStore.java +++ b/music-core/src/main/java/org/onap/music/datastore/MusicDataStore.java @@ -159,7 +159,12 @@ public class MusicDataStore { Cluster cluster; if(MusicUtil.getCassName() != null && MusicUtil.getCassPwd() != null) { - String cassPwd = CipherUtil.decryptPKC(MusicUtil.getCassPwd()); + String cassPwd; + if (MusicUtil.getCipherEncKey() != null && !("").equals(MusicUtil.getCipherEncKey())) { + cassPwd = CipherUtil.decryptPKC(MusicUtil.getCassPwd()); + } else { + cassPwd = MusicUtil.getCassPwd(); + } logger.info(EELFLoggerDelegate.applicationLogger, "Building with credentials "+MusicUtil.getCassName()+" & "+ MusicUtil.getCassPwd()); cluster = Cluster.builder().withPort(MusicUtil.getCassandraPort()) |