Repository: phoenix Updated Branches: refs/heads/master eaa7fbfde -> 2b8e66346
PHOENIX-1142 Fix compiler errors and warnings from original checkin Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/47ca5958 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/47ca5958 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/47ca5958 Branch: refs/heads/master Commit: 47ca5958a2334bef35da0d9ff938e0420a79b321 Parents: eaa7fbf Author: James Taylor <[email protected]> Authored: Fri Feb 6 18:12:49 2015 -0800 Committer: James Taylor <[email protected]> Committed: Fri Feb 6 18:12:49 2015 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/util/DateUtil.java | 5 +---- .../java/org/apache/phoenix/util/DateUtilTest.java | 15 +++++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/47ca5958/phoenix-core/src/main/java/org/apache/phoenix/util/DateUtil.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/DateUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/DateUtil.java index 659f45e..fbc74ba 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/DateUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/DateUtil.java @@ -155,10 +155,6 @@ public class DateUtil { private String datePattern; private SimpleDateFormat parser; - public SimpleDateFormatParser(String pattern) { - this(pattern, DEFAULT_TIME_ZONE); - } - public SimpleDateFormatParser(String pattern, TimeZone timeZone) { datePattern = pattern; parser = new SimpleDateFormat(pattern) { @@ -171,6 +167,7 @@ public class DateUtil { parser.setTimeZone(timeZone); } + @Override public Date parseDateTime(String dateTimeString) throws IllegalDataException { try { java.util.Date date =parser.parse(dateTimeString); http://git-wip-us.apache.org/repos/asf/phoenix/blob/47ca5958/phoenix-core/src/test/java/org/apache/phoenix/util/DateUtilTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/DateUtilTest.java b/phoenix-core/src/test/java/org/apache/phoenix/util/DateUtilTest.java index 1cca156..702e556 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/util/DateUtilTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/util/DateUtilTest.java @@ -17,6 +17,10 @@ */ package org.apache.phoenix.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; @@ -26,11 +30,6 @@ import java.util.TimeZone; import org.apache.phoenix.schema.IllegalDataException; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - /** * Test class for {@link DateUtil} * @@ -69,20 +68,20 @@ public class DateUtilTest { @Test public void testGetDateParser_DefaultTimeZone() throws ParseException { - Date date = (Date) DateUtil.getDateParser("yyyy-MM-dd").parseDateTime("1970-01-01"); + Date date = DateUtil.getDateParser("yyyy-MM-dd").parseDateTime("1970-01-01"); assertEquals(0, date.getTime()); } @Test public void testGetDateParser_CustomTimeZone() throws ParseException { - Date date = (Date) DateUtil.getDateParser( + Date date = DateUtil.getDateParser( "yyyy-MM-dd", TimeZone.getTimeZone("GMT+1")).parseDateTime("1970-01-01"); assertEquals(-ONE_HOUR_IN_MILLIS, date.getTime()); } @Test public void testGetDateParser_LocalTimeZone() throws ParseException { - Date date = (Date) DateUtil.getDateParser( + Date date = DateUtil.getDateParser( "yyyy-MM-dd", TimeZone.getDefault()).parseDateTime("1970-01-01"); assertEquals(Date.valueOf("1970-01-01"), date); }
