Merged in SHIBUI-693 (pull request #148)

SHIBUI-693 - The order of merges (SHIBUI-680, SHIBUI-692, SHIBUI-693, SHIBUI-734)

Approved-by: Bill Smith <wsmith@unicon.net>
Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com>

backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy

@@ -126,16 +126,18 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
     }
 
     void constructXmlNodeForFilter(SignatureValidationFilter filter, def markupBuilderDelegate) {
-        markupBuilderDelegate.MetadataFilter(id: filter.name,
-                'xsi:type': 'SignatureValidation',
-                'xmlns:md': 'urn:oasis:names:tc:SAML:2.0:metadata',
-                'requireSignedRoot': !filter.requireSignedRoot ?: null,
-                'certificateFile': filter.certificateFile,
-                'defaultCriteriaRef': filter.defaultCriteriaRef,
-                'signaturePrevalidatorRef': filter.signaturePrevalidatorRef,
-                'dynamicTrustedNamesStrategyRef': filter.dynamicTrustedNamesStrategyRef,
-                'trustEngineRef': filter.trustEngineRef,
-                'publicKey': filter.publicKey)
+        if(filter.xmlShouldBeGenerated()) {
+            markupBuilderDelegate.MetadataFilter(id: filter.name,
+                    'xsi:type': 'SignatureValidation',
+                    'xmlns:md': 'urn:oasis:names:tc:SAML:2.0:metadata',
+                    'requireSignedRoot': !filter.requireSignedRoot ?: null,
+                    'certificateFile': filter.certificateFile,
+                    'defaultCriteriaRef': filter.defaultCriteriaRef,
+                    'signaturePrevalidatorRef': filter.signaturePrevalidatorRef,
+                    'dynamicTrustedNamesStrategyRef': filter.dynamicTrustedNamesStrategyRef,
+                    'trustEngineRef': filter.trustEngineRef,
+                    'publicKey': filter.publicKey)
+        }
     }
 
     void constructXmlNodeForFilter(EntityAttributesFilter filter, def markupBuilderDelegate) {

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/SignatureValidationFilter.java

@@ -5,14 +5,7 @@
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.OrderColumn;
-import java.util.ArrayList;
-import java.util.List;
 
 @Entity
 @EqualsAndHashCode(callSuper = true)
@@ -38,4 +31,8 @@ public SignatureValidationFilter() {
     private String trustEngineRef;
 
     private String publicKey;
+
+    public boolean xmlShouldBeGenerated() {
+        return requireSignedRoot;
+    }
 }

backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/filters/SignatureValidationFilterTests.groovy

@@ -0,0 +1,26 @@
+package edu.internet2.tier.shibboleth.admin.ui.domain.filters
+
+import spock.lang.Specification
+import spock.lang.Subject
+
+/**
+ * @author Dmitriy Kopylenko
+ */
+class SignatureValidationFilterTests extends Specification {
+
+    def "correct logic in xmlShouldBeGenerated() method"() {
+        given: "filter under test with requireSignedRoot set to false"
+        @Subject
+        def filter = new SignatureValidationFilter(requireSignedRoot: false)
+
+        expect:
+        !filter.xmlShouldBeGenerated()
+
+        when: "filter under test with requireSignedRoot set to true"
+        filter.requireSignedRoot = true
+
+        then:
+        filter.xmlShouldBeGenerated()
+
+    }
+}