Merged in feature/SHIBUI-1902 (pull request #481)

SHIBUI-1902

Approved-by: Jonathan Johnson

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/CustomAttributesController.java → backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/CustomEntityAttributesDefinitionsController.java

@@ -17,21 +17,21 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.CustomAttributeDefinition;
+import edu.internet2.tier.shibboleth.admin.ui.domain.CustomEntityAttributeDefinition;
 import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor;
-import edu.internet2.tier.shibboleth.admin.ui.service.CustomAttributesService;
+import edu.internet2.tier.shibboleth.admin.ui.service.CustomEntityAttributesDefinitionService;
 
 @Controller
-@RequestMapping(value = "/api/custom")
-public class CustomAttributesController {
+@RequestMapping(value = "/api/custom/entity")
+public class CustomEntityAttributesDefinitionsController {
     @Autowired
-    private CustomAttributesService caService;
+    private CustomEntityAttributesDefinitionService caService;
 
     @PostMapping("/attribute")
     @Transactional
-    public ResponseEntity<?> create(@RequestBody CustomAttributeDefinition definition) {
+    public ResponseEntity<?> create(@RequestBody CustomEntityAttributeDefinition definition) {
         // If already defined, we can't create a new one, nor will this call update the definition
-        CustomAttributeDefinition cad = caService.find(definition.getName());
+        CustomEntityAttributeDefinition cad = caService.find(definition.getName());
 
         if (cad != null) {
             HttpHeaders headers = new HttpHeaders();
@@ -42,14 +42,14 @@ public ResponseEntity<?> create(@RequestBody CustomAttributeDefinition definitio
                                        String.format("The custom attribute definition with name: [%s] already exists.", definition.getName())));
         }
 
-        CustomAttributeDefinition result = caService.createOrUpdateDefinition(definition);
+        CustomEntityAttributeDefinition result = caService.createOrUpdateDefinition(definition);
         return ResponseEntity.status(HttpStatus.CREATED).body(result);
     }
 
     @PutMapping("/attribute")
     @Transactional
-    public ResponseEntity<?> update(@RequestBody CustomAttributeDefinition definition) {
-        CustomAttributeDefinition cad = caService.find(definition.getName());      
+    public ResponseEntity<?> update(@RequestBody CustomEntityAttributeDefinition definition) {
+        CustomEntityAttributeDefinition cad = caService.find(definition.getName());      
         if (cad == null) {
             HttpHeaders headers = new HttpHeaders();
             headers.setLocation(ServletUriComponentsBuilder.fromCurrentServletMapping().path("/api/custom/attribute").build().toUri());
@@ -59,7 +59,7 @@ public ResponseEntity<?> update(@RequestBody CustomAttributeDefinition definitio
                                        String.format("The custom attribute definition with name: [%s] does not already exist.", definition.getName())));
         }
 
-        CustomAttributeDefinition result = caService.createOrUpdateDefinition(definition);
+        CustomEntityAttributeDefinition result = caService.createOrUpdateDefinition(definition);
         return ResponseEntity.ok(result);
     }
 
@@ -72,7 +72,7 @@ public ResponseEntity<?> getAll() {
     @GetMapping("/attribute/{name}")
     @Transactional(readOnly = true)
     public ResponseEntity<?> getOne(@PathVariable String name) {
-        CustomAttributeDefinition cad = caService.find(name);
+        CustomEntityAttributeDefinition cad = caService.find(name);
         if (cad == null) {
             HttpHeaders headers = new HttpHeaders();
             headers.setLocation(
@@ -88,7 +88,7 @@ public ResponseEntity<?> getOne(@PathVariable String name) {
     @DeleteMapping("/attribute/{name}")
     @Transactional
     public ResponseEntity<?> delete(@PathVariable String name) {
-        CustomAttributeDefinition cad = caService.find(name);
+        CustomEntityAttributeDefinition cad = caService.find(name);
         if (cad == null) {
             HttpHeaders headers = new HttpHeaders();
             headers.setLocation(

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomAttributeDefinition.java → backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java

@@ -14,10 +14,10 @@
 
 import lombok.Data;
 
-@Entity(name = "custom_attribute_definition")
+@Entity(name = "custom_entity_attribute_definition")
 @Audited
 @Data
-public class CustomAttributeDefinition {
+public class CustomEntityAttributeDefinition {
     @Id
     @Column(nullable = false)
     String name;
@@ -32,13 +32,13 @@ public class CustomAttributeDefinition {
     String defaultValue;
 
     @ElementCollection
-    @CollectionTable(name = "custom_attr_list_defs", joinColumns = @JoinColumn(name = "name"))
+    @CollectionTable(name = "custom_entity_attr_list_items", joinColumns = @JoinColumn(name = "name"))
     @Column(name = "value", nullable = false)
     Set<String> customAttrListDefinitions = new HashSet<>();
 
     // @TODO: logic to ensure defaultValue matches an item from the list of values when SELECTION_LIST is the type ??
 }
 
 enum CustomAttributeType {
-    BOOLEAN, INTEGER, LONG, DOUBLE, DURATION, SELECTION_LIST, SPRING_BEAN_ID
+    STRING, BOOLEAN, INTEGER, LONG, DOUBLE, DURATION, SELECTION_LIST, SPRING_BEAN_ID
 }

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/CustomEntityAttributeDefinitionRepository.java

@@ -0,0 +1,20 @@
+package edu.internet2.tier.shibboleth.admin.ui.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import edu.internet2.tier.shibboleth.admin.ui.domain.CustomEntityAttributeDefinition;
+
+/**
+ * Repository to manage {@link CustomEntityAttributeDefinition} instances.
+ */
+public interface CustomEntityAttributeDefinitionRepository extends JpaRepository<CustomEntityAttributeDefinition, String> {
+
+    List<CustomEntityAttributeDefinition> findAll();
+
+    CustomEntityAttributeDefinition findByName(String name);
+
+    @SuppressWarnings("unchecked")
+    CustomEntityAttributeDefinition save(CustomEntityAttributeDefinition attribute);
+}

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/CustomEntityAttributesDefinitionService.java

@@ -0,0 +1,17 @@
+package edu.internet2.tier.shibboleth.admin.ui.service;
+
+import java.util.List;
+
+import edu.internet2.tier.shibboleth.admin.ui.domain.CustomEntityAttributeDefinition;
+
+public interface CustomEntityAttributesDefinitionService {
+
+    CustomEntityAttributeDefinition createOrUpdateDefinition(CustomEntityAttributeDefinition definition);
+
+    void deleteDefinition(CustomEntityAttributeDefinition definition);
+
+    CustomEntityAttributeDefinition find(String name);
+
+    List<CustomEntityAttributeDefinition> getAllDefinitions();
+
+}

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/CustomEntityAttributesDefinitionServiceImpl.java

@@ -0,0 +1,36 @@
+package edu.internet2.tier.shibboleth.admin.ui.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import edu.internet2.tier.shibboleth.admin.ui.domain.CustomEntityAttributeDefinition;
+import edu.internet2.tier.shibboleth.admin.ui.repository.CustomEntityAttributeDefinitionRepository;
+
+@Service
+public class CustomEntityAttributesDefinitionServiceImpl implements CustomEntityAttributesDefinitionService {
+    @Autowired
+    private CustomEntityAttributeDefinitionRepository repository;
+
+    @Override
+    public CustomEntityAttributeDefinition createOrUpdateDefinition(CustomEntityAttributeDefinition definition) {
+        return repository.save(definition);
+    }
+
+    @Override
+    public void deleteDefinition(CustomEntityAttributeDefinition definition) {
+        repository.delete(definition);
+    }
+
+    @Override
+    public CustomEntityAttributeDefinition find(String name) {
+        return repository.findByName(name);
+    }
+
+    @Override
+    public List<CustomEntityAttributeDefinition> getAllDefinitions() {
+        return repository.findAll();
+    }
+
+}