[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl: AssertionIn...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 18 16:15:41 2014
New Revision: 6440

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6440&view=rev
Log:
IDP-375 - remove String/Collection assumption from audit functions

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AssertionInstantAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AuthnContextAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AuthnInstantAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/InResponseToAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/SessionIndexAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/StatusCodeAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/StatusMessageAuditExtractor.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AssertionInstantAuditExtractor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AssertionInstantAuditExtractor.java?rev=6440&r1=6439&r2=6440&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AssertionInstantAuditExtractor.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AssertionInstantAuditExtractor.java Mon Aug 18 16:15:41 2014
@@ -24,6 +24,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import org.joda.time.DateTime;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.saml2.core.ArtifactResponse;
@@ -34,7 +35,7 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 /** {@link Function} that returns the IssueInstant attribute from the assertions in a response. */
-public class AssertionInstantAuditExtractor implements Function<ProfileRequestContext,Collection<String>> {
+public class AssertionInstantAuditExtractor implements Function<ProfileRequestContext,Collection<DateTime>> {
 
     /** Lookup strategy for message to read from. */
     @Nonnull private final Function<ProfileRequestContext,SAMLObject> responseLookupStrategy;
@@ -50,7 +51,7 @@
 
     /** {@inheritDoc} */
     @Override
-    @Nullable public Collection<String> apply(@Nullable final ProfileRequestContext input) {
+    @Nullable public Collection<DateTime> apply(@Nullable final ProfileRequestContext input) {
         SAMLObject response = responseLookupStrategy.apply(input);
         if (response != null) {
             
@@ -65,10 +66,9 @@
                         ((org.opensaml.saml.saml2.core.Response) response).getAssertions();
                 if (!assertions.isEmpty()) {
                     return Collections2.transform(assertions,
-                            new Function<org.opensaml.saml.saml2.core.Assertion,String>() {
-                                    public String apply(org.opensaml.saml.saml2.core.Assertion input) {
-                                        return input.getIssueInstant() != null ?
-                                                input.getIssueInstant().toString() : null;
+                            new Function<org.opensaml.saml.saml2.core.Assertion,DateTime>() {
+                                    public DateTime apply(org.opensaml.saml.saml2.core.Assertion input) {
+                                        return input.getIssueInstant();
                                     }
                                 });
                 }
@@ -79,10 +79,9 @@
                         ((org.opensaml.saml.saml1.core.Response) response).getAssertions();
                 if (!assertions.isEmpty()) {
                     return Collections2.transform(assertions,
-                            new Function<org.opensaml.saml.saml1.core.Assertion,String>() {
-                                    public String apply(org.opensaml.saml.saml1.core.Assertion input) {
-                                        return input.getIssueInstant() != null ?
-                                                input.getIssueInstant().toString() : null;
+                            new Function<org.opensaml.saml.saml1.core.Assertion,DateTime>() {
+                                    public DateTime apply(org.opensaml.saml.saml1.core.Assertion input) {
+                                        return input.getIssueInstant();
                                     }
                                 });
                 }

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AuthnContextAuditExtractor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AuthnContextAuditExtractor.java?rev=6440&r1=6439&r2=6440&view=diff

[... 344 lines stripped ...]