SHIBUI-2269

Additional missing bits to get backend to a point to allow UI to integrate
TIER · Jun 28, 2022 · e7980dd · e7980dd
1 parent a9e09db
commit e7980dd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/...ava/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ExternalMetadataResolver.java b/...ava/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ExternalMetadataResolver.java
@@ -22,6 +22,9 @@ public class ExternalMetadataResolver extends MetadataResolver {
     @Column(unique = true)
     private String externalResolverId;
 
+    @Column
+    String name;
+
     public ExternalMetadataResolver() {
         type = "ExternalMetadataResolver";
     }

diff --git a/...c/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java b/...c/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
@@ -43,7 +43,8 @@
         @JsonSubTypes.Type(value = FileBackedHttpMetadataResolver.class, name = "FileBackedHttpMetadataResolver"),
         @JsonSubTypes.Type(value = DynamicHttpMetadataResolver.class, name = "DynamicHttpMetadataResolver"),
         @JsonSubTypes.Type(value = FilesystemMetadataResolver.class, name = "FilesystemMetadataResolver"),
-        @JsonSubTypes.Type(value = ResourceBackedMetadataResolver.class, name = "ResourceBackedMetadataResolver")})
+        @JsonSubTypes.Type(value = ResourceBackedMetadataResolver.class, name = "ResourceBackedMetadataResolver"),
+        @JsonSubTypes.Type(value = ExternalMetadataResolver.class, name = "ExternalMetadataResolver")})
 @Audited
 @AuditOverride(forClass = AbstractAuditable.class)
 public class MetadataResolver extends AbstractAuditable implements IActivatable {

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
@@ -104,7 +104,8 @@ public enum SchemaType {
         FILE_BACKED_HTTP_METADATA_RESOLVER("FileBackedHttpMetadataResolver"),
         FILESYSTEM_METADATA_RESOLVER("FilesystemMetadataResolver"),
         LOCAL_DYNAMIC_METADATA_RESOLVER("LocalDynamicMetadataResolver"),
-        DYNAMIC_HTTP_METADATA_RESOLVER("DynamicHttpMetadataResolver");
+        DYNAMIC_HTTP_METADATA_RESOLVER("DynamicHttpMetadataResolver"),
+        EXTERNAL_METADATA_RESOLVER("ExternalMetadataResolver");
 
         String jsonType;