SHIBUI-2364

code cleanup
TIER · Sep 9, 2022 · 13c512b · 13c512b
1 parent 45b880f
commit 13c512b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/...in/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java b/...in/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java
@@ -145,13 +145,20 @@ public void initRestTemplate() {
     @PutMapping("/EntityDescriptor/{resourceId}")
     @Transactional
     public ResponseEntity<?> update(@RequestBody EntityDescriptorRepresentation edRepresentation, @PathVariable String resourceId)
-                    throws ForbiddenException, ConcurrentModificationException, PersistentEntityNotFound,
-                    InvalidPatternMatchException {
+                    throws ForbiddenException, ConcurrentModificationException, PersistentEntityNotFound, InvalidPatternMatchException {
         edRepresentation.setId(resourceId); // This should be the same already, but just to be safe...
         EntityDescriptorRepresentation result = entityDescriptorService.update(edRepresentation);
         return ResponseEntity.ok().body(result);
     }
 
+    @PutMapping("/EntityDescriptor/{resourceId}/changeGroup/{groupId}")
+    @Transactional
+    public ResponseEntity<?> updateGroupForEntityDescriptor(@PathVariable String resourceId, String groupId)
+                    throws ForbiddenException, ConcurrentModificationException, PersistentEntityNotFound, InvalidPatternMatchException {
+        EntityDescriptorRepresentation result = entityDescriptorService.updateGroupForEntityDescriptor(resourceId, groupId);
+        return ResponseEntity.ok().body(result);
+    }
+
     @PostMapping(value = "/EntityDescriptor", consumes = "application/xml")
     @Transactional
     public ResponseEntity<?> upload(@RequestBody byte[] entityDescriptorXml, @RequestParam String spName) throws Exception {

diff --git a/...src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorService.java b/...src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorService.java
@@ -120,4 +120,6 @@ EntityDescriptorRepresentation updateEntityDescriptorEnabledStatus(String resour
     EntityDescriptorRepresentation createNewEntityDescriptorFromXMLOrigin(EntityDescriptor ed);
 
     boolean entityExists(String entityID);
+
+    EntityDescriptorRepresentation updateGroupForEntityDescriptor(String resourceId, String groupId);
 }
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
@@ -119,6 +119,14 @@ public boolean entityExists(String entityID) {
         return entityDescriptorRepository.findByEntityID(entityID) != null ;
     }
 
+    @Override
+    public EntityDescriptorRepresentation updateGroupForEntityDescriptor(String resourceId, String groupId) {
+        EntityDescriptor ed = entityDescriptorRepository.findByResourceId(resourceId);
+        ed.setIdOfOwner(groupId);
+        EntityDescriptor savedEntity = entityDescriptorRepository.save(ed);
+        return createRepresentationFromDescriptor(savedEntity);
+    }
+
     @Override
     public EntityDescriptorRepresentation createNew(EntityDescriptorRepresentation edRep)
                     throws ForbiddenException, ObjectIdExistsException, InvalidPatternMatchException {