Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding parseDateStrictly method per LANG-486 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@895055 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Henri Yandell 2010-01-01 19:01:18 +00:00
parent edc4514e15
commit 1a433d2ec7
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/java/org/apache/commons/lang3/time/DateUtils.java
View File

@ -273,8 +273,9 @@ public class DateUtils {
* <p>Parses a string representing a date by trying a variety of different parsers.</p>
*
* <p>The parse will try each parse pattern in turn.
* A parse is only deemed sucessful if it parses the whole of the input string.
* A parse is only deemed successful if it parses the whole of the input string.
* If no parse patterns match, a ParseException is thrown.</p>
* The parser will be lenient toward the parsed date.
*
* @param str the date to parse, not null
* @param parsePatterns the date format patterns to use, see SimpleDateFormat, not null
@ -283,6 +284,31 @@ public class DateUtils {
* @throws ParseException if none of the date patterns were suitable (or there were none)
*/
public static Date parseDate(String str, String[] parsePatterns) throws ParseException {
return parseDateWithLeniency(str, parsePatterns, true);
}
//-----------------------------------------------------------------------
/**
* <p>Parses a string representing a date by trying a variety of different parsers.</p>
*
* <p>The parse will try each parse pattern in turn.
* A parse is only deemed successful if it parses the whole of the input string.
* If no parse patterns match, a ParseException is thrown.</p>
* The parser parses strictly - it does not allow for dates such as "February 942, 1996".
*
* @param str the date to parse, not null
* @param parsePatterns the date format patterns to use, see SimpleDateFormat, not null
* @param lenient Specify whether or not date/time parsing is to be lenient.
* @return the parsed date
* @throws IllegalArgumentException if the date string or pattern array is null
* @throws ParseException if none of the date patterns were suitable
* @see java.util.Calender#isLenient()
*/
public static Date parseDateStrictly(String str, String[] parsePatterns) throws ParseException {
return parseDateWithLeniency(str, parsePatterns, false);
}
private static Date parseDateWithLeniency(String str, String[] parsePatterns,
boolean lenient) throws ParseException {
if (str == null || parsePatterns == null) {
throw new IllegalArgumentException("Date and Patterns must not be null");
}
@ -300,6 +326,7 @@ public class DateUtils {
if (i == 0) {
parser = new SimpleDateFormat(pattern);
parser.setLenient(lenient);
} else {
parser.applyPattern(pattern); // cannot be null if i != 0
}

14
src/test/org/apache/commons/lang3/time/DateUtilsTest.java
View File

@ -272,6 +272,20 @@ public class DateUtilsTest extends TestCase {
fail();
} catch (ParseException ex) {}
}
// LANG-486
public void testParseDateWithLeniency() throws Exception {
GregorianCalendar cal = new GregorianCalendar(1998, 6, 30);
String dateStr = "February 942, 1996";
String[] parsers = new String[] {"MMMMM DDD, yyyy"};
Date date = DateUtils.parseDate(dateStr, parsers);
assertEquals(cal.getTime(), date);
try {
date = DateUtils.parseDateStrictly(dateStr, parsers);
fail();
} catch (ParseException ex) {}
}
//-----------------------------------------------------------------------
public void testAddYears() throws Exception {