X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fdatarouter%2Fquery%2FChameleonResponseBuiler.java;h=502fbf2e42af490cc609f6ad68b5ebe99eea6bb9;hb=refs%2Fchanges%2F53%2F40753%2F2;hp=d319c48a772f951e250bdd5b0e4ce10375bb5625;hpb=d46b0b9c3ce9ad5eca684ebeccb89f04d3cbcf6c;p=aai%2Fdata-router.git

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 d319c48..502fbf2 100644
--- a/src/main/java/org/onap/aai/datarouter/query/ChameleonResponseBuiler.java
+++ b/src/main/java/org/onap/aai/datarouter/query/ChameleonResponseBuiler.java
@@ -24,7 +24,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import javax.ws.rs.core.Response.Status;
+
 import org.apache.camel.Exchange;
+import org.onap.aai.datarouter.exception.DataRouterException;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -36,14 +39,13 @@ public class ChameleonResponseBuiler  {
   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();
+  public static String buildEntity(String chameleonResponse, String id) throws DataRouterException{
+    
     JsonParser parser = new JsonParser();
-    JsonObject root = parser.parse(response).getAsJsonObject();
+    JsonObject root = parser.parse(chameleonResponse).getAsJsonObject();
     JsonObject champResponse = new JsonObject();
     if (!root.has(TYPE)) {
-      exchange.getIn().setHeader(Exchange.HTTP_RESPONSE_CODE, 400);
-      return ;
+      throw new DataRouterException("Chameloen response does not have type : "+chameleonResponse , Status.BAD_REQUEST);
     }
     champResponse.addProperty("key", id);
     champResponse.addProperty(TYPE, root.get(TYPE).getAsString());
@@ -66,16 +68,19 @@ public class ChameleonResponseBuiler  {
     
     champResponse.add("properties", props);
 
-    exchange.getIn().setBody(champResponse.toString());
+    return champResponse.toString();
     
   }
   
  
-  public static void buildObjectRelationship(Exchange exchange, String id){
+  public static String buildObjectRelationship(String chameleonResponse, String id){
     //TODO: implement when chameleon supports this query     
+    return "[]";
   }
-  public static void buildCollection(Exchange exchange){
+  public static String buildCollection(String chameleonResponse){
     //TODO: implement when chameleon supports this query   
+    return "[]";
+    
   }