Merge "Fix for get anchor identifiers by module names"

diff --combined cps-ri/src/main/java/org/onap/cps/spi/impl/CpsAdminPersistenceServiceImpl.java
index 9f33b2f,e5df9c5..b1bd03c
--- 1/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsAdminPersistenceServiceImpl.java
--- 2/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
@@@ -30,7 -30,6 +30,7 @@@ import javax.transaction.Transactional
  import org.onap.cps.spi.CpsAdminPersistenceService;
  import org.onap.cps.spi.entities.AnchorEntity;
  import org.onap.cps.spi.entities.DataspaceEntity;
 +import org.onap.cps.spi.entities.YangResourceModuleReference;
  import org.onap.cps.spi.exceptions.AlreadyDefinedException;
  import org.onap.cps.spi.exceptions.ModuleNamesNotFoundException;
  import org.onap.cps.spi.model.Anchor;
@@@ -97,8 -96,9 +97,9 @@@ public class CpsAdminPersistenceService
      @Override
      public Collection<Anchor> queryAnchors(final String dataspaceName, final Collection<String> inputModuleNames) {
          validateDataspaceAndModuleNames(dataspaceName, inputModuleNames);
-         final Collection<AnchorEntity> anchorEntities =
-             anchorRepository.getAnchorsByDataspaceNameAndModuleNames(dataspaceName, inputModuleNames);
+         final DataspaceEntity dataspaceEntity = dataspaceRepository.getByName(dataspaceName);
+         final Collection<AnchorEntity> anchorEntities = anchorRepository
+             .getAnchorsByDataspaceIdAndModuleNames(dataspaceEntity.getId(), inputModuleNames, inputModuleNames.size());
          return anchorEntities.stream().map(CpsAdminPersistenceServiceImpl::toAnchor).collect(Collectors.toSet());
      }
  
@@@ -132,7 -132,7 +133,7 @@@
          final Collection<String> inputModuleNames) {
          final Collection<String> retrievedModuleNames =
              yangResourceRepository.findAllModuleReferences(dataspaceName, inputModuleNames)
 -                .stream().map(module -> module.getModuleName())
 +                .stream().map(YangResourceModuleReference::getModuleName)
                  .collect(Collectors.toList());
          if (retrievedModuleNames.isEmpty()) {
              dataspaceRepository.getByName(dataspaceName);