Merge branch 'feature/shibui-1744' of bitbucket.org:unicon/shib-idp-u…

…i into feature/shibui-1744
TIER · Sep 14, 2021 · d723459 · d723459
2 parents b70729a + 3c3890e
commit d723459
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/...ain/java/edu/internet2/tier/shibboleth/admin/ui/controller/AttributeBundleController.java b/...ain/java/edu/internet2/tier/shibboleth/admin/ui/controller/AttributeBundleController.java
@@ -50,6 +50,12 @@ public ResponseEntity<?> getAll() {
         return ResponseEntity.ok(attributeBundleService.findAll());
     }
 
+    @GetMapping("/{resourceId}")
+    @Transactional(readOnly = true)
+    public ResponseEntity<?> getOne(@PathVariable String resourceId) throws EntityNotFoundException {
+        return ResponseEntity.ok(attributeBundleService.findByResourceId(resourceId));
+    }
+
     @Secured("ROLE_ADMIN")
     @PutMapping
     @Transactional

diff --git a/.../src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/AttributeBundleService.java b/.../src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/AttributeBundleService.java
@@ -43,4 +43,12 @@ public AttributeBundle updateBundle(AttributeBundle bundle) throws EntityNotFoun
         bundleToUpdate.setAttributes(bundle.getAttributes());
         return attributeBundleRepository.save(bundleToUpdate);
     }
+
+    public AttributeBundle findByResourceId(String resourceId) throws EntityNotFoundException {
+        Optional<AttributeBundle> result = attributeBundleRepository.findByResourceId(resourceId);
+        if (result.isEmpty()) {
+            throw new EntityNotFoundException(String.format("Unable to find attribute bundle with resource id: [%s] for deletion", resourceId));
+        }
+        return result.get();
+    }
 }