فهرست منبع

incompatible refactoring

Ranides Atterwim 11 ماه پیش
والد
کامیت
fc360ed0b7

+ 0 - 20
assira.commons/src/main/java/net/ranides/assira/time/DateTimeUtils.java

@@ -183,26 +183,6 @@ public class DateTimeUtils {
         return seconds1.equals(seconds2);
     }
 
-    @ZoneExplicit
-    @Deprecated
-    @Contract("null -> null; !null -> !null")
-    public static @Nullable ZonedDateTime withUtcMinTime(@Nullable ZonedDateTime datetime) {
-        if(Objects.isNull(datetime)) {
-            return null;
-        }
-        return withZoneUtc(datetime).with(LocalTime.MIN);
-    }
-
-    @ZoneExplicit
-    @Deprecated
-    @Contract("null -> null; !null -> !null")
-    public static @Nullable ZonedDateTime withUtcMaxTime(@Nullable ZonedDateTime datetime) {
-        if(Objects.isNull(datetime)) {
-            return null;
-        }
-        return withZoneUtc(datetime).with(LocalTime.MAX);
-    }
-
     @Deprecated
     @Contract("null -> null; !null -> !null")
     public static @Nullable ZonedDateTime withLastDayOfMonth(@Nullable ZonedDateTime datetime) {

+ 3 - 3
assira.commons/src/main/java/net/ranides/assira/time/ZonedRange.java

@@ -9,15 +9,15 @@ import java.time.ZonedDateTime;
 
 public abstract class ZonedRange extends Range<ZonedDateTime> {
 
-    static ZonedRange of(ZonedDateTime begin, ZonedDateTime end) {
+    public static ZonedRange of(ZonedDateTime begin, ZonedDateTime end) {
         return begin.isBefore(end) ? new SimplePair(begin, end) : new SimplePair(end, begin);
     }
 
-    static ZonedRange of(ZonedDate begin, ZonedDate end) {
+    public static ZonedRange of(ZonedDate begin, ZonedDate end) {
         return begin.isBefore(end) ? new SimplePair(begin.withMin(), end.withMax()) : new SimplePair(end.withMin(), begin.withMax());
     }
 
-    static ZonedRange of(ZonedDate date) {
+    public static ZonedRange of(ZonedDate date) {
         return new SimpleDate(date.withMin());
     }
 

+ 1 - 1
assira.commons/src/test/java/net/ranides/assira/time/DateTimeUtilsTest.java

@@ -73,7 +73,7 @@ public class DateTimeUtilsTest {
     }
 
     @Test
-    public void testMin() {
+    public void testDiff() {
 
     }
 }

+ 0 - 2
assira.core/src/main/java/net/ranides/assira/collection/sets/ArraySet.java

@@ -16,8 +16,6 @@ import net.ranides.assira.generic.CompareUtils;
 
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
 import java.util.ListIterator;
 import java.util.SortedSet;
 

+ 1 - 20
assira.core/src/main/java/net/ranides/assira/generic/CompareUtils.java

@@ -44,25 +44,6 @@ public class CompareUtils {
         return Objects.equals(a, b);
     }
 
-    /**
-     * If both arguments are numbers ({@code instanceof Number}) then compares
-     * with specified precision. Use standard comparison otherwise.
-     *
-     * Method is null-safe.
-     *
-     * @param a a
-     * @param b b
-     * @param precision precision
-     * @return bool
-     */
-    public static boolean equals(Object a, Object b, double precision) {
-        if(a instanceof Number && b instanceof Number) {
-            return equals((Number)a, (Number)b, precision);
-        } else {
-            return CompareUtils.equals(a, b);
-        }
-    }
-    
     /**
      * Compares numbers with specified precision.
      * Method is null-safe.
@@ -322,7 +303,7 @@ public class CompareUtils {
             return Integer.compare(ai, bi);
         }
     }
-    
+
     private static final class NaturalComparator implements Comparator<Comparable>, Serializable {
         
         private static final long serialVersionUID = 1L;

+ 4 - 0
assira.core/src/main/java/net/ranides/assira/generic/Range.java

@@ -6,6 +6,10 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Collection;
 import java.util.Comparator;
 
+/**
+ * This is rudimentary range from "a" (inclusive) to "b" (exclusive)
+ * @param <T>
+ */
 public abstract class Range<T> implements Comparable<Range<T>> {
 
     static <T extends Comparable<T>> Range<T> of(T begin, T end) {

+ 1 - 15
assira.core/src/test/java/net/ranides/assira/generic/CompareUtilsTest.java

@@ -28,21 +28,7 @@ public class CompareUtilsTest {
 		assertFalse( CompareUtils.equals("a", null));
 		assertTrue( CompareUtils.equals(null, null));
 	}
-	
-	@Test
-	public void testEqualsObject_precision() {
-		assertTrue( CompareUtils.equals("a", "a", 1));
-		assertFalse( CompareUtils.equals("#", "a", 1));
-		assertFalse( CompareUtils.equals(null, "a", 1));
-		assertFalse( CompareUtils.equals("a", null, 1));
-		assertTrue( CompareUtils.equals((Object)null, (Object)null, 1));
-		
-		assertTrue( CompareUtils.equals((Object)10.0, (Object)9.5, 1));
-		assertFalse( CompareUtils.equals((Object)10.0, (Object)8.5, 1));
-		assertFalse( CompareUtils.equals(null, (Object)8.5, 1));
-		assertFalse( CompareUtils.equals((Object)8.5, null, 1));
-	}
-	
+
 	@Test
 	public void testEqualsNumber() {
 		assertTrue( CompareUtils.equals((Number)10.0, (Number)9.5, 1));