From 5db234d455561be502153763afd84fcbca97ffdd Mon Sep 17 00:00:00 2001 From: chasegawa Date: Mon, 28 Jun 2021 15:14:23 -0700 Subject: [PATCH] SHIBUI-1788 corrected stripping whitespace from ref names --- .../admin/ui/service/JsonSchemaBuilderService.groovy | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 ac58b86eb..2673dbdd2 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 @@ -30,9 +30,10 @@ class JsonSchemaBuilderService { void addRelyingPartyOverridesToJson(Object json) { def properties = [:] customPropertiesConfiguration.getOverrides().each { + def propertyName = ((String) it['name']).replaceAll("\\s","") def property if (it['displayType'] == 'list' || it['displayType'] == 'set' || it['displayType'] == 'selection_list') { - property = [$ref: '#/definitions/' + StringUtils.strip(it['name'])] + property = [$ref: '#/definitions/' + propertyName] } else { property = [title : it['displayName'], @@ -41,7 +42,7 @@ class JsonSchemaBuilderService { default : it['displayType'] == 'boolean' ? Boolean.getBoolean(it['defaultValue']) : it['defaultValue'], examples : it['examples']] } - properties[(String) it['name']] = property + properties[propertyName] = property } json['properties'] = properties } @@ -66,7 +67,7 @@ class JsonSchemaBuilderService { definition['items'] = items - json[StringUtils.strip((String) it['name'])] = definition + json[((String) it['name']).replaceAll("\\s","")] = definition } }