[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/common/profile/impl/ChainingName...

[noreply at shibboleth.net]

Author: scantor
Date: Mon May  5 10:25:27 2014
New Revision: 3837

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3837&view=rev
Log:
Rename some properties.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/ChainingNameIdentifierGenerator.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/ChainingNameIdentifierGenerator.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/ChainingNameIdentifierGenerator.java?rev=3837&r1=3836&r2=3837&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/ChainingNameIdentifierGenerator.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/ChainingNameIdentifierGenerator.java Mon May  5 10:25:27 2014
@@ -72,14 +72,16 @@
      * 
      * @param generators generators to use
      */
-    public void setNameIdentifierGenerators(
+    public void setGenerators(
             @Nonnull @NullableElements List<NameIdentifierGenerator<NameIdType>> generators) {
         Constraint.isNotNull(generators, "NameIdentifierGenerator list cannot be null");
         
         nameIdGeneratorMap.clear();
-        for (final NameIdentifierGenerator generator : Collections2.filter(generators, Predicates.notNull())) {
+        for (final NameIdentifierGenerator<NameIdType> generator
+                : Collections2.filter(generators, Predicates.notNull())) {
             if (generator instanceof FormatSpecificNameIdentifierGenerator) {
-                nameIdGeneratorMap.put(((FormatSpecificNameIdentifierGenerator) generator).getFormat(), generator);
+                nameIdGeneratorMap.put(
+                        ((FormatSpecificNameIdentifierGenerator<NameIdType>) generator).getFormat(), generator);
             } else {
                 log.warn("Unable to install NameIdentifierGenerator of type {}, not format-specific",
                         generator.getClass().getName());
@@ -92,7 +94,7 @@
      * 
      * @param generator a fallback default generator, if any
      */
-    public void setDefaultNameIDGenerator(@Nullable final NameIdentifierGenerator<NameIdType> generator) {
+    public void setDefaultGenerator(@Nullable final NameIdentifierGenerator<NameIdType> generator) {
         defaultNameIdGenerator = generator;
     }
 

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java?rev=3837&r1=3836&r2=3837&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java Mon May  5 10:25:27 2014
@@ -75,7 +75,7 @@
         mock3.initialize();
         
         generator = new ChainingSAML1NameIdentifierGenerator();
-        generator.setNameIdentifierGenerators(Arrays.<NameIdentifierGenerator<NameIdentifier>>asList(mock, mock2, mock3));
+        generator.setGenerators(Arrays.<NameIdentifierGenerator<NameIdentifier>>asList(mock, mock2, mock3));
         
         action.setNameIdentifierGenerator(generator);
     }

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java?rev=3837&r1=3836&r2=3837&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java Mon May  5 10:25:27 2014
@@ -113,7 +113,7 @@
         mock4.initialize();
         
         generator = new ChainingSAML2NameIDGenerator();
-        generator.setNameIdentifierGenerators(Arrays.<NameIdentifierGenerator<NameID>>asList(mock, mock2, mock3, mock4));
+        generator.setGenerators(Arrays.<NameIdentifierGenerator<NameID>>asList(mock, mock2, mock3, mock4));
 
         action.setNameIDGenerator(generator);