CPS-2187 - #6 Add module Set Tag to ncmp (single cm handle) data request to dmi

[cps.git] / cps-ncmp-service / src / main / java / org / onap / cps / ncmp / api / impl / utils / DmiServiceUrlBuilder.java

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/DmiServiceUrlBuilder.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/DmiServiceUrlBuilder.java
index 04acaa5..ede5256 100644 (file)
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/DmiServiceUrlBuilder.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/DmiServiceUrlBuilder.java
@@ -133,13 +133,15 @@ public class DmiServiceUrlBuilder {
      * This method is used to populate map from query params.
      *
      * @param resourceId          unique id of response for valid topic
-     * @param optionsParamInQuery options into url param
-     * @param topicParamInQuery   topic into url param
+     * @param optionsParamInQuery options as provided by client
+     * @param topicParamInQuery   topic as provided by client
+     * @param moduleSetTag   module set tag associated with the given cm handle
      * @return all valid query params as map
      */
     public MultiValueMap<String, String> populateQueryParams(final String resourceId,
                                                              final String optionsParamInQuery,
-                                                             final String topicParamInQuery) {
+                                                             final String topicParamInQuery,
+                                                             final String moduleSetTag) {
         final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>();
         getQueryParamConsumer().accept("resourceIdentifier",
                 resourceId, queryParams);
@@ -147,6 +149,9 @@ public class DmiServiceUrlBuilder {
         if (Strings.isNotEmpty(topicParamInQuery)) {
             getQueryParamConsumer().accept("topic", topicParamInQuery, queryParams);
         }
+        if (Strings.isNotEmpty(moduleSetTag)) {
+            getQueryParamConsumer().accept("moduleSetTag", moduleSetTag, queryParams);
+        }
         return queryParams;
     }