Allow filtering by reserved properties

[aai/gizmo.git] / src / main / java / org / onap / crud / dao / champ / ChampDao.java

diff --git a/src/main/java/org/onap/crud/dao/champ/ChampDao.java b/src/main/java/org/onap/crud/dao/champ/ChampDao.java
index 0bf8368..7174bfc 100644 (file)
--- a/src/main/java/org/onap/crud/dao/champ/ChampDao.java
+++ b/src/main/java/org/onap/crud/dao/champ/ChampDao.java
@@ -57,26 +57,29 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 public class ChampDao implements GraphDao {
-  private RestClient client;
-  private String baseObjectUrl;
-  private String baseRelationshipUrl;
-  private String baseTransactionUrl;
-
-  private static final String HEADER_FROM_APP = "X-FromAppId";
-  private static final String HEADER_TRANS_ID = "X-TransactionId";
-  private static final String FROM_APP_NAME = "Gizmo";
-  private static final String OBJECT_SUB_URL = "objects";
-  private static final String RELATIONSHIP_SUB_URL = "relationships";
-  private static final String TRANSACTION_SUB_URL = "transaction";
+  protected RestClient client;
+  protected String baseObjectUrl;
+  protected String baseRelationshipUrl;
+  protected String baseTransactionUrl;
+
+  protected static final String HEADER_FROM_APP = "X-FromAppId";
+  protected static final String HEADER_TRANS_ID = "X-TransactionId";
+  protected static final String FROM_APP_NAME = "Gizmo";
+  protected static final String OBJECT_SUB_URL = "objects";
+  protected static final String RELATIONSHIP_SUB_URL = "relationships";
+  protected static final String TRANSACTION_SUB_URL = "transaction";
 
   private Logger logger = LoggerFactory.getInstance().getLogger(ChampDao.class.getName());
 
   // We use a custom vertex serializer for champ because it expects "key"
   // instead of "id"
-  private static final Gson champGson = new GsonBuilder()
+  protected static final Gson champGson = new GsonBuilder()
       .registerTypeAdapterFactory(new GsonJava8TypeAdapterFactory())
       .registerTypeAdapter(Vertex.class, new ChampVertexSerializer())
       .registerTypeAdapter(Edge.class, new ChampEdgeSerializer()).create();
+  
+  public ChampDao() {
+  }
 
   public ChampDao(String champUrl, String certPassword) {
     try {
@@ -94,6 +97,13 @@ public class ChampDao implements GraphDao {
     }
   }
 
+  public ChampDao(RestClient client, String baseObjectUrl, String baseRelationshipUrl, String baseTransactionUrl) {
+      this.client = client;
+      this.baseObjectUrl = baseObjectUrl;
+      this.baseRelationshipUrl = baseRelationshipUrl;
+      this.baseTransactionUrl = baseTransactionUrl;
+  }
+
   @Override
   public Vertex getVertex(String id, String version) throws CrudException {
     String url = baseObjectUrl + "/" + id;
@@ -150,12 +160,12 @@ public class ChampDao implements GraphDao {
   }
 
   @Override
-  public List<Vertex> getVertices(String type, Map<String, Object> filter) throws CrudException {
-    return getVertices(type, filter, new HashSet<String>());
+  public List<Vertex> getVertices(String type, Map<String, Object> filter, String version) throws CrudException {
+    return getVertices(type, filter, new HashSet<String>(), version);
   }
 
   @Override
-  public List<Vertex> getVertices(String type, Map<String, Object> filter, HashSet<String> properties) throws CrudException {
+  public List<Vertex> getVertices(String type, Map<String, Object> filter, HashSet<String> properties, String version) throws CrudException {
     filter.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type);
 
     List<NameValuePair> queryParams = convertToNameValuePair(filter);
@@ -166,8 +176,7 @@ public class ChampDao implements GraphDao {
     OperationResult getResult = client.get(url, createHeader(), MediaType.APPLICATION_JSON_TYPE);
 
     if (getResult.getResultCode() == 200) {
-      return champGson.fromJson(getResult.getResult(), new TypeToken<List<Vertex>>() {
-      }.getType());
+      return Vertex.collectionFromJson(getResult.getResult(), version);
     } else {
       // We didn't find a vertex with the supplied id, so just throw an
       // exception.