SHIBUI-522[533]: polishing

TIER · Jun 7, 2018 · 576a647 · 576a647
1 parent c03a937
commit 576a647
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/...oovy/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/...edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy b/...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()))