From 378d8ac251c15bc28bbcd23e9ac8b303a0b177b7 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Mon, 28 Jun 2021 13:45:53 -0700 Subject: [PATCH] SHIBUI-1788 Changed removing whitespace to name just for json schema and refs --- .../admin/ui/service/JsonSchemaBuilderService.groovy | 10 +++------- .../ui/domain/CustomEntityAttributeDefinition.java | 5 ----- .../admin/ui/domain/RelyingPartyOverrideProperty.java | 5 ----- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy index 6ebdcf7be..0058c222b 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy +++ b/backend/src/main/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/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java index fdb9f9e83..cbac871bc 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java +++ b/backend/src/main/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/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RelyingPartyOverrideProperty.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RelyingPartyOverrideProperty.java index 159501fab..9c75bd382 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RelyingPartyOverrideProperty.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RelyingPartyOverrideProperty.java @@ -52,9 +52,4 @@ public void setDefaultValues(Set defaults) { defaultValues = defaults; examples = defaults; } - - @Override - public void setName(String name) { - this.name = StringUtils.strip(name); - } } \ No newline at end of file