summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBharath Balasubramanian <bharathb@research.att.com>2018-11-20 12:54:02 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-20 12:54:02 +0000
commitd35044fcb48aa09cbca5f6a89821e9cce5b0ba63 (patch)
tree7f4509e0c38f7873ab3f41a9ae9a0cb4470c509c
parentcbfcc8c459d504cd93c17d6d576ef1bf100c62b1 (diff)
parented1c9ea4a8e229a8a279749ba3985b1ee6c46435 (diff)
Merge "removed unused imports and fixed sonar issues"
-rw-r--r--src/main/java/org/onap/music/conductor/conditionals/RestMusicConditionalAPI.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/org/onap/music/conductor/conditionals/RestMusicConditionalAPI.java b/src/main/java/org/onap/music/conductor/conditionals/RestMusicConditionalAPI.java
index eb466754..1343628c 100644
--- a/src/main/java/org/onap/music/conductor/conditionals/RestMusicConditionalAPI.java
+++ b/src/main/java/org/onap/music/conductor/conditionals/RestMusicConditionalAPI.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
@@ -37,7 +39,6 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Response.Status;
-import org.codehaus.jettison.json.JSONObject;
import org.onap.music.datastore.PreparedQueryObject;
import org.onap.music.eelf.logging.EELFLoggerDelegate;
import org.onap.music.eelf.logging.format.AppMessages;
@@ -49,8 +50,6 @@ import org.onap.music.main.ResultType;
import org.onap.music.main.ReturnType;
import org.onap.music.response.jsonobjects.JsonResponse;
import org.onap.music.rest.RestMusicAdminAPI;
-import org.onap.music.conductor.*;
-
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.TableMetadata;
@@ -126,8 +125,8 @@ public class RestMusicConditionalAPI {
}
Map<String, String> status = new HashMap<>();
- status.put("exists", conditions.get("exists").get("status").toString());
- status.put("nonexists", conditions.get("nonexists").get("status").toString());
+ status.put("exists", conditions.get("exists").get("status"));
+ status.put("nonexists", conditions.get("nonexists").get("status"));
ReturnType out = null;
out = MusicConditional.conditionalInsert(keyspace, tablename, casscadeColumnName, casscadeColumnData,