From e7980dd24de843d63434367079acbfc8794031a5 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 28 Jun 2022 14:03:57 -0700
Subject: [PATCH] SHIBUI-2269

Additional missing bits to get backend to a point to allow UI to integrate
---
 .../admin/ui/domain/resolvers/ExternalMetadataResolver.java    | 3 +++
 .../shibboleth/admin/ui/domain/resolvers/MetadataResolver.java | 3 ++-
 .../admin/ui/jsonschema/JsonSchemaResourceLocation.java        | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ExternalMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ExternalMetadataResolver.java
index 08727018e..f7e2375bc 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ExternalMetadataResolver.java
+++ b/backend/src/main/java/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/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
index 63a04d764..19c96e753 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
+++ b/backend/src/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/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 2d25fac0b..1b9054cd3 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
@@ -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;