From 576a647e3bcc0c6f6542d61ecd6b6b26aa8f7c0c Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Thu, 7 Jun 2018 15:11:16 -0400 Subject: [PATCH] SHIBUI-522[533]: polishing --- .../admin/ui/service/JPAMetadataResolverServiceImpl.groovy | 6 +++--- .../ui/service/JPAMetadataResolverServiceImplTests.groovy | 2 +- 2 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 e8c074930..2c873de69 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 @@ -107,7 +107,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { ) //TODO: enhance mr.metadataFilters.each { edu.internet2.tier.shibboleth.admin.ui.domain.filters.MetadataFilter filter -> - constructFilterXmlNode(filter, delegate) + constructXmlNodeFor(filter, delegate) } } } @@ -117,7 +117,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { } } - void constructFilterXmlNode(EntityAttributesFilter filter, def markupBuilderDelegate) { + void constructXmlNodeFor(EntityAttributesFilter filter, def markupBuilderDelegate) { markupBuilderDelegate.MetadataFilter('xsi:type': 'EntityAttributes') { // TODO: enhance. currently this does weird things with namespaces filter.attributes.each { attribute -> @@ -132,7 +132,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { } } - void constructFilterXmlNode(EntityRoleWhiteListFilter filter, def markupBuilderDelegate) { + void constructXmlNodeFor(EntityRoleWhiteListFilter filter, def markupBuilderDelegate) { markupBuilderDelegate.MetadataFilter( 'xsi:type': 'EntityRoleWhiteList', 'xmlns:md': 'urn:oasis:names:tc:SAML:2.0:metadata' diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy index 916001ba7..b9623e4dc 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy @@ -131,7 +131,7 @@ class JPAMetadataResolverServiceImplTests extends Specification { def filter = testObjectGenerator.entityRoleWhitelistFilter() when: - genXmlSnippet(markupBuilder) { JPAMetadataResolverServiceImpl.cast(metadataResolverService).constructFilterXmlNode(filter, it) } + genXmlSnippet(markupBuilder) { JPAMetadataResolverServiceImpl.cast(metadataResolverService).constructXmlNodeFor(filter, it) } then: assert generatedXmlIsTheSameAsExpectedXml('/conf/533.xml', domBuilder.parseText(writer.toString()))