Update swagger.json and other updates.

Change-Id: I84753300e64ba82072e65ef1bde2cb76771ee046
Issue-ID: MUSIC-97
Signed-off-by: Nelson, Thomas (tn1381) <tn1381@att.com>

3 files changed, 215 insertions, 0 deletions

diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/JSONCallbackResponse.java b/src/main/java/org/onap/music/datastore/jsonobjects/JSONCallbackResponse.java
new file mode 100755
index 00000000..c521d0df
--- /dev/null
+++ b/src/main/java/org/onap/music/datastore/jsonobjects/JSONCallbackResponse.java
@@ -0,0 +1,80 @@
+/*
+ * ============LICENSE_START==========================================
+ * org.onap.music
+ * ===================================================================
+ *  Copyright (c) 2017 AT&T Intellectual Property
+ * ===================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ * 
+ * ============LICENSE_END=============================================
+ * ====================================================================
+ */
+
+package org.onap.music.datastore.jsonobjects;
+
+import java.util.Map;
+
+public class JSONCallbackResponse {
+
+	private String full_table;
+	private String keyspace;
+	private Map<String, String> changeValue;
+	private String operation;
+	private String table_name;
+	private String primary_key;
+	private Object miscObjects;
+	public String getFull_table() {
+		return full_table;
+	}
+	public void setFull_table(String full_table) {
+		this.full_table = full_table;
+	}
+	public String getKeyspace() {
+		return keyspace;
+	}
+	public void setKeyspace(String keyspace) {
+		this.keyspace = keyspace;
+	}
+	public String getOperation() {
+		return operation;
+	}
+	public void setOperation(String operation) {
+		this.operation = operation;
+	}
+	public String getTable_name() {
+		return table_name;
+	}
+	public void setTable_name(String table_name) {
+		this.table_name = table_name;
+	}
+	public String getPrimary_key() {
+		return primary_key;
+	}
+	public void setPrimary_key(String primary_key) {
+		this.primary_key = primary_key;
+	}
+	public Object getMiscObjects() {
+		return miscObjects;
+	}
+	public void setMiscObjects(Object miscObjects) {
+		this.miscObjects = miscObjects;
+	}
+	public void setChangeValue(Map<String, String> changeValue) {
+		this.changeValue = changeValue;
+	}
+	public Map<String, String> getChangeValue() {
+		return changeValue;
+	}
+	
+	
+}
diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/JsonCallback.java b/src/main/java/org/onap/music/datastore/jsonobjects/JsonCallback.java
index 42b12f10..4a865320 100644..100755
--- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonCallback.java
+++ b/src/main/java/org/onap/music/datastore/jsonobjects/JsonCallback.java
@@ -22,6 +22,7 @@
 package org.onap.music.datastore.jsonobjects;
 
 import java.io.Serializable;
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
@@ -39,6 +40,17 @@ public class JsonCallback implements Serializable {
     private String notifyWhenChangeIn;
     private String notifyWhenInsertsIn;
     private String notifyWhenDeletesIn;
+    private Map<String, String> responseBody;
+
+    private String uuid;
+    
+    public String getUuid() {
+    	return uuid;
+    }
+    
+    public void setUuid(String uuid) {
+    	this.uuid = uuid;
+    }
 
     @ApiModelProperty(value = "application name")
     public String getApplicationName() {
@@ -112,4 +124,12 @@ public class JsonCallback implements Serializable {
         this.notifyWhenDeletesIn = notifyWhenDeletesIn;
     }
 
+    public Map<String, String> getResponseBody() {
+		return responseBody;
+	}
+    
+    public void setResponseBody(Map<String, String> responseBody) {
+		this.responseBody = responseBody;
+	}
+    
 }
diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/JsonNotification.java b/src/main/java/org/onap/music/datastore/jsonobjects/JsonNotification.java
new file mode 100755
index 00000000..ad999190
--- /dev/null
+++ b/src/main/java/org/onap/music/datastore/jsonobjects/JsonNotification.java
@@ -0,0 +1,115 @@
+/*
+ * ============LICENSE_START==========================================
+ * org.onap.music
+ * ===================================================================
+ *  Copyright (c) 2017 AT&T Intellectual Property
+ * ===================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ * 
+ * ============LICENSE_END=============================================
+ * ====================================================================
+ */
+package org.onap.music.datastore.jsonobjects;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(value = "JsonNotification", description = "Json model for callback")
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(Include.NON_NULL) 
+public class JsonNotification implements Serializable {
+	
+	private String notify_field;
+    private String endpoint;
+    private String username;
+    private String password;
+    private String notify_change;
+    private String notify_insert;
+    private String notify_delete;
+    private String operation_type;
+    
+    private Map<String, String> response_body;
+    
+	public String getNotify_field() {
+		return notify_field;
+	}
+	public void setNotify_field(String notify_field) {
+		this.notify_field = notify_field;
+	}
+	public String getEndpoint() {
+		return endpoint;
+	}
+	public void setEndpoint(String endpoint) {
+		this.endpoint = endpoint;
+	}
+	public String getUsername() {
+		return username;
+	}
+	public void setUsername(String username) {
+		this.username = username;
+	}
+	public String getPassword() {
+		return password;
+	}
+	public void setPassword(String password) {
+		this.password = password;
+	}
+	public Map<String, String> getResponse_body() {
+		return response_body;
+	}
+	public void setResponse_body(Map<String, String> response_body) {
+		this.response_body = response_body;
+	}
+	public String getNotify_change() {
+		return notify_change;
+	}
+	public void setNotify_change(String notify_change) {
+		this.notify_change = notify_change;
+	}
+	public String getNotify_insert() {
+		return notify_insert;
+	}
+	public void setNotify_insert(String notify_insert) {
+		this.notify_insert = notify_insert;
+	}
+	public String getNotify_delete() {
+		return notify_delete;
+	}
+	public void setNotify_delete(String notify_delete) {
+		this.notify_delete = notify_delete;
+	}
+	public String getOperation_type() {
+		return operation_type;
+	}
+	public void setOperation_type(String operation_type) {
+		this.operation_type = operation_type;
+	}
+
+	@Override
+	public String toString() {
+		try {
+	        return new com.fasterxml.jackson.databind.ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(this);
+	    } catch (com.fasterxml.jackson.core.JsonProcessingException e) {
+			return notify_field+ " : "+endpoint+ " : "+username+ " : "+password+ " : "+response_body;
+	    }
+
+	}
+	
+}