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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct 12 21:32:47 2015
New Revision: 7810

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7810&view=rev
Log:
IDP-829 - Clean up use of computed strategy by passing it as a parameter.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/PersistentIdStoreEx.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/StoredPersistentIdGenerationStrategy.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/DatabaseBackedIDStoreTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGeneratorTest.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java?rev=7810&r1=7809&r2=7810&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java	Mon Oct 12 21:32:47 2015
@@ -60,7 +60,6 @@
     public StoredIDDataConnector() {
         idStore = new JDBCPersistentIdStoreEx();
         storedIdStrategy = new StoredPersistentIdGenerationStrategy();
-        storedIdStrategy.setIDStore(idStore);
     }
     
     /**
@@ -116,9 +115,9 @@
     @Override protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
 
-        idStore.setComputedIdStrategy(getComputedIdStrategy());
         idStore.initialize();
 
+        storedIdStrategy.setIDStore(idStore);
         storedIdStrategy.setComputedIdStrategy(getComputedIdStrategy());
         storedIdStrategy.initialize();
     }

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=7810&r1=7809&r2=7810&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	Mon Oct 12 21:32:47 2015
@@ -68,9 +68,6 @@
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(JDBCPersistentIdStoreEx.class);
-
-    /** Optional generator of initial ID values. */
-    @Nullable private ComputedPersistentIdGenerationStrategy computedIdStrategy;
     
     /** JDBC data source for retrieving connections. */
     @NonnullAfterInit private DataSource dataSource;
@@ -141,17 +138,6 @@
         peerProvidedIdColumn = "peerProvidedId";
         creationTimeColumn = "creationDate";
         deactivationTimeColumn = "deactivationDate";
-    }
-    
-    /**
-     * Set a strategy to use to compute IDs for the first time.
-     * 
-     * @param strategy  computed ID strategy
-     */
-    public void setComputedIdStrategy(@Nullable final ComputedPersistentIdGenerationStrategy strategy) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        
-        computedIdStrategy = strategy;
     }
     
     /**
@@ -469,12 +455,13 @@
         }
     }
 
-// Checkstyle: MethodLength|CyclomaticComplexity OFF
+// Checkstyle: MethodLength|CyclomaticComplexity|ParameterNumber OFF
     /** {@inheritDoc} */
     @Override
     @Nullable public PersistentIdEntry getBySourceValue(@Nonnull @NotEmpty final String nameQualifier,
             @Nonnull @NotEmpty final String spNameQualifier, @Nonnull @NotEmpty final String sourceId,
-            @Nonnull @NotEmpty final String principal, final boolean allowCreate) throws IOException {
+            @Nonnull @NotEmpty final String principal, final boolean allowCreate,
+            @Nullable final ComputedPersistentIdGenerationStrategy computedIdStrategy) throws IOException {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         
         log.debug("{} Obtaining persistent ID for source ID: {}", getLogPrefix(), sourceId);
@@ -557,7 +544,7 @@
             }
         }
     }
-// Checkstyle: MethodLength|CyclomaticComplexity ON
+// Checkstyle: MethodLength|CyclomaticComplexity|ParameterNumber ON
     
     /**
      * Store a record containing the values from the input object.

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

[... 100 lines stripped ...]