[java-identity-provider] branch master updated: JSPT-79 - Review date and time handling for Java 8

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=fdeca6eebae829b0b3848ff40ecd53cca229c8ea

The following commit(s) were added to refs/heads/master by this push:
       new  fdeca6e   JSPT-79 - Review date and time handling for Java 8
fdeca6e is described below

commit fdeca6eebae829b0b3848ff40ecd53cca229c8ea
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Mar 21 11:54:00 2019 +0000

    JSPT-79 - Review date and time handling for Java 8
    
    Track method name changes from java-support.
---
 .../attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java  | 2 +-
 .../java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java   | 2 +-
 .../net/shibboleth/idp/installer/metadata/impl/MetadataGenerator.java   | 2 +-
 .../idp/saml/attribute/mapping/AbstractSAMLAttributeValueMapper.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
index a9bba40..584974f 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
@@ -356,7 +356,7 @@ public class AttributeInMetadataMatcher extends AbstractIdentifiableInitializabl
         } else if (xmlObj instanceof XSDateTime) {
             final Instant dt = ((XSDateTime) xmlObj).getValue();
             if (dt != null) {
-                toMatch = DOMTypeSupport.instantToDateTime(dt);
+                toMatch = DOMTypeSupport.instantToString(dt);
             }
         } else if (xmlObj instanceof XSBase64Binary) {
             toMatch = ((XSBase64Binary) xmlObj).getValue();
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
index 36c530e..06494fb 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
@@ -344,7 +344,7 @@ import net.shibboleth.utilities.java.support.xml.XMLConstants;
         writeNameSpace(XMLConstants.XML_PREFIX, XMLConstants.XML_NS);
         writeNameSpace(SAMLConstants.SAML20MDUI_PREFIX, SAMLConstants.SAML20MDUI_NS);
 
-        writer.write(" validUntil=\"" + DOMTypeSupport.instantToDateTime(Instant.now()) + "\"");
+        writer.write(" validUntil=\"" + DOMTypeSupport.instantToString(Instant.now()) + "\"");
         
         writer.write(" entityID=\"");
         writer.write(getEntityID());
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGenerator.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGenerator.java
index a72a99f..b1fa2a0 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGenerator.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGenerator.java
@@ -343,7 +343,7 @@ public class MetadataGenerator {
         writeNameSpace(SAMLConstants.SAML20MDUI_PREFIX, SAMLConstants.SAML20MDUI_NS);
         writeNameSpace(SAMLConstants.SAML20PREQ_ATTRR_PREFIX, SAMLConstants.SAML20PREQ_ATTR_NS);
 
-        writer.write(" validUntil=\"" + DOMTypeSupport.instantToDateTime(Instant.now()) + "\"");
+        writer.write(" validUntil=\"" + DOMTypeSupport.instantToString(Instant.now()) + "\"");
         
         writer.write(" entityID=\"");
         writer.write(getEntityID());
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/mapping/AbstractSAMLAttributeValueMapper.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/mapping/AbstractSAMLAttributeValueMapper.java
index b34d453..1f1e78f 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/mapping/AbstractSAMLAttributeValueMapper.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/mapping/AbstractSAMLAttributeValueMapper.java
@@ -109,7 +109,7 @@ public abstract class AbstractSAMLAttributeValueMapper extends AbstractInitializ
 
             final Instant dt = ((XSDateTime) object).getValue();
             if (dt != null) {
-                retVal = DOMTypeSupport.instantToDateTime(dt);
+                retVal = DOMTypeSupport.instantToString(dt);
             } else {
                 retVal = null;
             }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.