SHIBUI-2380

Changes per code review
TIER · Oct 26, 2022 · 2e8f4e6 · 2e8f4e6
1 parent a9c2e3c
commit 2e8f4e6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/...in/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepository.java b/...in/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepository.java
@@ -2,7 +2,6 @@
 
 import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -17,7 +16,7 @@ public interface EntityDescriptorRepository extends JpaRepository<EntityDescript
     @Query(value = "select new edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorProjection(e.entityID, e.resourceId, e.serviceProviderName, e.createdBy, " +
                    "e.createdDate, e.serviceEnabled, e.idOfOwner, e.protocol) " +
                     "from EntityDescriptor e")
-    List<EntityDescriptorProjection> findAllBy();
+    List<EntityDescriptorProjection> findAllReturnProjections();
 
     @Query(value = "select new edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorProjection(e.entityID, e.resourceId, e.serviceProviderName, e.createdBy, " +
                    "e.createdDate, e.serviceEnabled, e.idOfOwner, e.protocol) " +

diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
@@ -439,7 +439,7 @@ public Iterable<EntityDescriptorRepresentation> getAllDisabledAndNotOwnedByAdmin
     public List<EntityDescriptorProjection> getAllEntityDescriptorProjectionsBasedOnUserAccess() throws ForbiddenException {
         switch (userService.getCurrentUserAccess()) {
         case ADMIN:
-            List<EntityDescriptorProjection> o = entityDescriptorRepository.findAllBy();
+            List<EntityDescriptorProjection> o = entityDescriptorRepository.findAllReturnProjections();
             return o;
         case GROUP:
             User user = userService.getCurrentUser();

diff --git a/...y/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy b/...y/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy
@@ -70,7 +70,7 @@ class EntityDescriptorRepositoryTest extends AbstractBaseDataJpaTest {
         noExceptionThrown()
 
         when:
-        List<EntityDescriptorProjection> projections = entityDescriptorRepository.findAllBy()
+        List<EntityDescriptorProjection> projections = entityDescriptorRepository.findAllReturnProjections()
 
         then:
         projections.size() == 1