X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fcrud%2Fservice%2FTestDao.java;h=38202d7958e0b5f8ec4ac6c4ebba9d7290dd2865;hb=f60a17c6abb6deef1c24f917488745cbc6e6a566;hp=5af85f0b4381d70b994bb25768046c1cde3f2476;hpb=d41ef90610aadb5aa3372d5922155e4fc4e0a407;p=aai%2Fgizmo.git

diff --git a/src/test/java/org/onap/crud/service/TestDao.java b/src/test/java/org/onap/crud/service/TestDao.java
index 5af85f0..38202d7 100644
--- a/src/test/java/org/onap/crud/service/TestDao.java
+++ b/src/test/java/org/onap/crud/service/TestDao.java
@@ -21,24 +21,34 @@
 package org.onap.crud.service;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-
+import java.util.Set;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import org.onap.aai.restclient.client.OperationResult;
 import org.onap.crud.dao.GraphDao;
+import org.onap.crud.dao.champ.ChampBulkPayload;
 import org.onap.crud.entity.Edge;
 import org.onap.crud.entity.Vertex;
 import org.onap.crud.exception.CrudException;
 
 public class TestDao implements GraphDao {
-  
+
   private final String champVertex = "{" +
       "\"key\": \"test-uuid\"," +
       "\"type\": \"pserver\"," +
       "\"properties\": {" +
       "\"fqdn\": \"myhost.onap.com\"," +
       "\"hostname\": \"myhost\" } }";
-  
+
+  private final String champVertices = "[ {" +
+          "\"key\": \"test-uuid\"," +
+          "\"type\": \"pserver\"," +
+          "\"properties\": {" +
+          "\"fqdn\": \"myhost.onap.com\"," +
+          "\"hostname\": \"myhost\" } } ]";
+
   private final String champEdge = "{" +
       "\"key\": \"test-uuid\"," +
       "\"type\": \"tosca.relationships.HostedOn\"," +
@@ -50,60 +60,81 @@ public class TestDao implements GraphDao {
       "\"key\": \"1d326bc7-b985-492b-9604-0d5d1f06f908\", \"type\": \"pserver\"}" +
       " }";
 
+  private final String champEdges = "[ {" +
+          "\"key\": \"test-uuid\"," +
+          "\"type\": \"tosca.relationships.HostedOn\"," +
+          "\"properties\": {" +
+          "\"prevent-delete\": \"NONE\" }," +
+          "\"source\": {" +
+          "\"key\": \"50bdab41-ad1c-4d00-952c-a0aa5d827811\", \"type\": \"vserver\"}," +
+          "\"target\": {" +
+          "\"key\": \"1d326bc7-b985-492b-9604-0d5d1f06f908\", \"type\": \"pserver\"}" +
+          " } ]";
+
   @Override
   public Vertex getVertex(String id, String version) throws CrudException {
     return Vertex.fromJson(champVertex, "v11");
   }
 
   @Override
-  public Vertex getVertex(String id, String type, String version, Map<String, String> queryParams)
+  public OperationResult getVertex(String id, String type, String version, Map<String, String> queryParams)
       throws CrudException {
-    return Vertex.fromJson(champVertex, "v11");
+    OperationResult operationResult = new OperationResult();
+    operationResult.setResult(champVertex);
+    return operationResult;
   }
 
   @Override
-  public List<Edge> getVertexEdges(String id, Map<String, String> queryParams) throws CrudException {
+  public List<Edge> getVertexEdges(String id, Map<String, String> queryParams, String txId) throws CrudException {
     List<Edge> list = new ArrayList<Edge>();
     list.add(Edge.fromJson(champEdge));
     return list;
   }
 
   @Override
-  public List<Vertex> getVertices(String type, Map<String, Object> filter, String version) throws CrudException {
-    List<Vertex> list = new ArrayList<Vertex>();
-    list.add(Vertex.fromJson(champVertex, "v11"));
-    return list;
+  public OperationResult getVertices(String type, Map<String, Object> filter, String version) throws CrudException {
+      OperationResult operationResult = new OperationResult();
+      operationResult.setResult(champVertices);
+      return operationResult;
   }
 
   @Override
-  public List<Vertex> getVertices(String type, Map<String, Object> filter, HashSet<String> properties, String version)
+  public OperationResult getVertices(String type, Map<String, Object> filter, Set<String> properties, String version)
       throws CrudException {
-    List<Vertex> list = new ArrayList<Vertex>();
-    list.add(Vertex.fromJson(champVertex, "v11"));
-    return list;
+    OperationResult operationResult = new OperationResult();
+    operationResult.setResult(champVertices);
+    return operationResult;
   }
 
   @Override
-  public Edge getEdge(String id, String type, Map<String, String> queryParams) throws CrudException {
-    return Edge.fromJson(champEdge);
+  public OperationResult getEdge(String id, String type, Map<String, String> queryParams) throws CrudException {
+    OperationResult operationResult = new OperationResult();
+    operationResult.setResult(champEdge);
+    return operationResult;
   }
 
   @Override
-  public List<Edge> getEdges(String type, Map<String, Object> filter) throws CrudException {
-    List<Edge> list = new ArrayList<Edge>();
-    list.add(Edge.fromJson(champEdge));
-    return list;
+  public OperationResult getEdges(String type, Map<String, Object> filter) throws CrudException {
+      OperationResult operationResult = new OperationResult();
+      operationResult.setResult(champEdges);
+      return operationResult;
   }
 
   @Override
-  public Vertex addVertex(String type, Map<String, Object> properties, String version) throws CrudException {
-    return Vertex.fromJson(champVertex, "v11");
+  public OperationResult addVertex(String type, Map<String, Object> properties, String version) throws CrudException {
+    OperationResult operationResult = new OperationResult();
+    operationResult.setHeaders(addReponseHeader());
+    operationResult.setResult(champVertex);
+    return operationResult;
   }
 
   @Override
-  public Vertex updateVertex(String id, String type, Map<String, Object> properties, String version)
+  public OperationResult updateVertex(String id, String type, Map<String, Object> properties, String version)
       throws CrudException {
-    return Vertex.fromJson(champVertex, "v11");
+    OperationResult operationResult = new OperationResult();
+	operationResult.setHeaders(addReponseHeader());
+    operationResult.setResult(champVertex);
+    return operationResult;
   }
 
   @Override
@@ -112,18 +143,24 @@ public class TestDao implements GraphDao {
   }
 
   @Override
-  public Edge addEdge(String type, Vertex source, Vertex target, Map<String, Object> properties, String version)
+  public OperationResult addEdge(String type, Vertex source, Vertex target, Map<String, Object> properties, String version)
       throws CrudException {
-    return Edge.fromJson(champEdge);
+    OperationResult operationResult = new OperationResult();
+	operationResult.setHeaders(addReponseHeader());
+    operationResult.setResult(champEdge);
+    return operationResult;
   }
 
   @Override
-  public Edge updateEdge(Edge edge) throws CrudException {
-    return Edge.fromJson(champEdge);
+  public OperationResult updateEdge(Edge edge) throws CrudException {
+    OperationResult operationResult = new OperationResult();
+	operationResult.setHeaders(addReponseHeader());
+    operationResult.setResult(champEdge);
+    return operationResult;
   }
 
   @Override
-  public void deleteEdge(String id, String type) throws CrudException {
+  public void deleteEdge(String id) throws CrudException {
     
   }
 
@@ -181,14 +218,31 @@ public class TestDao implements GraphDao {
   }
 
   @Override
-  public void deleteEdge(String id, String type, String txId) throws CrudException {
+  public void deleteEdge(String id, String txId) throws CrudException {
     // TODO Auto-generated method stub
     
   }
 
   @Override
-  public Edge getEdge(String id, String type, String txId) throws CrudException {
+  public Edge getEdge(String id, String txId) throws CrudException {
     return Edge.fromJson(champEdge);
   }
+  
+  private MultivaluedMap<String, String> addReponseHeader() {
+    MultivaluedMap<String, String> headers = new MultivaluedHashMap<String, String>();
+    headers.add("etag", "test123");
+    return headers;
+  }
 
+  @Override
+  public Edge getEdge(String id) throws CrudException {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+@Override
+public OperationResult bulkOperation(ChampBulkPayload champPayload) throws CrudException {
+    // TODO Auto-generated method stub
+    return null;
 }
+}
\ No newline at end of file