svn commit: r1786398 - /webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java

[co...@apache.org]

Author: coheigea
Date: Fri Mar 10 17:47:35 2017
New Revision: 1786398

URL: http://svn.apache.org/viewvc?rev=1786398&view=rev
Log:
Provide a utility method to convert the NotOnOrAfter JodaTime Date to a java ZonedDateTime object

Modified:
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java?rev=1786398&r1=1786397&r2=1786398&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java Fri Mar 10 17:47:35 2017
@@ -21,6 +21,8 @@ package org.apache.wss4j.common.saml;
 
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
@@ -254,6 +256,21 @@ public class SamlAssertionWrapper {
         return DOM2Writer.nodeToString(assertionElement);
     }
 
+    public ZonedDateTime getNotOnOrAfter() {
+        DateTime validTill = null;
+        if (getSamlVersion().equals(SAMLVersion.VERSION_20)) {
+            validTill = getSaml2().getConditions().getNotOnOrAfter();
+        } else {
+            validTill = getSaml1().getConditions().getNotOnOrAfter();
+        }
+
+        // Now conver to a Java ZonedDateTime Object
+        if (validTill != null) {
+            return ZonedDateTime.ofInstant(validTill.toDate().toInstant(), ZoneOffset.UTC);
+        }
+        return null;
+    }
+
     /**
      * Method getId returns the id of this SamlAssertionWrapper object.
      *