Merge "Added AAI Query Tool"

diff --combined holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java
index f20462f,1aa8d75..d22eb31
--- 1/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java
--- 2/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java
@@@ -72,27 -72,27 +72,27 @@@ public class AaiQuery 
      private String getVmResourceLinks(String vserverId, String vserverName) throws CorrelationException {
          String response = getResourceLinksResponse(vserverId, vserverName);
          List linkList = aaiResponseUtil.convertJsonToVmResourceLink(response);
 -        if (linkList.size() != 0) {
 +        if (!linkList.isEmpty()) {
              return aaiResponseUtil.convertJsonToVmResourceLink(response).get(0).getResourceLink();
          }
          return  "";
      }
  
      private String getResourceLinksResponse(String vserverId, String vserverName) throws CorrelationException {
-         String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_VM_ADDR) + "vserver-id:EQUALS:" + vserverId);
+         String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AaiConsts.AAI_VM_ADDR) + "vserver-id:EQUALS:" + vserverId);
          String response = getResponse(url);
          if ("".equals(response) || "{}".equals(response)) {
-             url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_VM_ADDR) + "vserver-name:EQUALS:" + vserverName);
+             url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AaiConsts.AAI_VM_ADDR) + "vserver-name:EQUALS:" + vserverName);
              response = getResponse(url);
          }
          return response;
      }
  
      private String getVnfDataResponse(String vnfId, String vnfName) throws CorrelationException {
-         String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_VNF_ADDR)+  "/" + vnfId);
+         String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AaiConsts.AAI_VNF_ADDR)+  "/" + vnfId);
          String response = getResponse(url);
          if ("".equals(response) || "{}".equals(response)) {
-             url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_VNF_ADDR) + "vnf-name=" + vnfName);
+             url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AaiConsts.AAI_VNF_ADDR) + "vnf-name=" + vnfName);
              response = getResponse(url);
          }
          return response;
@@@ -134,7 -134,7 +134,7 @@@
          addrSplits[1] = addrSplits[0] + "-" + addrSplits[2];
          addrSplits[2] = ret;
          addrSplits[0] = "api";
 -        StringBuffer stringBuffer = new StringBuffer();
 +        StringBuilder stringBuffer = new StringBuilder();
          for (String split : addrSplits) {
              stringBuffer.append("/" + split);
          }