Merge "Include owner in createLockRef"

diff --git a/music-core/src/main/java/org/onap/music/exceptions/MusicDeadlockException.java b/music-core/src/main/java/org/onap/music/exceptions/MusicDeadlockException.java
index f5478e7..7a40ed9 100644 (file)
--- a/music-core/src/main/java/org/onap/music/exceptions/MusicDeadlockException.java
+++ b/music-core/src/main/java/org/onap/music/exceptions/MusicDeadlockException.java
@@ -23,10 +23,10 @@ package org.onap.music.exceptions;
 
 public class MusicDeadlockException extends MusicLockingException {
 
-       public String owner = null;
-       public String keyspace = null;
-       public String table = null;
-       public String key = null;
+       private String owner = null;
+       private String keyspace = null;
+       private String table = null;
+       private String key = null;
        
        public MusicDeadlockException() {
                super();

diff --git a/music-core/src/main/java/org/onap/music/main/MusicCore.java b/music-core/src/main/java/org/onap/music/main/MusicCore.java
index 226dfb0..30d2bc4 100644 (file)
--- a/music-core/src/main/java/org/onap/music/main/MusicCore.java
+++ b/music-core/src/main/java/org/onap/music/main/MusicCore.java
@@ -84,6 +84,10 @@ public class MusicCore {
     public static String createLockReferenceAtomic(String fullyQualifiedKey) throws MusicLockingException {
         return musicCore.createLockReferenceAtomic(fullyQualifiedKey);
     }
+    
+    public static String createLockReference(String fullyQualifiedKey, String owner) throws MusicLockingException {
+        return musicCore.createLockReference(fullyQualifiedKey, owner);
+    }
 
     public static String createLockReferenceAtomic(String fullyQualifiedKey, LockType locktype) throws MusicLockingException {
         return musicCore.createLockReferenceAtomic(fullyQualifiedKey, locktype);

diff --git a/music-core/src/main/java/org/onap/music/service/MusicCoreService.java b/music-core/src/main/java/org/onap/music/service/MusicCoreService.java
index 7629eae..2fc8814 100644 (file)
--- a/music-core/src/main/java/org/onap/music/service/MusicCoreService.java
+++ b/music-core/src/main/java/org/onap/music/service/MusicCoreService.java
@@ -91,6 +91,13 @@ public interface MusicCoreService {
      */
     public String createLockReferenceAtomic(String fullyQualifiedKey) throws MusicLockingException; // lock name
 
+    /**
+     * Create a lock ref in the music lock store
+     * @param fullyQualifiedKey the key to create a lock on
+     * @param owner the owner of the lock, for deadlock prevention
+     */
+    public String createLockReference(String fullyQualifiedKey, String owner) throws MusicLockingException;
+    
     /**
      * Create a lock ref in the music lock store
      * @param fullyQualifiedKey the key to create a lock on
@@ -178,4 +185,5 @@ public interface MusicCoreService {
     public ReturnType deleteFromTable(JsonDelete jsonDeleteObj,MultivaluedMap<String, String> rowParams) 
             throws MusicLockingException, MusicQueryException, MusicServiceException;
 
+
 }

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 c7c7cdd..63f2d14 100644 (file)
--- 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
@@ -116,6 +116,9 @@ public class MusicCassaCore implements MusicCoreService {
     public String createLockReferenceAtomic(String fullyQualifiedKey) throws MusicLockingException {
         return createLockReferenceAtomic(fullyQualifiedKey, LockType.WRITE);
     }
+    public String createLockReference(String fullyQualifiedKey, String owner) throws MusicLockingException {
+        return createLockReference(fullyQualifiedKey, LockType.WRITE, owner);
+    }
 
     /**
      * This will be called for Atomic calls