Merge "Fix issues with SOnar Qube coverage report"

diff --cc pom.xml
Simple merge

diff --cc src/main/java/org/onap/cps/ncmp/dmi/rest/controller/DmiRestController.java
Simple merge

diff --cc src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy
index c818ecc,8aebbca..256db4e
--- 1/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy
--- 2/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy
+++ b/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy
@@@ -247,14 -259,11 +259,20 @@@ class DmiRestControllerSpec extends Spe
                      'testFields',
                      5,
                      ['prop1':'value1', 'prop2':'value2'])
 +        where: 'tokens are used in the resource identifier parameter'
 +            scenario                       | resourceIdentifier
 +            '/'                            | 'id/with/slashes'
 +            '?'                            | 'idWith?'
 +            ','                            | 'idWith,'
 +            '='                            | 'idWith='
 +            '[]'                           | 'idWith[]'
 +            '? needs to be encoded as %3F' | 'idWith%3F'
 +
      }
- }
+ 
+     def getJsonDataForGetModules(operation) {
+         def jsonData = TestUtils.getResourceFileContent('GetModules.json')
+         return jsonData.replace('${operation-for-test}', operation)
+     }
+ 
+ }