Merge pull request #8466 from kwoyke/BAEL-20573

BAEL-20573: Rename Date operations/computations modules

core-java-modules/core-java-date-operations-1/README.md

@@ -1,6 +1,5 @@
-## Java Date/time computations Cookbooks and Examples
+## Core Date Operations (Part 1)
-
+This module contains articles about date operations in Java.
-This module contains articles about date and time computations in Java.
 
 ### Relevant Articles: 
 - [Difference Between Two Dates in Java](http://www.baeldung.com/java-date-difference)
@@ -13,3 +12,4 @@ This module contains articles about date and time computations in Java.
 - [Increment Date in Java](http://www.baeldung.com/java-increment-date)
 - [Add Hours To a Date In Java](http://www.baeldung.com/java-add-hours-date)
 - [Introduction to Joda-Time](http://www.baeldung.com/joda-time)
+- [[Next -->]](/core-java-modules/core-java-date-operations-2)

core-java-modules/core-java-date-operations-1/pom.xml

@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>core-java-datetime-computations</artifactId>
+    <artifactId>core-java-date-operations-1</artifactId>
     <version>${project.parent.version}</version>
-    <name>core-java-datetime-computations</name>
+    <name>core-java-date-operations-1</name>
     <packaging>jar</packaging>
 
     <parent>
@@ -41,7 +41,7 @@
     </dependencies>
 
     <build>
-        <finalName>core-java-datetime-computations</finalName>
+        <finalName>core-java-date-operations-1</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

core-java-modules/core-java-date-operations-2/README.md

@@ -1,4 +1,4 @@
-## Core Date Operations
+## Core Date Operations (Part 2)
 This module contains articles about date operations in Java.
 
 ### Relevant Articles:
@@ -6,3 +6,4 @@ This module contains articles about date operations in Java.
 - [Skipping Weekends While Adding Days to LocalDate in Java 8](https://www.baeldung.com/java-localdate-add-days-skip-weekends)
 - [Checking If Two Java Dates Are on the Same Day](https://www.baeldung.com/java-check-two-dates-on-same-day)
 - [Converting Java Date to OffsetDateTime](https://www.baeldung.com/java-convert-date-to-offsetdatetime)
+- [[<-- Prev]](/core-java-modules/core-java-date-operations-1)

core-java-modules/core-java-date-operations-2/pom.xml

@@ -3,9 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>core-java-date-operations</artifactId>
+    <artifactId>core-java-date-operations-2</artifactId>
     <version>${project.parent.version}</version>
-    <name>core-java-date-operations</name>
+    <name>core-java-date-operations-2</name>
     <packaging>jar</packaging>
 
     <parent>

core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/date/comparison/DateComparisonUtils.java

@@ -1,65 +1,65 @@
-package com.baeldung.date.comparison;
+package com.baeldung.date.comparison;
-
+
-import java.text.SimpleDateFormat;
+import java.text.SimpleDateFormat;
-import java.time.Instant;
+import java.time.Instant;
-import java.time.LocalDate;
+import java.time.LocalDate;
-import java.time.ZoneId;
+import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
+import java.time.temporal.ChronoUnit;
-import java.util.Calendar;
+import java.util.Calendar;
-import java.util.Date;
+import java.util.Date;
-import java.util.TimeZone;
+import java.util.TimeZone;
-
+
-import org.apache.commons.lang3.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
-
+
-import hirondelle.date4j.DateTime;
+import hirondelle.date4j.DateTime;
-
+
-public class DateComparisonUtils {
+public class DateComparisonUtils {
-
+
-    public static boolean isSameDayUsingLocalDate(Date date1, Date date2) {
+    public static boolean isSameDayUsingLocalDate(Date date1, Date date2) {
-        LocalDate localDate1 = date1.toInstant()
+        LocalDate localDate1 = date1.toInstant()
-            .atZone(ZoneId.systemDefault())
+            .atZone(ZoneId.systemDefault())
-            .toLocalDate();
+            .toLocalDate();
-        LocalDate localDate2 = date2.toInstant()
+        LocalDate localDate2 = date2.toInstant()
-            .atZone(ZoneId.systemDefault())
+            .atZone(ZoneId.systemDefault())
-            .toLocalDate();
+            .toLocalDate();
-        return localDate1.isEqual(localDate2);
+        return localDate1.isEqual(localDate2);
-    }
+    }
-
+
-    public static boolean isSameDayUsingInstant(Date date1, Date date2) {
+    public static boolean isSameDayUsingInstant(Date date1, Date date2) {
-        Instant instant1 = date1.toInstant()
+        Instant instant1 = date1.toInstant()
-            .truncatedTo(ChronoUnit.DAYS);
+            .truncatedTo(ChronoUnit.DAYS);
-        Instant instant2 = date2.toInstant()
+        Instant instant2 = date2.toInstant()
-            .truncatedTo(ChronoUnit.DAYS);
+            .truncatedTo(ChronoUnit.DAYS);
-        return instant1.equals(instant2);
+        return instant1.equals(instant2);
-    }
+    }
-
+
-    public static boolean isSameDayUsingSimpleDateFormat(Date date1, Date date2) {
+    public static boolean isSameDayUsingSimpleDateFormat(Date date1, Date date2) {
-        SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd");
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd");
-        return fmt.format(date1)
+        return fmt.format(date1)
-            .equals(fmt.format(date2));
+            .equals(fmt.format(date2));
-    }
+    }
-
+
-    public static boolean isSameDayUsingCalendar(Date date1, Date date2) {
+    public static boolean isSameDayUsingCalendar(Date date1, Date date2) {
-        Calendar calendar1 = Calendar.getInstance();
+        Calendar calendar1 = Calendar.getInstance();
-        calendar1.setTime(date1);
+        calendar1.setTime(date1);
-        Calendar calendar2 = Calendar.getInstance();
+        Calendar calendar2 = Calendar.getInstance();
-        calendar2.setTime(date2);
+        calendar2.setTime(date2);
-        return calendar1.get(Calendar.YEAR) == calendar2.get(Calendar.YEAR) && calendar1.get(Calendar.MONTH) == calendar2.get(Calendar.MONTH) && calendar1.get(Calendar.DAY_OF_MONTH) == calendar2.get(Calendar.DAY_OF_MONTH);
+        return calendar1.get(Calendar.YEAR) == calendar2.get(Calendar.YEAR) && calendar1.get(Calendar.MONTH) == calendar2.get(Calendar.MONTH) && calendar1.get(Calendar.DAY_OF_MONTH) == calendar2.get(Calendar.DAY_OF_MONTH);
-    }
+    }
-
+
-    public static boolean isSameDayUsingApacheCommons(Date date1, Date date2) {
+    public static boolean isSameDayUsingApacheCommons(Date date1, Date date2) {
-        return DateUtils.isSameDay(date1, date2);
+        return DateUtils.isSameDay(date1, date2);
-    }
+    }
-
+
-    public static boolean isSameDayUsingJoda(Date date1, Date date2) {
+    public static boolean isSameDayUsingJoda(Date date1, Date date2) {
-        org.joda.time.LocalDate localDate1 = new org.joda.time.LocalDate(date1);
+        org.joda.time.LocalDate localDate1 = new org.joda.time.LocalDate(date1);
-        org.joda.time.LocalDate localDate2 = new org.joda.time.LocalDate(date2);
+        org.joda.time.LocalDate localDate2 = new org.joda.time.LocalDate(date2);
-        return localDate1.equals(localDate2);
+        return localDate1.equals(localDate2);
-    }
+    }
-
+
-    public static boolean isSameDayUsingDate4j(Date date1, Date date2) {
+    public static boolean isSameDayUsingDate4j(Date date1, Date date2) {
-        DateTime dateObject1 = DateTime.forInstant(date1.getTime(), TimeZone.getDefault());
+        DateTime dateObject1 = DateTime.forInstant(date1.getTime(), TimeZone.getDefault());
-        DateTime dateObject2 = DateTime.forInstant(date2.getTime(), TimeZone.getDefault());
+        DateTime dateObject2 = DateTime.forInstant(date2.getTime(), TimeZone.getDefault());
-        return dateObject1.isSameDayAs(dateObject2);
+        return dateObject1.isSameDayAs(dateObject2);
-    }
+    }
-}
+}

core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/date/comparison/DateComparisonUtilsUnitTest.java

@@ -1,57 +1,57 @@
-package com.baeldung.date.comparison;
+package com.baeldung.date.comparison;
-
+
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
-
+
-import java.time.LocalDateTime;
+import java.time.LocalDateTime;
-import java.time.ZoneId;
+import java.time.ZoneId;
-import java.util.Date;
+import java.util.Date;
-
+
-import org.junit.Test;
+import org.junit.Test;
-
+
-public class DateComparisonUtilsUnitTest {
+public class DateComparisonUtilsUnitTest {
-
+
-    private Date day1Morning = toDate(LocalDateTime.of(2019, 10, 19, 6, 30, 40));
+    private Date day1Morning = toDate(LocalDateTime.of(2019, 10, 19, 6, 30, 40));
-    private Date day1Evening = toDate(LocalDateTime.of(2019, 10, 19, 18, 30, 50));
+    private Date day1Evening = toDate(LocalDateTime.of(2019, 10, 19, 18, 30, 50));
-    private Date day2Morning = toDate(LocalDateTime.of(2019, 10, 20, 6, 30, 50));
+    private Date day2Morning = toDate(LocalDateTime.of(2019, 10, 20, 6, 30, 50));
-
+
-    private Date toDate(LocalDateTime localDateTime) {
+    private Date toDate(LocalDateTime localDateTime) {
-        return Date.from(localDateTime.atZone(ZoneId.systemDefault())
+        return Date.from(localDateTime.atZone(ZoneId.systemDefault())
-            .toInstant());
+            .toInstant());
-    }
+    }
-
+
-    @Test
+    @Test
-    public void givenDatesWithDifferentTime_whenIsSameDay_thenReturnsTrue() {
+    public void givenDatesWithDifferentTime_whenIsSameDay_thenReturnsTrue() {
-        assertTrue(DateComparisonUtils.isSameDayUsingLocalDate(day1Morning, day1Evening));
+        assertTrue(DateComparisonUtils.isSameDayUsingLocalDate(day1Morning, day1Evening));
-        assertTrue(DateComparisonUtils.isSameDayUsingInstant(day1Morning, day1Evening));
+        assertTrue(DateComparisonUtils.isSameDayUsingInstant(day1Morning, day1Evening));
-        assertTrue(DateComparisonUtils.isSameDayUsingSimpleDateFormat(day1Morning, day1Evening));
+        assertTrue(DateComparisonUtils.isSameDayUsingSimpleDateFormat(day1Morning, day1Evening));
-        assertTrue(DateComparisonUtils.isSameDayUsingCalendar(day1Morning, day1Evening));
+        assertTrue(DateComparisonUtils.isSameDayUsingCalendar(day1Morning, day1Evening));
-        assertTrue(DateComparisonUtils.isSameDayUsingApacheCommons(day1Morning, day1Evening));
+        assertTrue(DateComparisonUtils.isSameDayUsingApacheCommons(day1Morning, day1Evening));
-        assertTrue(DateComparisonUtils.isSameDayUsingJoda(day1Morning, day1Evening));
+        assertTrue(DateComparisonUtils.isSameDayUsingJoda(day1Morning, day1Evening));
-        assertTrue(DateComparisonUtils.isSameDayUsingDate4j(day1Morning, day1Evening));
+        assertTrue(DateComparisonUtils.isSameDayUsingDate4j(day1Morning, day1Evening));
-    }
+    }
-
+
-    @Test
+    @Test
-    public void givenDates_whenIsDifferentDay_thenReturnsFalse() {
+    public void givenDates_whenIsDifferentDay_thenReturnsFalse() {
-        assertFalse(DateComparisonUtils.isSameDayUsingLocalDate(day1Morning, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingLocalDate(day1Morning, day2Morning));
-        assertFalse(DateComparisonUtils.isSameDayUsingLocalDate(day1Evening, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingLocalDate(day1Evening, day2Morning));
-
+
-        assertFalse(DateComparisonUtils.isSameDayUsingInstant(day1Morning, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingInstant(day1Morning, day2Morning));
-        assertFalse(DateComparisonUtils.isSameDayUsingInstant(day1Evening, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingInstant(day1Evening, day2Morning));
-
+
-        assertFalse(DateComparisonUtils.isSameDayUsingSimpleDateFormat(day1Morning, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingSimpleDateFormat(day1Morning, day2Morning));
-        assertFalse(DateComparisonUtils.isSameDayUsingSimpleDateFormat(day1Evening, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingSimpleDateFormat(day1Evening, day2Morning));
-
+
-        assertFalse(DateComparisonUtils.isSameDayUsingCalendar(day1Morning, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingCalendar(day1Morning, day2Morning));
-        assertFalse(DateComparisonUtils.isSameDayUsingCalendar(day1Evening, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingCalendar(day1Evening, day2Morning));
-
+
-        assertFalse(DateComparisonUtils.isSameDayUsingApacheCommons(day1Morning, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingApacheCommons(day1Morning, day2Morning));
-        assertFalse(DateComparisonUtils.isSameDayUsingApacheCommons(day1Evening, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingApacheCommons(day1Evening, day2Morning));
-
+
-        assertFalse(DateComparisonUtils.isSameDayUsingJoda(day1Morning, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingJoda(day1Morning, day2Morning));
-        assertFalse(DateComparisonUtils.isSameDayUsingJoda(day1Evening, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingJoda(day1Evening, day2Morning));
-
+
-        assertFalse(DateComparisonUtils.isSameDayUsingDate4j(day1Morning, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingDate4j(day1Morning, day2Morning));
-        assertFalse(DateComparisonUtils.isSameDayUsingDate4j(day1Evening, day2Morning));
+        assertFalse(DateComparisonUtils.isSameDayUsingDate4j(day1Evening, day2Morning));
-    }
+    }
-}
+}

core-java-modules/pom.xml

@@ -18,7 +18,7 @@
         <module>core-java-optional</module>
         <module>core-java-lang-operators</module>
         <module>core-java-networking-2</module>
-        <module>core-java-date-operations</module>
+        <module>core-java-date-operations-2</module>
     </modules>
 
 </project>

pom.xml

@@ -400,7 +400,7 @@
                 <module>core-java-modules/core-java-lang-math</module>
                 <!-- We haven't upgraded to java 9.-->
                 <!--
-                <module>core-java-modules/core-java-datetime-computations</module>
+                <module>core-java-modules/core-java-date-operations-1</module>
                 <module>core-java-modules/core-java-datetime-conversion</module>
                 <module>core-java-modules/core-java-datetime-java8</module>
                 <module>core-java-modules/core-java-datetime-string</module>
@@ -1041,7 +1041,7 @@
                 <module>core-java-modules/core-java-lang-math</module>
                 <!-- We haven't upgraded to java 9.-->
                 <!--
-                <module>core-java-modules/core-java-datetime-computations</module>
+                <module>core-java-modules/core-java-date-operations-1</module>
                 <module>core-java-modules/core-java-datetime-conversion</module>
                 <module>core-java-modules/core-java-datetime-java8</module>
                 <module>core-java-modules/core-java-datetime-string</module>