[java-opensaml] branch master updated: JSPT-79 - Review date and time handling for Java 8
Ian Young
ian at iay.org.uk
Thu Mar 21 07:53:41 EDT 2019
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch master
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=ef0483facbe35024fe1f2f745b302a7f810fb4bf
The following commit(s) were added to refs/heads/master by this push:
new ef0483f JSPT-79 - Review date and time handling for Java 8
ef0483f is described below
commit ef0483facbe35024fe1f2f745b302a7f810fb4bf
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Mar 21 11:53:36 2019 +0000
JSPT-79 - Review date and time handling for Java 8
Track method name changes from java-support.
---
.../java/org/opensaml/core/xml/schema/impl/XSDateTimeMarshaller.java | 2 +-
.../org/opensaml/core/xml/schema/impl/XSDateTimeUnmarshaller.java | 2 +-
.../opensaml/saml/common/profile/logic/EntityAttributesPredicate.java | 2 +-
.../opensaml/saml/ext/saml2delrestrict/impl/DelegateUnmarshaller.java | 2 +-
.../saml/ext/saml2mdrpi/impl/PublicationInfoUnmarshaller.java | 2 +-
.../opensaml/saml/ext/saml2mdrpi/impl/PublicationUnmarshaller.java | 2 +-
.../saml/ext/saml2mdrpi/impl/RegistrationInfoUnmarshaller.java | 2 +-
.../java/org/opensaml/saml/saml1/core/impl/AssertionUnmarshaller.java | 2 +-
.../saml/saml1/core/impl/AuthenticationStatementUnmarshaller.java | 2 +-
.../org/opensaml/saml/saml1/core/impl/ConditionsUnmarshaller.java | 4 ++--
.../saml/saml1/core/impl/RequestAbstractTypeUnmarshaller.java | 2 +-
.../saml/saml1/core/impl/ResponseAbstractTypeUnmarshaller.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/AssertionUnmarshaller.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/AuthnStatementUnmarshaller.java | 4 ++--
.../org/opensaml/saml/saml2/core/impl/ConditionsUnmarshaller.java | 4 ++--
.../org/opensaml/saml/saml2/core/impl/LogoutRequestUnmarshaller.java | 2 +-
.../saml/saml2/core/impl/RequestAbstractTypeUnmarshaller.java | 2 +-
.../opensaml/saml/saml2/core/impl/StatusResponseTypeUnmarshaller.java | 2 +-
.../saml/saml2/core/impl/SubjectConfirmationDataUnmarshaller.java | 4 ++--
.../saml/saml2/metadata/impl/AffiliationDescriptorUnmarshaller.java | 4 ++--
.../saml/saml2/metadata/impl/EntitiesDescriptorUnmarshaller.java | 4 ++--
.../saml/saml2/metadata/impl/EntityDescriptorUnmarshaller.java | 4 ++--
.../opensaml/saml/saml2/metadata/impl/RoleDescriptorUnmarshaller.java | 4 ++--
.../org/opensaml/soap/wssecurity/impl/AttributedDateTimeImpl.java | 4 ++--
24 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeMarshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeMarshaller.java
index cf720a3..264b567 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeMarshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeMarshaller.java
@@ -39,7 +39,7 @@ public class XSDateTimeMarshaller extends BaseXMLObjectMarshaller {
throws MarshallingException {
final XSDateTime xsDateTime = (XSDateTime) xmlObject;
- ElementSupport.appendTextContent(domElement, DOMTypeSupport.instantToDateTime(xsDateTime.getValue()));
+ ElementSupport.appendTextContent(domElement, DOMTypeSupport.instantToString(xsDateTime.getValue()));
}
}
\ No newline at end of file
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeUnmarshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeUnmarshaller.java
index aeee037..92a16e8 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeUnmarshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeUnmarshaller.java
@@ -35,7 +35,7 @@ public class XSDateTimeUnmarshaller extends BaseXMLObjectUnmarshaller{
protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
final XSDateTime xsDateTime = (XSDateTime) xmlObject;
- xsDateTime.setValue(DOMTypeSupport.dateTimeToInstant(elementContent));
+ xsDateTime.setValue(DOMTypeSupport.stringToInstant(elementContent));
}
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
index 537bbf3..275951d 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
@@ -423,7 +423,7 @@ public class EntityAttributesPredicate implements Predicate<EntityDescriptor> {
} else if (object instanceof XSDateTime) {
final Instant dt = ((XSDateTime) object).getValue();
if (dt != null) {
- toMatch = DOMTypeSupport.instantToDateTime(dt);
+ toMatch = DOMTypeSupport.instantToString(dt);
}
} else if (object instanceof XSBase64Binary) {
toMatch = ((XSBase64Binary) object).getValue();
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateUnmarshaller.java
index d1af5d8..6c9c195 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateUnmarshaller.java
@@ -42,7 +42,7 @@ public class DelegateUnmarshaller extends AbstractSAMLObjectUnmarshaller {
if (Delegate.CONFIRMATION_METHOD_ATTRIB_NAME.equals(attrName)) {
delegate.setConfirmationMethod(attribute.getValue());
} else if (Delegate.DELEGATION_INSTANT_ATTRIB_NAME.equals(attrName)) {
- delegate.setDelegationInstant(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ delegate.setDelegationInstant(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else {
super.processAttribute(samlObject, attribute);
}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoUnmarshaller.java
index 6a896a3..2d12bdf 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoUnmarshaller.java
@@ -51,7 +51,7 @@ public class PublicationInfoUnmarshaller extends AbstractSAMLObjectUnmarshaller
if (PublicationInfo.PUBLISHER_ATTRIB_NAME.equals(attribute.getName())) {
info.setPublisher(attribute.getValue());
} else if (PublicationInfo.CREATION_INSTANT_ATTRIB_NAME.equals(attribute.getName())) {
- info.setCreationInstant(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ info.setCreationInstant(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (PublicationInfo.PUBLICATION_ID_ATTRIB_NAME.equals(attribute.getName())) {
info.setPublicationId(attribute.getValue());
} else {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationUnmarshaller.java
index 3631408..844dca3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationUnmarshaller.java
@@ -38,7 +38,7 @@ public class PublicationUnmarshaller extends AbstractSAMLObjectUnmarshaller {
if (Publication.PUBLISHER_ATTRIB_NAME.equals(attribute.getName())) {
info.setPublisher(attribute.getValue());
} else if (Publication.CREATION_INSTANT_ATTRIB_NAME.equals(attribute.getName())) {
- info.setCreationInstant(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ info.setCreationInstant(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (Publication.PUBLICATION_ID_ATTRIB_NAME.equals(attribute.getName())) {
info.setPublicationId(attribute.getValue());
} else {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoUnmarshaller.java
index ece883f..dae9ed0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoUnmarshaller.java
@@ -51,7 +51,7 @@ public class RegistrationInfoUnmarshaller extends AbstractSAMLObjectUnmarshaller
if (RegistrationInfo.REGISTRATION_AUTHORITY_ATTRIB_NAME.equals(attribute.getName())) {
info.setRegistrationAuthority(attribute.getValue());
} else if (RegistrationInfo.REGISTRATION_INSTANT_ATTRIB_NAME.equals(attribute.getName())) {
- info.setRegistrationInstant(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ info.setRegistrationInstant(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else {
super.processAttribute(samlObject, attribute);
}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionUnmarshaller.java
index 5330979..a863432 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionUnmarshaller.java
@@ -80,7 +80,7 @@ public class AssertionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
assertion.setIssuer(attribute.getValue());
} else if (Assertion.ISSUEINSTANT_ATTRIB_NAME.equals(attribute.getLocalName())
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- assertion.setIssueInstant(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ assertion.setIssueInstant(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (Assertion.MAJORVERSION_ATTRIB_NAME.equals(attribute.getLocalName())) {
final int major;
try {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementUnmarshaller.java
index 1804d19..980a069 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementUnmarshaller.java
@@ -56,7 +56,7 @@ public class AuthenticationStatementUnmarshaller extends SubjectStatementUnmarsh
if (AuthenticationStatement.AUTHENTICATIONINSTANT_ATTRIB_NAME.equals(attribute.getLocalName())
&& !Strings.isNullOrEmpty(attribute.getValue())) {
authenticationStatement.setAuthenticationInstant(
- DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (AuthenticationStatement.AUTHENTICATIONMETHOD_ATTRIB_NAME.equals(attribute.getLocalName())) {
authenticationStatement.setAuthenticationMethod(attribute.getValue());
} else {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsUnmarshaller.java
index 56a6ec2..ab07251 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsUnmarshaller.java
@@ -53,10 +53,10 @@ public class ConditionsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
if (attribute.getNamespaceURI() == null) {
if (Conditions.NOTBEFORE_ATTRIB_NAME.equals(attribute.getLocalName())
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- conditions.setNotBefore(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ conditions.setNotBefore(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (Conditions.NOTONORAFTER_ATTRIB_NAME.equals(attribute.getLocalName())
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- conditions.setNotOnOrAfter(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ conditions.setNotOnOrAfter(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else {
super.processAttribute(samlObject, attribute);
}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeUnmarshaller.java
index f25e50a..996a270 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeUnmarshaller.java
@@ -81,7 +81,7 @@ public abstract class RequestAbstractTypeUnmarshaller extends AbstractSAMLObject
request.setID(attribute.getValue());
} else if (RequestAbstractType.ISSUEINSTANT_ATTRIB_NAME.equals(attribute.getLocalName())
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- request.setIssueInstant(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ request.setIssueInstant(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (attribute.getLocalName().equals(RequestAbstractType.MAJORVERSION_ATTRIB_NAME)) {
final int major;
try {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeUnmarshaller.java
index 49b3c67..6f7e73e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeUnmarshaller.java
@@ -81,7 +81,7 @@ public abstract class ResponseAbstractTypeUnmarshaller extends AbstractSAMLObjec
response.setInResponseTo(attribute.getValue());
} else if (attribute.getLocalName().equals(ResponseAbstractType.ISSUEINSTANT_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- response.setIssueInstant(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ response.setIssueInstant(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (attribute.getLocalName().equals(ResponseAbstractType.MAJORVERSION_ATTRIB_NAME)) {
final int major;
try {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionUnmarshaller.java
index ec74bd3..5afdb55 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionUnmarshaller.java
@@ -73,7 +73,7 @@ public class AssertionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
assertion.setVersion(parseSAMLVersion(attribute));
} else if (attribute.getLocalName().equals(Assertion.ISSUE_INSTANT_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- assertion.setIssueInstant(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ assertion.setIssueInstant(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (attribute.getLocalName().equals(Assertion.ID_ATTRIB_NAME)) {
assertion.setID(attribute.getValue());
attribute.getOwnerElement().setIdAttributeNode(attribute, true);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementUnmarshaller.java
index cd43b11..681bb2d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementUnmarshaller.java
@@ -58,12 +58,12 @@ public class AuthnStatementUnmarshaller extends AbstractSAMLObjectUnmarshaller {
if (attribute.getNamespaceURI() == null) {
if (attribute.getLocalName().equals(AuthnStatement.AUTHN_INSTANT_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- authnStatement.setAuthnInstant(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ authnStatement.setAuthnInstant(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (attribute.getLocalName().equals(AuthnStatement.SESSION_INDEX_ATTRIB_NAME)) {
authnStatement.setSessionIndex(attribute.getValue());
} else if (attribute.getLocalName().equals(AuthnStatement.SESSION_NOT_ON_OR_AFTER_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- authnStatement.setSessionNotOnOrAfter(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ authnStatement.setSessionNotOnOrAfter(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else {
super.processAttribute(samlObject, attribute);
}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsUnmarshaller.java
index 5e10185..4477202 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsUnmarshaller.java
@@ -56,10 +56,10 @@ public class ConditionsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
if (attribute.getNamespaceURI() == null) {
if (attribute.getLocalName().equals(Conditions.NOT_BEFORE_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- conditions.setNotBefore(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ conditions.setNotBefore(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (attribute.getLocalName().equals(Conditions.NOT_ON_OR_AFTER_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- conditions.setNotOnOrAfter(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ conditions.setNotOnOrAfter(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else {
super.processAttribute(samlObject, attribute);
}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestUnmarshaller.java
index e87e73a..cd6ae42 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestUnmarshaller.java
@@ -62,7 +62,7 @@ public class LogoutRequestUnmarshaller extends RequestAbstractTypeUnmarshaller {
req.setReason(attribute.getValue());
} else if (attribute.getLocalName().equals(LogoutRequest.NOT_ON_OR_AFTER_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- req.setNotOnOrAfter(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ req.setNotOnOrAfter(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else {
super.processAttribute(samlObject, attribute);
}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeUnmarshaller.java
index 161378a..e9d959b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeUnmarshaller.java
@@ -67,7 +67,7 @@ public abstract class RequestAbstractTypeUnmarshaller extends AbstractSAMLObject
attribute.getOwnerElement().setIdAttributeNode(attribute, true);
} else if (attribute.getLocalName().equals(RequestAbstractType.ISSUE_INSTANT_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- req.setIssueInstant(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ req.setIssueInstant(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (attribute.getLocalName().equals(RequestAbstractType.DESTINATION_ATTRIB_NAME)) {
req.setDestination(attribute.getValue());
} else if (attribute.getLocalName().equals(RequestAbstractType.CONSENT_ATTRIB_NAME)) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeUnmarshaller.java
index 2e79311..49217ba 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeUnmarshaller.java
@@ -72,7 +72,7 @@ public abstract class StatusResponseTypeUnmarshaller extends AbstractSAMLObjectU
sr.setInResponseTo(attribute.getValue());
} else if (attribute.getLocalName().equals(StatusResponseType.ISSUE_INSTANT_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- sr.setIssueInstant(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ sr.setIssueInstant(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (attribute.getLocalName().equals(StatusResponseType.DESTINATION_ATTRIB_NAME)) {
sr.setDestination(attribute.getValue());
} else if (attribute.getLocalName().equals(StatusResponseType.CONSENT_ATTRIB_NAME)) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataUnmarshaller.java
index 31a3ad2..bb6ef2d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataUnmarshaller.java
@@ -53,10 +53,10 @@ public class SubjectConfirmationDataUnmarshaller extends AbstractSAMLObjectUnmar
if (attribute.getNamespaceURI() == null) {
if (attribute.getLocalName().equals(SubjectConfirmationData.NOT_BEFORE_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- subjectCD.setNotBefore(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ subjectCD.setNotBefore(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (attribute.getLocalName().equals(SubjectConfirmationData.NOT_ON_OR_AFTER_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- subjectCD.setNotOnOrAfter(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ subjectCD.setNotOnOrAfter(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (attribute.getLocalName().equals(SubjectConfirmationData.RECIPIENT_ATTRIB_NAME)) {
subjectCD.setRecipient(attribute.getValue());
} else if (attribute.getLocalName().equals(SubjectConfirmationData.IN_RESPONSE_TO_ATTRIB_NAME)) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorUnmarshaller.java
index dc69449..9e0e903 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorUnmarshaller.java
@@ -68,9 +68,9 @@ public class AffiliationDescriptorUnmarshaller extends AbstractSAMLObjectUnmarsh
attribute.getOwnerElement().setIdAttributeNode(attribute, true);
} else if (attribute.getLocalName().equals(TimeBoundSAMLObject.VALID_UNTIL_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- descriptor.setValidUntil(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ descriptor.setValidUntil(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (attribute.getLocalName().equals(CacheableSAMLObject.CACHE_DURATION_ATTRIB_NAME)) {
- descriptor.setCacheDuration(DOMTypeSupport.durationToDuration(attribute.getValue()));
+ descriptor.setCacheDuration(DOMTypeSupport.stringToDuration(attribute.getValue()));
} else {
super.processAttribute(samlObject, attribute);
}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorUnmarshaller.java
index 02dc407..cb9f890 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorUnmarshaller.java
@@ -65,9 +65,9 @@ public class EntitiesDescriptorUnmarshaller extends AbstractSAMLObjectUnmarshall
attribute.getOwnerElement().setIdAttributeNode(attribute, true);
} else if (attribute.getLocalName().equals(TimeBoundSAMLObject.VALID_UNTIL_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- entitiesDescriptor.setValidUntil(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ entitiesDescriptor.setValidUntil(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (attribute.getLocalName().equals(CacheableSAMLObject.CACHE_DURATION_ATTRIB_NAME)) {
- entitiesDescriptor.setCacheDuration(DOMTypeSupport.durationToDuration(attribute.getValue()));
+ entitiesDescriptor.setCacheDuration(DOMTypeSupport.stringToDuration(attribute.getValue()));
} else if (attribute.getLocalName().equals(EntitiesDescriptor.NAME_ATTRIB_NAME)) {
entitiesDescriptor.setName(attribute.getValue());
} else {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorUnmarshaller.java
index f4ec21b..0d57b56 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorUnmarshaller.java
@@ -77,9 +77,9 @@ public class EntityDescriptorUnmarshaller extends AbstractSAMLObjectUnmarshaller
attribute.getOwnerElement().setIdAttributeNode(attribute, true);
} else if (attribute.getLocalName().equals(TimeBoundSAMLObject.VALID_UNTIL_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- entityDescriptor.setValidUntil(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ entityDescriptor.setValidUntil(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (attribute.getLocalName().equals(CacheableSAMLObject.CACHE_DURATION_ATTRIB_NAME)) {
- entityDescriptor.setCacheDuration(DOMTypeSupport.durationToDuration(attribute.getValue()));
+ entityDescriptor.setCacheDuration(DOMTypeSupport.stringToDuration(attribute.getValue()));
} else {
super.processAttribute(samlObject, attribute);
}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorUnmarshaller.java
index 38dd23f..813b6e3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorUnmarshaller.java
@@ -71,9 +71,9 @@ public abstract class RoleDescriptorUnmarshaller extends AbstractSAMLObjectUnmar
attribute.getOwnerElement().setIdAttributeNode(attribute, true);
} else if (attribute.getLocalName().equals(TimeBoundSAMLObject.VALID_UNTIL_ATTRIB_NAME)
&& !Strings.isNullOrEmpty(attribute.getValue())) {
- roleDescriptor.setValidUntil(DOMTypeSupport.dateTimeToInstant(attribute.getValue()));
+ roleDescriptor.setValidUntil(DOMTypeSupport.stringToInstant(attribute.getValue()));
} else if (attribute.getLocalName().equals(CacheableSAMLObject.CACHE_DURATION_ATTRIB_NAME)) {
- roleDescriptor.setCacheDuration(DOMTypeSupport.durationToDuration(attribute.getValue()));
+ roleDescriptor.setCacheDuration(DOMTypeSupport.stringToDuration(attribute.getValue()));
} else if (attribute.getLocalName().equals(RoleDescriptor.PROTOCOL_ENUMERATION_ATTRIB_NAME)) {
final StringTokenizer protocolTokenizer = new StringTokenizer(attribute.getValue(), " ");
while (protocolTokenizer.hasMoreTokens()) {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeImpl.java
index 62a23c8..453bc35 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeImpl.java
@@ -64,7 +64,7 @@ public class AttributedDateTimeImpl extends AbstractWSSecurityObject implements
/** {@inheritDoc} */
public void setDateTime(final Instant newDateTime) {
dateTimeValue = newDateTime;
- stringValue = prepareForAssignment(stringValue, DOMTypeSupport.instantToDateTime(dateTimeValue));
+ stringValue = prepareForAssignment(stringValue, DOMTypeSupport.instantToString(dateTimeValue));
}
/** {@inheritDoc} */
@@ -74,7 +74,7 @@ public class AttributedDateTimeImpl extends AbstractWSSecurityObject implements
/** {@inheritDoc} */
public void setValue(final String newValue) {
- dateTimeValue = DOMTypeSupport.dateTimeToInstant(newValue);
+ dateTimeValue = DOMTypeSupport.stringToInstant(newValue);
stringValue = prepareForAssignment(stringValue, newValue);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list