summaryrefslogtreecommitdiffstats
path: root/cps-ri/src/main/java
diff options
context:
space:
mode:
authorniamhcore <niamh.core@est.tech>2021-09-17 10:30:56 +0100
committerniamhcore <niamh.core@est.tech>2021-09-20 10:57:20 +0100
commit052b755e28b160ed26676e720ed922e5a83c300a (patch)
treecae4336a49f0aacd8c69f9f5abe2bb6ae3f04aa4 /cps-ri/src/main/java
parentd94ebf2772bff3980941a80ae2e20521181510e3 (diff)
Updating fetch all yang modules queries and tests
Issue-ID: CPS-670 Signed-off-by: niamhcore <niamh.core@est.tech> Change-Id: I11e6da303320aea096a135eb93e270a5fd014740
Diffstat (limited to 'cps-ri/src/main/java')
-rw-r--r--cps-ri/src/main/java/org/onap/cps/spi/repository/YangResourceRepository.java34
1 files changed, 18 insertions, 16 deletions
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 b16b284a2a..764e2dfc74 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
@@ -38,29 +38,31 @@ public interface YangResourceRepository extends JpaRepository<YangResourceEntity
List<YangResourceEntity> findAllByChecksumIn(@NotNull Set<String> checksum);
@Query(value = "SELECT DISTINCT\n"
- + "yr.module_name AS module_name,\n"
- + "yr.revision AS revision\n"
+ + "yang_resource.module_name AS module_name,\n"
+ + "yang_resource.revision AS revision\n"
+ "FROM\n"
- + "dataspace d\n"
- + "JOIN schema_set ss ON ss.dataspace_id = d.id\n"
- + "JOIN schema_set_yang_resources ssyr ON ssyr.schema_set_id = ss.id\n"
- + "JOIN yang_resource yr ON yr.id = ssyr.yang_resource_id\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 = "
+ + "schema_set.id\n"
+ + "JOIN yang_resource yang_resource ON yang_resource.id = schema_set_yang_resource.yang_resource_id\n"
+ "WHERE\n"
- + "d.name = :dataspaceName", nativeQuery = true)
+ + "dataspace.name = :dataspaceName", nativeQuery = true)
Set<YangResourceModuleReference> findAllModuleReferences(@Param("dataspaceName") String dataspaceName);
@Query(value = "SELECT DISTINCT\n"
- + "yr.module_Name AS module_name,\n"
- + "yr.revision AS revision\n"
+ + "yang_resource.module_Name AS module_name,\n"
+ + "yang_resource.revision AS revision\n"
+ "FROM\n"
- + "dataspace d\n"
- + "JOIN anchor a ON a.dataspace_id = d.id\n"
- + "JOIN schema_set ss ON ss.dataspace_id = a.dataspace_id\n"
- + "JOIN schema_set_yang_resources ssyr ON ssyr.schema_set_id = ss.id\n"
- + "JOIN yang_resource yr ON yr.id = ssyr.yang_resource_id\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 = "
+ + "schema_set.id\n"
+ + "JOIN yang_resource yang_resource ON yang_resource.id = schema_set_yang_resource.yang_resource_id\n"
+ "WHERE\n"
- + "d.name = :dataspaceName AND\n"
- + "a.name =:anchorName", nativeQuery = true)
+ + "dataspace.name = :dataspaceName AND\n"
+ + "anchor.name =:anchorName", nativeQuery = true)
Set<YangResourceModuleReference> findAllModuleReferences(
@Param("dataspaceName") String dataspaceName, @Param("anchorName") String anchorName);