[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAf...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Mar  5 22:21:37 2014
New Revision: 3678

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3678&view=rev
Log:
IDP-124 - create dual version action

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertions.java
      - copied, changed from r3665, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNotOnOrAfterConditionToAssertions.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java
      - copied, changed from r3665, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNotOnOrAfterConditionToAssertions.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java

Copied: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertions.java (from r3665, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNotOnOrAfterConditionToAssertions.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertions.java?p2=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertions.java&p1=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNotOnOrAfterConditionToAssertions.java&r1=3665&r2=3678&rev=3678&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNotOnOrAfterConditionToAssertions.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertions.java Wed Mar  5 22:21:37 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.opensaml.saml.saml1.profile.impl;
+package org.opensaml.saml.common.profile.impl;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -34,10 +34,9 @@
 
 import org.joda.time.DateTime;
 import org.opensaml.messaging.context.navigate.MessageLookup;
-import org.opensaml.saml.saml1.core.Assertion;
-import org.opensaml.saml.saml1.core.Conditions;
-import org.opensaml.saml.saml1.core.Response;
+import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.saml1.profile.SAML1ActionSupport;
+import org.opensaml.saml.saml2.profile.SAML2ActionSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,8 +44,8 @@
 import com.google.common.base.Functions;
 
 /**
- * Action that adds the <code>NotBefore</code> attribute to every {@link Assertion} in a {@link Response}
- * message. If the containing {@link Conditions} is not present, it will be created.
+ * Action that adds the <code>NotBefore</code> attribute to every {@link Assertion} in a SAML 1/2
+ * response message. If the containing Conditions is not present, it will be created.
  * 
  * @event {@link EventIds#PROCEED_EVENT_ID}
  * @event {@link EventIds#INVALID_MSG_CTX}
@@ -56,8 +55,8 @@
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(AddNotOnOrAfterConditionToAssertions.class);
 
-    /** Strategy used to locate the {@link Response} to operate on. */
-    @Nonnull private Function<ProfileRequestContext,Response> responseLookupStrategy;
+    /** Strategy used to locate the Response to operate on. */
+    @Nonnull private Function<ProfileRequestContext,SAMLObject> responseLookupStrategy;
     
     /** Strategy to obtain assertion lifetime policy. */
     @Nullable private Function<ProfileRequestContext,Long> assertionLifetimeStrategy;
@@ -66,23 +65,23 @@
     @Duration @NonNegative private long defaultAssertionLifetime;
     
     /** Response to modify. */
-    @Nullable private Response response;
+    @Nullable private SAMLObject response;
 
     /** Constructor. */
     public AddNotOnOrAfterConditionToAssertions() {
         responseLookupStrategy =
-                Functions.compose(new MessageLookup<>(Response.class), new OutboundMessageContextLookup());
+                Functions.compose(new MessageLookup<>(SAMLObject.class), new OutboundMessageContextLookup());
         
         defaultAssertionLifetime = 5 * 60 * 1000;
     }
 
     /**
-     * Set the strategy used to locate the {@link Response} to operate on.
+     * Set the strategy used to locate the Response to operate on.
      * 
-     * @param strategy strategy used to locate the {@link Response} to operate on
+     * @param strategy lookup strategy
      */
     public synchronized void setResponseLookupStrategy(
-            @Nonnull final Function<ProfileRequestContext, Response> strategy) {
+            @Nonnull final Function<ProfileRequestContext,SAMLObject> strategy) {

[... 210 lines stripped ...]