repackage

assira.core/src/main/java/net/ranides/assira/time/DateTimeFormatters.java

@@ -1,4 +1,4 @@
-package net.ranides.assira.time;
+package net.ranides.assira.time2;
 
 import lombok.experimental.UtilityClass;
 

assira.core/src/main/java/net/ranides/assira/time/DateTimeParsers.java

@@ -1,4 +1,4 @@
-package net.ranides.assira.time;
+package net.ranides.assira.time2;
 
 import lombok.experimental.UtilityClass;
 

assira.core/src/main/java/net/ranides/assira/time/DateTimeUtils.java

@@ -1,10 +1,10 @@
-package net.ranides.assira.time;
+package net.ranides.assira.time2;
 
 import lombok.experimental.UtilityClass;
-import net.ranides.assira.annotations.Meta;
 
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.Locale;
 import java.util.Objects;
 
@@ -55,4 +55,41 @@ public class DateTimeUtils {
         return asDate(withZonePolish(input));
     }
 
+    public static ZonedDateTime min(ZonedDateTime date1, ZonedDateTime date2) {
+        if(Objects.isNull(date1)) {
+            return date2;
+        }
+        if(Objects.isNull(date2)) {
+            return date1;
+        }
+        return date1.isBefore(date2) ? date2 : date1;
+    }
+
+    public static ZonedDateTime max(ZonedDateTime date1, ZonedDateTime date2) {
+        if(Objects.isNull(date1)) {
+            return date2;
+        }
+        if(Objects.isNull(date2)) {
+            return date1;
+        }
+        return date1.isAfter(date2) ? date1 : date2;
+    }
+
+    public static ZonedDateTime valueOrMin(ZonedDateTime input) {
+        return Objects.isNull(input) ? MIN : input;
+    }
+
+    public static ZonedDateTime valueOrMax(ZonedDateTime input) {
+        return Objects.isNull(input) ? MAX : input;
+    }
+
+    public static boolean isSameDate(ZonedDateTime dateTime1, ZonedDateTime dateTime2) {
+        return dateTime1.truncatedTo(ChronoUnit.DAYS).isEqual(dateTime2.truncatedTo(ChronoUnit.DAYS));
+    }
+
+    public static boolean isSameDate(ZonedDate dateTime1, ZonedDate dateTime2) {
+        // @todo implement
+        throw new UnsupportedOperationException("");
+    }
+
 }

assira.core/src/main/java/net/ranides/assira/time/ExplicitZone.java

@@ -1,4 +1,4 @@
-package net.ranides.assira.time;
+package net.ranides.assira.time2;
 
 import java.lang.annotation.Documented;
 

assira.core/src/main/java/net/ranides/assira/time/ZonedDate.java

@@ -1,4 +1,4 @@
-package net.ranides.assira.time;
+package net.ranides.assira.time2;
 
 import java.time.ZonedDateTime;
 

assira.core/src/main/java/net/ranides/assira/time/ZonedTime.java

@@ -1,4 +1,4 @@
-package net.ranides.assira.time;
+package net.ranides.assira.time2;
 
 import java.time.ZonedDateTime;
 

assira.core/src/test/java/net/ranides/assira/time/DateTimeParsersTest.java

@@ -1,6 +1,7 @@
 package net.ranides.assira.time;
 
 import net.ranides.assira.junit.NewAssert;
+import net.ranides.assira.time2.DateTimeParsers;
 import org.junit.Test;
 
 import java.time.ZonedDateTime;

assira.drafts/src/main/java/net/ranides/assira/datetime/DateTimeUtils1.java

@@ -15,24 +15,6 @@ public class DateTimeUtils1 {
         return mapNullable(date, v -> v.withMinute(0).withHour(0).withSecond(0).withNano(0));
     }
 
-    public static ZonedDateTime min(ZonedDateTime firstDate, ZonedDateTime secondDate) {
-        if (firstDate == null && secondDate == null) return null;
-        if (firstDate == null) return secondDate;
-        if (secondDate == null) return firstDate;
-        return firstDate.isBefore(secondDate)
-                ? firstDate
-                : secondDate;
-    }
-
-    public static ZonedDateTime max(ZonedDateTime firstDate, ZonedDateTime secondDate) {
-        if (firstDate == null && secondDate == null) return null;
-        if (firstDate == null) return secondDate;
-        if (secondDate == null) return firstDate;
-        return firstDate.isBefore(secondDate)
-                ? secondDate
-                : firstDate;
-    }
-
     public static boolean dateBetweenWithMinMax(ZonedDateTime testedDate, ZonedDateTime dateFrom, ZonedDateTime dateTo) {
         return dateBetweenWithMinMax(testedDate, dateFrom, dateTo, false);
     }
@@ -48,16 +30,8 @@ public class DateTimeUtils1 {
         return !testedDate.isBefore(valueOrMin(dateFrom)) && !testedDate.isAfter(dateTo);
     }
 
-    public static ZonedDateTime valueOrMin(ZonedDateTime date) {
-        return ofNullable(date).orElseGet(() -> MIN);
-    }
-
-    public static ZonedDateTime valueOrMax(ZonedDateTime date) {
-        return ofNullable(date).orElseGet(() -> MAX);
-    }
-
     public static ZonedDateTime addTimeToDate(String dateValue, String timeValue) {
-        if(dateValue != null) {
+        if(dateValue == null) {
             return null;
         }
         ZonedDate1 zonedDate = parseToPolishDate(dateValue);
@@ -76,9 +50,7 @@ public class DateTimeUtils1 {
         return dateTime.with(LocalTime.MAX);
     }
 
-    public static boolean isSameDate(ZonedDateTime dateTime1, ZonedDateTime dateTime2) {
-        return dateTime1.truncatedTo(ChronoUnit.DAYS).isEqual(dateTime2.truncatedTo(ChronoUnit.DAYS));
-    }
+
 
     public static boolean isMinTime(ZonedDateTime dateTime) {
         return LocalTime.MIN.equals(dateTime.toLocalTime());