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

… into feature/SHIBUI-701
TIER · Nov 9, 2018 · fc21e87 · fc21e87
2 parents c62258c + 3fa8e14
commit fc21e87
Showing 1 changed file with 15 additions and 4 deletions.
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
@@ -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<String> 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());
         }
     }
 }