From 2d2c4b3a552fefafbbd0e8d3a9b2c4646dc73f03 Mon Sep 17 00:00:00 2001 From: Jonathan Cook Date: Mon, 4 Nov 2019 18:05:45 +0100 Subject: [PATCH] BAEL-3375 - Get the current Date in Java (non Java 8) --- .../{legacy/utilpackage => datetime}/CalendarUtils.java | 2 +- .../{legacy/utilpackage => datetime}/DateUtils.java | 2 +- .../{legacy/sqlpackage => datetime/sql}/DateUtils.java | 2 +- .../{legacy/sqlpackage => datetime/sql}/TimeUtils.java | 2 +- .../sqlpackage => datetime/sql}/TimestampUtils.java | 2 +- .../utilpackage => datetime}/CalendarUtilsUnitTest.java | 7 +++++-- .../utilpackage => datetime}/DateUtilsUnitTest.java | 6 ++++-- .../sqlpackage => datetime/sql}/DateUtilsUnitTest.java | 4 +++- .../sqlpackage => datetime/sql}/TimeUtilsUnitTest.java | 4 +++- .../sql}/TimestampUtilsUnitTest.java | 7 +++++-- 10 files changed, 25 insertions(+), 13 deletions(-) rename core-java-modules/core-java-date-operations/src/main/java/com/baeldung/{legacy/utilpackage => datetime}/CalendarUtils.java (90%) rename core-java-modules/core-java-date-operations/src/main/java/com/baeldung/{legacy/utilpackage => datetime}/DateUtils.java (91%) rename core-java-modules/core-java-date-operations/src/main/java/com/baeldung/{legacy/sqlpackage => datetime/sql}/DateUtils.java (93%) rename core-java-modules/core-java-date-operations/src/main/java/com/baeldung/{legacy/sqlpackage => datetime/sql}/TimeUtils.java (93%) rename core-java-modules/core-java-date-operations/src/main/java/com/baeldung/{legacy/sqlpackage => datetime/sql}/TimestampUtils.java (93%) rename core-java-modules/core-java-date-operations/src/test/java/com/baeldung/{legacy/utilpackage => datetime}/CalendarUtilsUnitTest.java (74%) rename core-java-modules/core-java-date-operations/src/test/java/com/baeldung/{legacy/utilpackage => datetime}/DateUtilsUnitTest.java (82%) rename core-java-modules/core-java-date-operations/src/test/java/com/baeldung/{legacy/sqlpackage => datetime/sql}/DateUtilsUnitTest.java (89%) rename core-java-modules/core-java-date-operations/src/test/java/com/baeldung/{legacy/sqlpackage => datetime/sql}/TimeUtilsUnitTest.java (89%) rename core-java-modules/core-java-date-operations/src/test/java/com/baeldung/{legacy/sqlpackage => datetime/sql}/TimestampUtilsUnitTest.java (80%) diff --git a/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/utilpackage/CalendarUtils.java b/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/CalendarUtils.java similarity index 90% rename from core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/utilpackage/CalendarUtils.java rename to core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/CalendarUtils.java index cea7936004..ab1550fd90 100644 --- a/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/utilpackage/CalendarUtils.java +++ b/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/CalendarUtils.java @@ -1,4 +1,4 @@ -package com.baeldung.legacy.utilpackage; +package com.baeldung.datetime; import java.text.ParseException; import java.util.Calendar; diff --git a/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/utilpackage/DateUtils.java b/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/DateUtils.java similarity index 91% rename from core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/utilpackage/DateUtils.java rename to core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/DateUtils.java index 5eb98e0d74..34f799d3f4 100644 --- a/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/utilpackage/DateUtils.java +++ b/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/DateUtils.java @@ -1,4 +1,4 @@ -package com.baeldung.legacy.utilpackage; +package com.baeldung.datetime; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/sqlpackage/DateUtils.java b/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/sql/DateUtils.java similarity index 93% rename from core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/sqlpackage/DateUtils.java rename to core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/sql/DateUtils.java index b430c1cb17..1b4e825df8 100644 --- a/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/sqlpackage/DateUtils.java +++ b/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/sql/DateUtils.java @@ -1,4 +1,4 @@ -package com.baeldung.legacy.sqlpackage; +package com.baeldung.datetime.sql; import java.sql.Date; import java.text.ParseException; diff --git a/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/sqlpackage/TimeUtils.java b/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/sql/TimeUtils.java similarity index 93% rename from core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/sqlpackage/TimeUtils.java rename to core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/sql/TimeUtils.java index 352a04b23b..3fa1ffdef8 100644 --- a/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/sqlpackage/TimeUtils.java +++ b/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/sql/TimeUtils.java @@ -1,4 +1,4 @@ -package com.baeldung.legacy.sqlpackage; +package com.baeldung.datetime.sql; import java.sql.Time; import java.text.ParseException; diff --git a/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/sqlpackage/TimestampUtils.java b/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/sql/TimestampUtils.java similarity index 93% rename from core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/sqlpackage/TimestampUtils.java rename to core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/sql/TimestampUtils.java index 350eb71497..02a928daa7 100644 --- a/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/legacy/sqlpackage/TimestampUtils.java +++ b/core-java-modules/core-java-date-operations/src/main/java/com/baeldung/datetime/sql/TimestampUtils.java @@ -1,4 +1,4 @@ -package com.baeldung.legacy.sqlpackage; +package com.baeldung.datetime.sql; import java.sql.Timestamp; import java.text.ParseException; diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/utilpackage/CalendarUtilsUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/CalendarUtilsUnitTest.java similarity index 74% rename from core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/utilpackage/CalendarUtilsUnitTest.java rename to core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/CalendarUtilsUnitTest.java index db029153ee..0060162ffb 100644 --- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/utilpackage/CalendarUtilsUnitTest.java +++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/CalendarUtilsUnitTest.java @@ -1,9 +1,12 @@ -package com.baeldung.legacy.utilpackage; +package com.baeldung.datetime; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.baeldung.datetime.CalendarUtils; +import com.baeldung.datetime.DateUtils; + import java.text.ParseException; import java.util.Date; diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/utilpackage/DateUtilsUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/DateUtilsUnitTest.java similarity index 82% rename from core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/utilpackage/DateUtilsUnitTest.java rename to core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/DateUtilsUnitTest.java index 432aa1ecfc..62a0fc0b4b 100644 --- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/utilpackage/DateUtilsUnitTest.java +++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/DateUtilsUnitTest.java @@ -1,9 +1,11 @@ -package com.baeldung.legacy.utilpackage; +package com.baeldung.datetime; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.baeldung.datetime.DateUtils; + import java.text.ParseException; import java.util.Date; diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/sqlpackage/DateUtilsUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/DateUtilsUnitTest.java similarity index 89% rename from core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/sqlpackage/DateUtilsUnitTest.java rename to core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/DateUtilsUnitTest.java index 73eda5a9dd..a04f64f6dd 100644 --- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/sqlpackage/DateUtilsUnitTest.java +++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/DateUtilsUnitTest.java @@ -1,9 +1,11 @@ -package com.baeldung.legacy.sqlpackage; +package com.baeldung.datetime.sql; import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.baeldung.datetime.sql.DateUtils; + import java.text.ParseException; import java.util.Date; diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/sqlpackage/TimeUtilsUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/TimeUtilsUnitTest.java similarity index 89% rename from core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/sqlpackage/TimeUtilsUnitTest.java rename to core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/TimeUtilsUnitTest.java index 9519122e92..6b49558f1b 100644 --- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/sqlpackage/TimeUtilsUnitTest.java +++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/TimeUtilsUnitTest.java @@ -1,9 +1,11 @@ -package com.baeldung.legacy.sqlpackage; +package com.baeldung.datetime.sql; import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.baeldung.datetime.sql.TimeUtils; + import java.text.ParseException; import java.util.Date; diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/sqlpackage/TimestampUtilsUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/TimestampUtilsUnitTest.java similarity index 80% rename from core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/sqlpackage/TimestampUtilsUnitTest.java rename to core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/TimestampUtilsUnitTest.java index d48560624d..2faf8fab0e 100644 --- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/legacy/sqlpackage/TimestampUtilsUnitTest.java +++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/TimestampUtilsUnitTest.java @@ -1,9 +1,11 @@ -package com.baeldung.legacy.sqlpackage; +package com.baeldung.datetime.sql; import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.baeldung.datetime.sql.TimestampUtils; + import java.text.ParseException; import java.util.Date; @@ -11,7 +13,8 @@ public class TimestampUtilsUnitTest { @Test public void givenCurrentTimestamp_thenNowIsReturned() { - assertEquals(TimestampUtils.getNow().getTime(), new Date().getTime()); + assertEquals(TimestampUtils.getNow() + .getTime(), new Date().getTime()); } @Test(expected = IllegalArgumentException.class)