aboutsummaryrefslogtreecommitdiffstats
path: root/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java
diff options
context:
space:
mode:
Diffstat (limited to 'aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java')
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java26
1 files changed, 13 insertions, 13 deletions
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java
index d9bee38..a50d3f7 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java
@@ -31,14 +31,14 @@ import org.openecomp.sdnc.sli.aai.data.AAIDatum;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.SearchResults;
+import org.openecomp.aai.inventory.v10.SearchResults;
public class NodesQueryRequest extends AAIRequest {
public static final String NODES_SEARCH_PATH = "org.openecomp.sdnc.sli.aai.query.nodes";
-
+
private final String nodes_search_path;
-
+
public static final String NODE_TYPE = "node-type";
public static final String ENTITY_IDENTIFIER = "entity-identifier";
public static final String ENTITY_VALUE = "entity-value";
@@ -48,7 +48,7 @@ public class NodesQueryRequest extends AAIRequest {
nodes_search_path = configProperties.getProperty(NODES_SEARCH_PATH);
}
-
+
// @Override
// public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
//
@@ -57,15 +57,15 @@ public class NodesQueryRequest extends AAIRequest {
//
// String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
// request_url = request_url.replace("{vnf-id}", encoded_vnf) ;
-//
+//
// if(resourceVersion != null) {
// request_url = request_url +"?resource-version="+resourceVersion;
// }
// URL http_req_url = new URL(request_url);
//
// aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-//
-//
+//
+//
// return http_req_url;
// }
@@ -82,12 +82,12 @@ public class NodesQueryRequest extends AAIRequest {
URL http_req_url = new URL(request_url);
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-
+
return http_req_url;
}
-
+
@Override
- public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
+ public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
return getRequestUrl(method, null);
}
@@ -127,19 +127,19 @@ public class NodesQueryRequest extends AAIRequest {
String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{entity-identifier}", encoded_vnf) ;
aaiService.LOGwriteDateTrace("entity-identifier", requestProperties.getProperty(key));
-
+
key = ENTITY_VALUE;
encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{entity-name}", encoded_vnf) ;
aaiService.LOGwriteDateTrace("entity-name", requestProperties.getProperty(key));
-
+
key = NODE_TYPE;
encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{node-type}", encoded_vnf) ;
aaiService.LOGwriteDateTrace("node-type", requestProperties.getProperty(key));
-
+
return request_url;
}
}