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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Feb 28 22:37:58 2014
New Revision: 5499

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5499&view=rev
Log:
Remove defaulted ID.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacyNameIdentifierGenerator.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML1NameIdentifierGeneratorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML2NameIDGeneratorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/LegacySAML1NameIdentifierGeneratorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/LegacySAML2NameIDGeneratorTest.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacyNameIdentifierGenerator.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacyNameIdentifierGenerator.java?rev=5499&r1=5498&r2=5499&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacyNameIdentifierGenerator.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacyNameIdentifierGenerator.java Fri Feb 28 22:37:58 2014
@@ -78,8 +78,6 @@
      * @param clazz encoder class type
      */
     protected LegacyNameIdentifierGenerator(@Nonnull Class<? extends NameIdentifierAttributeEncoder> clazz) {
-        super.setId(getClass().getName());
-        
         activationCondition = Predicates.alwaysTrue();
         encoderType = Constraint.isNotNull(clazz, "Encoder class type cannot be null");
 

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML1NameIdentifierGeneratorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML1NameIdentifierGeneratorTest.java?rev=5499&r1=5498&r2=5499&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML1NameIdentifierGeneratorTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML1NameIdentifierGeneratorTest.java Fri Feb 28 22:37:58 2014
@@ -85,6 +85,7 @@
     @BeforeMethod public void initTest() throws ComponentInitializationException {
 
         generator = new DefaultSAML1NameIdentifierGenerator();
+        generator.setId("test");
         generator.setFormat(NameIdentifier.X509_SUBJECT);
         saml1Builder = new NameIdentifierBuilder();
         saml2Builder = new NameIDBuilder();

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML2NameIDGeneratorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML2NameIDGeneratorTest.java?rev=5499&r1=5498&r2=5499&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML2NameIDGeneratorTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML2NameIDGeneratorTest.java Fri Feb 28 22:37:58 2014
@@ -85,6 +85,7 @@
     @BeforeMethod public void initTest() throws ComponentInitializationException {
 
         generator = new DefaultSAML2NameIDGenerator();
+        generator.setId("test");
         generator.setFormat(NameID.X509_SUBJECT);
         saml1Builder = new NameIdentifierBuilder();
         saml2Builder = new NameIDBuilder();

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/LegacySAML1NameIdentifierGeneratorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/LegacySAML1NameIdentifierGeneratorTest.java?rev=5499&r1=5498&r2=5499&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/LegacySAML1NameIdentifierGeneratorTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/LegacySAML1NameIdentifierGeneratorTest.java Fri Feb 28 22:37:58 2014
@@ -55,6 +55,7 @@
 
     @BeforeMethod public void initTest() throws ComponentInitializationException {
         generator = new LegacySAML1NameIdentifierGenerator();
+        generator.setId("this");
         generator.initialize();
         prc = new RequestContextBuilder().buildProfileRequestContext();
     }

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/LegacySAML2NameIDGeneratorTest.java

[... 13 lines stripped ...]