diff options
Diffstat (limited to 'src/main/java/org/onap/music/datastore/jsonobjects')
3 files changed, 21 insertions, 11 deletions
diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/AAFResponse.java b/src/main/java/org/onap/music/datastore/jsonobjects/AAFResponse.java index df6089ee..b0f41311 100644 --- a/src/main/java/org/onap/music/datastore/jsonobjects/AAFResponse.java +++ b/src/main/java/org/onap/music/datastore/jsonobjects/AAFResponse.java @@ -2,7 +2,9 @@ * ============LICENSE_START========================================== * org.onap.music * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property + * Copyright (c) 2017 AT&T Intellectual Property + * =================================================================== + * Modifications Copyright (c) 2018 IBM * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,21 +23,22 @@ */ package org.onap.music.datastore.jsonobjects; -import java.util.ArrayList; +import java.util.List; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @ApiModel(value = "JsonTable", description = "Reponse class for AAF request") public class AAFResponse { - private ArrayList<NameSpace> ns = null; + private List<NameSpace> ns = null; @ApiModelProperty(value = "Namespace value") - public ArrayList<NameSpace> getNs() { + public List<NameSpace> getNs() { return ns; } - public void setNs(ArrayList<NameSpace> ns) { + public void setNs(List<NameSpace> ns) { this.ns = ns; } 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..73237cd2 100644 --- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonSelect.java +++ b/src/main/java/org/onap/music/datastore/jsonobjects/JsonSelect.java @@ -3,6 +3,7 @@ * org.onap.music * =================================================================== * Copyright (c) 2017 AT&T Intellectual Property + * Modifications Copyright (C) 2018 IBM. * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +53,6 @@ public class JsonSelect implements Serializable { } 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..514f34ab 100644 --- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonUpdate.java +++ b/src/main/java/org/onap/music/datastore/jsonobjects/JsonUpdate.java @@ -3,6 +3,7 @@ * org.onap.music * =================================================================== * Copyright (c) 2017 AT&T Intellectual Property + * Modifications Copyright (C) 2018 IBM. * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +34,11 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import org.onap.music.eelf.logging.EELFLoggerDelegate; +import org.onap.music.eelf.logging.format.AppMessages; +import org.onap.music.eelf.logging.format.ErrorSeverity; +import org.onap.music.eelf.logging.format.ErrorTypes; + @ApiModel(value = "JsonTable", description = "Json model for table update") @JsonIgnoreProperties(ignoreUnknown = true) public class JsonUpdate implements Serializable { @@ -43,7 +49,8 @@ public class JsonUpdate implements Serializable { private String timestamp; private Map<String, String> consistencyInfo; private transient Map<String, Object> conditions; - private transient Map<String, Object> row_specification; + private transient Map<String, Object> rowSpecification; + private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(JsonUpdate.class); @ApiModelProperty(value = "Conditions") public Map<String, Object> getConditions() { @@ -56,11 +63,11 @@ public class JsonUpdate implements Serializable { @ApiModelProperty(value = "Information for selecting sepcific rows") public Map<String, Object> getRow_specification() { - return row_specification; + return rowSpecification; } - public void setRow_specification(Map<String, Object> row_specification) { - this.row_specification = row_specification; + public void setRow_specification(Map<String, Object> rowSpecification) { + this.rowSpecification = rowSpecification; } @@ -125,7 +132,7 @@ public class JsonUpdate implements Serializable { out = new ObjectOutputStream(bos); out.writeObject(this); } catch (IOException e) { - e.printStackTrace(); + logger.error(EELFLoggerDelegate.errorLogger, e,AppMessages.IOERROR, ErrorSeverity.ERROR, ErrorTypes.DATAERROR); } return bos.toByteArray(); } |