Merge branch 'feature/SHIBUI-701' of bitbucket.org:unicon/shib-idp-ui…

… into feature/SHIBUI-701
TIER · Nov 9, 2018 · 68846b3 · 68846b3
2 parents 0fd30ce + e7dd96f
commit 68846b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/...ternet2/tier/shibboleth/admin/ui/controller/MetadataResolverUiDefinitionController.groovy b/...ternet2/tier/shibboleth/admin/ui/controller/MetadataResolverUiDefinitionController.groovy
@@ -37,7 +37,7 @@ class MetadataResolverUiDefinitionController {
 
     @GetMapping(value = "/{resolverType}")
     ResponseEntity<?> getUiDefinitionJsonSchema(@PathVariable String resolverType) {
-        switch (SchemaType.valueOf(resolverType)) {
+        switch (SchemaType.getSchemaType(resolverType)) {
             case SchemaType.FILESYSTEM_METADATA_RESOLVER:
                 jsonSchemaLocation = filesystemMetadataProviderSchema(this.jsonSchemaResourceLocationRegistry)
                 break

diff --git a/...in/java/edu/internet2/tier/shibboleth/admin/ui/jsonschema/JsonSchemaResourceLocation.java b/...in/java/edu/internet2/tier/shibboleth/admin/ui/jsonschema/JsonSchemaResourceLocation.java
@@ -119,5 +119,14 @@ String getJsonType() {
         public static List<String> getResolverTypes() {
             return Stream.of(SchemaType.values()).map(SchemaType::getJsonType).filter(it -> it.endsWith("Resolver")).collect(Collectors.toList());
         }
+
+        public static SchemaType getSchemaType(String jsonType) {
+            List<SchemaType> schemaTypes = Stream.of(SchemaType.values()).filter(it -> it.getJsonType().equals(jsonType)).collect(Collectors.toList());
+            if (schemaTypes.size() != 1) {
+                throw new RuntimeException("Found two schema types for jsonType (" + jsonType + ")! How did this even happen?");
+            } else {
+                return schemaTypes.get(0);
+            }
+        }
     }
 }