[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/PersistentIdStor...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Oct 10 15:17:04 2015
New Revision: 7806

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7806&view=rev
Log:
IDP-829 - checkpoint completed implementation of new persistent ID store backend

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/PersistentIdStoreEx.java   (with props)
Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/PersistentIdStoreEx.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStore.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStore.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStore.java?rev=7806&r1=7805&r2=7806&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStore.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStore.java	Sat Oct 10 15:17:04 2015
@@ -52,11 +52,16 @@
 /**
  * JDBC-based storage management for SAML persistent IDs.
  * 
+ * <p>This is a deprecated version that relies on the older, racy interface for
+ * storage. It has been superseded by the {@link JDBCPersistentIdStoreEx} class.</p>
+ * 
  * The DDL for the database is
  * 
  * <tt>CREATE TABLE shibpid {localEntity VARCHAR NOT NULL, peerEntity VARCHAR NOT NULL, principalName \\
  *     VARCHAR NOT NULL, localId VARCHAR NOT NULL, persistentId VARCHAR NOT NULL, peerProvidedId \\
  *     VARCHAR, creationDate TIMESTAMP NOT NULL, deactivationDate TIMESTAMP}</tt> .
+ *     
+ * @deprecated
  */
 public class JDBCPersistentIdStore extends AbstractInitializableComponent implements PersistentIdStore {
 
@@ -116,6 +121,15 @@
     }
     
     /**
+     * Get the table name.
+     * 
+     * @return table name
+     */
+    @Nonnull @NotEmpty public String getTableName() {
+        return tableName;
+    }
+
+    /**
      * Set the table name.
      * 
      * @param name table name
@@ -125,6 +139,15 @@
         
         tableName = Constraint.isNotNull(StringSupport.trimOrNull(name), "Table name cannot be null or empty");
     }
+    
+    /**
+     * Get the name of the issuer entityID column.
+     * 
+     * @return name of issuer column
+     */
+    @Nonnull @NotEmpty public String getLocalEntityColumn() {
+        return issuerColumn;
+    }
 
     /**
      * Set the name of the issuer entityID column.
@@ -136,6 +159,15 @@
         
         issuerColumn = Constraint.isNotNull(StringSupport.trimOrNull(name), "Column name cannot be null or empty");
     }
+    
+    /**
+     * Get the name of the recipient entityID column.
+     * 
+     * @return name of recipient column
+     */
+    @Nonnull @NotEmpty public String getPeerEntityColumn() {
+        return recipientColumn;
+    }
 
     /**
      * Set the name of the recipient entityID column.
@@ -146,6 +178,15 @@
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         
         recipientColumn = Constraint.isNotNull(StringSupport.trimOrNull(name), "Column name cannot be null or empty");
+    }
+
+    /**
+     * Get the name of the principal name column.
+     * 
+     * @return name of principal name column
+     */
+    @Nonnull @NotEmpty public String getPrincipalNameColumn() {
+        return principalNameColumn;
     }
 
     /**
@@ -161,6 +202,15 @@
     }
 
     /**
+     * Get the name of the source ID column.
+     * 
+     * @return name of source ID column
+     */
+    @Nonnull @NotEmpty public String getSourceIdColumn() {
+        return sourceIdColumn;
+    }
+
+    /**
      * Set the name of the source ID column.
      * 
      * @param name name of source ID column
@@ -169,6 +219,15 @@
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         
         sourceIdColumn = Constraint.isNotNull(StringSupport.trimOrNull(name), "Column name cannot be null or empty");
+    }
+
+    /**
+     * Get the name of the persistent ID column.
+     * 
+     * @return name of persistent ID column
+     */
+    @Nonnull @NotEmpty public String getPersistentIdColumn() {
+        return persistentIdColumn;
     }
 
     /**
@@ -184,6 +243,15 @@
     }
 
     /**
+     * Get the name of the peer-provided ID column.
+     * 
+     * @return name of peer-provided ID column
+     */
+    @Nonnull @NotEmpty public String getPeerProvidedIdColumn() {
+        return peerProvidedIdColumn;
+    }
+
+    /**
      * Set the name of the peer-provided ID column.
      * 
      * @param name name of peer-provided ID column
@@ -196,6 +264,15 @@
     }
 
     /**
+     * Get the name of the creation time column.
+     * 
+     * @return name of creation time column
+     */

[... 38 lines stripped ...]