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

diff --cc cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiDataOperations.java
Simple merge

diff --cc cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/DmiServiceUrlBuilder.java
index e0c9568,ede5256..ac6d093
--- 1/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/DmiServiceUrlBuilder.java
--- 2/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
@@@ -140,9 -140,11 +141,10 @@@ public class DmiServiceUrlBuilder 
       */
      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);
 +        getQueryParamConsumer().accept("resourceIdentifier", resourceId, queryParams);
          getQueryParamConsumer().accept("options", optionsParamInQuery, queryParams);
          if (Strings.isNotEmpty(topicParamInQuery)) {
              getQueryParamConsumer().accept("topic", topicParamInQuery, queryParams);

diff --cc cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/utils/DmiServiceUrlBuilderSpec.groovy
Simple merge