Skip to content

wrap getDate() IllegalStateException in rich parser date getters #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aizu-m wants to merge 1 commit into
base: trunk
Choose a base branch
from
+32 −3
Open

wrap getDate() IllegalStateException in rich parser date getters #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExtImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ public Date getDateValue()
_charSeq.reload(CharSeqTrimWS.XMLWHITESPACE_TRIM);
try {
return new GDateBuilder(_charSeq).getDate();
} catch (IllegalArgumentException e) {
} catch (IllegalArgumentException | IllegalStateException e) {
throw new InvalidLexicalValueException(e, _charSeq.getLocation());
}
}
Expand Down Expand Up @@ -353,7 +353,7 @@ public Date getAttributeDateValue(int index) throws XMLStreamException {
try {
return new GDateBuilder(_charSeq.reloadAtt(index, CharSeqTrimWS.XMLWHITESPACE_TRIM))
.getDate();
} catch (IllegalArgumentException e) {
} catch (IllegalArgumentException | IllegalStateException e) {
throw new InvalidLexicalValueException(e, _charSeq.getLocation());
}
}
Expand Down Expand Up @@ -507,7 +507,7 @@ public Date getAttributeDateValue(String uri, String local) throws XMLStreamExce
try {
CharSequence cs = _charSeq.reloadAtt(uri, local, CharSeqTrimWS.XMLWHITESPACE_TRIM);
return new GDateBuilder(cs).getDate();
} catch (IllegalArgumentException e) {
} catch (IllegalArgumentException | IllegalStateException e) {
throw new InvalidLexicalValueException(e, _charSeq.getLocation());
}
}
Expand Down
29 changes: 29 additions & 0 deletions src/test/java/misc/checkin/RichParserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,35 @@ void testInvalidQNameThrowsInvalidLexicalValue() throws Exception {
assertEquals(new QName("urn:x", "good"), good.getQNameValue());
}

@Test
void testInvalidDateThrowsInvalidLexicalValue() throws Exception {
// getDateValue converts the parsed GDate to a java.util.Date via
// GDateBuilder.getDate(), which throws IllegalStateException - not
// IllegalArgumentException - when the value is not a complete date
// (a time/gYear/gYearMonth reaching a dateTime field) or its year is
// before the Julian epoch. The getter only caught IllegalArgumentException
// so the IllegalStateException escaped instead of the documented
// InvalidLexicalValueException the other getters surface.
XMLStreamReaderExt timeOnly = atFirstStartElement("<a>12:00:00</a>");
assertThrows(InvalidLexicalValueException.class, timeOnly::getDateValue);

XMLStreamReaderExt yearOnly = atFirstStartElement("<a>2001</a>");
assertThrows(InvalidLexicalValueException.class, yearOnly::getDateValue);

XMLStreamReaderExt ancient = atFirstStartElement("<a>-5000-01-01T00:00:00Z</a>");
assertThrows(InvalidLexicalValueException.class, ancient::getDateValue);

XMLStreamReaderExt attByIndex = atFirstStartElement("<a b='12:00:00'/>");
assertThrows(InvalidLexicalValueException.class, () -> attByIndex.getAttributeDateValue(0));

XMLStreamReaderExt attByName = atFirstStartElement("<a b='12:00:00'/>");
assertThrows(InvalidLexicalValueException.class, () -> attByName.getAttributeDateValue("", "b"));

// a well-formed dateTime still converts
XMLStreamReaderExt good = atFirstStartElement("<a>2001-11-26T21:32:52Z</a>");
assertEquals(new XmlCalendar("2001-11-26T21:32:52Z").getTime(), good.getDateValue());
}

private static XMLStreamReaderExt atFirstStartElement(String xml) throws Exception {
XMLStreamReader xsr = XmlObject.Factory.parse(xml).newXMLStreamReader();
XMLStreamReaderExt ext = new XMLStreamReaderExtImpl(xsr);
Expand Down