aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Nelson <nelson24@att.com>2018-11-15 07:17:51 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-15 07:17:51 +0000
commitb6e548fb52f035062ce08fceaa8fe5bcfdfcd386 (patch)
treeb5c7e93f8aa35c5f4183544abafe89a7237514b9
parent49a5bf8abc9a1f69695ed1d1b22268871b49eb11 (diff)
parentc0e4d3de9f1758e5124a24feb236500c4dc6c32f (diff)
Merge "Sonar Fix: JsonResponse.java"
-rw-r--r--src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java33
1 files changed, 21 insertions, 12 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 a406afce..207911d7 100644
--- a/src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java
+++ b/src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java
@@ -26,12 +26,7 @@ import java.util.Map;
import org.onap.music.lockingservice.MusicLockState.LockStatus;
import org.onap.music.main.ResultType;
-import org.powermock.core.spi.testresult.Result;
-import com.datastax.driver.core.ColumnDefinitions;
-import com.datastax.driver.core.ResultSet;
-import com.datastax.driver.core.Row;
-import com.datastax.driver.core.ColumnDefinitions.Definition;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -231,10 +226,16 @@ public class JsonResponse {
public Map<String, Object> toMap() {
Map<String, Object> fullMap = new HashMap<>();
fullMap.put("status", status);
- if (error!=null) {fullMap.put("error", error);}
- if (message!=null) {fullMap.put("message", message);}
+ if (error!=null) {
+ fullMap.put("error", error);
+ }
+ if (message!=null) {
+ fullMap.put("message", message);
+ }
- if (musicVersion!=null) {fullMap.put("version", musicVersion);}
+ if (musicVersion!=null) {
+ fullMap.put("version", musicVersion);
+ }
if (dataResult!=null) {
fullMap.put("result", dataResult);
@@ -242,10 +243,18 @@ public class JsonResponse {
if (lock!=null) {
Map<String, Object> lockMap = new HashMap<>();
- if (lock!=null) {lockMap.put("lock", lock);}
- if (lockStatus!=null) {lockMap.put("lock-status", lockStatus);}
- if (lockHolder!=null) {lockMap.put("lock-holder", lockHolder);}
- if (lockLease!=null) {lockMap.put("lock-lease", lockLease);}
+ if (lock!=null) {
+ lockMap.put("lock", lock);
+ }
+ if (lockStatus!=null) {
+ lockMap.put("lock-status", lockStatus);
+ }
+ if (lockHolder!=null) {
+ lockMap.put("lock-holder", lockHolder);
+ }
+ if (lockLease!=null) {
+ lockMap.put("lock-lease", lockLease);
+ }
fullMap.put("lock", lockMap);
}