Push variuos changes

[music.git] / jar / src / main / java / org / onap / music / response / jsonobjects / JsonResponse.java

diff --git a/jar/src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java b/jar/src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java
index a406afc..9d4f5ed 100644 (file)
--- a/jar/src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java
+++ b/jar/src/main/java/org/onap/music/response/jsonobjects/JsonResponse.java
@@ -19,6 +19,7 @@
  * ============LICENSE_END=============================================
  * ====================================================================
  */
+
 package org.onap.music.response.jsonobjects;
 
 import java.util.HashMap;
@@ -39,7 +40,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value = "JsonResponse", description = "General Response JSON")
 public class JsonResponse {
 
-       /* Status is required */
+    /* Status is required */
     private ResultType status;
     
     /* Standard informational fields */
@@ -69,7 +70,7 @@ public class JsonResponse {
         this.status = status;
     }
 
-       /**
+     /**
      * 
      * @return
      */
@@ -130,7 +131,7 @@ public class JsonResponse {
      * @return the music version
      */
     public String getMusicVersion() {
-       return this.musicVersion;
+        return this.musicVersion;
     }
     
     /**
@@ -139,20 +140,20 @@ public class JsonResponse {
      * @return
      */
     public JsonResponse setMusicVersion(String version) {
-       this.musicVersion = version;
-       return this;
+        this.musicVersion = version;
+        return this;
     }
 
     public Map<String, HashMap<String, Object>> getDataResult() {
-       return this.dataResult;
+        return this.dataResult;
     }
     
     public JsonResponse setDataResult(Map<String, HashMap<String, Object>> map) {
-       this.dataResult = map;
-       return this;
+        this.dataResult = map;
+        return this;
     }
 
-       /**
+    /**
      * 
      * @return
      */
@@ -237,16 +238,16 @@ public class JsonResponse {
         if (musicVersion!=null) {fullMap.put("version", musicVersion);}
         
         if (dataResult!=null) {
-               fullMap.put("result", dataResult);
+            fullMap.put("result", dataResult);
         }
         
         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);}
-               fullMap.put("lock", lockMap);
+            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);}
+            fullMap.put("lock", lockMap);
         }
 
         return fullMap;