X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-ri%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fcps%2Fspi%2Frepository%2FYangResourceRepository.java;h=5e9c47429ba7746dafa2a7d96d8f9b24b5c42c17;hb=192e8eb4810646d7778afe71776742c03b568c48;hp=764e2dfc7467c4dd5c80c080879051baadb5c90a;hpb=cf2482c1fa1b7b9d9638e7c658807e8ab35069b4;p=cps.git

diff --git a/cps-ri/src/main/java/org/onap/cps/spi/repository/YangResourceRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/YangResourceRepository.java
index 764e2dfc7..5e9c47429 100644
--- a/cps-ri/src/main/java/org/onap/cps/spi/repository/YangResourceRepository.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/YangResourceRepository.java
@@ -1,7 +1,7 @@
 /*
  *  ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Pantheon.tech
- *  Modifications Copyright (C) Nordix Foundation
+ *  Modifications Copyright (C) 2021-2022 Nordix Foundation
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 package org.onap.cps.spi.repository;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import javax.validation.constraints.NotNull;
@@ -41,31 +42,45 @@ public interface YangResourceRepository extends JpaRepository<YangResourceEntity
         + "yang_resource.module_name AS module_name,\n"
         + "yang_resource.revision AS revision\n"
         + "FROM\n"
-        + "dataspace dataspace\n"
-        + "JOIN schema_set schema_set ON schema_set.dataspace_id = dataspace.id\n"
-        + "JOIN schema_set_yang_resources schema_set_yang_resource ON schema_set_yang_resource.schema_set_id = "
+        + "dataspace\n"
+        + "JOIN schema_set ON schema_set.dataspace_id = dataspace.id\n"
+        + "JOIN schema_set_yang_resources ON schema_set_yang_resources.schema_set_id = "
         + "schema_set.id\n"
-        + "JOIN yang_resource yang_resource ON yang_resource.id = schema_set_yang_resource.yang_resource_id\n"
+        + "JOIN yang_resource ON yang_resource.id = schema_set_yang_resources.yang_resource_id\n"
         + "WHERE\n"
         + "dataspace.name = :dataspaceName", nativeQuery = true)
-    Set<YangResourceModuleReference> findAllModuleReferences(@Param("dataspaceName") String dataspaceName);
+    Set<YangResourceModuleReference> findAllModuleReferencesByDataspace(@Param("dataspaceName") String dataspaceName);
 
     @Query(value = "SELECT DISTINCT\n"
         + "yang_resource.module_Name AS module_name,\n"
         + "yang_resource.revision AS revision\n"
         + "FROM\n"
-        + "dataspace dataspace\n"
-        + "JOIN anchor anchor ON anchor.dataspace_id = dataspace.id\n"
-        + "JOIN schema_set schema_set ON schema_set.id = anchor.schema_set_id\n"
-        + "JOIN schema_set_yang_resources schema_set_yang_resource ON schema_set_yang_resource.schema_set_id = "
+        + "dataspace\n"
+        + "JOIN anchor ON anchor.dataspace_id = dataspace.id\n"
+        + "JOIN schema_set ON schema_set.id = anchor.schema_set_id\n"
+        + "JOIN schema_set_yang_resources ON schema_set_yang_resources.schema_set_id = "
         + "schema_set.id\n"
-        + "JOIN yang_resource yang_resource ON yang_resource.id = schema_set_yang_resource.yang_resource_id\n"
+        + "JOIN yang_resource ON yang_resource.id = schema_set_yang_resources.yang_resource_id\n"
         + "WHERE\n"
         + "dataspace.name = :dataspaceName AND\n"
         + "anchor.name =:anchorName", nativeQuery = true)
-    Set<YangResourceModuleReference> findAllModuleReferences(
+    Set<YangResourceModuleReference> findAllModuleReferencesByDataspaceAndAnchor(
         @Param("dataspaceName") String dataspaceName, @Param("anchorName") String anchorName);
 
+    @Query(value = "SELECT DISTINCT\n"
+        + "yang_resource.*\n"
+        + "FROM\n"
+        + "dataspace\n"
+        + "JOIN schema_set ON schema_set.dataspace_id = dataspace.id\n"
+        + "JOIN schema_set_yang_resources ON schema_set_yang_resources.schema_set_id = "
+        + "schema_set.id\n"
+        + "JOIN yang_resource ON yang_resource.id = schema_set_yang_resources.yang_resource_id\n"
+        + "WHERE\n"
+        + "dataspace.name = :dataspaceName and yang_resource.module_Name IN (:moduleNames)", nativeQuery = true)
+    Set<YangResourceModuleReference> findAllModuleReferencesByDataspaceAndModuleNames(
+            @Param("dataspaceName") String dataspaceName, @Param("moduleNames") Collection<String> moduleNames);
+
+
     @Query(value = "SELECT id FROM yang_resource WHERE module_name=:name and revision=:revision", nativeQuery = true)
     Long getIdByModuleNameAndRevision(@Param("name") String moduleName, @Param("revision") String revision);