[AS-570]

WIP
TIER · Sep 12, 2018 · 8ac52b8 · 8ac52b8
1 parent 670fb5c
commit 8ac52b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -56,7 +56,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
     void reloadFilters(String metadataResolverName) {
         ChainingMetadataResolver chainingMetadataResolver = (ChainingMetadataResolver) metadataResolver
         MetadataResolver targetMetadataResolver = chainingMetadataResolver.getResolvers().find { it.id == metadataResolverName }
-        edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver jpaMetadataResolver = metadataResolverRepository.findByName(metadataResolverName)
+        edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver jpaMetadataResolver = metadataResolverRepository.findByResourceId(metadataResolverName)
 
         if (targetMetadataResolver && targetMetadataResolver.getMetadataFilter() instanceof MetadataFilterChain) {
             MetadataFilterChain metadataFilterChain = (MetadataFilterChain) targetMetadataResolver.getMetadataFilter()

diff --git a/...ain/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java b/...ain/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java
@@ -88,7 +88,7 @@ public ResponseEntity<?> create(@PathVariable String metadataResolverId, @Reques
         MetadataResolver persistedMr = repository.save(metadataResolver);
 
         // we reload the filters here after save
-        metadataResolverService.reloadFilters(persistedMr.getName());
+        metadataResolverService.reloadFilters(persistedMr.getResourceId());
 
         MetadataFilter persistedFilter = newlyPersistedFilter(persistedMr.getMetadataFilters().stream(), createdFilter.getResourceId());
 
@@ -130,7 +130,7 @@ public ResponseEntity<?> update(@PathVariable String metadataResolverId,
         MetadataFilter persistedFilter = filterRepository.save(filterTobeUpdated);
 
         // TODO: this is wrong
-        metadataResolverService.reloadFilters(metadataResolver.getName());
+        metadataResolverService.reloadFilters(metadataResolver.getResourceId());
 
         return ResponseEntity.ok().body(persistedFilter);
     }