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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar  6 17:52:42 2014
New Revision: 3680

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

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertions.java
      - copied, changed from r3679, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddAudienceRestrictionToAssertions.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertionsTest.java
      - copied, changed from r3679, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddAudienceRestrictionToAssertionsTest.java
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddAudienceRestrictionToAssertions.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddAudienceRestrictionToAssertionsTest.java

Copied: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertions.java (from r3679, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddAudienceRestrictionToAssertions.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertions.java?p2=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertions.java&p1=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddAudienceRestrictionToAssertions.java&r1=3679&r2=3680&rev=3680&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddAudienceRestrictionToAssertions.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertions.java Thu Mar  6 17:52:42 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.opensaml.saml.saml1.profile.impl;
+package org.opensaml.saml.common.profile.impl;
 
 import java.util.Collection;
 
@@ -35,13 +35,12 @@
 
 import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.messaging.context.navigate.MessageLookup;
+import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.SAMLObjectBuilder;
-import org.opensaml.saml.saml1.core.Assertion;
-import org.opensaml.saml.saml1.core.Audience;
 import org.opensaml.saml.saml1.core.AudienceRestrictionCondition;
-import org.opensaml.saml.saml1.core.Conditions;
-import org.opensaml.saml.saml1.core.Response;
 import org.opensaml.saml.saml1.profile.SAML1ActionSupport;
+import org.opensaml.saml.saml2.core.AudienceRestriction;
+import org.opensaml.saml.saml2.profile.SAML2ActionSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,8 +48,8 @@
 import com.google.common.base.Functions;
 
 /**
- * Action adds an {@link AudienceRestrictionCondition} to every {@link Assertion} contained on a {@link Response}
- * message, with the audiences obtained from a lookup function. If the containing {@link Conditions} is not present,
+ * Action adds an {@link AudienceRestrictionCondition} to every {@link Assertion} contained in a SAML 1/2
+ * response, with the audiences obtained from a lookup function. If the containing {@link Conditions} is not present,
  * it will be created.
  * 
  * @event {@link EventIds#PROCEED_EVENT_ID}
@@ -67,14 +66,14 @@
      */
     private boolean addingAudiencesToExistingRestriction;
 
-    /** 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 used to obtain the audiences to add. */
     @Nullable private Function<ProfileRequestContext,Collection<String>> audienceRestrictionsLookupStrategy;
     
     /** Response to modify. */
-    @Nullable private Response response;
+    @Nullable private SAMLObject response;
 
     /**
      * Constructor. Initializes {@link #addingAudiencesToExistingRestriction} to <code>true</code>. Initializes
@@ -84,9 +83,21 @@
         addingAudiencesToExistingRestriction = true;
 
         responseLookupStrategy =
-                Functions.compose(new MessageLookup<>(Response.class), new OutboundMessageContextLookup());
-    }
-
+                Functions.compose(new MessageLookup<>(SAMLObject.class), new OutboundMessageContextLookup());
+    }
+    
+    /**
+     * Set the strategy used to locate the Response to operate on.
+     * 
+     * @param strategy lookup strategy
+     */
+    public synchronized void setResponseLookupStrategy(
+            @Nonnull final Function<ProfileRequestContext,SAMLObject> strategy) {
+        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+

[... 234 lines stripped ...]