Address Sonar Qube issues

- Add some basic test for missed coverage
- Refactored NetworkCmProxyDataServiceImpl to addres duplcaied code and code coverage
- Increased Coverage treshold where possible

Issue-ID: CPS-475
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Change-Id: Id05f41ac242aeaf57606748009c0e370199e054f

2 files changed, 17 insertions, 23 deletions

diff --git a/cps-ncmp-rest/pom.xml b/cps-ncmp-rest/pom.xml
index 2c44c24807..b47ea17331 100644
--- a/cps-ncmp-rest/pom.xml
+++ b/cps-ncmp-rest/pom.xml
@@ -23,19 +23,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-<modelVersion>4.0.0</modelVersion>
-<parent>
-    <groupId>org.onap.cps</groupId>
-    <artifactId>cps-parent</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
-    <relativePath>../cps-parent/pom.xml</relativePath>
-</parent>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.cps</groupId>
+        <artifactId>cps-parent</artifactId>
+        <version>2.0.1-SNAPSHOT</version>
+        <relativePath>../cps-parent/pom.xml</relativePath>
+    </parent>
 
-<artifactId>cps-ncmp-rest</artifactId>
-
-    <properties>
-        <minimum-coverage>0.95</minimum-coverage>
-    </properties>
+    <artifactId>cps-ncmp-rest</artifactId>
 
     <dependencies>
         <dependency>
diff --git a/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/exceptions/NetworkCmProxyRestExceptionHandlerSpec.groovy b/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/exceptions/NetworkCmProxyRestExceptionHandlerSpec.groovy
index 8153eeb70b..3fcf818aff 100644
--- a/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/exceptions/NetworkCmProxyRestExceptionHandlerSpec.groovy
+++ b/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/exceptions/NetworkCmProxyRestExceptionHandlerSpec.groovy
@@ -22,6 +22,7 @@ package org.onap.cps.ncmp.rest.exceptions
 
 import groovy.json.JsonSlurper
 import org.onap.cps.ncmp.api.NetworkCmProxyDataService
+import org.onap.cps.ncmp.api.impl.exception.NcmpException
 import org.onap.cps.spi.FetchDescendantsOption
 import org.onap.cps.spi.exceptions.CpsException
 import org.spockframework.spring.SpringBean
@@ -61,20 +62,17 @@ class NetworkCmProxyRestExceptionHandlerSpec extends Specification {
         dataNodeBaseEndpoint = "$basePath/v1"
     }
 
-    def 'Get request with runtime exception returns HTTP Status Internal Server Error.'() {
-        when: 'runtime exception is thrown by the service'
-            setupTestException(new IllegalStateException(errorMessage))
-            def response = performTestRequest()
-        then: 'an HTTP Internal Server Error response is returned with correct message and details'
-            assertTestResponse(response, INTERNAL_SERVER_ERROR, errorMessage, null)
-    }
-
-    def 'Get request with generic CPS exception returns HTTP Status Internal Server Error.'() {
+    def 'Get request with generic #scenario exception returns HTTP Status Internal Server Error.'() {
         when: 'generic CPS exception is thrown by the service'
-            setupTestException(new CpsException(errorMessage, errorDetails))
+            setupTestException(exception)
             def response = performTestRequest()
         then: 'an HTTP Internal Server Error response is returned with correct message and details'
-            assertTestResponse(response, INTERNAL_SERVER_ERROR, errorMessage, errorDetails)
+            assertTestResponse(response, INTERNAL_SERVER_ERROR, errorMessage, expectedErrorDetails)
+        where:
+            scenario | exception                                     || expectedErrorDetails
+            'CPS'    | new CpsException(errorMessage, errorDetails)  || errorDetails
+            'NCMP'   | new NcmpException(errorMessage, errorDetails) || null
+            'other'  | new IllegalStateException(errorMessage)       || null
     }
 
     def setupTestException(exception) {