aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Blimkie <Steven.Blimkie@amdocs.com>2018-03-22 14:40:52 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-22 14:40:52 +0000
commitfbbe3625fd5d7f13d6b070367319418d61ec31c3 (patch)
treedb8ff03016857d506d36e03afb5958acfbbc7a5a
parente8eaa995462f3e48ffc959117e3fca75e143819e (diff)
parentfb3e33675e2aab29ebd0750e86d57b03fe21e37b (diff)
Merge "Fixes in ChameleonResponseBuiler"
-rw-r--r--src/main/java/org/onap/aai/datarouter/query/ChameleonResponseBuiler.java27
1 files changed, 14 insertions, 13 deletions
diff --git a/src/main/java/org/onap/aai/datarouter/query/ChameleonResponseBuiler.java b/src/main/java/org/onap/aai/datarouter/query/ChameleonResponseBuiler.java
index f74e742..d319c48 100644
--- a/src/main/java/org/onap/aai/datarouter/query/ChameleonResponseBuiler.java
+++ b/src/main/java/org/onap/aai/datarouter/query/ChameleonResponseBuiler.java
@@ -32,32 +32,33 @@ import com.google.gson.JsonParser;
public class ChameleonResponseBuiler {
- public static void buildEntity(Exchange exchange, String ID){
+ private static final String SOURCE = "source";
+ private static final String TARGET = "target";
+ private static final String TYPE = "type";
+
+ public static void buildEntity(Exchange exchange, String id){
String response = exchange.getIn().getBody().toString();
JsonParser parser = new JsonParser();
JsonObject root = parser.parse(response).getAsJsonObject();
JsonObject champResponse = new JsonObject();
- if (!root.has("type")) {
+ if (!root.has(TYPE)) {
exchange.getIn().setHeader(Exchange.HTTP_RESPONSE_CODE, 400);
return ;
}
- champResponse.addProperty("key", ID);
- champResponse.addProperty("type", root.get("type").getAsString());
- if (root.has("source")) {
- champResponse.add("source", root.get("source"));
+ champResponse.addProperty("key", id);
+ champResponse.addProperty(TYPE, root.get(TYPE).getAsString());
+ if (root.has(SOURCE)) {
+ champResponse.add(SOURCE, root.get(SOURCE));
}
- if (root.has("target")) {
- champResponse.add("target", root.get("target"));
+ if (root.has(TARGET)) {
+ champResponse.add(TARGET, root.get(TARGET));
}
JsonObject props = new JsonObject();
List<Map.Entry<String, JsonElement>> entries = new ArrayList<Map.Entry<String, JsonElement>>(
root.getAsJsonObject().entrySet());
for (Map.Entry<String, JsonElement> e : entries) {
- if (!e.getKey().equals("type") && !e.getKey().equals("source") && !e.getKey().equals("target")) {
- if (e.getKey().equals("source")) {
-
- }
+ if (!TYPE.equals(e.getKey()) && !SOURCE.equals(e.getKey()) && !TARGET.equals(e.getKey())) {
props.addProperty(e.getKey(), e.getValue().getAsString());
}
@@ -70,7 +71,7 @@ public class ChameleonResponseBuiler {
}
- public static void buildObjectRelationship(Exchange exchange, String ID){
+ public static void buildObjectRelationship(Exchange exchange, String id){
//TODO: implement when chameleon supports this query
}
public static void buildCollection(Exchange exchange){