PatchesAndForks/rome
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support time zone Z in RFC 822 dates

Browse source
This commit is contained in:
Misha Onoprienko 2015-12-04 23:27:11 +01:00
parent 8cac90db66
commit 73cd60ea1e
2 changed files with 62 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/com/rometools/rome/io/impl/DateParser.java
View file

@ -19,7 +19,9 @@ package com.rometools.rome.io.impl;
import java.text.DateFormat;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
@ -146,15 +148,33 @@ public class DateParser {
*
*/
public static Date parseRFC822(String sDate, final Locale locale) {
final int utIndex = sDate.indexOf(" UT");
if (utIndex > -1) {
final String pre = sDate.substring(0, utIndex);
final String post = sDate.substring(utIndex + 3);
sDate = pre + " GMT" + post;
}
sDate = convertUnsupportedTimeZones(sDate);
return parseUsingMask(RFC822_MASKS, sDate, locale);
}
private static String convertUnsupportedTimeZones(String sDate) {
final List<String> unsupportedZeroOffsetTimeZones = Arrays.asList("UT", "Z");
for (String timeZone : unsupportedZeroOffsetTimeZones) {
if (sDate.endsWith(timeZone)) {
return replaceLastOccurrence(sDate, timeZone, "UTC");
}
}
return sDate;
}
private static String replaceLastOccurrence(String original, String target, String replacement) {
final int lastIndexOfTarget = original.lastIndexOf(target);
if (lastIndexOfTarget == -1) {
return original;
} else {
return new StringBuilder(original)
.replace(lastIndexOfTarget, lastIndexOfTarget + target.length(), replacement)
.toString();
}
}
/**
* Parses a Date out of a String with a date in W3C date-time format.
* <p/>

36
src/test/java/com/rometools/rome/unittest/TestDateParser.java
View file

@ -16,6 +16,9 @@
*/
package com.rometools.rome.unittest;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
@ -125,6 +128,39 @@ public class TestDateParser extends TestCase {
// INVALID
sDate = "X20:10 2000-10-10";
assertNull(DateParser.parseDate(sDate, Locale.US));
}
public void testRfc822WithZTimeZone() throws Exception {
assertDateEquals(
"1970-01-01 00:00:00",
DateParser.parseRFC822("Thu, 01 Jan 1970 00:00:00 Z", Locale.US));
}
public void testRfc822WithUtTimeZone() throws Exception {
assertDateEquals(
"1970-01-01 00:00:00",
DateParser.parseRFC822("Thu, 01 Jan 1970 00:00:00 UT", Locale.US));
}
public void testRfc822WithUtcTimeZone() throws Exception {
assertDateEquals(
"1970-01-01 00:00:00",
DateParser.parseRFC822("Thu, 01 Jan 1970 00:00:00 UTC", Locale.US));
}
static void assertDateEquals(String expectedString, Date actual) {
if (actual == null) {
fail("Actual date is null");
}
final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
try {
final Date expected = dateFormat.parse(expectedString);
assertEquals(expected, actual);
} catch (ParseException e) {
fail("Failed to parse date: " + e.getMessage());
}
}
}