[java-shib-attribute] 02/02: JSATTR-7 PairwiseIdDataConnectorParser does not derive from the data connector parser base class

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-shib-attribute.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=97e280c3a01969a313cc6d2152c8c6c6f1df5891

commit 97e280c3a01969a313cc6d2152c8c6c6f1df5891
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Nov 12 16:31:56 2022 +0000

    JSATTR-7 PairwiseIdDataConnectorParser does not derive from the data connector parser base class
    
    https://shibboleth.atlassian.net/browse/JSATTR-7
    
    Add test, then make the pairwise parser inherit from the abstract data connector parser.
---
 .../resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java    | 3 +--
 .../spring/dc/impl/ComputedIdDataConnectorParserTest.java         | 8 ++++++--
 .../resolver/spring/dc/resolver/computedDataConnector.xml         | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java
index a600dc46e..9262ddbd9 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java
@@ -30,7 +30,6 @@ import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
 import net.shibboleth.idp.attribute.resolver.dc.impl.PairwiseIdDataConnector;
-import net.shibboleth.idp.attribute.resolver.spring.BaseResolverPluginParser;
 import net.shibboleth.idp.attribute.resolver.spring.dc.AbstractDataConnectorParser;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
@@ -41,7 +40,7 @@ import net.shibboleth.shared.xml.ElementSupport;
  * Spring bean definition parser for configuring
  * {@link net.shibboleth.idp.attribute.resolver.dc.impl.PairwiseIdDataConnector} variants.
  */
-public class PairwiseIdDataConnectorParser extends BaseResolverPluginParser {
+public class PairwiseIdDataConnectorParser extends AbstractDataConnectorParser {
 
     /** Schema type - resolver. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE, 
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParserTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParserTest.java
index 94a4aaddc..94a9622ea 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParserTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParserTest.java
@@ -21,6 +21,8 @@ import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+import java.util.Collection;
+
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.env.MutablePropertySources;
@@ -31,7 +33,6 @@ import org.testng.annotations.Test;
 import net.shibboleth.idp.attribute.impl.ComputedPairwiseIdStore;
 import net.shibboleth.idp.attribute.impl.ComputedPairwiseIdStore.Encoding;
 import net.shibboleth.idp.attribute.resolver.dc.impl.PairwiseIdDataConnector;
-import net.shibboleth.idp.attribute.resolver.spring.dc.impl.ComputedIdDataConnectorParser;
 import net.shibboleth.idp.attribute.resolver.spring.testing.BaseAttributeDefinitionParserTest;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
@@ -62,7 +63,10 @@ public class ComputedIdDataConnectorParserTest extends BaseAttributeDefinitionPa
         final ComputedPairwiseIdStore store = (ComputedPairwiseIdStore) connector.getPairwiseIdStore();
         assertFalse(connector.isExportAllAttributes());
 
-        assertEquals(connector.getId(), "computed");
+        final Collection<String> exports = connector.getExportAttributes();
+        assertEquals(exports.size(), 2);
+        assertTrue(exports.contains("Joe"));
+        assertTrue(exports.contains("Doe"));        assertEquals(connector.getId(), "computed");
         assertEquals(connector.getGeneratedAttributeId(), "jenny");
         assertEquals(store.getSalt(), "abcdefghijklmnopqrst ".getBytes());
         assertEquals(connector.getSourceAttributeInformation(), "DC/theSourceRemainsTheSame");
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedDataConnector.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedDataConnector.xml
index 8a8e4841b..5825391c1 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedDataConnector.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedDataConnector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <DataConnector id="computed"
 	xsi:type="ComputedId" xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	
+	exportAttributes="Joe Doe"
 	generatedAttributeID="jenny"
 	encodedSalt="YWJjZGVmZ2hpamtsbW5vcHFyc3Qg"
 	xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.