minor updates to clean up code

[ccsdk/sli/adaptors.git] / aai-service / provider / src / main / java / org / onap / ccsdk / sli / adaptors / aai / GenericRequest.java

diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequest.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequest.java
index 7c6234e..7f15c03 100755 (executable)
--- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequest.java
@@ -189,9 +189,13 @@ public class GenericRequest extends AAIRequest {
 
                             queryParams.put(splitKey[1], encodeQuery(value));
                         } else {
-                            String token = String.format("%s/{%s}", splitKey[0], splitKey[1]);
-                            String encoded_vnf = encodeQuery(value);
-                            request_url = request_url.replace(token, String.format("%s/%s", splitKey[0], encoded_vnf));
+                               String encoded_vnf = encodeQuery(value);
+                               if(!resourceName.equals(splitKey[0]) && resourceName.contains(splitKey[0])) {
+                                       queryParams.put(splitKey[1], encoded_vnf);
+                               } else {
+                                       String token = String.format("%s/{%s}", splitKey[0], splitKey[1]);
+                                       request_url = request_url.replace(token, String.format("%s/%s", splitKey[0], encoded_vnf));
+                               }
                         }
                     }