* ============LICENSE_END=============================================
* ====================================================================
*/
+
package org.onap.music.response.jsonobjects;
import java.util.HashMap;
import java.util.Map;
-import org.onap.music.lockingservice.MusicLockState.LockStatus;
+import org.onap.music.lockingservice.cassandra.MusicLockState.LockStatus;
import org.onap.music.main.ResultType;
@ApiModel(value = "JsonResponse", description = "General Response JSON")
public class JsonResponse {
- /* Status is required */
+ /* Status is required */
private ResultType status;
/* Standard informational fields */
/* versioning */
private String musicVersion;
+ private String musicBuild;
/* Data Fields */
private Map<String, HashMap<String, Object>> dataResult;
this.status = status;
}
- /**
+ /**
*
* @return
*/
/**
- *
+ * .
* @return the music version
*/
public String getMusicVersion() {
- return this.musicVersion;
+ return this.musicVersion;
}
/**
- *
+ * .
* @param version of music
* @return
*/
public JsonResponse setMusicVersion(String version) {
- this.musicVersion = version;
- return this;
+ this.musicVersion = version;
+ return this;
}
+ /**
+ * .
+ * @return the music version
+ */
+ public String getMusicBuild() {
+ return this.musicBuild;
+ }
+
+ /**
+ * .
+ * @param build of music
+ * @return
+ */
+ public JsonResponse setMusicBuild(String build) {
+ this.musicBuild = build;
+ 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
*/
public Map<String, Object> toMap() {
Map<String, Object> fullMap = new HashMap<>();
fullMap.put("status", status);
- if (error!=null) {
- fullMap.put("error", error);
+ if (error != null && !"".equals(error)) {
+ fullMap.put("error", error);
}
- if (message!=null) {
- fullMap.put("message", message);
+ if (message != null) {
+ fullMap.put("message", message);
}
- if (musicVersion!=null) {
+ if (musicVersion != null) {
fullMap.put("version", musicVersion);
}
- if (dataResult!=null) {
- fullMap.put("result", dataResult);
+ if (musicBuild != null) {
+ fullMap.put("build", musicBuild);
+ }
+
+ if (dataResult != null) {
+ 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);
+ 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);
}
return fullMap;