Merge branch 'SHIBUI-906' into feature/SHIBUI-701

TIER · Nov 8, 2018 · 9061801 · 9061801
2 parents e785e68 + 9a1fd96
commit 9061801
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 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
@@ -50,8 +50,8 @@ class JsonSchemaBuilderService {
                 definition['uniqueItems'] = false
             }
             def items = [type     : 'string',
-                         minLength: '1', // TODO: should this be configurable?
-                         maxLength: '255'] //TODO: or this?
+                         minLength: 1, // TODO: should this be configurable?
+                         maxLength: 255] //TODO: or this?
             items.widget = [id: 'datalist', data: it['defaultValues']]
 
             definition['items'] = items

diff --git a/...main/java/edu/internet2/tier/shibboleth/admin/ui/jsonschema/JsonSchemaLocationLookup.java b/...main/java/edu/internet2/tier/shibboleth/admin/ui/jsonschema/JsonSchemaLocationLookup.java
@@ -36,7 +36,7 @@ public static JsonSchemaResourceLocation metadataSourcesSchema(JsonSchemaResourc
     public static JsonSchemaResourceLocation entityAttributesFiltersSchema(JsonSchemaResourceLocationRegistry resourceLocationRegistry) {
         return resourceLocationRegistry
                 .lookup(ENTITY_ATTRIBUTES_FILTERS)
-                .orElseThrow(() -> new IllegalStateException("JSON schema resource location for metadata sources is not registered."));
+                .orElseThrow(() -> new IllegalStateException("JSON schema resource location for entity attributes filters is not registered."));
     }
 
     /**