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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 13 23:14:20 2015
New Revision: 7821

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7821&view=rev
Log:
IDP-829 - Handle deactivation date column on inserts.

Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/PersistentIdEntry.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStore.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/PersistentIdEntry.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/PersistentIdEntry.java?rev=7821&r1=7820&r2=7821&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/PersistentIdEntry.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/PersistentIdEntry.java	Tue Oct 13 23:14:20 2015
@@ -193,7 +193,7 @@
      * @param time the time the identifier was deactivated
      */
     public void setDeactivationTime(@Nullable final Timestamp time) {
-        this.deactivationTime = time;
+        deactivationTime = time;
     }
 
     /** {@inheritDoc} */

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=7821&r1=7820&r2=7821&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	Tue Oct 13 23:14:20 2015
@@ -357,8 +357,6 @@
         idEntrySelectSQL = "SELECT * FROM " + tableName + " WHERE ";
         deactivateSQL = "UPDATE " + tableName + " SET " + deactivationTimeColumn + "= ? WHERE "
                 + persistentIdColumn + "= ?";
-        
-        log.error("{} This is a deprecated class and should have been swapped out at runtime", getLogPrefix());
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java?rev=7821&r1=7820&r2=7821&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java	Tue Oct 13 23:14:20 2015
@@ -64,9 +64,9 @@
  *      persistentId VARCHAR(50) NOT NULL,
  *      principalName VARCHAR(50) NOT NULL,
  *      localId VARCHAR(50) NOT NULL,
- *      peerProvidedId VARCHAR(50),
+ *      peerProvidedId VARCHAR(50) NULL,
  *      creationDate TIMESTAMP NOT NULL,
- *      deactivationDate TIMESTAMP,
+ *      deactivationDate TIMESTAMP NULL,
  *      PRIMARY KEY (localEntity, peerEntity, persistentId)
  *     );</pre>.
  *    
@@ -365,8 +365,8 @@
     /**
      * Set the INSERT statement used to insert new records.
      * 
-     * @param sql statement text, which must contain seven parameters
-     *  (NameQualifier, SPNameQualifier, value, principal, source ID, SPProvidedID, creation TS)
+     * @param sql statement text, which must contain 8 parameters
+     *  (NameQualifier, SPNameQualifier, value, principal, source ID, SPProvidedID, creation time, deactivation time)
      */
     public void setInsertSQL(@Nonnull @NotEmpty final String sql) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
@@ -442,8 +442,9 @@
                     + principalNameColumn + ", "
                     + sourceIdColumn + ", "
                     + peerProvidedIdColumn + ", "
-                    + creationTimeColumn
-                    + ") VALUES (?, ?, ?, ?, ?, ?, ?)";
+                    + creationTimeColumn + ", "
+                    + deactivationTimeColumn
+                    + ") VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
         }
                 
         if (deactivateSQL == null) {
@@ -696,6 +697,7 @@
         log.trace("{} Setting prepared statement parameter {}: {}", getLogPrefix(), 5, entry.getSourceId());
         log.trace("{} Setting prepared statement parameter {}: {}", getLogPrefix(), 6, entry.getPeerProvidedId());
         log.trace("{} Setting prepared statement parameter {}: {}", getLogPrefix(), 7, entry.getCreationTime());
+        log.trace("{} Setting prepared statement parameter {}: {}", getLogPrefix(), 8, entry.getDeactivationTime());
         
         final PreparedStatement statement = dbConn.prepareStatement(insertSQL);

[... 14 lines stripped ...]