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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar 27 12:49:06 2014
New Revision: 5650

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5650&view=rev
Log:
Make generator strategy setter name consistent with transient one.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/PersistentSAML2NameIDGenerator.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/PersistentSAML2NameIDGeneratorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/StoredPersistentIdDecoderTest.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/PersistentSAML2NameIDGenerator.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/PersistentSAML2NameIDGenerator.java?rev=5650&r1=5649&r2=5650&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/PersistentSAML2NameIDGenerator.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/PersistentSAML2NameIDGenerator.java Thu Mar 27 12:49:06 2014
@@ -132,7 +132,7 @@
      * 
      * @param strategy generation strategy
      */
-    public synchronized void setPersistentIdGenerationStrategy(@Nonnull final PersistentIdGenerationStrategy strategy) {
+    public synchronized void setPersistentIdGenerator(@Nonnull final PersistentIdGenerationStrategy strategy) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         
         persistentIdStrategy = Constraint.isNotNull(strategy, "PersistentIdGenerationStrategy cannot be null");

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/PersistentSAML2NameIDGeneratorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/PersistentSAML2NameIDGeneratorTest.java?rev=5650&r1=5649&r2=5650&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/PersistentSAML2NameIDGeneratorTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/PersistentSAML2NameIDGeneratorTest.java Thu Mar 27 12:49:06 2014
@@ -93,13 +93,13 @@
         strategy.initialize();
         
         generator.initialize();
-        generator.setPersistentIdGenerationStrategy(strategy);
+        generator.setPersistentIdGenerator(strategy);
         generator.initialize();
     }
     
     @Test
     public void testNoResponderId() throws ComponentInitializationException, ProfileException {
-        generator.setPersistentIdGenerationStrategy(new ComputedPersistentIdGenerationStrategy());
+        generator.setPersistentIdGenerator(new ComputedPersistentIdGenerationStrategy());
         generator.setAttributeSourceIds(Collections.singletonList("SOURCE"));
         generator.initialize();
         
@@ -108,7 +108,7 @@
 
     @Test
     public void testNoRequesterId() throws ComponentInitializationException, ProfileException {
-        generator.setPersistentIdGenerationStrategy(new ComputedPersistentIdGenerationStrategy());
+        generator.setPersistentIdGenerator(new ComputedPersistentIdGenerationStrategy());
         generator.setAttributeSourceIds(Collections.singletonList("SOURCE"));
         generator.initialize();
         
@@ -119,7 +119,7 @@
     
     @Test
     public void testNoSubject() throws ComponentInitializationException, ProfileException {
-        generator.setPersistentIdGenerationStrategy(new ComputedPersistentIdGenerationStrategy());
+        generator.setPersistentIdGenerator(new ComputedPersistentIdGenerationStrategy());
         generator.setAttributeSourceIds(Collections.singletonList("SOURCE"));
         generator.initialize();
         
@@ -128,7 +128,7 @@
 
     @Test
     public void testNoSource() throws ComponentInitializationException, ProfileException {
-        generator.setPersistentIdGenerationStrategy(new ComputedPersistentIdGenerationStrategy());
+        generator.setPersistentIdGenerator(new ComputedPersistentIdGenerationStrategy());
         generator.setAttributeSourceIds(Collections.singletonList("SOURCE"));
         generator.initialize();
         
@@ -147,7 +147,7 @@
         strategy.setSalt(salt);
         strategy.initialize();
 
-        generator.setPersistentIdGenerationStrategy(strategy);
+        generator.setPersistentIdGenerator(strategy);
         generator.setAttributeSourceIds(Collections.singletonList("SOURCE"));
         generator.initialize();
         
@@ -177,7 +177,7 @@
         strategy.setIDStore(store);
         strategy.initialize();
 
-        generator.setPersistentIdGenerationStrategy(strategy);
+        generator.setPersistentIdGenerator(strategy);
         generator.setAttributeSourceIds(Collections.singletonList("SOURCE"));
         generator.initialize();
         
@@ -242,7 +242,7 @@

[... 24 lines stripped ...]