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

LANG-1088 - FastDateParser should be case insensitive 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1589446 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chas Honton 2014-04-23 16:02:52 +00:00
parent e288d39ba3
commit 3b2de24af3
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/apache/commons/lang3/time/FastDateParser.java
View File

@ -25,6 +25,7 @@ import java.text.ParsePosition;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
@ -586,6 +587,7 @@ public class FastDateParser implements DateParser, Serializable {
private static class TextStrategy extends Strategy { private static class TextStrategy extends Strategy {
private final int field; private final int field;
private final Map<String, Integer> keyValues; private final Map<String, Integer> keyValues;
private final Map<String, Integer> lKeyValues;
/** /**
* Construct a Strategy that parses a Text field * Construct a Strategy that parses a Text field
@ -596,6 +598,11 @@ public class FastDateParser implements DateParser, Serializable {
TextStrategy(final int field, final Calendar definingCalendar, final Locale locale) { TextStrategy(final int field, final Calendar definingCalendar, final Locale locale) {
this.field= field; this.field= field;
this.keyValues= getDisplayNames(field, definingCalendar, locale); this.keyValues= getDisplayNames(field, definingCalendar, locale);
this.lKeyValues= new HashMap<String,Integer>();
for(Map.Entry<String, Integer> entry : keyValues.entrySet()) {
lKeyValues.put(entry.getKey().toLowerCase(), entry.getValue());
}
} }
/** /**
@ -603,7 +610,7 @@ public class FastDateParser implements DateParser, Serializable {
*/ */
@Override @Override
boolean addRegex(final FastDateParser parser, final StringBuilder regex) { boolean addRegex(final FastDateParser parser, final StringBuilder regex) {
regex.append('('); regex.append("((?i)(?u)");
for(final String textKeyValue : keyValues.keySet()) { for(final String textKeyValue : keyValues.keySet()) {
escapeRegex(regex, textKeyValue, false).append('|'); escapeRegex(regex, textKeyValue, false).append('|');
} }
@ -616,7 +623,7 @@ public class FastDateParser implements DateParser, Serializable {
*/ */
@Override @Override
void setCalendar(final FastDateParser parser, final Calendar cal, final String value) { void setCalendar(final FastDateParser parser, final Calendar cal, final String value) {
final Integer iVal = keyValues.get(value); final Integer iVal = lKeyValues.get(value.toLowerCase());
if(iVal == null) { if(iVal == null) {
final StringBuilder sb= new StringBuilder(value); final StringBuilder sb= new StringBuilder(value);
sb.append(" not in ("); sb.append(" not in (");

12
src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java
View File

@ -540,4 +540,16 @@ public class FastDateParserTest {
final DateParser parser= getInstance(yMdHmsSZ, REYKJAVIK); final DateParser parser= getInstance(yMdHmsSZ, REYKJAVIK);
assertEquals(REYKJAVIK, parser.getTimeZone()); assertEquals(REYKJAVIK, parser.getTimeZone());
} }
@Test
public void testLang996() throws ParseException {
Calendar expected = Calendar.getInstance(NEW_YORK, Locale.US);
expected.clear();
expected.set(2014, 4, 14);
final DateParser fdp = getInstance("ddMMMyyyy", NEW_YORK, Locale.US);
assertEquals(expected.getTime(), fdp.parse("14may2014"));
assertEquals(expected.getTime(), fdp.parse("14MAY2014"));
assertEquals(expected.getTime(), fdp.parse("14May2014"));
}
} }