From e0fe40969e3e2e23a5532e4a469b9fa4df5240ce Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Fri, 9 Nov 2018 08:36:28 -0700 Subject: [PATCH] [SHIBUI-701] Added json types fo SchemaType so that the UI knows what @Type to pass along to the backend. --- .../JsonSchemaResourceLocation.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/jsonschema/JsonSchemaResourceLocation.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/jsonschema/JsonSchemaResourceLocation.java index 61f6bbeff..2f37723af 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/jsonschema/JsonSchemaResourceLocation.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/jsonschema/JsonSchemaResourceLocation.java @@ -95,18 +95,29 @@ public static JsonSchemaResourceLocation newSchemaLocation(String jsonSchemaLoca public enum SchemaType { // common types - METADATA_SOURCES, + METADATA_SOURCES("MetadataSources"), // filter types - ENTITY_ATTRIBUTES_FILTERS, + ENTITY_ATTRIBUTES_FILTERS("EntityAttributesFilters"), // resolver types - FILESYSTEM_METADATA_RESOLVER; + FILE_BACKED_HTTP_METADATA_RESOLVER("FileBackedHttpMetadataResolver"), + FILESYSTEM_METADATA_RESOLVER("FilesystemMetadataResolver"); // LOCAL_DYNAMIC_METADATA_RESOLVER, // DYNAMIC_HTTP_METADATA_RESOLVER; + String jsonType; + + SchemaType(String jsonType) { + this.jsonType = jsonType; + } + + String getJsonType() { + return jsonType; + } + public static List getResolverTypes() { - return Stream.of(SchemaType.values()).map(SchemaType::name).filter(it -> it.endsWith("RESOLVER")).collect(Collectors.toList()); + return Stream.of(SchemaType.values()).map(SchemaType::getJsonType).filter(it -> it.endsWith("Resolver")).collect(Collectors.toList()); } } } \ No newline at end of file