Code Review
/
aai
/
data-router.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactoring to use camel servlet with spring boot
[aai/data-router.git]
/
src
/
main
/
java
/
org
/
onap
/
aai
/
datarouter
/
query
/
ChameleonResponseBuiler.java
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
502fbf2
..
d319c48
100644
(file)
--- a/
src/main/java/org/onap/aai/datarouter/query/ChameleonResponseBuiler.java
+++ b/
src/main/java/org/onap/aai/datarouter/query/ChameleonResponseBuiler.java
@@
-24,10
+24,7
@@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.List;
import java.util.Map;
-import javax.ws.rs.core.Response.Status;
-
import org.apache.camel.Exchange;
import org.apache.camel.Exchange;
-import org.onap.aai.datarouter.exception.DataRouterException;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
@@
-39,13
+36,14
@@
public class ChameleonResponseBuiler {
private static final String TARGET = "target";
private static final String TYPE = "type";
private static final String TARGET = "target";
private static final String TYPE = "type";
- public static
String buildEntity(String chameleonResponse, String id) throws DataRouterException
{
-
+ public static
void buildEntity(Exchange exchange, String id)
{
+ String response = exchange.getIn().getBody().toString();
JsonParser parser = new JsonParser();
JsonParser parser = new JsonParser();
- JsonObject root = parser.parse(
chameleonR
esponse).getAsJsonObject();
+ JsonObject root = parser.parse(
r
esponse).getAsJsonObject();
JsonObject champResponse = new JsonObject();
if (!root.has(TYPE)) {
JsonObject champResponse = new JsonObject();
if (!root.has(TYPE)) {
- throw new DataRouterException("Chameloen response does not have type : "+chameleonResponse , Status.BAD_REQUEST);
+ exchange.getIn().setHeader(Exchange.HTTP_RESPONSE_CODE, 400);
+ return ;
}
champResponse.addProperty("key", id);
champResponse.addProperty(TYPE, root.get(TYPE).getAsString());
}
champResponse.addProperty("key", id);
champResponse.addProperty(TYPE, root.get(TYPE).getAsString());
@@
-68,19
+66,16
@@
public class ChameleonResponseBuiler {
champResponse.add("properties", props);
champResponse.add("properties", props);
-
return champResponse.toString(
);
+
exchange.getIn().setBody(champResponse.toString()
);
}
}
- public static
String buildObjectRelationship(String chameleonRespons
e, String id){
+ public static
void buildObjectRelationship(Exchange exchang
e, String id){
//TODO: implement when chameleon supports this query
//TODO: implement when chameleon supports this query
- return "[]";
}
}
- public static
String buildCollection(String chameleonRespons
e){
+ public static
void buildCollection(Exchange exchang
e){
//TODO: implement when chameleon supports this query
//TODO: implement when chameleon supports this query
- return "[]";
-
}
}