X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fcrud%2Fdao%2Fchamp%2FChampDao.java;h=81980ccb36d4590006348ef4adc43e930ff61e20;hb=3bc6a702f2d3d8710c7aaa94cdc8c0ccf3deb759;hp=6817ea66878e52abd2ce4709b4f28c48592293d7;hpb=d5322dbd0fa1e32d543b24824a28d6bf0a0b5497;p=aai%2Fgizmo.git

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 6817ea6..81980cc 100644
--- a/src/main/java/org/onap/crud/dao/champ/ChampDao.java
+++ b/src/main/java/org/onap/crud/dao/champ/ChampDao.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import org.apache.http.NameValuePair;
@@ -140,26 +141,39 @@ public class ChampDao implements GraphDao {
   }
 
   @Override
-  public List<Edge> getVertexEdges(String id, Map<String, String> queryParams) throws CrudException {
-    StringBuilder strBuild = new StringBuilder(baseObjectUrl);
-    strBuild.append("/relationships/");
-    strBuild.append(id);
-    if(queryParams != null && !queryParams.isEmpty())
-    {
-        strBuild.append("?");
-        strBuild.append(URLEncodedUtils.format(convertToNameValuePair(queryParams), Charset.defaultCharset()));
-    }
+  public List<Edge> getVertexEdges(String id, Map<String, String> queryParams, String txId) throws CrudException {
+      StringBuilder strBuild = new StringBuilder(baseObjectUrl);
+      strBuild.append("/relationships/");
+      strBuild.append(id);
+
+      Map<String,String> queryParamsCopy = null;
+      if (queryParams != null) {
+          queryParamsCopy = new HashMap<String,String>(queryParams);
+      }
+      else {
+          queryParamsCopy = new HashMap<String,String>();
+      }
 
-    OperationResult getResult = client.get(strBuild.toString(), createHeader(), MediaType.APPLICATION_JSON_TYPE);
+      if (txId != null) {
+          queryParamsCopy.put("transactionId", txId);
+      }
 
-    if (getResult.getResultCode() == 200) {
-      return champGson.fromJson(getResult.getResult(), new TypeToken<List<Edge>>() {
-      }.getType());
-    } else {
-      // We didn't find a vertex with the supplied id, so just throw an
-      // exception.
-      throw createErrorException(getResult, javax.ws.rs.core.Response.Status.NOT_FOUND, "No vertex with id " + id + " found in graph");
-    }
+      if (!queryParamsCopy.isEmpty())
+      {
+          strBuild.append("?");
+          strBuild.append(URLEncodedUtils.format(convertToNameValuePair(queryParamsCopy), Charset.defaultCharset()));
+      }
+
+      OperationResult getResult = client.get(strBuild.toString(), createHeader(), MediaType.APPLICATION_JSON_TYPE);
+
+      if (getResult.getResultCode() == 200) {
+          return champGson.fromJson(getResult.getResult(), new TypeToken<List<Edge>>() {
+          }.getType());
+      } else {
+          // We didn't find a vertex with the supplied id, so just throw an
+          // exception.
+          throw createErrorException(getResult, javax.ws.rs.core.Response.Status.NOT_FOUND, "No vertex with id " + id + " found in graph");
+      }
   }
 
   @Override
@@ -168,7 +182,7 @@ public class ChampDao implements GraphDao {
   }
 
   @Override
-  public OperationResult getVertices(String type, Map<String, Object> filter, HashSet<String> properties, String version) throws CrudException {
+  public OperationResult getVertices(String type, Map<String, Object> filter, Set<String> properties, String version) throws CrudException {
     filter.put(org.onap.schema.validation.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type);
 
     List<NameValuePair> queryParams = convertToNameValuePair(filter);
@@ -342,7 +356,7 @@ public class ChampDao implements GraphDao {
   }
 
   @Override
-  public void deleteEdge(String id, String type) throws CrudException {
+  public void deleteEdge(String id) throws CrudException {
     String url = baseRelationshipUrl + "/" + id;
     OperationResult getResult = client.delete(url, createHeader(), MediaType.APPLICATION_JSON_TYPE);
 
@@ -511,7 +525,7 @@ public class ChampDao implements GraphDao {
   }
 
   @Override
-  public void deleteEdge(String id, String type, String txId) throws CrudException {
+  public void deleteEdge(String id, String txId) throws CrudException {
     String url = baseRelationshipUrl + "/" + id + "?transactionId=" + txId;
     OperationResult getResult = client.delete(url, createHeader(), MediaType.APPLICATION_JSON_TYPE);
 
@@ -523,19 +537,12 @@ public class ChampDao implements GraphDao {
   }
 
   @Override
-  public Edge getEdge(String id, String type, String txId) throws CrudException {
+  public Edge getEdge(String id, String txId) throws CrudException {
     String url = baseRelationshipUrl + "/" + id + "?transactionId=" + txId;
     OperationResult getResult = client.get(url, createHeader(), MediaType.APPLICATION_JSON_TYPE);
 
     if (getResult.getResultCode() == 200) {
       Edge edge = Edge.fromJson(getResult.getResult());
-
-      if (!edge.getType().equalsIgnoreCase(type)) {
-        // We didn't find an edge with the supplied type, so just throw an
-        // exception.
-        throw new CrudException("No edge with id " + id + " and type " + type + " found in graph",
-            javax.ws.rs.core.Response.Status.NOT_FOUND);
-      }
       return edge;
     } else {
       // We didn't find an edge with the supplied id, so just throw an
@@ -543,6 +550,20 @@ public class ChampDao implements GraphDao {
       throw createErrorException(getResult, javax.ws.rs.core.Response.Status.NOT_FOUND, "No edge with id " + id + " found in graph");
     }
   }
+  
+  @Override
+  public Edge getEdge(String id) throws CrudException {
+    String url = baseRelationshipUrl + "/" + id;
+    OperationResult getResult = client.get(url, createHeader(), MediaType.APPLICATION_JSON_TYPE);
+
+    if (getResult.getResultCode() == 200) {
+      Edge edge = Edge.fromJson(getResult.getResult());
+      return edge;
+    } else {
+      // We didn't find an edge with the supplied id, so just throw an exception.
+      throw createErrorException(getResult, javax.ws.rs.core.Response.Status.NOT_FOUND, "No edge with id " + id + " found in graph");
+    }
+  }
 
   public Vertex getVertex(String id, String type, String version, String txId) throws CrudException {
     String url = baseObjectUrl + "/" + id + "?transactionId=" + txId;
@@ -575,7 +596,7 @@ public class ChampDao implements GraphDao {
   }
 
   // https://stackoverflow.com/questions/26942330/convert-mapstring-string-to-listnamevaluepair-is-this-the-most-efficient
-  private List<NameValuePair> convertToNameValuePair(String k, HashSet<String> values) {
+  private List<NameValuePair> convertToNameValuePair(String k, Set<String> values) {
     List<NameValuePair> nvpList = new ArrayList<>(values.size());
 
     values.forEach((v) -> nvpList.add(new BasicNameValuePair(k, v)));