Make MusicCore non-staticdev-cassandra-only

Make MusicCore and other dependencies (MusicDataStoreHandle) non-static

For compatibility, MusicCore still has a singleton instance that is statically instantiated and can be used as needed by legacy users.

These changes should be made in calling sites (legacy users using singleton):
MusicDataStoreHandle.getDSHandle() -> MusicCore.getInstanceDSHandle()

Change-Id: I02b67f316dc21a1498157bc68cc32bf76d3ec01e
Issue-ID: MUSIC-148
Signed-off-by: Mohammad Salehe <salehe@cs.toronto.edu>

1 files changed, 9 insertions, 10 deletions

diff --git a/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java b/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java
index 6e0b61a0..2c1bdb14 100644
--- a/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java
+++ b/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java
@@ -1,16 +1,22 @@
 package org.onap.music.lockingservice.cassandra;
 
+import java.io.IOError;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.Session;
+import org.onap.music.datastore.CassandraClusterBuilder;
 import org.onap.music.datastore.MusicDataStore;
 import org.onap.music.datastore.PreparedQueryObject;
 import org.onap.music.eelf.logging.EELFLoggerDelegate;
+import org.onap.music.exceptions.MusicLockingException;
 import org.onap.music.exceptions.MusicQueryException;
 import org.onap.music.exceptions.MusicServiceException;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
+import org.onap.music.main.MusicUtil;
 import org.onap.music.util.TimeMeasureInstance;
 
 /*
@@ -21,7 +27,8 @@ public class CassaLockStore {
 	
 	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(CassaLockStore.class);
 	private static String table_prepend_name = "lockQ_";
-	
+	private MusicDataStore dsHandle;
+
 	public class LockObject{
 		public String lockRef;
 		public String createTime;
@@ -30,19 +37,13 @@ public class CassaLockStore {
 			this.lockRef = lockRef;
 			this.acquireTime = acquireTime;
 			this.createTime = createTime;
-			
 		}
 	}
-	MusicDataStore dsHandle;
-	public CassaLockStore() {
-		dsHandle = new MusicDataStore();
-	}
-	
+
 	public CassaLockStore(MusicDataStore dsHandle) {
 		this.dsHandle=dsHandle;
 	}
 
-    
 	/**
 	 * 
 	 * This method creates a shadow locking table for every main table in Cassandra. This table tracks all information regarding locks. 
@@ -304,6 +305,4 @@ public class CassaLockStore {
             TimeMeasureInstance.instance().exit();
         }
 	}
-	
-
 }