SHIBUI-1788

Changed removing whitespace to name just for json schema and refs
TIER · Jun 28, 2021 · 378d8ac · 378d8ac
1 parent b93526a
commit 378d8ac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy
@@ -1,10 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.service
 
-import edu.internet2.tier.shibboleth.admin.ui.configuration.CustomPropertiesConfiguration
-import edu.internet2.tier.shibboleth.admin.ui.domain.IRelyingPartyOverrideProperty
-import edu.internet2.tier.shibboleth.admin.ui.security.model.User
-import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService
-import org.springframework.beans.factory.annotation.Autowired
+import org.apache.commons.lang3.StringUtils
 
 /**
  * @author Bill Smith (wsmith@unicon.net)
@@ -31,7 +27,7 @@ class JsonSchemaBuilderService {
         customPropertiesConfiguration.getOverrides().each {
             def property
             if (it['displayType'] == 'list' || it['displayType'] == 'set' || it['displayType'] == 'selection_list') {
-                property = [$ref: '#/definitions/' + it['name']]
+                property = [$ref: '#/definitions/' + StringUtils.strip(it['name'])]
             } else {
                 property =
                         [title       : it['displayName'],
@@ -65,7 +61,7 @@ class JsonSchemaBuilderService {
 
 
             definition['items'] = items
-            json[(String) it['name']] = definition
+            json[StringUtils.strip((String) it['name'])] = definition
         }
     }
 

diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java
@@ -121,11 +121,6 @@ public void setDisplayType(String displayType) {
         // This is here to comply with the interface only and should not be used to change the value in this implementation 
     }
 
-    @Override
-    public void setName(String name) {
-        this.name = StringUtils.strip(name);
-    }
-
     public void updateExamplesList() {
         examples = customAttrListDefinitions;
     }

diff --git a/...main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RelyingPartyOverrideProperty.java b/...main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RelyingPartyOverrideProperty.java
@@ -52,9 +52,4 @@ public void setDefaultValues(Set<String> defaults) {
         defaultValues = defaults;
         examples = defaults;        
     }
-
-    @Override
-    public void setName(String name) {
-        this.name = StringUtils.strip(name);
-    }
 }