summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/onap/music/datastore/jsonobjects/AAFResponse.java13
-rw-r--r--src/main/java/org/onap/music/datastore/jsonobjects/JsonSelect.java2
-rwxr-xr-xsrc/main/java/org/onap/music/rest/RestMusicAdminAPI.java4
3 files changed, 12 insertions, 7 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/rest/RestMusicAdminAPI.java b/src/main/java/org/onap/music/rest/RestMusicAdminAPI.java
index 33128f3c..7fb7b1d5 100755
--- a/src/main/java/org/onap/music/rest/RestMusicAdminAPI.java
+++ b/src/main/java/org/onap/music/rest/RestMusicAdminAPI.java
@@ -4,6 +4,8 @@
* ===================================================================
* 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.
* You may obtain a copy of the License at
@@ -939,7 +941,7 @@ public class RestMusicAdminAPI {
pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), notifyOn));
MusicCore.nonKeyRelatedPut(pQuery, MusicUtil.EVENTUAL);
} catch(Exception e) {
- e.printStackTrace();
+ logger.error(EELFLoggerDelegate.errorLogger,e.getMessage());
return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setMessage("Callback api registration failed").toMap()).build();
}
return response.status(Status.OK).entity(new JsonResponse(ResultType.SUCCESS).setMessage("Callback api successfully deleted").toMap()).build();