diff options
author | Nelson, Thomas (arthurdent3) <nelson24@att.com> | 2019-05-14 20:23:59 +0000 |
---|---|---|
committer | Tschaen, Brendan <ctschaen@att.com> | 2019-05-16 12:59:46 -0400 |
commit | 66aac8e2b8f61f075b285f969c1f8a88fdb313bd (patch) | |
tree | 8ee4e4c06b6a95c6b596c503fa9a6b19936917f0 /src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java | |
parent | d6e7b63cc580e7b3822be61fe92a493ad5e222a3 (diff) |
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>
Diffstat (limited to 'src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java')
-rw-r--r-- | src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java b/src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java index 66fec9c2..2c419e18 100644 --- a/src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java +++ b/src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java @@ -22,7 +22,9 @@ package org.onap.music.response.jsonobjects; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.onap.music.lockingservice.cassandra.MusicLockState.LockStatus; @@ -52,7 +54,7 @@ public class JsonResponse { /* Locking fields */ private String lock; private LockStatus lockStatus; - private String lockHolder; + private List<String> lockHolders; private String lockLease; @@ -209,8 +211,8 @@ public class JsonResponse { * @return the lockHolder */ @ApiModelProperty(value = "Holder of the Lock") - public String getLockHolder() { - return lockHolder; + public List<String> getLockHolder() { + return lockHolders; } /** @@ -218,10 +220,15 @@ public class JsonResponse { * @param lockHolder */ public JsonResponse setLockHolder(String lockHolder) { - this.lockHolder = lockHolder; + this.lockHolders = new ArrayList<String>(); + this.lockHolders.add(lockHolder); return this; } + public JsonResponse setLockHolder(List<String> lockHolders) { + this.lockHolders = lockHolders; + return this; + } /** @@ -274,8 +281,13 @@ public class JsonResponse { if (lockStatus != null) { lockMap.put("lock-status", lockStatus); } - if (lockHolder != null) { - lockMap.put("lock-holder", lockHolder); + if (lockHolders != null && !lockHolders.isEmpty()) { + if (lockHolders.size()==1) { + //for backwards compatability + lockMap.put("lock-holder", lockHolders.get(0)); + } else { + lockMap.put("lock-holder", lockHolders); + } } if (lockLease != null) { lockMap.put("lock-lease", lockLease); @@ -293,7 +305,7 @@ public class JsonResponse { public String toString() { return "JsonLockResponse [status=" + status + ", error=" + error + ", message=" + message + ", lock=" + lock + ", lockStatus=" + lockStatus + ", lockHolder=" - + lockHolder + "]"; + + lockHolders + "]"; } } |