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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Mar 17 17:30:10 2014
New Revision: 5593

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5593&view=rev
Log:
Move stored ID back-end into nameid package, work on bean access to SQL text.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/JDBCPersistentIdStore.java
      - copied, changed from r5592, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/JDBCPersistentIdStore.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DatabaseBackedIDStoreTest.java
      - copied, changed from r5592, trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/resolver/DatabaseBackedIDStoreTest.java
Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/JDBCPersistentIdStore.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/resolver/DatabaseBackedIDStoreTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/PersistentSAML2NameIDGeneratorTest.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java?rev=5593&r1=5592&r2=5593&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java Mon Mar 17 17:30:10 2014
@@ -27,6 +27,7 @@
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
+import net.shibboleth.idp.saml.impl.nameid.JDBCPersistentIdStore;
 import net.shibboleth.idp.saml.impl.nameid.StoredPersistentIdGenerationStrategy;
 import net.shibboleth.utilities.java.support.annotation.Duration;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;

Copied: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/JDBCPersistentIdStore.java (from r5592, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/JDBCPersistentIdStore.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/JDBCPersistentIdStore.java?p2=trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/JDBCPersistentIdStore.java&p1=trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/JDBCPersistentIdStore.java&r1=5592&r2=5593&rev=5593&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/JDBCPersistentIdStore.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/JDBCPersistentIdStore.java Mon Mar 17 17:30:10 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.saml.impl.attribute.resolver;
+package net.shibboleth.idp.saml.impl.nameid;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -41,6 +41,7 @@
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
@@ -67,38 +68,291 @@
     @Duration @NonNegative private long queryTimeout;
 
     /** Name of the database table. */
-    private final String table = "shibpid";
-
-    /** Name of the local entity ID column. */
-    private final String localEntityColumn = "localEntity";
-
-    /** Name of the peer entity ID name column. */
-    private final String peerEntityColumn = "peerEntity";
+    @Nonnull @NotEmpty private String tableName;
+
+    /** Name of the issuer entityID column. */
+    @Nonnull @NotEmpty private String issuerColumn;
+
+    /** Name of the recipient entityID column. */
+    @Nonnull @NotEmpty private String recipientColumn;
 
     /** Name of the principal name column. */
-    private final String principalNameColumn = "principalName";
-
-    /** Name of the local ID column. */
-    private final String localIdColumn = "localId";
+    @Nonnull @NotEmpty private String principalNameColumn;
+
+    /** Name of the source ID column. */
+    @Nonnull @NotEmpty private String sourceIdColumn;
 
     /** Name of the persistent ID column. */

[... 397 lines stripped ...]