[java-opensaml COMMIT] in /trunk: opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessage...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Apr 17 15:39:09 2014
New Revision: 3803

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3803&view=rev
Log:
Add Prototype annotation to message handler base class, and stop setting random ID.

Modified:
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java
    trunk/opensaml-messaging-api/src/test/java/org/opensaml/messaging/handler/AbstractMessageHandlerTest.java
    trunk/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/HTTPRequestValidationHandlerTest.java
    trunk/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXMLMessageTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/CheckMessageVersionHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddConsentToResponseHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractConsentFromRequestHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java

Modified: trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java?rev=3803&r1=3802&r2=3803&view=diff
==============================================================================
--- trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java (original)
+++ trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java Thu Apr 17 15:39:09 2014
@@ -17,10 +17,9 @@
 
 package org.opensaml.messaging.handler;
 
-import java.util.UUID;
-
 import javax.annotation.Nonnull;
 
+import net.shibboleth.utilities.java.support.annotation.Prototype;
 import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
@@ -32,17 +31,9 @@
  * 
  * @param <MessageType> the type of message being handled
  */
+ at Prototype
 public abstract class AbstractMessageHandler<MessageType> extends AbstractIdentifiableInitializableComponent implements
         MessageHandler<MessageType> {
-
-    /**
-     * Constructor.
-     * 
-     */
-    public AbstractMessageHandler() {
-        super();
-        setId(UUID.randomUUID().toString());
-    }
 
     /** {@inheritDoc} */
     @Override public void invoke(@Nonnull final MessageContext<MessageType> messageContext)

Modified: trunk/opensaml-messaging-api/src/test/java/org/opensaml/messaging/handler/AbstractMessageHandlerTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-api/src/test/java/org/opensaml/messaging/handler/AbstractMessageHandlerTest.java?rev=3803&r1=3802&r2=3803&view=diff
==============================================================================
--- trunk/opensaml-messaging-api/src/test/java/org/opensaml/messaging/handler/AbstractMessageHandlerTest.java (original)
+++ trunk/opensaml-messaging-api/src/test/java/org/opensaml/messaging/handler/AbstractMessageHandlerTest.java Thu Apr 17 15:39:09 2014
@@ -31,7 +31,8 @@
     @Test
     public void testSuccess() throws Exception {
 
-        BaseMessageHandler handler = new BaseMessageHandler();
+        final BaseMessageHandler handler = new BaseMessageHandler();
+        handler.setId("test");
         handler.initialize();
         handler.invoke(new MessageContext());
 
@@ -44,7 +45,8 @@
     @Test
     public void testPreFailure() throws Exception {
 
-        BaseMessageHandler handler = new PreFailMessageHandler();
+        final BaseMessageHandler handler = new PreFailMessageHandler();
+        handler.setId("test");
         handler.initialize();
 
         try {
@@ -60,7 +62,8 @@
     @Test

[... 450 lines stripped ...]