[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/saml1/binding/CheckRequestVersio...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jan  6 12:00:35 2014
New Revision: 3547

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3547&view=rev
Log:
Convert version checking action to message handler.

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/CheckRequestVersionHandler.java
      - copied, changed from r3542, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/CheckRequestVersion.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/package-info.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/CheckRequestVersionHandler.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/package-info.java   (with props)
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/CheckRequestVersionHandlerTest.java
      - copied, changed from r3542, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/CheckRequestVersionTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/CheckRequestVersionHandlerTest.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/CheckRequestVersion.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/CheckRequestVersion.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/CheckRequestVersionTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/CheckRequestVersionTest.java

Copied: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/CheckRequestVersionHandler.java (from r3542, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/CheckRequestVersion.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/CheckRequestVersionHandler.java?p2=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/CheckRequestVersionHandler.java&p1=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/CheckRequestVersion.java&r1=3542&r2=3547&rev=3547&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/CheckRequestVersion.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/CheckRequestVersionHandler.java Mon Jan  6 12:00:35 2014
@@ -15,44 +15,36 @@
  * limitations under the License.
  */
 
-package org.opensaml.saml.saml1.profile.impl;
+package org.opensaml.saml.saml1.binding;
 
 import javax.annotation.Nonnull;
 
-import org.opensaml.profile.ProfileException;
-import org.opensaml.profile.action.AbstractProfileAction;
-import org.opensaml.profile.action.ActionSupport;
-import org.opensaml.profile.action.EventIds;
-import org.opensaml.profile.context.ProfileRequestContext;
-
+import org.opensaml.messaging.context.MessageContext;
+import org.opensaml.messaging.handler.AbstractMessageHandler;
+import org.opensaml.messaging.handler.MessageHandlerException;
 import org.opensaml.saml.common.SAMLVersion;
 import org.opensaml.saml.saml1.core.RequestAbstractType;
-import org.opensaml.saml.saml1.core.ResponseAbstractType;
 
 import com.google.common.base.Objects;
 
 /**
  * Checks whether the inbound SAML request has the appropriate version.
- * 
- * @event {@link EventIds#PROCEED_EVENT_ID}
- * @event {@link EventIds#INVALID_MESSAGE_VERSION}
- * @pre ProfileRequestContext.getInboundMessageContext().getMessage() != null
  */
-public class CheckRequestVersion extends AbstractProfileAction<RequestAbstractType, ResponseAbstractType> {
+public class CheckRequestVersionHandler extends AbstractMessageHandler<RequestAbstractType> {
 
     /** {@inheritDoc} */
     @Override
-    protected void doExecute(
-            @Nonnull final ProfileRequestContext<RequestAbstractType, ResponseAbstractType> profileRequestContext)
-                        throws ProfileException {
+    protected void doInvoke(@Nonnull final MessageContext<RequestAbstractType> messageContext)
+            throws MessageHandlerException {
 
-        final RequestAbstractType request = profileRequestContext.getInboundMessageContext().getMessage();
+        final RequestAbstractType request = messageContext.getMessage();
+        if (request == null) {
+            throw new MessageHandlerException("Request was not found");
+        }
 
-        if (Objects.equal(SAMLVersion.VERSION_10, request.getVersion())
-                || Objects.equal(SAMLVersion.VERSION_11, request.getVersion())) {
-            ActionSupport.buildProceedEvent(profileRequestContext);
-        } else {
-            ActionSupport.buildEvent(profileRequestContext, EventIds.INVALID_MESSAGE_VERSION);
+        if (!Objects.equal(SAMLVersion.VERSION_10, request.getVersion())
+                && !Objects.equal(SAMLVersion.VERSION_11, request.getVersion())) {

[... 90 lines stripped ...]