[java-opensaml COMMIT] in /trunk: opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.jav...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Feb 22 11:11:22 2014
New Revision: 3641

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3641&view=rev
Log:
JSPT-43 Teach  OpenSAML and the IdP about the new Abstract Class

Modified:
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java
    trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/BindingDescriptor.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMap.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/StorageServiceSAMLArtifactMap.java
    trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
    trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/ReplayCache.java

Modified: trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java?rev=3641&r1=3640&r2=3641&view=diff
==============================================================================
--- trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java (original)
+++ trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java Sat Feb 22 11:11:22 2014
@@ -88,6 +88,7 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     public String getId() {
         return id;
     }
@@ -300,6 +301,7 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     public Iterator<BaseContext> iterator() {
         return new ContextSetNoRemoveIteratorDecorator(subcontexts.iterator());
     }
@@ -355,16 +357,19 @@
         }
 
         /** {@inheritDoc} */
+        @Override
         public boolean hasNext() {
             return wrappedIterator.hasNext();
         }
 
         /** {@inheritDoc} */
+        @Override
         public BaseContext next() {
             return wrappedIterator.next();
         }
 
         /** {@inheritDoc} */
+        @Override
         public void remove() {
             throw new UnsupportedOperationException("Removal of subcontexts via the iterator is unsupported");
         }

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=3641&r1=3640&r2=3641&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 Sat Feb 22 11:11:22 2014
@@ -20,27 +20,24 @@
 import java.util.UUID;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
+import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializeableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.messaging.context.MessageContext;
 import org.slf4j.LoggerFactory;
-
-
 
 /**
  * A base abstract implementation of {@link MessageHandler}.
  * 
  * @param <MessageType> the type of message being handled
  */
-public abstract class AbstractMessageHandler<MessageType>
-    extends AbstractIdentifiedInitializableComponent implements MessageHandler<MessageType> {
-    
+public abstract class AbstractMessageHandler<MessageType> extends AbstractIdentifiableInitializeableComponent implements
+        MessageHandler<MessageType> {
+
     /**
      * Constructor.
-     *
+     * 
      */
     public AbstractMessageHandler() {
         super();
@@ -48,19 +45,15 @@
     }
 
     /** {@inheritDoc} */
-    public void setId(@Nullable final String newId) {
-        super.setId(newId);
-    }
-    
-    /** {@inheritDoc} */
-    public void invoke(@Nonnull final MessageContext<MessageType> messageContext) throws MessageHandlerException {
+    @Override public void invoke(@Nonnull final MessageContext<MessageType> messageContext)
+            throws MessageHandlerException {
         Constraint.isNotNull(messageContext, "Message context cannot be null");
-        
+
         // The try/catch logic is designed to suppress a checked exception raised by
         // the doInvoke step by any unchecked errors in the doPostInvoke method.
         // The original exception is logged, and can be accessed from the suppressing
         // error object using the Java 7 API.
-        
+

[... 1034 lines stripped ...]