From 457837ca3d7de78b99cc4bc30612ecffb1e29e76 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Mon, 3 Aug 2020 12:53:13 -0400
Subject: [PATCH] Fix wrong type of resolver generation

---
 .../admin/ui/service/JPAMetadataResolverServiceImpl.groovy      | 2 +-
 backend/src/test/resources/conf/1059.xml                        | 2 +-
 backend/src/test/resources/conf/278.2.xml                       | 2 +-
 backend/src/test/resources/conf/278.xml                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
index b34a5b2c6..8558026a6 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -489,7 +489,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                 sourceKeyGeneratorRef: resolver.sourceKeyGeneratorRef,
 
                 id: resolver.xmlId,
-                'xsi:type': 'DynamicHttpMetadataProvider',
+                'xsi:type': 'LocalDynamicMetadataProvider',
                 requireValidMetadata: !resolver.requireValidMetadata ?: null,
                 failFastInitialization: !resolver.failFastInitialization ?: null,
                 sortKey: resolver.sortKey,
diff --git a/backend/src/test/resources/conf/1059.xml b/backend/src/test/resources/conf/1059.xml
index 7610893be..4ad4263c1 100644
--- a/backend/src/test/resources/conf/1059.xml
+++ b/backend/src/test/resources/conf/1059.xml
@@ -12,6 +12,6 @@
                       initializeFromPersistentCacheInBackground="true"
                       removeIdleEntityData="true"
                       sourceDirectory="/tmp"
-                      xsi:type="DynamicHttpMetadataProvider">
+                      xsi:type="LocalDynamicMetadataProvider">
     </MetadataProvider>
 </MetadataProvider>
\ No newline at end of file
diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml
index 7f950d8ac..66704cbd9 100644
--- a/backend/src/test/resources/conf/278.2.xml
+++ b/backend/src/test/resources/conf/278.2.xml
@@ -14,7 +14,7 @@
         </MetadataFilter>
     </MetadataProvider>
     <MetadataProvider id='HTTPMetadata' xsi:type='FileBackedHTTPMetadataProvider' backingFile='%{idp.home}/metadata/metadata.xml' metadataURL='https://idp.unicon.net/idp/shibboleth' minRefreshDelay='PT0M' maxRefreshDelay='P1D' />
-    <MetadataProvider sourceDirectory='/tmp' id='LocalDynamic' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' />
+    <MetadataProvider sourceDirectory='/tmp' id='LocalDynamic' xsi:type='LocalDynamicMetadataProvider' removeIdleEntityData='true' />
     <MetadataProvider id='ClasspathResourceMetadata' xsi:type='ResourceBackedMetadataProvider' refreshDelayFactor='0.3'>
         <MetadataResource xmlns:resource='urn:mace:shibboleth:2.0:resource' xsi:type='resource:ClasspathResource' file='metadata/metadata.xml' />
     </MetadataProvider>
diff --git a/backend/src/test/resources/conf/278.xml b/backend/src/test/resources/conf/278.xml
index 1e4c34b31..e5039cb99 100644
--- a/backend/src/test/resources/conf/278.xml
+++ b/backend/src/test/resources/conf/278.xml
@@ -8,7 +8,7 @@
         </MetadataFilter>
     </MetadataProvider>
     <MetadataProvider id='HTTPMetadata' xsi:type='FileBackedHTTPMetadataProvider' backingFile='%{idp.home}/metadata/metadata.xml' metadataURL='https://idp.unicon.net/idp/shibboleth' minRefreshDelay='PT0M' maxRefreshDelay='P1D' />
-    <MetadataProvider sourceDirectory='/tmp' id='LocalDynamic' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' />
+    <MetadataProvider sourceDirectory='/tmp' id='LocalDynamic' xsi:type='LocalDynamicMetadataProvider' removeIdleEntityData='true' />
     <MetadataProvider id='ClasspathResourceMetadata' xsi:type='ResourceBackedMetadataProvider' refreshDelayFactor='0.3'>
         <MetadataResource xmlns:resource='urn:mace:shibboleth:2.0:resource' xsi:type='resource:ClasspathResource' file='metadata/metadata.xml' />
     </MetadataProvider>