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=7584ff65c0ab6fe026ae2b22da43b5324e63e817;hb=ccf2e5abd0a1eec25f90fa6f89ed3766fc9c068f;hp=b16b284a2aef6bc92ce5b60a066cd6b20bce3603;hpb=bd8ab2fc4737aebada59962baed8b35d4f86dd1c;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 b16b284a2..7584ff65c 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-2023 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,9 +20,9 @@
 
 package org.onap.cps.spi.repository;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-import javax.validation.constraints.NotNull;
 import org.onap.cps.spi.entities.YangResourceEntity;
 import org.onap.cps.spi.entities.YangResourceModuleReference;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -33,39 +33,71 @@ import org.springframework.stereotype.Repository;
 
 @Repository
 public interface YangResourceRepository extends JpaRepository<YangResourceEntity, Long>,
-        SchemaSetYangResourceRepository {
+    YangResourceNativeRepository, SchemaSetYangResourceRepository {
 
-    List<YangResourceEntity> findAllByChecksumIn(@NotNull Set<String> checksum);
+    List<YangResourceEntity> findAllByChecksumIn(String[] checksums);
+
+    default List<YangResourceEntity> findAllByChecksumIn(final Collection<String> checksums) {
+        return findAllByChecksumIn(checksums.toArray(new String[0]));
+    }
 
     @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\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"
-        + "d.name = :dataspaceName", nativeQuery = true)
-    Set<YangResourceModuleReference> findAllModuleReferences(@Param("dataspaceName") String dataspaceName);
+        + "dataspace.name = :dataspaceName", nativeQuery = true)
+    Set<YangResourceModuleReference> findAllModuleReferencesByDataspace(@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\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 ON yang_resource.id = schema_set_yang_resources.yang_resource_id\n"
         + "WHERE\n"
-        + "d.name = :dataspaceName AND\n"
-        + "a.name =:anchorName", nativeQuery = true)
-    Set<YangResourceModuleReference> findAllModuleReferences(
+        + "dataspace.name = :dataspaceName AND\n"
+        + "anchor.name =:anchorName", nativeQuery = true)
+    Set<YangResourceModuleReference> findAllModuleReferencesByDataspaceAndAnchor(
         @Param("dataspaceName") String dataspaceName, @Param("anchorName") String anchorName);
 
-    @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);
+    @Query(value = "SELECT DISTINCT yang_resource.*\n"
+            + "FROM 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 ON yang_resource.id = schema_set_yang_resources.yang_resource_id\n"
+            + "WHERE dataspace.name = :dataspaceName "
+            + "AND anchor.name =:anchorName", nativeQuery = true)
+    Set<YangResourceEntity> findAllModuleDefinitionsByDataspaceAndAnchor(
+            @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 = ANY (:moduleNames)", nativeQuery = true)
+    Set<YangResourceModuleReference> findAllModuleReferencesByDataspaceAndModuleNames(
+            @Param("dataspaceName") String dataspaceName, @Param("moduleNames") String[] moduleNames);
+
+    default Set<YangResourceModuleReference> findAllModuleReferencesByDataspaceAndModuleNames(
+        final String dataspaceName, final Collection<String> moduleNames) {
+        return findAllModuleReferencesByDataspaceAndModuleNames(dataspaceName, moduleNames.toArray(new String[0]));
+    }
 
     @Modifying
     @Query(value = "DELETE FROM yang_resource yr WHERE NOT EXISTS "