BAEL-20573: Rename core-java-date-operations to core-java-date-operations-2
This commit is contained in:
parent
4733eddcbb
commit
eba38ea1d8
@ -3,9 +3,9 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
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>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>core-java-date-operations</artifactId>
|
<artifactId>core-java-date-operations-2</artifactId>
|
||||||
<version>${project.parent.version}</version>
|
<version>${project.parent.version}</version>
|
||||||
<name>core-java-date-operations</name>
|
<name>core-java-date-operations-2</name>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -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));
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -19,7 +19,7 @@
|
|||||||
<module>core-java-lang-operators</module>
|
<module>core-java-lang-operators</module>
|
||||||
<module>core-java-networking-2</module>
|
<module>core-java-networking-2</module>
|
||||||
<module>core-java-security-manager</module>
|
<module>core-java-security-manager</module>
|
||||||
<module>core-java-date-operations</module>
|
<module>core-java-date-operations-2</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user