CADI and a few small updates.

- Include CADI and remove Admin API and admin
  code.
- A few Sonar Fixes.
- Properties File Clean up.
- Read/Write Locking API.
- Various whitespace fixes.

Issue-ID: MUSIC-394
Change-Id: I58e1b64b71796bb6bda1c97ea688f434a836d3c7
Signed-off-by: Nelson, Thomas (arthurdent3) <nelson24@att.com>

1 files changed, 289 insertions, 323 deletions

diff --git a/src/test/java/org/onap/music/unittests/TstRestMusicLockAPI.java b/src/test/java/org/onap/music/unittests/TstRestMusicLockAPI.java
index 956a266d..86746472 100644
--- a/src/test/java/org/onap/music/unittests/TstRestMusicLockAPI.java
+++ b/src/test/java/org/onap/music/unittests/TstRestMusicLockAPI.java
@@ -29,9 +29,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-
+import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
-
+import javax.ws.rs.core.UriInfo;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -39,15 +39,18 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mindrot.jbcrypt.BCrypt;
+import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.onap.music.authentication.CachingUtil;
-import org.onap.music.datastore.MusicDataStoreHandle;
 import org.onap.music.datastore.PreparedQueryObject;
 import org.onap.music.datastore.jsonobjects.JsonInsert;
 import org.onap.music.datastore.jsonobjects.JsonLeasedLock;
+import org.onap.music.datastore.jsonobjects.JsonLock;
 import org.onap.music.datastore.jsonobjects.JsonTable;
+import org.onap.music.datastore.jsonobjects.JsonUpdate;
 import org.onap.music.exceptions.MusicServiceException;
 import org.onap.music.lockingservice.cassandra.CassaLockStore;
+import org.onap.music.lockingservice.cassandra.LockType;
 import org.onap.music.main.MusicCore;
 import org.onap.music.main.MusicUtil;
 import org.onap.music.rest.RestMusicDataAPI;
