[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl/src: main/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Mar 24 10:52:36 2013
New Revision: 4351

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4351&view=rev
Log:
SIDP-278 Move SAMLAttributeDataConnector to the test side, clean it up and add 

Added:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/SAMLAttributeDataConnector.java
      - copied, changed from r4337, trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseSamlAttributeDataConnector.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/SAMLAttributeDataConnectorTest.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/entityAttributes.xml
      - copied, changed from r4350, trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/entity.xml
Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseSamlAttributeDataConnector.java
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/entity.xml

Copied: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/SAMLAttributeDataConnector.java (from r4337, trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseSamlAttributeDataConnector.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/SAMLAttributeDataConnector.java?p2=trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/SAMLAttributeDataConnector.java&p1=trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseSamlAttributeDataConnector.java&r1=4337&r2=4351&rev=4351&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseSamlAttributeDataConnector.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/SAMLAttributeDataConnector.java Sun Mar 24 10:52:36 2013
@@ -18,7 +18,7 @@
 package net.shibboleth.idp.attribute.resolver.impl.dc;
 
 import java.util.Collection;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -28,13 +28,17 @@
 
 import net.shibboleth.idp.attribute.Attribute;
 import net.shibboleth.idp.attribute.AttributeValue;
+import net.shibboleth.idp.attribute.ScopedStringAttributeValue;
+import net.shibboleth.idp.attribute.StringAttributeValue;
+import net.shibboleth.idp.attribute.XMLObjectAttributeValue;
 import net.shibboleth.idp.attribute.resolver.AttributeResolutionContext;
+import net.shibboleth.idp.attribute.resolver.BaseDataConnector;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
-import net.shibboleth.idp.attribute.resolver.BaseDataConnector;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
 import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.xml.schema.XSString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,60 +48,15 @@
 /**
  * Data Connector to extra attributes from a saml2 {@link org.opensaml.saml.saml2.core.Assertion}.
  */
- at Deprecated // Work in progress
-public abstract class BaseSamlAttributeDataConnector extends BaseDataConnector {
+public class SAMLAttributeDataConnector extends BaseDataConnector {
 
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(BaseSamlAttributeDataConnector.class);
-
-    /** ID of the attribute generated by this data connector. */
-    private String generatedAttribute;
-
-    /** ID of the attribute whose first value is used when generating the computed ID. */
-    private String sourceAttribute;
+    private final Logger log = LoggerFactory.getLogger(SAMLAttributeDataConnector.class);
 
     /**
      * The way to get the list of attributes from the resolution context.
      */
     private Function<AttributeResolutionContext, List<org.opensaml.saml.saml2.core.Attribute>> attributesStrategy;
-
-    /**
-     * Gets the ID of the attribute whose first value is used when generating the computed ID.
-     * 
-     * @return ID of the attribute whose first value is used when generating the computed ID
-     */
-    public String getSourceAttributeId() {
-        return sourceAttribute;
-    }
-
-    /**
-     * Sets the ID of the attribute whose first value is used when generating the computed ID.
-     * 
-     * @param newAttributeId what to set.
-     */
-    public void setSourceAttributeId(String newAttributeId) {

[... 182 lines stripped ...]