X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Faai%2FAaiResponseUtil.java;h=37bfc1d852d32d7d1c2d29a576f2ec6a99efac04;hb=a5dcabe2ed88747b71997164e201eed865cbc92e;hp=ccfb4fd6ae5221f8708339d96a8518f92414d405;hpb=43e1dfbcdb2a84d5e69a8b038f76fa626718e5d7;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiResponseUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiResponseUtil.java
index ccfb4fd..37bfc1d 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiResponseUtil.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiResponseUtil.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.jvnet.hk2.annotations.Service;
-import org.onap.holmes.common.aai.entity.RelationshipList;
 import org.onap.holmes.common.aai.entity.RelationshipList.RelatedToProperty;
 import org.onap.holmes.common.aai.entity.RelationshipList.Relationship;
 import org.onap.holmes.common.aai.entity.RelationshipList.RelationshipData;
@@ -33,6 +32,7 @@ import org.onap.holmes.common.aai.entity.VnfEntity;
 @Service
 public class AaiResponseUtil {
 
+    public static final String RELATIONSHIP_LIST = "relationship-list";
     public List<VmResourceLink> convertJsonToVmResourceLink(String responseJson) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         JsonNode jsonNode = mapper.readTree(responseJson);
@@ -61,8 +61,8 @@ public class AaiResponseUtil {
         vmEntity.setVserverName2(getTextElementByNode(jsonNode,"vserver-name2"));
         vmEntity.setVserverSelflink(getTextElementByNode(jsonNode,"vserver-selflink"));
 
-        if (jsonNode.has("relationship-list")) {
-            JsonNode relationshipListNode = jsonNode.get("relationship-list");
+        if (jsonNode.has(RELATIONSHIP_LIST)) {
+            JsonNode relationshipListNode = jsonNode.get(RELATIONSHIP_LIST);
             if (relationshipListNode.has("relationship")) {
                 JsonNode relationshipNode = relationshipListNode.get("relationship");
                 vmEntity.getRelationshipList().setRelationships(convertRelationships(relationshipNode));
@@ -92,8 +92,8 @@ public class AaiResponseUtil {
         vnfEntity.setVnfName(getTextElementByNode(jsonNode,"vnf-name"));
         vnfEntity.setVnfType(getTextElementByNode(jsonNode,"vnf-type"));
 
-        if (jsonNode.has("relationship-list")) {
-            JsonNode relationshipListNode = jsonNode.get("relationship-list");
+        if (jsonNode.has(RELATIONSHIP_LIST)) {
+            JsonNode relationshipListNode = jsonNode.get(RELATIONSHIP_LIST);
             if (relationshipListNode.has("relationship")) {
                 JsonNode relationshipNode = relationshipListNode.get("relationship");
                 vnfEntity.getRelationshipList().setRelationships(convertRelationships(relationshipNode));