SHIBUI-1788

Quick feedback adjustments
TIER · Jun 17, 2021 · 98ca11f · 98ca11f
1 parent 770cdc6
commit 98ca11f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/...a/edu/internet2/tier/shibboleth/admin/ui/configuration/CustomPropertiesConfiguration.java b/...a/edu/internet2/tier/shibboleth/admin/ui/configuration/CustomPropertiesConfiguration.java
@@ -30,19 +30,21 @@ public class CustomPropertiesConfiguration implements ApplicationListener<Custom
 
     private void buildRelyingPartyOverrides() {
         // Start over with a clean map and get the CustomEntityAttributesDefinitions from the DB
-        overrides = new HashMap<>();
+        HashMap<String, IRelyingPartyOverrideProperty> reloaded = new HashMap<>();
         ceadService.getAllDefinitions().forEach(def -> {
             def.updateExamplesList(); // totally non-ooo, but @PostLoad wasn't working and JPA/Hibernate is doing some reflection crap
-            overrides.put(def.getName(), def);
+            reloaded.put(def.getName(), def);
         });
 
         // We only want to add to an override from the config file if the incoming override (by name) isn't already in
         // the list of overrides (ie DB > file config)
         for (RelyingPartyOverrideProperty rpop : this.overridesFromConfigFile) {
-            if (!this.overrides.containsKey(rpop.getName())) {
-                this.overrides.put(rpop.getName(), rpop);
+            if (!reloaded.containsKey(rpop.getName())) {
+                reloaded.put(rpop.getName(), rpop);
             }
         }
+
+        this.overrides = reloaded;
     }
 
     public List<? extends Map<String, String>> getAttributes() {

diff --git a/...net2/tier/shibboleth/admin/ui/controller/CustomEntityAttributesDefinitionsController.java b/...net2/tier/shibboleth/admin/ui/controller/CustomEntityAttributesDefinitionsController.java
@@ -15,7 +15,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import edu.internet2.tier.shibboleth.admin.ui.configuration.CustomPropertiesConfiguration;
 import edu.internet2.tier.shibboleth.admin.ui.domain.CustomEntityAttributeDefinition;
 import edu.internet2.tier.shibboleth.admin.ui.service.CustomEntityAttributesDefinitionService;
 
@@ -24,9 +23,6 @@
 public class CustomEntityAttributesDefinitionsController {
     @Autowired
     private CustomEntityAttributesDefinitionService caService;
-
-    @Autowired
-    private CustomPropertiesConfiguration customPropertiesConfiguration;
 
     @PostMapping("/attribute")
     @Transactional
@@ -71,7 +67,7 @@ public ResponseEntity<?> update(@RequestBody CustomEntityAttributeDefinition def
     @GetMapping("/attributes")
     @Transactional(readOnly = true)
     public ResponseEntity<?> getAll() {
-        return ResponseEntity.ok(customPropertiesConfiguration.getOverrides());
+        return ResponseEntity.ok(caService.getAllDefinitions());
     }
 
     @GetMapping("/attribute/{name}")