@@ -56,256 +59,253 @@ import com.datastax.driver.core.DataType;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
 import com.sun.jersey.core.util.Base64;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TstRestMusicLockAPI {
 
-	RestMusicLocksAPI lock = new RestMusicLocksAPI();
-	RestMusicDataAPI data = new RestMusicDataAPI();
-	static PreparedQueryObject testObject;
-
-	static String appName = "TestApp";
-	static String userId = "TestUser";
-	static String password = "TestPassword";
-	static String authData = userId+":"+password;
-	static String wrongAuthData = userId+":"+"pass";
-	static String authorization = new String(Base64.encode(authData.getBytes()));
-	static String wrongAuthorization = new String(Base64.encode(wrongAuthData.getBytes()));
-	static boolean isAAF = false;
-	static UUID uuid = UUID.fromString("abc66ccc-d857-4e90-b1e5-df98a3d40ce6");
-	static String keyspaceName = "testcassa";
-	static String tableName = "employees";
-	static String onboardUUID = null;
-	static String lockName = "testcassa.employees.testname";
-	static String malformedLock = "malformedLock";
-
-	@BeforeClass
-	public static void init() throws Exception {
-		System.out.println("Testing RestMusicLock class");
-		try {
-			createKeyspace();
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new Exception("Unable to initialize before TestRestMusicData test class. " + e.getMessage());
-		}
-	}
-	
-	@After
-	public void afterEachTest( ) throws MusicServiceException {
-		clearAllTablesFromKeyspace();
-	}
-
-	@AfterClass
-	public static void tearDownAfterClass() throws Exception {
-		testObject = new PreparedQueryObject();
-		testObject.appendQueryString("DROP KEYSPACE IF EXISTS " + keyspaceName);
-		MusicCore.eventualPut(testObject);
-	}
 
-    @SuppressWarnings("unchecked")
-	@Test
-    public void test_createLockReference() throws Exception {
-    	System.out.println("Testing create lockref");
-    	createAndInsertIntoTable();
-    	Response response =lock.createLockReference(lockName,"1","1",authorization,
-    			"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
-		Map<String,Object> respMap = (Map<String, Object>) response.getEntity();
-    	System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-
-    	assertEquals(200, response.getStatus());
-    	assertTrue(respMap.containsKey("lock"));
-    	assertTrue(((Map<String,String>) respMap.get("lock")).containsKey("lock"));
+    @Mock
+    UriInfo info;
+
+    RestMusicLocksAPI lock = new RestMusicLocksAPI();
+    RestMusicDataAPI data = new RestMusicDataAPI();
+    static PreparedQueryObject testObject;
+
+    static String appName = "TestApp";
+    static String userId = "TestUser";
+    static String password = "TestPassword";
+    static String authData = userId + ":" + password;
+    static String wrongAuthData = userId + ":" + "pass";
+    static String authorization = new String(Base64.encode(authData.getBytes()));
+    static String wrongAuthorization = new String(Base64.encode(wrongAuthData.getBytes()));
+    static boolean isAAF = false;
+    static UUID uuid = UUID.fromString("abc66ccc-d857-4e90-b1e5-df98a3d40ce6");
+    static String keyspaceName = "testcassa";
+    static String tableName = "employees";
+    static String onboardUUID = null;
+    static String lockName = "testcassa.employees.testname";
+
+    @BeforeClass
+    public static void init() throws Exception {
+        System.out.println("Testing RestMusicLock class");
+        try {
+            createKeyspace();
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new Exception("Unable to initialize before TestRestMusicData test class. " + e.getMessage());
+        }
     }
     
-    @Test
-    public void test_createLockReference_wrongAuth() throws Exception {
-        System.out.println("Testing create lockref with wrong auth");
-        createAndInsertIntoTable();
-        Response response =lock.createLockReference(lockName,"1","1", wrongAuthorization,
-                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
-        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+    @After
+    public void afterEachTest() throws MusicServiceException {
+        clearAllTablesFromKeyspace();
+    }
 
-        assertEquals(401, response.getStatus());
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception {
+        testObject = new PreparedQueryObject();
+        testObject.appendQueryString("DROP KEYSPACE IF EXISTS " + keyspaceName);
+        MusicCore.eventualPut(testObject);
     }
-    
+
+    @SuppressWarnings("unchecked")
     @Test
-    public void test_createLockReference_malformedLockName() throws Exception {
-        System.out.println("Testing create lockref w/ malformed lock");
+    public void test_createLockReference() throws Exception {
+        System.out.println("Testing create lockref");
         createAndInsertIntoTable();
-        Response response =lock.createLockReference(malformedLock,"1","1",authorization,
-                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        Response response = lock.createLockReference(lockName, "1", "1", authorization,
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", null, appName);
+        Map<String, Object> respMap = (Map<String, Object>) response.getEntity();
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
 
-        assertEquals(400, response.getStatus());
+        assertEquals(200, response.getStatus());
+        assertTrue(respMap.containsKey("lock"));
+        assertTrue(((Map<String, String>) respMap.get("lock")).containsKey("lock"));
     }
 
     @Test
-    public void test_accquireLock() throws Exception {
-    	System.out.println("Testing acquire lock");
-		createAndInsertIntoTable();
-    	String lockRef = createLockReference();
-
-    	Response response = lock.accquireLock(lockRef, "1", "1", authorization,
-    			"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
-    	System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-    	assertEquals(200, response.getStatus());
-    }
-    
-    @Test
-    public void test_accquireLock_wrongAuth() throws Exception {
-        System.out.println("Testing acquire lock w/ wrong auth");
+    public void test_createReadLock() throws Exception {
+        System.out.println("Testing create read lockref");
         createAndInsertIntoTable();
-        String lockRef = createLockReference();
-
-        Response response = lock.accquireLock(lockRef, "1", "1", wrongAuthorization,
-                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        JsonLock jsonLock = createJsonLock(LockType.READ);
+        Response response = lock.createLockReference(lockName, "1", "1", authorization,
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", jsonLock, appName);
+        Map<String, Object> respMap = (Map<String, Object>) response.getEntity();
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        assertEquals(401, response.getStatus());
+
+        assertEquals(200, response.getStatus());
+        assertTrue(respMap.containsKey("lock"));
+        assertTrue(((Map<String, String>) respMap.get("lock")).containsKey("lock"));
     }
-    
+
     @Test
-    public void test_accquireBadLock() throws Exception {
-        System.out.println("Testing acquire lock that is not lock-holder");
+    public void test_createWriteLock() throws Exception {
+        System.out.println("Testing create read lockref");
         createAndInsertIntoTable();
-
-        String lockRef1 = createLockReference();
-        String lockRef2 = createLockReference();
-
-
-        Response response = lock.accquireLock(lockRef2, "1", "1", authorization,
-                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        JsonLock jsonLock = createJsonLock(LockType.WRITE);
+        Response response = lock.createLockReference(lockName, "1", "1", authorization,
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", jsonLock, appName);
+        Map<String, Object> respMap = (Map<String, Object>) response.getEntity();
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        assertEquals(400, response.getStatus());
+
+        assertEquals(200, response.getStatus());
+        assertTrue(respMap.containsKey("lock"));
+        assertTrue(((Map<String, String>) respMap.get("lock")).containsKey("lock"));
     }
-    
+
     @Test
-    public void test_accquireLock_malformedLock() throws Exception {
-        System.out.println("Testing acquire lock w/ malformedLock");
+    public void test_accquireLock() throws Exception {
+        System.out.println("Testing acquire lock");
         createAndInsertIntoTable();
+        String lockRef = createLockReference();
 
-        Response response = lock.accquireLock(malformedLock, "1", "1", wrongAuthorization,
-                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        Response response =
+                lock.accquireLock(lockRef, "1", "1", authorization, "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        assertEquals(400, response.getStatus());
+        assertEquals(200, response.getStatus());
     }
-    
+
     @Test
-    public void test_accquireLockWLease() throws Exception {
-        System.out.println("Testing acquire lock with lease");
+    public void test_acquireReadLock() throws Exception {
+        System.out.println("Testing acquire read lock");
         createAndInsertIntoTable();
-        String lockRef = createLockReference();
+        String lockRef = createLockReference(LockType.READ);
+        String lockRef2 = createLockReference(LockType.READ);
 
-        JsonLeasedLock jsonLock = new JsonLeasedLock();
-        jsonLock.setLeasePeriod(10000); //10 second lease period?
-        Response response = lock.accquireLockWithLease(jsonLock, lockRef, "1", "1", authorization,
-                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        Response response =
+                lock.accquireLock(lockRef, "1", "1", authorization, "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(200, response.getStatus());
+        response =
+                lock.accquireLock(lockRef2, "1", "1", authorization, "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
         assertEquals(200, response.getStatus());
     }
     
     @Test
-    public void test_accquireLockWLease_wrongAuth() throws Exception {
-        System.out.println("Testing acquire lock with lease w/ wrong Auth");
+    public void test_acquireReadLockaFail() throws Exception {
+        System.out.println("Testing acquire read lock");
         createAndInsertIntoTable();
-        String lockRef = createLockReference();
+        String lockRef = createLockReference(LockType.WRITE);
+        String lockRef2 = createLockReference(LockType.READ);
 
-        JsonLeasedLock jsonLock = new JsonLeasedLock();
-        jsonLock.setLeasePeriod(10000); //10 second lease period?
-        Response response = lock.accquireLockWithLease(jsonLock, lockRef, "1", "1", wrongAuthorization,
-                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        Response response =
+                lock.accquireLock(lockRef, "1", "1", authorization, "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(200, response.getStatus());
+        response =
+                lock.accquireLock(lockRef2, "1", "1", authorization, "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        assertEquals(401, response.getStatus());
+        assertEquals(400, response.getStatus());
     }
-    
+
     @Test
-    public void test_accquireLockWLease_malformedLock() throws Exception {
-        System.out.println("Testing acquire lock with lease w/ malformed lock");
+    public void test_writeWReadLock() throws Exception {
+        System.out.println("Testing writing with a read lock");
         createAndInsertIntoTable();
-        String lockRef = createLockReference();
+        String lockRef = createLockReference(LockType.READ);
+
+        JsonUpdate jsonUpdate = new JsonUpdate();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        Map<String, Object> values = new HashMap<>();
+        values.put("emp_salary", 2500);
+        consistencyInfo.put("type", "critical");
+        consistencyInfo.put("lockId", lockRef);
+        jsonUpdate.setConsistencyInfo(consistencyInfo);
+        jsonUpdate.setKeyspaceName(keyspaceName);
+        jsonUpdate.setTableName(tableName);
+        jsonUpdate.setValues(values);
+        MultivaluedMap<String, String> row = new MultivaluedMapImpl();
+        row.add("emp_name", "testname");
+        Mockito.when(info.getQueryParameters()).thenReturn(row);
+
+        Response response = data.updateTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonUpdate, keyspaceName, tableName, info);
 
-        JsonLeasedLock jsonLock = new JsonLeasedLock();
-        jsonLock.setLeasePeriod(10000); //10 second lease period?
-        Response response = lock.accquireLockWithLease(jsonLock, malformedLock, "1", "1",
-                wrongAuthorization, "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
-        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
         assertEquals(400, response.getStatus());
     }
-    
-    @Test
-    public void test_currentLockHolder() throws Exception {
-    	System.out.println("Testing get current lock holder");
-		createAndInsertIntoTable();
 
-    	String lockRef = createLockReference();
+    @Test
+    public void test_writeWWriteLock() throws Exception {
+        System.out.println("Testing writing with a read lock");
+        createAndInsertIntoTable();
+        String lockRef = createLockReference(LockType.WRITE);
+
+        JsonUpdate jsonUpdate = new JsonUpdate();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        Map<String, Object> values = new HashMap<>();
+        values.put("emp_salary", 2500);
+        consistencyInfo.put("type", "critical");
+        consistencyInfo.put("lockId", lockRef);
+        jsonUpdate.setConsistencyInfo(consistencyInfo);
+        jsonUpdate.setKeyspaceName(keyspaceName);
+        jsonUpdate.setTableName(tableName);
+        jsonUpdate.setValues(values);
+        MultivaluedMap<String, String> row = new MultivaluedMapImpl();
+        row.add("emp_name", "testname");
+        Mockito.when(info.getQueryParameters()).thenReturn(row);
+
+        Response response = data.updateTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonUpdate, keyspaceName, tableName, info);
 
-    	Response response = lock.currentLockHolder(lockName, "1", "1", authorization,
-    			"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
-    	System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-    	assertEquals(200, response.getStatus());
-    	Map<String,Object> respMap = (Map<String, Object>) response.getEntity();
-    	assertEquals(lockRef, ((Map<String,String>) respMap.get("lock")).get("lock-holder"));
+        assertEquals(200, response.getStatus());
     }
-    
+
     @Test
-    public void test_currentLockHolder_wrongAuth() throws Exception {
-        System.out.println("Testing get current lock holder w/ wrong Auth");
+    public void test_accquireLockWLease() throws Exception {
+        System.out.println("Testing acquire lock with lease");
         createAndInsertIntoTable();
-
         String lockRef = createLockReference();
 
-        Response response = lock.currentLockHolder(lockName, "1", "1", wrongAuthorization,
+        JsonLeasedLock jsonLock = new JsonLeasedLock();
+        jsonLock.setLeasePeriod(10000); // 10 second lease period?
+        Response response = lock.accquireLockWithLease(jsonLock, lockRef, "1", "1", authorization,
                 "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        assertEquals(401, response.getStatus());
+        assertEquals(200, response.getStatus());
     }
     
     @Test
-    public void test_currentLockHolder_malformedLock() throws Exception {
-        System.out.println("Testing get current lock holder w/ malformed lock");
+    public void test_accquireBadLock() throws Exception {
+        System.out.println("Testing acquire lock that is not lock-holder");
         createAndInsertIntoTable();
+        // This is required to create an initial loc reference.
+        String lockRef1 = createLockReference();
+        // This will create the next lock reference, whcih will not be avalale yet.
+        String lockRef2 = createLockReference();
 
-        String lockRef = createLockReference();
-
-        Response response = lock.currentLockHolder(malformedLock, "1", "1", wrongAuthorization,
+        Response response = lock.accquireLock(lockRef2, "1", "1", authorization,
                 "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
         assertEquals(400, response.getStatus());
     }
     
     @Test
-    public void test_unLock() throws Exception {
-    	System.out.println("Testing unlock");
-		createAndInsertIntoTable();
-    	String lockRef = createLockReference();
-
-    	Response response = lock.unLock(lockRef, "1", "1", authorization,
-    			"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
-    	System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-    	assertEquals(200, response.getStatus());
-    }
-    
-    @Test
-    public void test_unLock_wrongAuth() throws Exception {
-        System.out.println("Testing unlock w/ wrong auth");
+    public void test_currentLockHolder() throws Exception {
+        System.out.println("Testing get current lock holder");
         createAndInsertIntoTable();
+
         String lockRef = createLockReference();
 
-        Response response = lock.unLock(lockRef, "1", "1", wrongAuthorization,
-                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        Response response =
+                lock.enquireLock(lockName, "1", "1", authorization, "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        assertEquals(401, response.getStatus());
+        assertEquals(200, response.getStatus());
+        Map<String, Object> respMap = (Map<String, Object>) response.getEntity();
+        assertEquals(lockRef, ((Map<String, String>) respMap.get("lock")).get("lock-holder"));
     }
     
     @Test
-    public void test_unLock_malformedLock() throws Exception {
-        System.out.println("Testing unlock w/ malformedLock");
+    public void test_unLock() throws Exception {
+        System.out.println("Testing unlock");
         createAndInsertIntoTable();
         String lockRef = createLockReference();
 
-        Response response = lock.unLock("malformedLock", "1", "1", wrongAuthorization,
-                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        Response response =
+                lock.unLock(lockRef, "1", "1", authorization, "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        assertEquals(400, response.getStatus());
+        assertEquals(200, response.getStatus());
     }
     
     @Test
@@ -322,102 +322,59 @@ public class TstRestMusicLockAPI {
         Map<String,Object> respMap = (Map<String, Object>) response.getEntity();
         assertEquals(lockRef, ((Map<String,String>) respMap.get("lock")).get("lock-holder"));
     }
-    
-    @Test
-    public void test_getLockState_wrongAuth() throws Exception {
-        System.out.println("Testing get lock state w/ wrong auth");
-        createAndInsertIntoTable();
-
-        String lockRef = createLockReference();
 
-        Response response = lock.currentLockState(lockName, "1", "1", wrongAuthorization,
-                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
-        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        assertEquals(401, response.getStatus());
-    }
-    
+    // Ignoring since this is now a duplicate of delete lock ref.
     @Test
-    public void test_getLockState_malformedLock() throws Exception {
-        System.out.println("Testing get lock state w/ malformedLock");
-        createAndInsertIntoTable();
-
-        String lockRef = createLockReference();
-
-        Response response = lock.currentLockState(malformedLock, "1", "1", wrongAuthorization,
-                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
-        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        assertEquals(400, response.getStatus());
-    }
-    
-    @Test
-    @Ignore //deprecated function
+    @Ignore
     public void test_deleteLock() throws Exception {
-        System.out.println("Testing delete lock");
+        System.out.println("Testing get lock state");
         createAndInsertIntoTable();
 
-        String lockRef = createLockReference();
-        
         Response response = lock.deleteLock(lockName, "1", "1",
                 "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", authorization, appName);
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
         assertEquals(200, response.getStatus());
     }
     
-    @Test
-    @Ignore //deprecated function
-    public void test_deleteLock_wrongAuth() throws Exception {
-        System.out.println("Testing delete lock w/ wrong auth");
-        createAndInsertIntoTable();
-
-        String lockRef = createLockReference();
-
-        Response response = lock.deleteLock(lockName, "1", "1",
-                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", wrongAuthorization, appName);
-        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        assertEquals(401, response.getStatus());
+    /**
+    * Create table and lock reference
+     * 
+    * @return the lock ref created
+     * @throws Exception
+    */
+    @SuppressWarnings("unchecked")
+    private String createLockReference() throws Exception {
+        Response response = lock.createLockReference(lockName, "1", "1", authorization,
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", null, appName);
+        Map<String, Object> respMap = (Map<String, Object>) response.getEntity();
+        return ((Map<String, String>) respMap.get("lock")).get("lock");
     }
-    
-    @Test
-    @Ignore //deprecated function
-    public void test_deleteLock_malformedLock() throws Exception {
-        System.out.println("Testing delete lock w/ malformed lock");
-        createAndInsertIntoTable();
-
-        String lockRef = createLockReference();
 
-        Response response = lock.deleteLock(malformedLock, "1", "1",
-                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", wrongAuthorization, appName);
-        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        assertEquals(400, response.getStatus());
+    /**
+     * Create table and lock reference
+     * 
+     * @return the lock ref created
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    private String createLockReference(LockType lockType) throws Exception {
+        JsonLock jsonLock = createJsonLock(lockType);
+        Response response = lock.createLockReference(lockName, "1", "1", authorization,
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", jsonLock, appName);
+        Map<String, Object> respMap = (Map<String, Object>) response.getEntity();
+        return ((Map<String, String>) respMap.get("lock")).get("lock");
     }
-	
-	/**
-	 * Create table and lock reference
-	 * @return the lock ref created
-	 * @throws Exception 
-	 */
-	@SuppressWarnings("unchecked")
-	private String createLockReference() throws Exception {
-    	Response response =lock.createLockReference(lockName,"1","1",authorization,
-    			"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
-    	Map<String,Object> respMap = (Map<String, Object>) response.getEntity();
-		return ((Map<String,String>) respMap.get("lock")).get("lock");
-	}
-
-	
-	
-
-	private static void createKeyspace() throws Exception {
-		//shouldn't really be doing this here, but create keyspace is currently turned off
-		PreparedQueryObject query = new PreparedQueryObject();
-		query.appendQueryString(CassandraCQL.createKeySpace);
-		MusicCore.eventualPut(query);
-		
-		boolean isAAF = false;
+
+    private static void createKeyspace() throws Exception {
+        // shouldn't really be doing this here, but create keyspace is currently turned off
+        PreparedQueryObject query = new PreparedQueryObject();
+        query.appendQueryString(CassandraCQL.createKeySpace);
+        MusicCore.eventualPut(query);
+        
+        boolean isAAF = false;
         String hashedpwd = BCrypt.hashpw(password, BCrypt.gensalt());
         query = new PreparedQueryObject();
-        query.appendQueryString(
-                    "INSERT into admin.keyspace_master (uuid, keyspace_name, application_name, is_api, "
+        query.appendQueryString("INSERT into admin.keyspace_master (uuid, keyspace_name, application_name, is_api, "
                                     + "password, username, is_aaf) values (?,?,?,?,?,?,?)");
         query.addValue(MusicUtil.convertToActualDataType(DataType.uuid(), uuid));
         query.addValue(MusicUtil.convertToActualDataType(DataType.text(), keyspaceName));
@@ -426,69 +383,78 @@ public class TstRestMusicLockAPI {
         query.addValue(MusicUtil.convertToActualDataType(DataType.text(), hashedpwd));
         query.addValue(MusicUtil.convertToActualDataType(DataType.text(), userId));
         query.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(), isAAF));
-        CachingUtil.updateMusicCache(keyspaceName, appName);
-        CachingUtil.updateMusicValidateCache(appName, userId, hashedpwd);
+        //CachingUtil.updateMusicCache(keyspaceName, appName);
+        //CachingUtil.updateMusicValidateCache(appName, userId, hashedpwd);
         MusicCore.eventualPut(query);
-	}
-	
-	private void clearAllTablesFromKeyspace() throws MusicServiceException {
-		ArrayList<String> tableNames = new ArrayList<>();
-		PreparedQueryObject query = new PreparedQueryObject();
-		query.appendQueryString("SELECT table_name FROM system_schema.tables WHERE keyspace_name = '"+keyspaceName+"';");
-		ResultSet rs = MusicCore.get(query);
-		for (Row row: rs) {
-			tableNames.add(row.getString("table_name"));
-		}
-		for (String table: tableNames) {
-			query = new PreparedQueryObject();
-			query.appendQueryString("DROP TABLE " + keyspaceName + "." + table);
-			MusicCore.eventualPut(query);
-		}
-	}
-	
-	/**
-	 * Create a table {@link tableName} in {@link keyspaceName}
-	 * @throws Exception
-	 */
-	private void createTable() throws Exception {
-		JsonTable jsonTable = new JsonTable();
-		Map<String, String> consistencyInfo = new HashMap<>();
-		Map<String, String> fields = new HashMap<>();
-		fields.put("uuid", "text");
-		fields.put("emp_name", "text");
-		fields.put("emp_salary", "varint");
-		fields.put("PRIMARY KEY", "(emp_name)");
-		consistencyInfo.put("type", "eventual");
-		jsonTable.setConsistencyInfo(consistencyInfo);
-		jsonTable.setKeyspaceName(keyspaceName);
-		jsonTable.setPrimaryKey("emp_name");
-		jsonTable.setTableName(tableName);
-		jsonTable.setFields(fields);
-		//Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
-		Response response = data.createTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6",appName, authorization, 
-				jsonTable, keyspaceName, tableName);
-	}
-	
-	/**
-	 * Create table {@link createTable} and insert into said table
-	 * @throws Exception
-	 */
-	private void createAndInsertIntoTable() throws Exception {
-		createTable();
-		
-		JsonInsert jsonInsert = new JsonInsert();
-		Map<String, String> consistencyInfo = new HashMap<>();
-		Map<String, Object> values = new HashMap<>();
-		values.put("uuid", "cfd66ccc-d857-4e90-b1e5-df98a3d40cd6");
-		values.put("emp_name", "testname");
-		values.put("emp_salary", 500);
-		consistencyInfo.put("type", "eventual");
-		jsonInsert.setConsistencyInfo(consistencyInfo);
-		jsonInsert.setKeyspaceName(keyspaceName);
-		jsonInsert.setTableName(tableName);
-		jsonInsert.setValues(values);
-		Response response = data.insertIntoTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
-				appName, authorization, jsonInsert, keyspaceName, tableName);
-	}
-}
+    }
+    
+    private void clearAllTablesFromKeyspace() throws MusicServiceException {
+        ArrayList<String> tableNames = new ArrayList<>();
+        PreparedQueryObject query = new PreparedQueryObject();
+        query.appendQueryString(
+                "SELECT table_name FROM system_schema.tables WHERE keyspace_name = '" + keyspaceName + "';");
+        ResultSet rs = MusicCore.get(query);
+        for (Row row : rs) {
+            tableNames.add(row.getString("table_name"));
+        }
+        for (String table : tableNames) {
+            query = new PreparedQueryObject();
+            query.appendQueryString("DROP TABLE " + keyspaceName + "." + table);
+            MusicCore.eventualPut(query);
+        }
+    }
+    
+    /**
+     * Create a table {@link tableName} in {@link keyspaceName}
+     * 
+     * @throws Exception
+     */
+    private void createTable() throws Exception {
+        JsonTable jsonTable = new JsonTable();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        Map<String, String> fields = new HashMap<>();
+        fields.put("uuid", "text");
+        fields.put("emp_name", "text");
+        fields.put("emp_salary", "varint");
+        fields.put("PRIMARY KEY", "(emp_name)");
+        consistencyInfo.put("type", "eventual");
+        jsonTable.setConsistencyInfo(consistencyInfo);
+        jsonTable.setKeyspaceName(keyspaceName);
+        jsonTable.setPrimaryKey("emp_name");
+        jsonTable.setTableName(tableName);
+        jsonTable.setFields(fields);
+        // Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
+        Response response = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonTable, keyspaceName, tableName);
+    }
+    
+    /**
+     * Create table {@link createTable} and insert into said table
+     * 
+     * @throws Exception
+     */
+    private void createAndInsertIntoTable() throws Exception {
+        createTable();
+        
+        JsonInsert jsonInsert = new JsonInsert();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        Map<String, Object> values = new HashMap<>();
+        values.put("uuid", "cfd66ccc-d857-4e90-b1e5-df98a3d40cd6");
+        values.put("emp_name", "testname");
+        values.put("emp_salary", 500);
+        consistencyInfo.put("type", "eventual");
+        jsonInsert.setConsistencyInfo(consistencyInfo);
+        jsonInsert.setKeyspaceName(keyspaceName);
+        jsonInsert.setTableName(tableName);
+        jsonInsert.setValues(values);
+        Response response = data.insertIntoTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonInsert, keyspaceName, tableName);
+    }
+
+    private JsonLock createJsonLock(LockType lockType) {
+        JsonLock jsonLock = new JsonLock();
+        jsonLock.setLockType(lockType);
+        return jsonLock;
+    }
+
+}
\ No newline at end of file