X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=music-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fmusic%2Flockingservice%2Fcassandra%2FCassaLockStore.java;h=9a69a9ba76cf47c04d02e2105d0a3ffc1b0f32fe;hb=ef85885428fc2d352e5171a98f6edc321dcdaaee;hp=a727357f8eba8dec450027b850f18b67ad7c77e2;hpb=712f0dddc791f9ef8283fb40b5b5f326bc4ea0d9;p=music.git

diff --git a/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java b/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java
index a727357f..9a69a9ba 100644
--- a/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java
+++ b/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java
@@ -40,8 +40,6 @@ import org.onap.music.main.ResultType;
 import org.onap.music.main.ReturnType;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
-import com.datastax.driver.core.Session;
-import com.datastax.driver.extras.codecs.enums.EnumNameCodec;
 
 /*
  * This is the lock store that is built on top of Cassandra that is used by MUSIC to maintain lock state. 
@@ -469,8 +467,10 @@ public class CassaLockStore {
     }  
 
     public boolean checkForDeadlock(String keyspace, String table, String lockName, LockType locktype, String owner, boolean forAcquire) throws MusicServiceException, MusicQueryException {
-        if (locktype.equals(LockType.READ)) return false;
-        if (owner==null || owner.length()==0) return false;
+        if (locktype.equals(LockType.READ)) 
+			return false;
+        if (owner==null || owner.length()==0)
+			return false;
 
         String lockTable = table_prepend_name + table;
         PreparedQueryObject queryObject = new PreparedQueryObject();
@@ -489,7 +489,8 @@ public class CassaLockStore {
             ddu.setExisting(row.getString("key"), row.getString("owner"), ("0".equals(row.getString("acquiretime")))?OwnershipType.CREATED:OwnershipType.ACQUIRED);
         }
         boolean deadlock = ddu.checkForDeadlock(lockName, owner, forAcquire?OwnershipType.ACQUIRED:OwnershipType.CREATED);
-        if (deadlock) logger.warn("Deadlock detected when " + owner + " tried to create lock on " + keyspace + "." + lockTable + "." + lockName);
+        if (deadlock)
+		   logger.warn("Deadlock detected when " + owner + " tried to create lock on " + keyspace + "." + lockTable + "." + lockName);
         return deadlock;
     }
 
@@ -502,7 +503,7 @@ public class CassaLockStore {
     }
     
     public List<String> getAllLocksForOwner(String ownerId, String keyspace, String table) throws MusicServiceException, MusicQueryException {
-        List<String> toRet = new ArrayList<String>();
+        List<String> toRet = new ArrayList<>();
         String lockTable = table_prepend_name + table;
         PreparedQueryObject queryObject = new PreparedQueryObject();
         queryObject.appendQueryString("SELECT key, lockreference FROM " + keyspace + "." + lockTable);
@@ -518,7 +519,7 @@ public class CassaLockStore {
     }
 
     public ReturnType promoteLock(String keyspace, String table, String key, String lockRef)
-            throws MusicLockingException, MusicServiceException, MusicQueryException {
+            throws MusicServiceException, MusicQueryException {
         String lockqtable = table_prepend_name + table;
         String selectQuery = "select * from " + keyspace + "." + lockqtable + " where key=?;";