Fixing trustStore issues in AAI Client
[ccsdk/sli/adaptors.git] / aai-service / provider / src / main / java / org / onap / ccsdk / sli / adaptors / aai / NodesQueryRequest.java
index f7aaccb..27e4567 100755 (executable)
@@ -3,14 +3,14 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                     reserved.
+ *             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,118 +27,118 @@ import java.net.URL;
 import java.util.Properties;
 
 import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
-import org.openecomp.aai.inventory.v11.SearchResults;
+import org.openecomp.aai.inventory.v13.SearchResults;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class NodesQueryRequest extends AAIRequest {
 
-       public static final String NODES_SEARCH_PATH                    = "org.onap.ccsdk.sli.adaptors.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";
+    public static final String NODES_SEARCH_PATH            = "org.onap.ccsdk.sli.adaptors.aai.query.nodes";
 
+    private final String nodes_search_path;
 
-       public NodesQueryRequest() {
-               nodes_search_path = configProperties.getProperty(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";
 
-       
-//     @Override
-//     public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
+
+    public NodesQueryRequest() {
+        nodes_search_path = configProperties.getProperty(NODES_SEARCH_PATH);
+    }
+
+
+//    @Override
+//    public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
+//
+//        String request_url = targetUri+generic_search_path;
+//        String key = START_NODE_TYPE;
 //
-//             String request_url = targetUri+generic_search_path;
-//             String key = START_NODE_TYPE;
+//        String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
+//        request_url = request_url.replace("{vnf-id}", encoded_vnf) ;
 //
-//             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);
+//        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;
-//     }
-
-       @Override
-       public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
-
-               String request_url = targetUri+nodes_search_path;
-
-               request_url = processPathData(request_url, requestProperties);
-
-               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;
-       }
-       
-       @Override
-       public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {       
-               return getRequestUrl(method, null);
-       }
-
-
-       @Override
-       public String toJSONString() {
-               ObjectMapper mapper = getObjectMapper();
-               SearchResults tenant = (SearchResults)requestDatum;
-               String json_text = null;
-               try {
-                       json_text = mapper.writeValueAsString(tenant);
-               } catch (JsonProcessingException exc) {
-                       handleException(this, exc);
-                       return null;
-               }
-               return json_text;
-       }
-
-
-       @Override
-       public String[] getArgsList() {
-               String[] args = {NODE_TYPE, ENTITY_IDENTIFIER, ENTITY_VALUE};
-               return args;
-       }
-
-
-       @Override
-       public Class<? extends AAIDatum> getModelClass() {
-               return SearchResults.class;
-       }
-
-
-       public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
-
-               String key = ENTITY_IDENTIFIER;
-
-               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;
-       }
+//        aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
+//
+//
+//        return http_req_url;
+//    }
+
+    @Override
+    public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
+
+        String request_url = targetUri+nodes_search_path;
+
+        request_url = processPathData(request_url, requestProperties);
+
+        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;
+    }
+
+    @Override
+    public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
+        return getRequestUrl(method, null);
+    }
+
+
+    @Override
+    public String toJSONString() {
+        ObjectMapper mapper = getObjectMapper();
+        SearchResults tenant = (SearchResults)requestDatum;
+        String json_text = null;
+        try {
+            json_text = mapper.writeValueAsString(tenant);
+        } catch (JsonProcessingException exc) {
+            handleException(this, exc);
+            return null;
+        }
+        return json_text;
+    }
+
+
+    @Override
+    public String[] getArgsList() {
+        String[] args = {NODE_TYPE, ENTITY_IDENTIFIER, ENTITY_VALUE};
+        return args;
+    }
+
+
+    @Override
+    public Class<? extends AAIDatum> getModelClass() {
+        return SearchResults.class;
+    }
+
+
+    public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
+
+        String key = ENTITY_IDENTIFIER;
+
+        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;
+    }
 }