Author: simoneg
Date: Fri Nov 25 17:13:05 2011
New Revision: 1206264
URL: http://svn.apache.org/viewvc?rev=1206264&view=rev
Log:
Support for some additional date string formats
Modified:
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/string/DateConverter.java
labs/magma/trunk/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestDateConverterFromStringCorrect.java
Modified:
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/string/DateConverter.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/string/DateConverter.java?rev=1206264&r1=1206263&r2=1206264&view=diff
==============================================================================
---
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/string/DateConverter.java
(original)
+++
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/string/DateConverter.java
Fri Nov 25 17:13:05 2011
@@ -54,9 +54,11 @@ public class DateConverter extends BaseC
patterns.add("yyyy");
patterns.add("yyyy-MM");
patterns.add("yyyy-MM-dd");
+ patterns.add("yyyy-MM-dd'T'HH");
patterns.add("yyyy-MM-dd'T'HH:mm");
patterns.add("yyyy-MM-dd'T'HH:mm:ss");
patterns.add("yyyy-MM-dd'T'HH:mm:ss.SSS");
+ patterns.add("yyyy-MM-dd'T'HH:mm:ss.SSSz");
patterns.add("yyyy-MM-dd'T'HH:mm:ssz");
}
@@ -80,6 +82,10 @@ public class DateConverter extends BaseC
}
len -= 4;
}
+ if (value.endsWith("Z")) {
+ value = value.substring(0, value.length() - 1);
+ len--;
+ }
for (String patt : patterns) {
if (patt.length() == len) {
sdf = new SimpleDateFormat(patt);
Modified:
labs/magma/trunk/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestDateConverterFromStringCorrect.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestDateConverterFromStringCorrect.java?rev=1206264&r1=1206263&r2=1206264&view=diff
==============================================================================
---
labs/magma/trunk/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestDateConverterFromStringCorrect.java
(original)
+++
labs/magma/trunk/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestDateConverterFromStringCorrect.java
Fri Nov 25 17:13:05 2011
@@ -47,8 +47,10 @@ public class TestDateConverterFromString
set2 = {"2008-02", "2008-02-01T00:00:00.000"},
set3 = {"2008-02-02", "2008-02-02T00:00:00.000"},
set4 = {"2008-02-02T15:40", "2008-02-02T15:40:00.000"},
+ set4b = {"2008-02-02T15", "2008-02-02T15:00:00.000"},
set5 = {"2008-02-02T15:40:10", "2008-02-02T15:40:10.000"},
- set6 = {"2008-02-02T15:40:10.423", "2008-02-02T15:40:10.423"};
+ set6 = {"2008-02-02T15:40:10.423", "2008-02-02T15:40:10.423"},
+ set7 = {"2008-02-02T15:40:10.423Z", "2008-02-02T15:40:10.423"};
@Theory public void convert(String[] vals) {
Date d = converter.from(vals[0]);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
