diff options
author | Thomas Nelson <nelson24@att.com> | 2020-01-29 19:48:03 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-01-29 19:48:03 +0000 |
commit | 3e7717442eceb670bfa69ddb27c9abe68e99a920 (patch) | |
tree | 48d43c916d45c0047e18fed372c8cc0273dce4b2 /music-core/src/main/java/org | |
parent | a40b03fe9039d247dcc5a366f9778155a92c947b (diff) | |
parent | 19967120639154dcb4ed154113015b7d1ed9b7f1 (diff) |
Merge "Further MusicCassaCore Testing"
Diffstat (limited to 'music-core/src/main/java/org')
-rw-r--r-- | music-core/src/main/java/org/onap/music/datastore/MusicDataStoreHandle.java | 3 | ||||
-rw-r--r-- | music-core/src/main/java/org/onap/music/service/impl/MusicCassaCore.java | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/music-core/src/main/java/org/onap/music/datastore/MusicDataStoreHandle.java b/music-core/src/main/java/org/onap/music/datastore/MusicDataStoreHandle.java index 92457d07..09fe0d35 100644 --- a/music-core/src/main/java/org/onap/music/datastore/MusicDataStoreHandle.java +++ b/music-core/src/main/java/org/onap/music/datastore/MusicDataStoreHandle.java @@ -88,6 +88,9 @@ public class MusicDataStoreHandle { return mDstoreHandle; } + public static void setMDstoreHandle(MusicDataStore dsHandle) { + mDstoreHandle = dsHandle; + } /** * diff --git a/music-core/src/main/java/org/onap/music/service/impl/MusicCassaCore.java b/music-core/src/main/java/org/onap/music/service/impl/MusicCassaCore.java index e1416f86..d29ba32b 100644 --- a/music-core/src/main/java/org/onap/music/service/impl/MusicCassaCore.java +++ b/music-core/src/main/java/org/onap/music/service/impl/MusicCassaCore.java @@ -87,7 +87,8 @@ public class MusicCassaCore implements MusicCoreService { return mLockHandle; } - public static void setmLockHandle(CassaLockStore mLockHandle) { + //for unit testing purposes + static void setmLockHandle(CassaLockStore mLockHandle) { MusicCassaCore.mLockHandle = mLockHandle; } @@ -352,7 +353,6 @@ public class MusicCassaCore implements MusicCoreService { * @return Boolean Indicates success or failure * @throws MusicServiceException * - * */ public ResultType createTable(String keyspace, String table, PreparedQueryObject tableQueryObject, String consistency) throws MusicServiceException { @@ -361,9 +361,9 @@ public class MusicCassaCore implements MusicCoreService { try { // create shadow locking table result = getLockingServiceHandle().createLockQueue(keyspace, table); - if (result == false) + if (result == false) { return ResultType.FAILURE; - + } result = false; // create table to track unsynced_keys @@ -374,8 +374,11 @@ public class MusicCassaCore implements MusicCoreService { PreparedQueryObject queryObject = new PreparedQueryObject(); queryObject.appendQueryString(tabQuery); - result = false; result = MusicDataStoreHandle.getDSHandle().executePut(queryObject, "eventual"); + if (result == false) { + return ResultType.FAILURE; + } + result = false; // create actual table result = MusicDataStoreHandle.getDSHandle().executePut(tableQueryObject, consistency); |