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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Apr 28 12:32:23 2014
New Revision: 3821

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3821&view=rev
Log:
Cleanup artifact encoders, and get rid of message metadata context.

Modified:
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BasicMessageMetadataContext.java
    trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/EventIds.java
    trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/MessageIssuerPredicate.java
    trunk/opensaml-profile-api/src/test/java/org/opensaml/profile/RequestContextBuilder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/BaseSAML1MessageEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPArtifactEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11Encoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddResponseShell.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddResponseShell.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddResponseShellTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddResponseShellTest.java

Modified: trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/EventIds.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/EventIds.java?rev=3821&r1=3820&r2=3821&view=diff
==============================================================================
--- trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/EventIds.java (original)
+++ trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/EventIds.java Mon Apr 28 12:32:23 2014
@@ -35,12 +35,6 @@
      * way.
      */
     @Nonnull @NotEmpty public static final String INVALID_MSG_CTX = "InvalidMessageContext";
-
-    /**
-     * ID of the event returned if a {@link org.opensaml.messaging.context.BasicMessageMetadataContext} is missing or
-     * corrupt in some way.
-     */
-    @Nonnull @NotEmpty public static final String INVALID_MSG_MD = "InvalidMessageMetadata";
 
     /** ID of the event returned if a SAML message version is incorrect or unsupported. */
     @Nonnull @NotEmpty public static final String INVALID_MESSAGE_VERSION = "InvalidMessageVersion";

Modified: trunk/opensaml-profile-api/src/test/java/org/opensaml/profile/RequestContextBuilder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-profile-api/src/test/java/org/opensaml/profile/RequestContextBuilder.java?rev=3821&r1=3820&r2=3821&view=diff
==============================================================================
--- trunk/opensaml-profile-api/src/test/java/org/opensaml/profile/RequestContextBuilder.java (original)
+++ trunk/opensaml-profile-api/src/test/java/org/opensaml/profile/RequestContextBuilder.java Mon Apr 28 12:32:23 2014
@@ -20,12 +20,8 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.opensaml.messaging.context.BasicMessageMetadataContext;
 import org.opensaml.messaging.context.MessageContext;
-import org.opensaml.profile.action.ActionTestingSupport;
 import org.opensaml.profile.context.ProfileRequestContext;
-
-import com.google.common.base.Objects;
 
 /**
  * Builder used to construct {@link ProfileRequestContext} used in {@link org.opensaml.profile.action.ProfileAction}
@@ -211,52 +207,7 @@
     @Nonnull protected MessageContext buildInboundMessageContext() {
         final MessageContext context = new MessageContext();
         context.setMessage(inboundMessage);
-        buildInboudMessageMetadataContext(context);
         return context;
-    }
-
-    /**
-     * Builds a {@link BasicMessageMetadataContext} and adds it to the given inbound {@link MessageContext}.
-     * 
-     * The default implementation builds a {@link BasicMessageMetadataContext} that contains:
-     * <ul>
-     * <li>a message ID provided by {@link #setInboundMessageId(String)} or {@link ActionTestingSupport#INBOUND_MSG_ID}
-     * if none is given</li>
-     * <li>a message issue instant provided by {@link #setInboundMessageIssueInstant(long)} or 0 (1970-01-01T00:00:00Z)
-     * if none is given</li>
-     * <li>a message issuer provided by {@link #setInboundMessageIssuer(String)} or
-     * {@link ActionTestingSupport#INBOUND_MSG_ISSUER} if none is given
-     * </ul>
-     * 
-     * @param inboundMsgCtx the inbound message context to which the constructed {@link BasicMessageMetadataContext} is
-     *            added
-     * 
-     * @return the constructed {@link BasicMessageMetadataContext}
-     */

[... 1036 lines stripped ...]