Move integration test for adminService

- finalized moving of admin service interation test
(just some scenarios were missing)
- deleted old test class (code coverage in RI module dropped)
- line/branch coverage now 100/100 (was 97/91)
- small refactoring; renaming and removed unnecessary check

Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Change-Id: Ic683548ea5e1e4e252f257c0f1034c5cf76e498d

1 files changed, 2 insertions, 4 deletions

diff --git a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsAdminPersistenceServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsAdminPersistenceServiceImpl.java
index 162b268d8..6f9f5a482 100755
--- a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsAdminPersistenceServiceImpl.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsAdminPersistenceServiceImpl.java
@@ -198,12 +198,10 @@ public class CpsAdminPersistenceServiceImpl implements CpsAdminPersistenceServic
             verifyDataspaceName(dataspaceName);
         }
         if (inputModuleNames.size() > retrievedModuleReferences.size()) {
-            final List<String> moduleNamesNotFound = inputModuleNames.stream()
+            final List<String> unknownModules = inputModuleNames.stream()
                 .filter(moduleName -> !retrievedModuleReferences.contains(moduleName))
                 .collect(Collectors.toList());
-            if (!moduleNamesNotFound.isEmpty()) {
-                throw new ModuleNamesNotFoundException(dataspaceName, moduleNamesNotFound);
-            }
+            throw new ModuleNamesNotFoundException(dataspaceName, unknownModules);
         }
     }