Upgrade to MUSIC 3.2.1

Add license headers to new files

Change-Id: I1a557dbafbd29ce457b545dbd1ca2bc0db62a085
Issue-ID: MUSIC-219
Signed-off-by: Rob Daugherty <rd472p@att.com>

2 files changed, 7 insertions, 5 deletions

diff --git a/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/MusicConnector.java b/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/MusicConnector.java
index 59e3581..b9b4fb6 100755
--- a/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/MusicConnector.java
+++ b/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/MusicConnector.java
@@ -27,6 +27,7 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 
+import org.onap.music.datastore.MusicDataStoreHandle;
 import org.onap.music.logging.EELFLoggerDelegate;
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.HostDistance;
@@ -89,7 +90,7 @@ public class MusicConnector {
 	}
 	
 	private void connectToMultipleAddresses(String address) {
-		MusicCore.getDSHandle(address);
+		MusicDataStoreHandle.getDSHandle(address);
 	/*
 	PoolingOptions poolingOptions =
 		new PoolingOptions()
diff --git a/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/MusicMixin.java b/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/MusicMixin.java
index 7228b55..a928526 100755
--- a/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/MusicMixin.java
+++ b/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/MusicMixin.java
@@ -43,13 +43,14 @@ import org.onap.music.mdbc.tables.MusicTxDigestId;
 import org.onap.music.mdbc.tables.StagingTable;
 import org.onap.music.mdbc.tables.MusicRangeInformationRow;
 import org.onap.music.mdbc.tables.TxCommitProgress;
-
+import org.onap.music.service.impl.MusicCassaCore;
 import org.json.JSONObject;
-import org.onap.music.datastore.CassaLockStore;
+import org.onap.music.lockingservice.cassandra.CassaLockStore;
 import org.onap.music.datastore.PreparedQueryObject;
 import org.onap.music.exceptions.MusicLockingException;
 import org.onap.music.exceptions.MusicQueryException;
 import org.onap.music.exceptions.MusicServiceException;
+import org.onap.music.datastore.Condition;
 import org.onap.music.main.MusicCore;
 import org.onap.music.main.ResultType;
 import org.onap.music.main.ReturnType;
@@ -1650,7 +1651,7 @@ public class MusicMixin implements MusicInterface {
         }
         CassaLockStore lsHandle;
         try {
-            lsHandle = MusicCore.getLockingServiceHandle();
+            lsHandle = MusicCassaCore.getLockingServiceHandle();
         } catch (MusicLockingException e) {
             logger.error("Error obtaining the locking service handle when checking if relinquish was required");
             throw new MDBCServiceException("Error obtaining locking service"+e.getMessage());
@@ -1723,7 +1724,7 @@ public class MusicMixin implements MusicInterface {
 
     private void executeMusicLockedPut(String namespace, String tableName,
                                        String primaryKeyWithoutDomain, PreparedQueryObject queryObject, String lockId,
-                                       MusicCore.Condition conditionInfo) throws MDBCServiceException {
+                                       Condition conditionInfo) throws MDBCServiceException {
         ReturnType rt ;
         if(lockId==null) {
             try {