[java-identity-provider COMMIT] /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/JDBCPersistent...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar 18 11:50:09 2014
New Revision: 5602

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5602&view=rev
Log:
Annotation cleanup, and remove unneeded methods.

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

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/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?rev=5602&r1=5601&r2=5602&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/JDBCPersistentIdStore.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/JDBCPersistentIdStore.java Tue Mar 18 11:50:09 2014
@@ -34,8 +34,10 @@
 import net.shibboleth.idp.saml.nameid.PersistentIdEntry;
 import net.shibboleth.idp.saml.nameid.PersistentIdStore;
 import net.shibboleth.utilities.java.support.annotation.Duration;
+import net.shibboleth.utilities.java.support.annotation.constraint.Live;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -93,12 +95,12 @@
 
     /** Name of the deactivation time column. */
     @Nonnull @NotEmpty private String deactivationTimeColumn;
-
+    
     /** Partial select query for ID entries. */
     @NonnullAfterInit private String idEntrySelectSQL;
 
     /** SQL used to deactivate an ID. */
-    @NonnullAfterInit private String deactivateIdSQL;
+    @NonnullAfterInit private String deactivateSQL;
 
     /** Constructor. */
     public JDBCPersistentIdStore() {
@@ -111,22 +113,8 @@
         peerProvidedIdColumn = "peerProvidedId";
         creationTimeColumn = "creationDate";
         deactivationTimeColumn = "deactivationDate";
-        
-        deactivateIdSQL = "UPDATE " + tableName + " SET " + deactivationTimeColumn + "= ? WHERE "
-                + persistentIdColumn + "= ?";
-    }
-    
-    /**
-     * Get the table name.
-     * 
-     * @return table name
-     */
-    @Nonnull @NotEmpty public String getTableName() {
-        return tableName;
-    }
-
-
-
+    }
+    
     /**
      * Set the table name.
      * 
@@ -137,21 +125,6 @@
         
         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 getIssuerColumn() {
-        return issuerColumn;
-    }
-    
-
-
 
     /**
      * Set the name of the issuer entityID column.
@@ -163,21 +136,6 @@
         
         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.
@@ -189,21 +147,6 @@
         
         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;
-    }
-    
-
-
 
     /**
      * Set the name of the principal name column.
@@ -216,21 +159,6 @@
         principalNameColumn = Constraint.isNotNull(StringSupport.trimOrNull(name),
                 "Column name cannot be null or empty");
     }
-    
-
-
-
-    /**
-     * 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.
@@ -242,21 +170,6 @@
         
         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() {

[... 150 lines stripped ...]