[java-opensaml COMMIT] in /trunk/opensaml-saml-api/src/main/java/org/opensaml/saml: saml1/profile/SAML1ActionSupport....

[noreply at shibboleth.net]

Author: scantor
Date: Sun Sep 28 14:39:37 2014
New Revision: 4087

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4087&view=rev
Log:
Add new assertion creation methods.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/SAML1ActionSupport.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ActionSupport.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/SAML1ActionSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/SAML1ActionSupport.java?rev=4087&r1=4086&r2=4087&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/SAML1ActionSupport.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/SAML1ActionSupport.java Sun Sep 28 14:39:37 2014
@@ -22,6 +22,7 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
 
+import org.joda.time.DateTime;
 import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.profile.action.AbstractProfileAction;
 import org.opensaml.saml.common.SAMLObjectBuilder;
@@ -39,6 +40,35 @@
     private SAML1ActionSupport() {
 
     }
+    
+    /**
+     * Constructs an {@link Assertion} using the parameters supplied, with its issue instant set to the
+     * current time.
+     * 
+     * @param action the current action
+     * @param idGenerator source of assertion ID
+     * @param issuer value for assertion
+     * 
+     * @return the assertion
+     */
+    @Nonnull public static Assertion buildAssertion(@Nonnull final AbstractProfileAction action,
+            @Nonnull final IdentifierGenerationStrategy idGenerator, @Nonnull @NotEmpty final String issuer) {
+        
+        final SAMLObjectBuilder<Assertion> assertionBuilder = (SAMLObjectBuilder<Assertion>)
+                XMLObjectProviderRegistrySupport.getBuilderFactory().<Assertion>getBuilderOrThrow(
+                        Assertion.DEFAULT_ELEMENT_NAME);
+
+        final Assertion assertion = assertionBuilder.buildObject();
+        assertion.setID(idGenerator.generateIdentifier());
+        assertion.setIssueInstant(new DateTime());
+        assertion.setIssuer(issuer);
+        assertion.setVersion(SAMLVersion.VERSION_11);
+        
+        getLogger().debug("Profile Action {}: Created Assertion {}", action.getClass().getSimpleName(),
+                assertion.getID());
+
+        return assertion;
+    }
 
     /**
      * Constructs and adds a {@link Assertion} to the given {@link Response}. The {@link Assertion} is constructed
@@ -55,15 +85,8 @@
             @Nonnull final Response response, @Nonnull final IdentifierGenerationStrategy idGenerator,
             @Nonnull @NotEmpty final String issuer) {
 
-        final SAMLObjectBuilder<Assertion> assertionBuilder = (SAMLObjectBuilder<Assertion>)
-                XMLObjectProviderRegistrySupport.getBuilderFactory().<Assertion>getBuilderOrThrow(
-                        Assertion.DEFAULT_ELEMENT_NAME);
-
-        final Assertion assertion = assertionBuilder.buildObject();
-        assertion.setID(idGenerator.generateIdentifier());
+        final Assertion assertion = buildAssertion(action, idGenerator, issuer);
         assertion.setIssueInstant(response.getIssueInstant());
-        assertion.setIssuer(issuer);
-        assertion.setVersion(SAMLVersion.VERSION_11);
         
         getLogger().debug("Profile Action {}: Added Assertion {} to Response {}",
                 new Object[] {action.getClass().getSimpleName(), assertion.getID(), response.getID(),});

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ActionSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ActionSupport.java?rev=4087&r1=4086&r2=4087&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ActionSupport.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ActionSupport.java Sun Sep 28 14:39:37 2014
@@ -22,6 +22,7 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
 
+import org.joda.time.DateTime;
 import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.profile.action.AbstractProfileAction;
 import org.opensaml.saml.common.SAMLObjectBuilder;
@@ -43,6 +44,42 @@
     }
 
     /**
+     * Constructs an {@link Assertion} using the parameters supplied, with its issue instant set to the
+     * current time.
+     * 
+     * @param action the current action
+     * @param idGenerator source of assertion ID

[... 59 lines stripped ...]