Sync with underscore-java

Author: javadev

src/main/java/com/github/underscore/Optional.java

@@ -30,16 +30,16 @@
 
 public final class Optional<T> {
     private static final Optional<?> EMPTY = new Optional<>();
-    private final T arg;
+    private final T value;
     private final boolean absent;
 
     private Optional() {
-        this.arg = null;
+        this.value = null;
         this.absent = true;
     }
 
-    private Optional(final T arg) {
-        this.arg = arg;
+    private Optional(final T value) {
+        this.value = value;
         this.absent = false;
     }
 
@@ -60,21 +60,21 @@ public T get() {
         if (absent) {
             throw new IllegalStateException("Optional.get() cannot be called on an empty value");
         }
-        return arg;
+        return value;
     }
 
     public T or(final T defaultValue) {
         if (absent) {
             return defaultValue;
         }
-        return arg;
+        return value;
     }
 
     public T orNull() {
         if (absent) {
             return null;
         }
-        return arg;
+        return value;
     }
 
     public boolean isEmpty() {
@@ -88,7 +88,7 @@ public boolean isPresent() {
     public Optional<T> filter(Predicate<? super T> predicate) {
         Underscore.checkNotNull(predicate);
         if (isPresent()) {
-            return predicate.test(arg) ? this : Optional.empty();
+            return predicate.test(value) ? this : Optional.empty();
         } else {
             return this;
         }
@@ -97,7 +97,7 @@ public Optional<T> filter(Predicate<? super T> predicate) {
     public <F> Optional<F> map(Function<? super T, F> mapper) {
         Underscore.checkNotNull(mapper);
         if (isPresent()) {
-            return Optional.fromNullable(mapper.apply(arg));
+            return Optional.fromNullable(mapper.apply(value));
         } else {
             return empty();
         }
@@ -107,12 +107,12 @@ public <X extends Throwable> T orThrow(Supplier<? extends X> exceptionFunction)
         if (absent) {
             throw exceptionFunction.get();
         } else {
-            return arg;
+            return value;
         }
     }
 
     public java.util.Optional<T> toJavaOptional() {
-        return java.util.Optional.ofNullable(arg);
+        return java.util.Optional.ofNullable(value);
     }
 
     @Override
@@ -126,18 +126,18 @@ public boolean equals(final Object o) {
 
         final Optional<?> optional = (Optional<?>) o;
 
-        return absent == optional.absent && Objects.equals(arg, optional.arg);
+        return absent == optional.absent && Objects.equals(value, optional.value);
     }
 
     @Override
     public int hashCode() {
-        int result = arg == null ? 0 : arg.hashCode();
+        int result = value == null ? 0 : value.hashCode();
         result = 31 * result + (absent ? 1 : 0);
         return result;
     }
 
     @Override
     public String toString() {
-        return absent ? "Optional.empty" : "Optional[" + arg + "]";
+        return absent ? "Optional.empty" : "Optional[" + value + "]";
     }
 }

src/main/java/com/github/underscore/Underscore.java

@@ -3801,129 +3801,6 @@ public static <T> Predicate<T> or(
         };
     }
 
-    public static int minimumDays(int rows, int columns, List<List<Integer>> grid) {
-        Queue<int[]> queue = new LinkedList<>();
-        int cnt = 0;
-        for (int i = 0; i < rows; i++) {
-            for (int j = 0; j < columns; j++) {
-                if (grid.get(i).get(j) == 1) {
-                    queue.offer(new int[] {i, j});
-                    cnt++;
-                }
-            }
-        }
-        return getInteger(rows, columns, grid, queue, cnt);
-    }
-
-    private static int getInteger(
-            int rows, int columns, List<List<Integer>> grid, Queue<int[]> queue, int cnt) {
-        int target = rows * columns;
-        int res = 0;
-        int localCnt = cnt;
-        int[][] dirs = {{0, 1}, {0, -1}, {1, 0}, {-1, 0}};
-        while (!queue.isEmpty()) {
-            int size = queue.size();
-            if (localCnt == target) {
-                return res;
-            }
-            for (int i = 0; i < size; i++) {
-                int[] cur = queue.poll();
-                for (int[] dir : dirs) {
-                    int ni = cur[0] + dir[0];
-                    int nj = cur[1] + dir[1];
-                    if (ni >= 0
-                            && ni < rows
-                            && nj >= 0
-                            && nj < columns
-                            && grid.get(ni).get(nj) == 0) {
-                        localCnt++;
-                        queue.offer(new int[] {ni, nj});
-                        grid.get(ni).set(nj, 1);
-                    }
-                }
-            }
-            res++;
-        }
-        return -1;
-    }
-
-    public static List<String> topNCompetitors(
-            int numCompetitors,
-            int topNCompetitors,
-            List<String> competitors,
-            int numReviews,
-            List<String> reviews) {
-        if (Underscore.isNull(reviews)
-                || reviews.isEmpty()
-                || Underscore.isNull(competitors)
-                || competitors.isEmpty()
-                || numReviews < 1
-                || numCompetitors < 1) {
-            return new ArrayList<>();
-        }
-
-        List<String> topNCompetitorsList = new ArrayList<>(topNCompetitors);
-
-        Set<String> competitorsSet = new HashSet<>(competitors);
-        Map<String, Integer> topCompetitorsMap = new HashMap<>();
-        List<Map.Entry<String, Integer>> list =
-                getEntries(reviews, competitorsSet, topCompetitorsMap);
-
-        for (Map.Entry<String, Integer> item : list) {
-            if (topNCompetitorsList.size() < topNCompetitors) {
-                topNCompetitorsList.add(item.getKey());
-            } else {
-                break;
-            }
-        }
-
-        return topNCompetitorsList;
-    }
-
-    private static List<Map.Entry<String, Integer>> getEntries(
-            List<String> reviews,
-            Set<String> competitorsSet,
-            Map<String, Integer> topCompetitorsMap) {
-        // clean the reviews first: lowercase, remove special characters and split by spaces.
-        for (String review : reviews) {
-            String[] reviewArray = review.toLowerCase().replaceAll("[^a-zA-Z0-9 ]", "").split(" ");
-            Set<String> tempCompetitorSet = new HashSet<>();
-
-            for (String text : reviewArray) {
-                if (competitorsSet.contains(text) && !tempCompetitorSet.contains(text)) {
-                    tempCompetitorSet.add(text);
-                    if (topCompetitorsMap.containsKey(text)) {
-                        topCompetitorsMap.put(text, topCompetitorsMap.get(text) + 1);
-                    } else {
-                        topCompetitorsMap.put(text, 1);
-                    }
-                }
-            }
-        }
-
-        return getEntries(topCompetitorsMap);
-    }
-
-    private static List<Map.Entry<String, Integer>> getEntries(
-            Map<String, Integer> topCompetitorsMap) {
-        List<Map.Entry<String, Integer>> list = new ArrayList<>(topCompetitorsMap.entrySet());
-        list.sort(new ValueThenKeyComparator<>());
-        return list;
-    }
-
-    public static class ValueThenKeyComparator<
-                    K extends Comparable<? super K>, V extends Comparable<? super V>>
-            implements Comparator<Map.Entry<K, V>>, java.io.Serializable {
-
-        public int compare(Map.Entry<K, V> a, Map.Entry<K, V> b) {
-            int cmp1 = b.getValue().compareTo(a.getValue());
-            if (cmp1 == 0) {
-                return a.getKey().compareTo(b.getKey());
-            }
-            return cmp1;
-        }
-    }
-
     public static void main(String... args) {
         final String message =
                 "Underscore-java17 is a java 17 port of Underscore.js.\n\n"

src/test/java/com/github/underscore/UtilityTest.java

@@ -445,61 +445,6 @@ void format() {
         assertEquals("hello: mo\\e", fortmatted6);
     }
 
-    @Test
-    void minimumDays() {
-        List<List<Integer>> ll = new ArrayList<>();
-        ll.add(Arrays.asList(1, 1, 1, 1, 1));
-        ll.add(Arrays.asList(1, 1, 1, 0, 1));
-        ll.add(Arrays.asList(1, 0, 1, 1, 1));
-        ll.add(Arrays.asList(1, 1, 1, 1, 1));
-        assertEquals(1, Underscore.minimumDays(4, 5, ll));
-        List<List<Integer>> ll2 = new ArrayList<>();
-        ll2.add(Arrays.asList(0, 0, 0, 0, 0));
-        ll2.add(Arrays.asList(0, 0, 0, 0, 0));
-        ll2.add(Arrays.asList(0, 0, 0, 0, 0));
-        ll2.add(Arrays.asList(0, 0, 0, 0, 0));
-        assertEquals(-1, Underscore.minimumDays(4, 5, ll2));
-    }
-
-    @Test
-    void topNCompetitors() {
-        List<String> competitors =
-                Arrays.asList("anacell", "betacellular", "cetracular", "deltacellular", "eurocell");
-        List<String> reviews =
-                Arrays.asList(
-                        "I love anacell Best services provided by anacell in the town",
-                        "betacellular has great services",
-                        "deltacellular provides much betacellular",
-                        "cetracular is worse than eurocell",
-                        "betacellular is better than deltacellular");
-        List<String> strings = Underscore.topNCompetitors(6, 2, competitors, 6, reviews);
-        assertEquals("[betacellular, deltacellular]", strings.toString());
-        List<String> competitors2 = Arrays.asList("ААА", "БББ");
-        List<String> reviews2 =
-                Arrays.asList(
-                        "I love anacell Best services provided by anacell in the town",
-                        "betacellular has great services",
-                        "deltacellular provides much betacellular",
-                        "cetracular is worse than eurocell",
-                        "betacellular is better than deltacellular");
-        List<String> strings2 = Underscore.topNCompetitors(2, 2, competitors2, 6, reviews2);
-        assertEquals("[]", strings2.toString());
-        List<String> strings3 = Underscore.topNCompetitors(2, 2, competitors2, 6, null);
-        assertEquals("[]", strings3.toString());
-        List<String> strings4 =
-                Underscore.topNCompetitors(2, 2, competitors2, 6, Collections.<String>emptyList());
-        assertEquals("[]", strings4.toString());
-        List<String> strings5 = Underscore.topNCompetitors(2, 2, null, 6, reviews2);
-        assertEquals("[]", strings5.toString());
-        List<String> strings6 =
-                Underscore.topNCompetitors(2, 2, Collections.<String>emptyList(), 6, reviews2);
-        assertEquals("[]", strings6.toString());
-        List<String> strings7 = Underscore.topNCompetitors(0, 2, competitors2, 6, reviews2);
-        assertEquals("[]", strings7.toString());
-        List<String> strings8 = Underscore.topNCompetitors(2, 2, competitors2, 0, reviews2);
-        assertEquals("[]", strings8.toString());
-    }
-
     /*
     var object = {cheese: 'crumpets', stuff: function(){ return 'nonsense'; }};
     _.result(object, 'cheese');