[SDNC-5] Rebase SDN-C adaptors

Apply latest bug fixes, enhancements and port to OpenDaylight Boron.

Change-Id: Ia7d29986eb12f98edbf075dae3cc9343af6791b6
Signed-off-by: Dan Timoney <dtimoney@att.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java
index a420a06..bb7ebd8 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java
@@ -36,9 +36,9 @@ import org.openecomp.aai.inventory.v10.ResultData;
 public class GenericQueryRequest extends AAIRequest {
 
 	public static final String GENERIC_SEARCH_PATH			= "org.openecomp.sdnc.sli.aai.query.generic";
-
+	
 	private final String generic_search_path;
-
+	
 	public static final String START_NODE_TYPE = "start-node-type";
 	public static final String IDENTIFIER = "identifier";
 	public static final String VALUE = "value";
@@ -48,7 +48,7 @@ public class GenericQueryRequest extends AAIRequest {
 		generic_search_path = configProperties.getProperty(GENERIC_SEARCH_PATH);
 	}
 
-
+	
 //	@Override
 //	public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
 //
@@ -57,15 +57,15 @@ public class GenericQueryRequest 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 GenericQueryRequest 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 GenericQueryRequest extends AAIRequest {
 		String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
 		request_url = request_url.replace("{identifier}", encoded_vnf) ;
 		aaiService.LOGwriteDateTrace("identifier", requestProperties.getProperty(key));
-
+		
 		key = VALUE;
 
 		encoded_vnf = encodeQuery(requestProperties.getProperty(key));
 		request_url = request_url.replace("{value}", encoded_vnf) ;
 		aaiService.LOGwriteDateTrace("value", requestProperties.getProperty(key));
-
+		
 		key = START_NODE_TYPE;
 
 		encoded_vnf = encodeQuery(requestProperties.getProperty(key));
 		request_url = request_url.replace("{start-node-type}", encoded_vnf) ;
 		aaiService.LOGwriteDateTrace("start-node-type", requestProperties.getProperty(key));
-
+		
 		return request_url;
 	}
 }