From e5f74cb18dc7277d19ef0a8446216c0d0618b045 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Mon, 11 Oct 2021 10:48:22 -0700 Subject: [PATCH] SHIBUI-2164 Adjustment to output to move MDQ to after the filter nodes --- .../admin/ui/service/JPAMetadataResolverServiceImpl.groovy | 2 +- backend/src/test/resources/conf/278.2.xml | 4 ++-- backend/src/test/resources/conf/278.xml | 4 ++-- backend/src/test/resources/conf/984-2.xml | 4 ++-- backend/src/test/resources/conf/984.xml | 4 ++-- 5 files changed, 9 insertions(+), 9 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 e9faeb69c..4c0229b22 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 @@ -246,6 +246,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { httpMaxCacheEntries: resolver.httpMetadataResolverAttributes?.httpMaxCacheEntries, httpMaxCacheEntrySize: resolver.httpMetadataResolverAttributes?.httpMaxCacheEntrySize) { + childNodes() switch (MetadataRequestURLConstructionScheme.SchemeType.get(resolver.metadataRequestURLConstructionScheme.type)) { case MetadataRequestURLConstructionScheme.SchemeType.METADATA_QUERY_PROTOCOL: MetadataQueryProtocolScheme scheme = (MetadataQueryProtocolScheme) resolver.metadataRequestURLConstructionScheme @@ -276,7 +277,6 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { default: break } - childNodes() } } diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml index c8bd08e6b..9218ebcd5 100644 --- a/backend/src/test/resources/conf/278.2.xml +++ b/backend/src/test/resources/conf/278.2.xml @@ -1,6 +1,5 @@ - content @@ -12,10 +11,11 @@ md:SPSSODescriptor + content - + \ No newline at end of file diff --git a/backend/src/test/resources/conf/278.xml b/backend/src/test/resources/conf/278.xml index 0c1bfd794..46e57a6b4 100644 --- a/backend/src/test/resources/conf/278.xml +++ b/backend/src/test/resources/conf/278.xml @@ -1,15 +1,15 @@ - content md:SPSSODescriptor + content - + \ No newline at end of file diff --git a/backend/src/test/resources/conf/984-2.xml b/backend/src/test/resources/conf/984-2.xml index c3bd16e05..f6db94956 100644 --- a/backend/src/test/resources/conf/984-2.xml +++ b/backend/src/test/resources/conf/984-2.xml @@ -1,6 +1,5 @@ - http://mdq-beta.incommon.org/global + http://mdq-beta.incommon.org/global - + \ No newline at end of file diff --git a/backend/src/test/resources/conf/984.xml b/backend/src/test/resources/conf/984.xml index a67eb1a93..42328a0c0 100644 --- a/backend/src/test/resources/conf/984.xml +++ b/backend/src/test/resources/conf/984.xml @@ -1,6 +1,5 @@ - http://mdq-beta.incommon.org/global + http://mdq-beta.incommon.org/global - + \ No newline at end of file