diff options
Diffstat (limited to 'src/main/java/org/onap/music/datastore/jsonobjects')
8 files changed, 10 insertions, 415 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 deleted file mode 100755 index f869c342..00000000 --- a/src/main/java/org/onap/music/datastore/jsonobjects/JSONCallbackResponse.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * ============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.List; -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; - private List<String> updateList; - - 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; - } - public List<String> getUpdateList() { - return updateList; - } - public void setUpdateList(List<String> updateList) { - this.updateList = updateList; - } - - -} diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/JsonCallback.java b/src/main/java/org/onap/music/datastore/jsonobjects/JsonCallback.java deleted file mode 100755 index 4a865320..00000000 --- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonCallback.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * ============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 io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -@ApiModel(value = "JsonCallback", description = "Json model for callback") -@JsonIgnoreProperties(ignoreUnknown = true) -public class JsonCallback implements Serializable { - private String applicationName; - private String applicationUsername; - private String applicationPassword; - private String applicationNotificationEndpoint; - private String notifyOn; - 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() { - return applicationName; - } - - public void setApplicationName(String applicationName) { - this.applicationName = applicationName; - } - - @ApiModelProperty(value = "notify On") - public String getNotifyOn() { - return notifyOn; - } - - public void setNotifyOn(String notifyOn) { - this.notifyOn = notifyOn; - } - - @ApiModelProperty(value = "application User name") - public String getApplicationUsername() { - return applicationUsername; - } - - public void setApplicationUsername(String applicationUsername) { - this.applicationUsername = applicationUsername; - } - - @ApiModelProperty(value = "application password") - public String getApplicationPassword() { - return applicationPassword; - } - - public void setApplicationPassword(String applicationPassword) { - this.applicationPassword = applicationPassword; - } - - @ApiModelProperty(value = "application notification endpoint") - public String getApplicationNotificationEndpoint() { - return applicationNotificationEndpoint; - } - - public void setApplicationNotificationEndpoint(String applicationNotificationEndpoint) { - this.applicationNotificationEndpoint = applicationNotificationEndpoint; - } - - @ApiModelProperty(value = "notify when updates") - public String getNotifyWhenChangeIn() { - return notifyWhenChangeIn; - } - - public void setNotifyWhenChangeIn(String notifyWhenChangeIn) { - this.notifyWhenChangeIn = notifyWhenChangeIn; - } - - @ApiModelProperty(value = "notify when inserts") - public String getNotifyWhenInsertsIn() { - return notifyWhenInsertsIn; - } - - public void setNotifyWhenInsertsIn(String notifyWhenInsertsIn) { - this.notifyWhenInsertsIn = notifyWhenInsertsIn; - } - - @ApiModelProperty(value = "notify when deletes") - public String getNotifyWhenDeletesIn() { - return notifyWhenDeletesIn; - } - - public void setNotifyWhenDeletesIn(String notifyWhenDeletesIn) { - 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/JsonDelete.java b/src/main/java/org/onap/music/datastore/jsonobjects/JsonDelete.java index ce7f509b..a5db4be5 100644 --- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonDelete.java +++ b/src/main/java/org/onap/music/datastore/jsonobjects/JsonDelete.java @@ -36,8 +36,7 @@ public class JsonDelete { private ArrayList<String> columns = null; private Map<String, String> consistencyInfo; private Map<String, Object> conditions; - String ttl; - String timestamp; + String ttl, timestamp; @ApiModelProperty(value = "Conditions") @@ -86,4 +85,3 @@ public class JsonDelete { this.timestamp = timestamp; } } - diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/JsonInsert.java b/src/main/java/org/onap/music/datastore/jsonobjects/JsonInsert.java index c79ba9b7..9630abe0 100644 --- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonInsert.java +++ b/src/main/java/org/onap/music/datastore/jsonobjects/JsonInsert.java @@ -38,11 +38,12 @@ import io.swagger.annotations.ApiModelProperty; public class JsonInsert implements Serializable { private String keyspaceName; private String tableName; - private transient Map<String, Object> values; + private Map<String, Object> values; private String ttl; private String timestamp; - private transient Map<String, Object> row_specification; + private Map<String, Object> row_specification; private Map<String, String> consistencyInfo; + private byte[] data; private Map<String, byte[]> objectMap; @ApiModelProperty(value = "objectMap") diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/JsonNotification.java b/src/main/java/org/onap/music/datastore/jsonobjects/JsonNotification.java deleted file mode 100755 index ce244e2c..00000000 --- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonNotification.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * ============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; - -@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 String triggerName; - 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; - } - public String getTriggerName() { - return triggerName; - } - public void setTriggerName(String triggerName) { - this.triggerName = triggerName; - } - @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; - } - - } - -} diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/JsonNotifyClientResponse.java b/src/main/java/org/onap/music/datastore/jsonobjects/JsonNotifyClientResponse.java deleted file mode 100644 index 963352d0..00000000 --- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonNotifyClientResponse.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * ============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 com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -import io.swagger.annotations.ApiModel; - -@ApiModel(value = "JsonNotifyClientResponse", description = "Json model for callback") -@JsonIgnoreProperties(ignoreUnknown = true) -public class JsonNotifyClientResponse implements Serializable { - private String message; - private String status; - - public String getMessage() { - return message; - } - public void setMessage(String message) { - this.message = message; - } - public String getStatus() { - return status; - } - public void setStatus(String status) { - this.status = status; - } - - @Override - public String toString() { - try { - return new com.fasterxml.jackson.databind.ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(this); - } catch (com.fasterxml.jackson.core.JsonProcessingException e) { - return message+ " : "+status; - } - - } - -} diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/JsonSelect.java b/src/main/java/org/onap/music/datastore/jsonobjects/JsonSelect.java index ef56c5de..64bc3887 100644 --- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonSelect.java +++ b/src/main/java/org/onap/music/datastore/jsonobjects/JsonSelect.java @@ -27,13 +27,13 @@ import java.io.ObjectOutput; import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Map; -import org.apache.log4j.Logger; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class JsonSelect implements Serializable { private Map<String, String> consistencyInfo; - static Logger logger = Logger.getLogger(JsonSelect.class.getName()); + public Map<String, String> getConsistencyInfo() { return consistencyInfo; @@ -51,7 +51,6 @@ public class JsonSelect implements Serializable { out.writeObject(this); } catch (IOException e) { // TODO Auto-generated catch block - logger.error("Error", e); e.printStackTrace(); } return bos.toByteArray(); diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/JsonUpdate.java b/src/main/java/org/onap/music/datastore/jsonobjects/JsonUpdate.java index c1a56819..3ab5ea0d 100644 --- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonUpdate.java +++ b/src/main/java/org/onap/music/datastore/jsonobjects/JsonUpdate.java @@ -38,12 +38,11 @@ import io.swagger.annotations.ApiModelProperty; public class JsonUpdate implements Serializable { private String keyspaceName; private String tableName; - private transient Map<String, Object> values; - private String ttl; - private String timestamp; + private Map<String, Object> values; + private String ttl, timestamp; private Map<String, String> consistencyInfo; - private transient Map<String, Object> conditions; - private transient Map<String, Object> row_specification; + private Map<String, Object> conditions; + private Map<String, Object> row_specification; @ApiModelProperty(value = "Conditions") public Map<String, Object> getConditions() { |