1.5.7

Add Stream/IntStream/.../DoubleStream.scan(seed, accumulator, seedIncluded). Add ByteStream/IntStream/.../DoubleStream.flatMappToObj(ByteFunction<T[]> mapper). Add JdbcUtil.batchUpdate/batchInsert(PreparedQuery...). Improvements and bug fix.
landawn · Mar 12, 2019 · 4fc238d · 4fc238d
1 parent 84f2ec5
commit 4fc238d
Show file tree

Hide file tree

Showing 66 changed files with 4,740 additions and 1,990 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,9 +1,13 @@
 ### 1.5.7
 
+* Add `Stream.split/splitAt/splitBy/sliding(..., Collector<? super T, A, R> collector)`.
+
 * Add `Stream/IntStream/.../DoubleStream.scan(seed, accumulator, seedIncluded)`.
 
 * Add `ByteStream/IntStream/.../DoubleStream.flatMappToObj(ByteFunction<T[]> mapper)`.
 
+* Add `JdbcUtil.batchUpdate/batchInsert(PreparedQuery...)`.
+
 * Improvements and bug fix.
 
 

diff --git a/lib/abacus-util-1.5.7.jar b/lib/abacus-util-1.5.7.jar
diff --git a/lib/abacus-util-jdk7-1.5.7.jar b/lib/abacus-util-jdk7-1.5.7.jar
diff --git a/src/com/landawn/abacus/android/util/Observer.java b/src/com/landawn/abacus/android/util/Observer.java
@@ -166,13 +166,15 @@ public Observer<Timed<T>> timestamp() {
 
         @Override
         public O skip(final long n) {
+            N.checkArgNotNegative(n, "n");
+
             return (O) super.skip(n);
 
         }
 
         @Override
-        public O limit(final long n) {
-            return (O) super.limit(n);
+        public O limit(final long maxSize) {
+            return (O) super.limit(maxSize);
         }
 
         /*

diff --git a/src/com/landawn/abacus/core/RowDataSet.java b/src/com/landawn/abacus/core/RowDataSet.java
@@ -8468,6 +8468,8 @@ public long count() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 checkForComodification();
 
                 cursor = n > toRowIndex - cursor ? toRowIndex : (int) n + cursor;
@@ -8558,6 +8560,8 @@ public long count() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 checkForComodification();
 
                 cursor = n > toRowIndex - cursor ? toRowIndex : (int) n + cursor;

diff --git a/src/com/landawn/abacus/spring/DBUtil.java b/src/com/landawn/abacus/spring/DBUtil.java
@@ -131,11 +131,11 @@ public PreparedCallableQuery prepareCallableQuery(final Try.Function<Connection,
         return result;
     }
 
-    private Try.Runnable<SQLException> createCloseHandler(final Connection conn) {
-        return new Try.Runnable<SQLException>() {
+    private Runnable createCloseHandler(final Connection conn) {
+        return new Runnable() {
             @Override
-            public void run() throws SQLException {
-                DataSourceUtils.doReleaseConnection(conn, ds);
+            public void run() {
+                DataSourceUtils.releaseConnection(conn, ds);
             }
         };
     }

diff --git a/src/com/landawn/abacus/util/Array.java b/src/com/landawn/abacus/util/Array.java
@@ -1342,7 +1342,7 @@ static <T> void sort(final List<? extends T> c, final int fromIndex, final int t
 
             try {
                 array = (T[]) N.listElementDataField.get(c);
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 // ignore;
                 N.isListElementDataFieldGettable = false;
             }
@@ -2561,7 +2561,7 @@ static <T> void parallelSort(final List<? extends T> c, final int fromIndex, fin
 
             try {
                 array = (T[]) N.listElementDataField.get(c);
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 // ignore;
                 N.isListElementDataFieldGettable = false;
             }
@@ -3281,7 +3281,7 @@ static <T> int binarySearch(final List<? extends T> list, final int fromIndex, f
 
             try {
                 array = (T[]) N.listElementDataField.get(list);
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 // ignore;
                 N.isListElementDataFieldGettable = false;
             }

diff --git a/src/com/landawn/abacus/util/BooleanMatrix.java b/src/com/landawn/abacus/util/BooleanMatrix.java
@@ -1052,6 +1052,8 @@ public Boolean next() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 
@@ -1094,6 +1096,8 @@ public Boolean next() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 
@@ -1159,6 +1163,8 @@ public Boolean next() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 if (n >= (toRowIndex - i) * cols * 1L - j) {
                     i = toRowIndex;
                     j = 0;
@@ -1252,6 +1258,8 @@ public Boolean next() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 if (n >= (toColumnIndex - j) * BooleanMatrix.this.rows * 1L - i) {
                     i = 0;
                     j = toColumnIndex;
@@ -1331,6 +1339,8 @@ public Stream<Boolean> next() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 
@@ -1402,6 +1412,8 @@ public Boolean next() {
 
                     @Override
                     public void skip(long n) {
+                        N.checkArgNotNegative(n, "n");
+
                         cursor2 = n < toIndex2 - cursor2 ? cursor2 + (int) n : toIndex2;
                     }
 
@@ -1414,6 +1426,8 @@ public long count() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 

diff --git a/src/com/landawn/abacus/util/ByteMatrix.java b/src/com/landawn/abacus/util/ByteMatrix.java
@@ -1389,6 +1389,8 @@ public byte nextByte() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 
@@ -1431,6 +1433,8 @@ public byte nextByte() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 
@@ -1496,6 +1500,8 @@ public byte nextByte() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 if (n >= (toRowIndex - i) * cols * 1L - j) {
                     i = toRowIndex;
                     j = 0;
@@ -1585,6 +1591,8 @@ public byte nextByte() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 if (n >= (toColumnIndex - j) * ByteMatrix.this.rows * 1L - i) {
                     i = 0;
                     j = toColumnIndex;
@@ -1661,6 +1669,8 @@ public ByteStream next() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 
@@ -1732,6 +1742,8 @@ public byte nextByte() {
 
                     @Override
                     public void skip(long n) {
+                        N.checkArgNotNegative(n, "n");
+
                         cursor2 = n < toIndex2 - cursor2 ? cursor2 + (int) n : toIndex2;
                     }
 
@@ -1744,6 +1756,8 @@ public long count() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 

diff --git a/src/com/landawn/abacus/util/CharMatrix.java b/src/com/landawn/abacus/util/CharMatrix.java
@@ -1355,6 +1355,8 @@ public char nextChar() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 
@@ -1397,6 +1399,8 @@ public char nextChar() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 
@@ -1462,6 +1466,8 @@ public char nextChar() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 if (n >= (toRowIndex - i) * cols * 1L - j) {
                     i = toRowIndex;
                     j = 0;
@@ -1552,6 +1558,8 @@ public char nextChar() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 if (n >= (toColumnIndex - j) * CharMatrix.this.rows * 1L - i) {
                     i = 0;
                     j = toColumnIndex;
@@ -1628,6 +1636,8 @@ public CharStream next() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 
@@ -1699,6 +1709,8 @@ public char nextChar() {
 
                     @Override
                     public void skip(long n) {
+                        N.checkArgNotNegative(n, "n");
+
                         cursor2 = n < toIndex2 - cursor2 ? cursor2 + (int) n : toIndex2;
                     }
 
@@ -1711,6 +1723,8 @@ public long count() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 

diff --git a/src/com/landawn/abacus/util/DoubleMatrix.java b/src/com/landawn/abacus/util/DoubleMatrix.java
@@ -1335,6 +1335,8 @@ public double nextDouble() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 
@@ -1377,6 +1379,8 @@ public double nextDouble() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 
@@ -1433,6 +1437,8 @@ public double nextDouble() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 if (n >= (toRowIndex - i) * cols * 1L - j) {
                     i = toRowIndex;
                     j = 0;
@@ -1523,6 +1529,8 @@ public double nextDouble() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 if (n >= (toColumnIndex - j) * DoubleMatrix.this.rows * 1L - i) {
                     i = 0;
                     j = toColumnIndex;
@@ -1599,6 +1607,8 @@ public DoubleStream next() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }
 
@@ -1670,6 +1680,8 @@ public double nextDouble() {
 
                     @Override
                     public void skip(long n) {
+                        N.checkArgNotNegative(n, "n");
+
                         cursor2 = n < toIndex2 - cursor2 ? cursor2 + (int) n : toIndex2;
                     }
 
@@ -1682,6 +1694,8 @@ public long count() {
 
             @Override
             public void skip(long n) {
+                N.checkArgNotNegative(n, "n");
+
                 cursor = n < toIndex - cursor ? cursor + (int) n : toIndex;
             }