[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: Fri Jan 18 04:32:25 2013
New Revision: 4270

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4270&view=rev
Log:
https://issues.shibboleth.net/jira/browse/IDP-204

StoredIDConnector.  This involved refactoring the ComputedIDConnector so that the hash calculation (and much parameterization) was common.  Otherwise a port from 2.0  Much of the tests are shared with that for the ComputedIDConnector.

Open issues are the usual context navigation (prinicipal, IdPEntityID, SPEntityID)

Added:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseComputedIDDataConnector.java
      - copied, changed from r4262, trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ComputedIDDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ComputedIDDataConnector.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIDDataConnector.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIDDataConnectorTest.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/resources/data/
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIdStore.sql
Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIDStore.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/ComputedIDDataConnectorTest.java

Copied: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseComputedIDDataConnector.java (from r4262, trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ComputedIDDataConnector.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseComputedIDDataConnector.java?p2=trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseComputedIDDataConnector.java&p1=trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ComputedIDDataConnector.java&r1=4262&r2=4270&rev=4270&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ComputedIDDataConnector.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseComputedIDDataConnector.java Fri Jan 18 04:32:25 2013
@@ -36,6 +36,7 @@
 import net.shibboleth.utilities.java.support.codec.Base64Support;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,13 +45,14 @@
 import com.google.common.base.Optional;
 
 /**
- * A data connector that generates a unique ID by computing the SHA-1 hash of a given attribute value, the entity ID of
- * the inbound message issuer, and a provided salt.
+ * A the basis of a data connector that generates a unique ID by computing the SHA-1 hash of a given attribute value,
+ * the entity ID of the inbound message issuer, and a provided salt. The ComputedIDDataConnector is a thin shim on this,
+ * the StoredIdConnector a slightly thicker shim.
  */
-public class ComputedIDDataConnector extends BaseDataConnector {
+public abstract class BaseComputedIDDataConnector extends BaseDataConnector {
 
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ComputedIDDataConnector.class);
+    private final Logger log = LoggerFactory.getLogger(BaseComputedIDDataConnector.class);
 
     /** ID of the attribute generated by this data connector. */
     private String generatedAttribute;
@@ -146,22 +148,19 @@
         super.doInitialize();
 
         if (null == spEntityIdStrategy) {
-            throw new ComponentInitializationException("Attribute definition '" + getId()

[... 413 lines stripped ...]