diff options
Diffstat (limited to 'music-core/src')
3 files changed, 21 insertions, 7 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()) diff --git a/music-core/src/test/java/org/onap/music/datastore/MusicDataStoreTest.java b/music-core/src/test/java/org/onap/music/datastore/MusicDataStoreTest.java index 4de995f7..9260cd92 100644 --- a/music-core/src/test/java/org/onap/music/datastore/MusicDataStoreTest.java +++ b/music-core/src/test/java/org/onap/music/datastore/MusicDataStoreTest.java @@ -80,10 +80,6 @@ public class MusicDataStoreTest { dataStore = new MusicDataStore(cluster, session); } - @Test - public void testMusicDataStore() { - //MusicDataStore mds = new MusicDataStore(); - } @Test public void testMusicDataStoreClusterSession() { diff --git a/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonSelectTest.java b/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonSelectTest.java index 21c022ab..baada1d5 100644 --- a/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonSelectTest.java +++ b/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonSelectTest.java @@ -33,10 +33,10 @@ import java.util.Map; import org.junit.Test; public class JsonSelectTest { + JsonSelect js = new JsonSelect(); @Test public void testGetConsistencyInfo() { - JsonSelect js = new JsonSelect(); Map<String, String> mapSs = new HashMap<>(); mapSs.put("k1", "one"); js.setConsistencyInfo(mapSs); @@ -45,11 +45,24 @@ public class JsonSelectTest { @Test public void testSerialize() throws IOException { - JsonSelect js = new JsonSelect(); Map<String, String> mapSs = new HashMap<>(); mapSs.put("Key", "Value"); js.setConsistencyInfo(mapSs); js.serialize(); } + @Test + public void testGetKeyspaceName() { + js.setKeyspaceName("testkeyspace"); + assertEquals("testkeyspace",js.getKeyspaceName()); + + } + + @Test + public void testGetTableName() { + js.setTableName("testkeyspace"); + assertEquals("testkeyspace",js.getTableName()); + + } + } |