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, 17 insertions, 0 deletions

diff --git a/src/test/java/org/onap/music/unittests/JsonResponseTest.java b/src/test/java/org/onap/music/unittests/JsonResponseTest.java
index 88fddf4e..20ac1562 100644
--- a/src/test/java/org/onap/music/unittests/JsonResponseTest.java
+++ b/src/test/java/org/onap/music/unittests/JsonResponseTest.java
@@ -26,7 +26,9 @@ package org.onap.music.unittests;
 
 import static org.junit.Assert.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.junit.Test;
 import org.onap.music.lockingservice.cassandra.MusicLockState.LockStatus;
@@ -125,4 +127,19 @@ public class JsonResponseTest {
         assertTrue(result.toString() instanceof String);
         
     }
+    
+    @Test
+    public void testLockHolders() {
+        result = new JsonResponse(ResultType.SUCCESS).setLock("lockName").setLockHolder("lockholder1");
+        Map<String, Object> lockMap = (Map<String, Object>) result.toMap().get("lock");
+        // assure that this is string for backwards compatibility
+        assertEquals("lockholder1", lockMap.get("lock-holder"));
+
+        List<String> lockholders = new ArrayList<>();
+        lockholders.add("lockholder1");
+        lockholders.add("lockholder2");
+        result.setLockHolder(lockholders);
+        lockMap = (Map<String, Object>) result.toMap().get("lock");
+        assertEquals(lockMap.get("lock-holder"), lockholders);
+    }
 }