3 files changed, 14 insertions, 10 deletions
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java
index 928255031..4e6ab71a4 100644
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java
@@ -37,6 +37,9 @@ public class CuratorLockFacade implements Lock {
     // Logger for this class
     private static final XLogger LOGGER = XLoggerFactory.getXLogger(CuratorLockFacade.class);
 
+    // Recurring string constants
+    private static final String FAILED_TO_ACQUIRE_LOCK_TAG = "failed to acquire lock for \"{}\"";
+
     // The Lock ID
     private final String lockId;
 
@@ -64,7 +67,7 @@ public class CuratorLockFacade implements Lock {
         try {
             lockMutex.acquire();
         } catch (final Exception e) {
-            LOGGER.warn("failed to acquire lock for \"" + lockId, e);
+            LOGGER.warn(FAILED_TO_ACQUIRE_LOCK_TAG, lockId, e);
         }
     }
 
@@ -75,7 +78,7 @@ public class CuratorLockFacade implements Lock {
      */
     @Override
     public void lockInterruptibly() throws InterruptedException {
-        LOGGER.warn("lockInterruptibly() not supported for \"" + lockId);
+        LOGGER.warn("lockInterruptibly() not supported for \"{}\"", lockId);
     }
 
     /*
@@ -131,7 +134,7 @@ public class CuratorLockFacade implements Lock {
      */
     @Override
     public Condition newCondition() {
-        LOGGER.warn("newCondition() not supported for \"" + lockId);
+        LOGGER.warn("newCondition() not supported for \"{} \"", lockId);
         return null;
     }
 }
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java
index d2976d799..bc8ce9055 100644
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java
@@ -81,9 +81,10 @@ public class CuratorLockManager extends AbstractLockManager {
         // Check if the curator address has been set
         curatorZookeeperAddress = lockParameters.getZookeeperAddress();
         if (curatorZookeeperAddress == null || curatorZookeeperAddress.trim().length() == 0) {
-            LOGGER.warn("could not set up Curator locking, check if the curator Zookeeper address parameter is set correctly");
-            throw new ContextException(
-                            "could not set up Curator locking, check if the curator Zookeeper address parameter is set correctly");
+            String message = "could not set up Curator locking, "
+                            + "check if the curator Zookeeper address parameter is set correctly";
+            LOGGER.warn(message);
+            throw new ContextException(message);
         }
 
         // Set up the curator framework we'll use
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java
index 22bf5e596..5a24fb701 100644
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java
@@ -33,7 +33,7 @@ import org.apache.curator.framework.recipes.locks.InterProcessReadWriteLock;
  */
 public class CuratorReentrantReadWriteLock implements ReadWriteLock {
     // The Lock ID
-    private final String lockID;
+    private final String lockId;
 
     // The Curator lock
     private final InterProcessReadWriteLock curatorReadWriteLock;
@@ -49,7 +49,7 @@ public class CuratorReentrantReadWriteLock implements ReadWriteLock {
      * @param lockId The unique ID of the lock.
      */
     public CuratorReentrantReadWriteLock(final CuratorFramework curatorFramework, final String lockId) {
-        lockID = lockId;
+        this.lockId = lockId;
 
         // Create the Curator lock
         curatorReadWriteLock = new InterProcessReadWriteLock(curatorFramework, lockId);
@@ -64,8 +64,8 @@ public class CuratorReentrantReadWriteLock implements ReadWriteLock {
      *
      * @return the lock ID
      */
-    public String getLockID() {
-        return lockID;
+    public String getLockId() {
+        return lockId;
     }
 
     /*