[java-opensaml COMMIT] in /trunk: opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileActio...

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Feb 10 23:57:17 2014
New Revision: 3610

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3610&view=rev
Log:
Set the ID of profile actions via a bean post processor.
No longer set the ID to the profile action's class name by default.

Modified:
    trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java
    trunk/opensaml-profile-api/src/test/java/org/opensaml/profile/action/AbstractProfileActionTest.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/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java

Modified: trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java?rev=3610&r1=3609&r2=3610&view=diff
==============================================================================
--- trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java (original)
+++ trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java Mon Feb 10 23:57:17 2014
@@ -52,11 +52,8 @@
     
     /**
      * Constructor.
-     * 
-     * Initializes the ID of this action to the class name.
      */
     public AbstractProfileAction() {
-        setId(getClass().getName());
     }
 
     /** {@inheritDoc} */

Modified: trunk/opensaml-profile-api/src/test/java/org/opensaml/profile/action/AbstractProfileActionTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-profile-api/src/test/java/org/opensaml/profile/action/AbstractProfileActionTest.java?rev=3610&r1=3609&r2=3610&view=diff
==============================================================================
--- trunk/opensaml-profile-api/src/test/java/org/opensaml/profile/action/AbstractProfileActionTest.java (original)
+++ trunk/opensaml-profile-api/src/test/java/org/opensaml/profile/action/AbstractProfileActionTest.java Mon Feb 10 23:57:17 2014
@@ -113,6 +113,10 @@
         private boolean didExec = false;
         private boolean didPost = false;
         
+        protected BaseProfileAction() {
+            setId(getClass().getName());
+        }
+        
         protected boolean doPreExecute(@Nonnull final ProfileRequestContext prc) throws ProfileException {
             return didPre = true;
         }

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=3610&r1=3609&r2=3610&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 Feb 10 23:57:17 2014
@@ -60,6 +60,7 @@
         prc = new RequestContextBuilder().buildProfileRequestContext();
         
         action = new AddNameIdentifierToSubjects();
+        action.setId("test");
         
         MockSAML1NameIdentifierGenerator mock = new MockSAML1NameIdentifierGenerator("foo");
         mock.setFormat(NameIdentifier.X509_SUBJECT);

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java?rev=3610&r1=3609&r2=3610&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java Mon Feb 10 23:57:17 2014
@@ -52,6 +52,7 @@
         prc = new RequestContextBuilder().buildProfileRequestContext();
         
         action = new AddSubjectConfirmationToSubjects();
+        action.setId("test");
     }
 
     @Test(expectedExceptions = ComponentInitializationException.class)

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=3610&r1=3609&r2=3610&view=diff

[... 26 lines stripped ...]