(commons-dbutils) branch master updated: Encapsulate test fields (#222)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
The following commit(s) were added to refs/heads/master by this push:
new 1b71a61 Encapsulate test fields (#222)
1b71a61 is described below
commit 1b71a6160ca026b4900e6ffb947944f1901f5bbf
Author: sanjanarampurkottur01
<149339511+sanjanarampurkottu...@users.noreply.github.com>
AuthorDate: Thu Nov 23 09:08:32 2023 -0400
Encapsulate test fields (#222)
* Removing Deficient Encapsulation using Encapsulate Field technique
* Fixed more design issues
* Refactored visibility modifier of BaseTestCase
---
.../commons/dbutils/AsyncQueryRunnerTest.java | 16 +-
.../org/apache/commons/dbutils/BaseTestCase.java | 16 --
.../commons/dbutils/BasicRowProcessorTest.java | 36 +++---
.../apache/commons/dbutils/BeanProcessorTest.java | 27
.../commons/dbutils/GenerousBeanProcessorTest.java | 6 ++--
.../apache/commons/dbutils/OutParameterTest.java | 4 +--
.../apache/commons/dbutils/QueryRunnerTest.java| 22 ++---
.../commons/dbutils/ResultSetIteratorTest.java | 2 +-
.../commons/dbutils/handlers/ArrayHandlerTest.java | 4 +--
.../dbutils/handlers/ArrayListHandlerTest.java | 4 +--
.../commons/dbutils/handlers/BeanHandlerTest.java | 8 ++---
.../dbutils/handlers/BeanListHandlerTest.java | 8 ++---
.../dbutils/handlers/ColumnListHandlerTest.java| 10 +++---
.../commons/dbutils/handlers/KeyedHandlerTest.java | 12 +---
.../commons/dbutils/handlers/MapHandlerTest.java | 4 +--
.../dbutils/handlers/MapListHandlerTest.java | 4 +--
.../dbutils/handlers/ScalarHandlerTest.java| 8 ++---
.../columns/AbstractTestColumnHandler.java | 18 +--
.../handlers/columns/BooleanColumnHandlerTest.java | 5 ++-
.../handlers/columns/ByteColumnHandlerTest.java| 5 ++-
.../handlers/columns/DoubleColumnHandlerTest.java | 5 ++-
.../handlers/columns/FloatColumnHandlerTest.java | 5 ++-
.../handlers/columns/IntegerColumnHandlerTest.java | 6 ++--
.../handlers/columns/LongColumnHandlerTest.java| 4 +--
.../handlers/columns/SQLXMLColumnHandlerTest.java | 4 +--
.../handlers/columns/ShortColumnHandlerTest.java | 4 +--
.../handlers/columns/StringColumnHandlerTest.java | 4 +--
.../columns/TimestampColumnHandlerTest.java| 4 +--
.../wrappers/SqlNullCheckedResultSetTest.java | 4 ++-
.../wrappers/StringTrimmedResultSetTest.java | 10 +++---
30 files changed, 156 insertions(+), 113 deletions(-)
diff --git a/src/test/java/org/apache/commons/dbutils/AsyncQueryRunnerTest.java
b/src/test/java/org/apache/commons/dbutils/AsyncQueryRunnerTest.java
index 827e91c..acc317e 100644
--- a/src/test/java/org/apache/commons/dbutils/AsyncQueryRunnerTest.java
+++ b/src/test/java/org/apache/commons/dbutils/AsyncQueryRunnerTest.java
@@ -47,21 +47,21 @@ import org.mockito.junit.MockitoJUnitRunner;
@SuppressWarnings("boxing") // test code
@RunWith(MockitoJUnitRunner.class)
public class AsyncQueryRunnerTest {
-AsyncQueryRunner runner;
-ArrayHandler handler;
+private AsyncQueryRunner runner;
+private ArrayHandler handler;
@Mock
-DataSource dataSource;
+private DataSource dataSource;
@Mock
-Connection conn;
+private Connection conn;
@Mock
-PreparedStatement prepStmt;
+private PreparedStatement prepStmt;
@Mock
-Statement stmt;
+private Statement stmt;
@Mock
-ParameterMetaData meta;
+private ParameterMetaData meta;
@Mock
-ResultSet results;
+private ResultSet results;
// helper method for calling batch when an exception is expected
private void callBatchWithException(final String sql, final Object[][]
params) throws Exception {
diff --git a/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
b/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
index 0157cc1..e1ce7ed 100644
--- a/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
+++ b/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
@@ -65,12 +65,12 @@ public class BaseTestCase extends TestCase {
/**
* The ResultSet all test methods will use.
*/
-protected ResultSet rs;
+private ResultSet rs;
/**
* A ResultSet with 0 rows.
*/
-protected ResultSet emptyResultSet;
+private ResultSet emptyResultSet;
/**
* Creates a freshly initialized ResultSet.
@@ -92,6 +92,18 @@ public class BaseTestCase extends TestCase {
emptyResultSet = MockResultSet.create(metaData, null);
}
+public ResultSet getResultSet() {
+return this.rs;
+}
+
+public ResultSet getEmptyResultSet() {
+return this.emptyResultSet;
+}
+
+public void setResultSet(ResultSet resultSet) {
+this.rs = resultSet;
+}
+
(commons-dbutils) branch master updated (1b71a61 -> c3a913f)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git from 1b71a61 Encapsulate test fields (#222) new 28109d4 Enable Checkstyle for tests new c3a913f Encapsulate test fields #222 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- src/changes/changes.xml | 1 + .../org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java| 1 - .../java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java| 1 - .../commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java| 4 ++-- .../commons/dbutils/handlers/columns/ByteColumnHandlerTest.java | 4 ++-- .../commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java | 4 ++-- .../commons/dbutils/handlers/columns/FloatColumnHandlerTest.java | 4 ++-- 8 files changed, 10 insertions(+), 11 deletions(-)
(commons-dbutils) 02/02: Encapsulate test fields #222
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git commit c3a913f6b39ed74403858d25fbb56dd8b23c7a13 Author: Gary Gregory AuthorDate: Thu Nov 23 08:12:46 2023 -0500 Encapsulate test fields #222 --- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 790ed98..44d520b 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -46,6 +46,7 @@ The type attribute can be add,update,fix,remove. Switch on String instead of cascading if-else in MockResultSet #220. + Encapsulate test fields #222. Bump Java from 8 to 11.
(commons-dbutils) 01/02: Enable Checkstyle for tests
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
commit 28109d4103390b2056831b938a0bb7e7998da939
Author: Gary Gregory
AuthorDate: Thu Nov 23 08:12:37 2023 -0500
Enable Checkstyle for tests
Fix import order
---
pom.xml | 2 +-
.../org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java| 1 -
.../java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java| 1 -
.../commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java| 4 ++--
.../commons/dbutils/handlers/columns/ByteColumnHandlerTest.java | 4 ++--
.../commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java | 4 ++--
.../commons/dbutils/handlers/columns/FloatColumnHandlerTest.java | 4 ++--
7 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index e0c9dd1..f4d8392 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,7 +279,7 @@
${checkstyle.config.file}
false
${checkstyle.header.file}
-false
+true
${basedir}/src/conf/checkstyle/checkstyle-suppressions.xml
${basedir}/src/conf/checkstyle/checkstyle-suppressions.xml
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java
index 2f4d88e..e2d45a7 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.dbutils.handlers;
-import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java
index b5e0b26..803b0e4 100644
--- a/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java
+++ b/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java
@@ -18,7 +18,6 @@ package org.apache.commons.dbutils.handlers;
import static org.mockito.Mockito.mock;
-import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;
import java.util.Map.Entry;
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java
index 9a50041..8803106 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java
@@ -19,12 +19,12 @@ package org.apache.commons.dbutils.handlers.columns;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
+import java.sql.ResultSet;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
-import java.sql.ResultSet;
-
@RunWith(MockitoJUnitRunner.class)
public class BooleanColumnHandlerTest extends
AbstractTestColumnHandler {
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandlerTest.java
index efe1b15..155ad68 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandlerTest.java
@@ -19,12 +19,12 @@ package org.apache.commons.dbutils.handlers.columns;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
+import java.sql.ResultSet;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
-import java.sql.ResultSet;
-
@RunWith(MockitoJUnitRunner.class)
public class ByteColumnHandlerTest extends AbstractTestColumnHandler {
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java
index 92eed1f..aa61e93 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java
@@ -19,12 +19,12 @@ package org.apache.commons.dbutils.handlers.columns;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
+import java.sql.ResultSet;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
-import java.sql.ResultSet;
-
@RunWith(MockitoJUnitRunner.class)
public class DoubleColumnHandlerTest extends AbstractTestColumnHandler
(commons-dbutils) branch master updated: Sort members
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
The following commit(s) were added to refs/heads/master by this push:
new a6cdeab Sort members
a6cdeab is described below
commit a6cdeab2145c61d135f42c1a71d8aca43c1113a5
Author: Gary Gregory
AuthorDate: Thu Nov 23 08:18:59 2023 -0500
Sort members
---
.../org/apache/commons/dbutils/BaseTestCase.java | 24 -
.../org/apache/commons/dbutils/MockResultSet.java | 58 +++---
.../columns/AbstractTestColumnHandler.java | 8 +--
.../wrappers/SqlNullCheckedResultSetTest.java | 4 +-
4 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
b/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
index e1ce7ed..8de88bc 100644
--- a/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
+++ b/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
@@ -79,6 +79,18 @@ public class BaseTestCase extends TestCase {
return MockResultSet.create(metaData, rows);
}
+public ResultSet getEmptyResultSet() {
+return this.emptyResultSet;
+}
+
+public ResultSet getResultSet() {
+return this.rs;
+}
+
+public void setResultSet(ResultSet resultSet) {
+this.rs = resultSet;
+}
+
/**
* This is called before each test method so ResultSet will be fresh each
time.
*
@@ -92,18 +104,6 @@ public class BaseTestCase extends TestCase {
emptyResultSet = MockResultSet.create(metaData, null);
}
-public ResultSet getResultSet() {
-return this.rs;
-}
-
-public ResultSet getEmptyResultSet() {
-return this.emptyResultSet;
-}
-
-public void setResultSet(ResultSet resultSet) {
-this.rs = resultSet;
-}
-
// Test which allows Eclipse to be run on full project (avoids no tests
found)
// check that the rows are valid for the column definition
public void testCheckDataSizes() {
diff --git a/src/test/java/org/apache/commons/dbutils/MockResultSet.java
b/src/test/java/org/apache/commons/dbutils/MockResultSet.java
index f919c16..a59b689 100644
--- a/src/test/java/org/apache/commons/dbutils/MockResultSet.java
+++ b/src/test/java/org/apache/commons/dbutils/MockResultSet.java
@@ -32,6 +32,8 @@ import java.util.Set;
*/
public class MockResultSet implements InvocationHandler {
+private static final Set METHOD_NAMES = Set.of("isLast",
"hashCode", "toString", "equals");
+
/**
* Create a {@code MockResultSet} proxy object. This is equivalent to:
*
@@ -54,8 +56,6 @@ public class MockResultSet implements InvocationHandler {
private Boolean wasNull = Boolean.FALSE;
-private static final Set METHOD_NAMES = Set.of("isLast",
"hashCode", "toString", "equals");
-
/**
* MockResultSet constructor.
*
@@ -267,33 +267,6 @@ public class MockResultSet implements InvocationHandler {
return obj == null ? null : obj.toString();
}
-@Override
-public Object invoke(final Object proxy, final Method method, final
Object[] args)
-throws Throwable {
-
-final String methodName = method.getName();
-if (methodName.equals("getMetaData")) {
-return this.getMetaData();
-}
-if (methodName.equals("next")) {
-return this.next();
-}
-if (methodName.equals("previous")) {
-// Handle previous method
-} else if (methodName.equals("close")) {
-// Handle close method
-} else if (isColumnMethod(methodName)) {
-return handleColumnMethod(methodName, args);
-} else if (METHOD_NAMES.contains(methodName)) {
-return handleNonColumnMethod(methodName, proxy, args);
-}
-throw new UnsupportedOperationException("Unsupported method: " +
methodName);
-}
-
-private boolean isColumnMethod(String methodName) {
-return methodName.startsWith("get") || methodName.equals("wasNull");
-}
-
private Object handleColumnMethod(String methodName, final Object[] args)
throws SQLException {
switch (methodName) {
case "getBoolean":
@@ -336,6 +309,33 @@ public class MockResultSet implements InvocationHandler {
}
}
+@Override
+public Object invoke(final Object proxy, final Method method, final
Object[] args)
+throws Throwable {
+
+final String methodName = method.getName();
+if (methodName.equals("getMetaData")) {
+return this.getMetaData();
+}
+if (methodName.equals("next")) {
+return this.next();
+}
+if (methodName.equals("previous")) {
+// Handle previous method
+} else if (methodName.equals("close")) {
+// Handle close method
+} else i
(commons-dbutils) branch master updated (a6cdeab -> c5c0887)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git from a6cdeab Sort members new 7204439 Fix BeanProcessor SpotBugs CT: Be wary of letting constructors throw exceptions. (CT_CONSTRUCTOR_THROW). new 1a31f8b Fix StatementConfiguration SpotBugs CT: Be wary of letting constructors throw exceptions. (CT_CONSTRUCTOR_THROW). new c5c0887 Bump commons-parent from 64 to 65 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- src/changes/changes.xml | 4 +++- src/main/java/org/apache/commons/dbutils/BeanProcessor.java | 6 ++ .../java/org/apache/commons/dbutils/StatementConfiguration.java | 6 ++ 4 files changed, 16 insertions(+), 2 deletions(-)
(commons-dbutils) 01/03: Fix BeanProcessor SpotBugs CT: Be wary of letting constructors throw exceptions. (CT_CONSTRUCTOR_THROW).
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
commit 72044396930684088bb3845a6b7d12839dfee8ff
Author: Gary Gregory
AuthorDate: Thu Nov 23 08:25:43 2023 -0500
Fix BeanProcessor SpotBugs CT: Be wary of letting constructors throw
exceptions. (CT_CONSTRUCTOR_THROW).
---
src/main/java/org/apache/commons/dbutils/BeanProcessor.java | 6 ++
1 file changed, 6 insertions(+)
diff --git a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
index 2d0b07c..18240ee 100644
--- a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
+++ b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
@@ -165,6 +165,12 @@ public class BeanProcessor {
return populateBean(resultSet, this.newInstance(type), props,
columnToProperty);
}
+/** Does nothing. */
+@Override
+protected final void finalize() {
+// SpotBugs CT_CONSTRUCTOR_THROW
+}
+
/**
* Gets the write method to use when setting {@code value} to the {@code
target}.
*
(commons-dbutils) 02/03: Fix StatementConfiguration SpotBugs CT: Be wary of letting constructors throw exceptions. (CT_CONSTRUCTOR_THROW).
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
commit 1a31f8b70c1453e72b3d25051ddb3d2109e649fb
Author: Gary Gregory
AuthorDate: Thu Nov 23 08:25:55 2023 -0500
Fix StatementConfiguration SpotBugs CT: Be wary of letting constructors
throw exceptions. (CT_CONSTRUCTOR_THROW).
---
src/changes/changes.xml | 2 ++
.../java/org/apache/commons/dbutils/StatementConfiguration.java | 6 ++
2 files changed, 8 insertions(+)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 44d520b..f17fb7d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -47,6 +47,8 @@ The type attribute can be add,update,fix,remove.
Switch on String instead of cascading if-else in MockResultSet
#220.
Encapsulate test fields #222.
+ Fix
BeanProcessor SpotBugs CT: Be wary of letting constructors throw exceptions.
(CT_CONSTRUCTOR_THROW).
+ Fix
StatementConfiguration SpotBugs CT: Be wary of letting constructors throw
exceptions. (CT_CONSTRUCTOR_THROW).
Bump Java
from 8 to 11.
diff --git
a/src/main/java/org/apache/commons/dbutils/StatementConfiguration.java
b/src/main/java/org/apache/commons/dbutils/StatementConfiguration.java
index da10a3d..6793b86 100644
--- a/src/main/java/org/apache/commons/dbutils/StatementConfiguration.java
+++ b/src/main/java/org/apache/commons/dbutils/StatementConfiguration.java
@@ -149,6 +149,12 @@ public class StatementConfiguration {
this(fetchDirection, fetchSize, maxFieldSize, maxRows,
Duration.ofSeconds(queryTimeout));
}
+/** Does nothing. */
+@Override
+protected final void finalize() {
+// SpotBugs CT_CONSTRUCTOR_THROW
+}
+
/**
* Gets the fetch direction.
*
(commons-dbutils) 03/03: Bump commons-parent from 64 to 65
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git commit c5c08879de874f01fc563c44eaa39c5a5e978405 Author: Gary Gregory AuthorDate: Thu Nov 23 08:27:10 2023 -0500 Bump commons-parent from 64 to 65 --- pom.xml | 2 +- src/changes/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f4d8392..d9d3694 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.apache.commons commons-parent -64 +65 4.0.0 commons-dbutils diff --git a/src/changes/changes.xml b/src/changes/changes.xml index f17fb7d..4f6bf90 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -52,7 +52,7 @@ The type attribute can be add,update,fix,remove. Bump Java from 8 to 11. - Bump commons-parent from 62 to 64. + Bump commons-parent from 62 to 65.
(commons-dbutils) branch master updated: Javadoc
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
The following commit(s) were added to refs/heads/master by this push:
new f673c91 Javadoc
f673c91 is described below
commit f673c91d158a081aed6e1936c10ac3c5f9cac9c2
Author: Gary Gregory
AuthorDate: Thu Nov 23 08:30:54 2023 -0500
Javadoc
Format tweaks
---
.../apache/commons/dbutils/BaseResultSetHandler.java | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java
b/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java
index 68ff351..959a541 100644
--- a/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java
@@ -40,14 +40,14 @@ import java.util.Map;
/**
* Extensions of this class convert ResultSets into other objects.
- *
- * According to the DRY principle (Don't Repeat Yourself), repeating
{@code resultSet}
- * variable inside the {@link ResultSetHandler#handle(ResultSet)} over and
over for each iteration
- * can get a little tedious, {@code AbstractResultSetHandler} implicitly gives
users access to
- * {@code ResultSet}'s methods.
- *
+ *
+ * According to the DRY principle (Don't Repeat Yourself), repeating
{@code resultSet} variable inside the {@link ResultSetHandler#handle(ResultSet)}
+ * over and over for each iteration can get a little tedious, {@code
AbstractResultSetHandler} implicitly gives users access to {@code ResultSet}'s
methods.
+ *
+ *
* NOTE This class is NOT thread safe!
- *
+ *
+ *
* @param the target type the input ResultSet will be converted to.
* @since 1.6
*/
@@ -59,8 +59,8 @@ public abstract class BaseResultSetHandler implements
ResultSetHandler {
private ResultSet resultSet;
/**
- * TODO.
-A */
+ * TODO. A
+ */
protected final boolean absolute(final int row) throws SQLException {
return resultSet.absolute(row);
}
(commons-io) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-io.git The following commit(s) were added to refs/heads/master by this push: new 5ecbd832 Checkstyle: @author tags are deprecated 5ecbd832 is described below commit 5ecbd832178716307d4f9e3fe03736461d763452 Author: Gary Gregory AuthorDate: Thu Nov 23 08:33:42 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index e8dab51b..24fc4b73 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -52,4 +52,11 @@ limitations under the License. + + + + + + +
(commons-beanutils) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git The following commit(s) were added to refs/heads/master by this push: new 6b470681 Checkstyle: @author tags are deprecated 6b470681 is described below commit 6b4706813e5e74288275a08cec5d38d72575ab36 Author: Gary Gregory AuthorDate: Thu Nov 23 08:35:08 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index 35c330e6..9245c01c 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -61,4 +61,11 @@ limitations under the License. + + + + + + +
(commons-cli) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-cli.git The following commit(s) were added to refs/heads/master by this push: new 06b357d Checkstyle: @author tags are deprecated 06b357d is described below commit 06b357d13ef74e6845f9e6c562d40d9b7b3acb5b Author: Gary Gregory AuthorDate: Thu Nov 23 08:36:26 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 8 1 file changed, 8 insertions(+) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index 1968db0..00f5e14 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -139,4 +139,12 @@ + + + + + + + +
(commons-collections) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-collections.git The following commit(s) were added to refs/heads/master by this push: new 1df5606b8 Checkstyle: @author tags are deprecated 1df5606b8 is described below commit 1df5606b821047e9cda52b728027d7ddb8e6fb4c Author: Gary Gregory AuthorDate: Thu Nov 23 08:37:25 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index eb410f1f7..d4b8cff4b 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -70,5 +70,12 @@ limitations under the License. - + + + + + + + +
(commons-compress) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-compress.git The following commit(s) were added to refs/heads/master by this push: new 3ac463fe4 Checkstyle: @author tags are deprecated 3ac463fe4 is described below commit 3ac463fe4dd3bfcc9a04ea3524c49942fc254a32 Author: Gary Gregory AuthorDate: Thu Nov 23 08:38:37 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 63 + 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index d87695d4e..f49489e08 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -15,56 +15,57 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - https://checkstyle.org/dtds/configuration_1_3.dtd";> - - + + - + - - + + - + - - - - - - - - + + + + + + + + - - - + + + - - - - + + + + - - - - + + + + + + + + + + +
(commons-configuration) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-configuration.git The following commit(s) were added to refs/heads/master by this push: new ccf62992 Checkstyle: @author tags are deprecated ccf62992 is described below commit ccf62992926ea1ca69bc25ed84392576057280f9 Author: Gary Gregory AuthorDate: Thu Nov 23 08:40:13 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index 22a3dd1a..35383753 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -153,7 +153,12 @@ - - + + + + + + +
(commons-crypto) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-crypto.git The following commit(s) were added to refs/heads/master by this push: new b90c7549 Checkstyle: @author tags are deprecated b90c7549 is described below commit b90c7549d1aa7308dde69afeb65fdb8a06e3ddd1 Author: Gary Gregory AuthorDate: Thu Nov 23 08:41:07 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle/checkstyle.xml | 39 +- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/src/conf/checkstyle/checkstyle.xml b/src/conf/checkstyle/checkstyle.xml index 3a87f303..117517a0 100644 --- a/src/conf/checkstyle/checkstyle.xml +++ b/src/conf/checkstyle/checkstyle.xml @@ -15,37 +15,42 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - https://checkstyle.org/dtds/configuration_1_3.dtd";> - - + - + - + - - - - - - + + + + + + - + - - - - + + + + - + + + + + + + +
(commons-csv) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-csv.git The following commit(s) were added to refs/heads/master by this push: new 75b34c70 Checkstyle: @author tags are deprecated 75b34c70 is described below commit 75b34c70264b7359a0c2fa78d71e10ec2ad7bd4e Author: Gary Gregory AuthorDate: Thu Nov 23 08:41:50 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle/checkstyle.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/conf/checkstyle/checkstyle.xml b/src/conf/checkstyle/checkstyle.xml index 4ae1fec6..a19f8f53 100644 --- a/src/conf/checkstyle/checkstyle.xml +++ b/src/conf/checkstyle/checkstyle.xml @@ -70,6 +70,12 @@ limitations under the License. - + + + + + + +
(commons-dbcp) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git The following commit(s) were added to refs/heads/master by this push: new bcf8e0df Checkstyle: @author tags are deprecated bcf8e0df is described below commit bcf8e0dfb6c5156a7c638c0eed08d94ac4e93c42 Author: Gary Gregory AuthorDate: Thu Nov 23 08:43:00 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index 42be5f3e..99de2ffe 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -132,7 +132,12 @@ - - + + + + + + +
(commons-dbutils) branch master updated (f673c91 -> b626fb5)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git from f673c91 Javadoc new dcb476c Fix trailing whitespace new b626fb5 Checkstyle: @author tags are deprecated The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/conf/checkstyle/checkstyle.xml| 15 +++ .../org/apache/commons/dbutils/BaseResultSetHandler.java | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-)
(commons-dbutils) 02/02: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git commit b626fb5dc002005b25cc4a73654a9bf9ca68de26 Author: Gary Gregory AuthorDate: Thu Nov 23 08:44:25 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle/checkstyle.xml | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/conf/checkstyle/checkstyle.xml b/src/conf/checkstyle/checkstyle.xml index ab3bcc2..581021f 100644 --- a/src/conf/checkstyle/checkstyle.xml +++ b/src/conf/checkstyle/checkstyle.xml @@ -94,7 +94,6 @@ - @@ -113,12 +112,10 @@ - - @@ -129,13 +126,11 @@ - - @@ -145,7 +140,6 @@ - @@ -167,7 +161,6 @@ - @@ -182,5 +175,11 @@ - + + + + + + +
(commons-dbutils) 01/02: Fix trailing whitespace
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git commit dcb476cf311d399d85bbb1eb66551f1c18eaa8eb Author: Gary Gregory AuthorDate: Thu Nov 23 08:44:19 2023 -0500 Fix trailing whitespace --- src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java b/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java index 959a541..95703a2 100644 --- a/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java +++ b/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java @@ -47,7 +47,7 @@ import java.util.Map; * * NOTE This class is NOT thread safe! * - * + * * @param the target type the input ResultSet will be converted to. * @since 1.6 */
(commons-email) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-email.git The following commit(s) were added to refs/heads/master by this push: new 6c9794b Checkstyle: @author tags are deprecated 6c9794b is described below commit 6c9794bade1faea5bfd5cf3b5569c348c16eaf9b Author: Gary Gregory AuthorDate: Thu Nov 23 08:46:35 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index 8cb7fde..2857a97 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -146,7 +146,12 @@ - - + + + + + + +
(commons-exec) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-exec.git The following commit(s) were added to refs/heads/master by this push: new a88a97b Checkstyle: @author tags are deprecated a88a97b is described below commit a88a97b8798d2604d3ca971e1e37170247b1e1eb Author: Gary Gregory AuthorDate: Thu Nov 23 08:47:59 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 295 1 file changed, 146 insertions(+), 149 deletions(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index 47b9952..ddbf878 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -22,159 +22,156 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
(commons-fileupload) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git The following commit(s) were added to refs/heads/master by this push: new cdd93584 Checkstyle: @author tags are deprecated cdd93584 is described below commit cdd93584036ceb01c04c3065fc39c5aa32f57eca Author: Gary Gregory AuthorDate: Thu Nov 23 08:49:13 2023 -0500 Checkstyle: @author tags are deprecated --- src/checkstyle/fileupload_checks.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/checkstyle/fileupload_checks.xml b/src/checkstyle/fileupload_checks.xml index 28bfb745..cd31f3db 100644 --- a/src/checkstyle/fileupload_checks.xml +++ b/src/checkstyle/fileupload_checks.xml @@ -228,5 +228,11 @@ - + + + + + + +
(commons-imaging) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-imaging.git The following commit(s) were added to refs/heads/master by this push: new 56395a8a Checkstyle: @author tags are deprecated 56395a8a is described below commit 56395a8aea629b1c8fec6cd08ea5840703b4c284 Author: Gary Gregory AuthorDate: Thu Nov 23 08:50:16 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 63 + 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index d87695d4..f49489e0 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -15,56 +15,57 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - https://checkstyle.org/dtds/configuration_1_3.dtd";> - - + + - + - - + + - + - - - - - - - - + + + + + + + + - - - + + + - - - - + + + + - - - - + + + + + + + + + + +
(commons-jcs) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-jcs.git The following commit(s) were added to refs/heads/master by this push: new be908dc4 Checkstyle: @author tags are deprecated new 03e5f3e4 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-jcs be908dc4 is described below commit be908dc4fad2e114ee704e95c6957a3375f56daf Author: Gary Gregory AuthorDate: Thu Nov 23 08:51:57 2023 -0500 Checkstyle: @author tags are deprecated Longer lines --- checkstyle.xml | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/checkstyle.xml b/checkstyle.xml index 16c430ad..26f6da3f 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -60,7 +60,7 @@ - + @@ -171,7 +171,12 @@ - - + + + + + + +
(commons-logging) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-logging.git The following commit(s) were added to refs/heads/master by this push: new 64ea85b Checkstyle: @author tags are deprecated 64ea85b is described below commit 64ea85b0ca524211bda714edfe3576db1f05b727 Author: Gary Gregory AuthorDate: Thu Nov 23 08:53:54 2023 -0500 Checkstyle: @author tags are deprecated --- checkstyle.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/checkstyle.xml b/checkstyle.xml index 4dbcc4c..8618ab9 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -73,5 +73,11 @@ limitations under the License. - + + + + + + +
(commons-net) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-net.git The following commit(s) were added to refs/heads/master by this push: new 5b07e872 Checkstyle: @author tags are deprecated 5b07e872 is described below commit 5b07e8722592755636e9da308603e5b5897fafcc Author: Gary Gregory AuthorDate: Thu Nov 23 08:56:16 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index c73e4697..c3e02933 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -102,7 +102,13 @@ limitations under the License. - + + + + + + +
(commons-pool) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-pool.git The following commit(s) were added to refs/heads/master by this push: new 9be881a3 Checkstyle: @author tags are deprecated 9be881a3 is described below commit 9be881a3a6ee58a1521c7db7724cc63f31da356a Author: Gary Gregory AuthorDate: Thu Nov 23 08:57:31 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index a0033239..c089407d 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -83,5 +83,11 @@ - + + + + + + +
(commons-pool) branch POOL_2_X updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch POOL_2_X in repository https://gitbox.apache.org/repos/asf/commons-pool.git The following commit(s) were added to refs/heads/POOL_2_X by this push: new 2d253967 Checkstyle: @author tags are deprecated 2d253967 is described below commit 2d253967b20bf3b0b30640d92b6d6692e090866a Author: Gary Gregory AuthorDate: Thu Nov 23 09:02:35 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index a0033239..c089407d 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -83,5 +83,11 @@ - + + + + + + +
(commons-release-plugin) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-release-plugin.git The following commit(s) were added to refs/heads/master by this push: new 84d75ef Checkstyle: @author tags are deprecated 84d75ef is described below commit 84d75ef7641dc14ed081ba30ef342f7b2ba7b633 Author: Gary Gregory AuthorDate: Thu Nov 23 09:04:28 2023 -0500 Checkstyle: @author tags are deprecated --- checkstyle.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/checkstyle.xml b/checkstyle.xml index 1010ce2..6cf6c6a 100755 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -191,5 +191,11 @@ - + + + + + + +
(commons-scxml) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-scxml.git The following commit(s) were added to refs/heads/master by this push: new ef2f7b04 Checkstyle: @author tags are deprecated ef2f7b04 is described below commit ef2f7b0485f3f862afad90c33ff0ad3fa7f09883 Author: Gary Gregory AuthorDate: Thu Nov 23 09:05:12 2023 -0500 Checkstyle: @author tags are deprecated --- checkstyle.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/checkstyle.xml b/checkstyle.xml index f13238e6..bbb9c051 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -200,5 +200,11 @@ - + + + + + + +
(commons-rdf) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-rdf.git The following commit(s) were added to refs/heads/master by this push: new 347b8de1 Checkstyle: @author tags are deprecated 347b8de1 is described below commit 347b8de1b6299f44dda068f91e0b7bced7d50741 Author: Gary Gregory AuthorDate: Thu Nov 23 09:03:39 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index f81c7716..d03ca51e 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -198,6 +198,12 @@ limitations under the License. - + + + + + + +
(commons-text) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-text.git The following commit(s) were added to refs/heads/master by this push: new 0e15af9f Checkstyle: @author tags are deprecated 0e15af9f is described below commit 0e15af9f68f5b54b08102881dba8da277b072aa5 Author: Gary Gregory AuthorDate: Thu Nov 23 09:05:57 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index b98c717e..6cc80c46 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -182,5 +182,11 @@ - + + + + + + +
(commons-validator) branch master updated: Checkstyle: @author tags are deprecated
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-validator.git The following commit(s) were added to refs/heads/master by this push: new 938c831b Checkstyle: @author tags are deprecated 938c831b is described below commit 938c831b02e5a33b3889547c21bf25a2bd5c245e Author: Gary Gregory AuthorDate: Thu Nov 23 09:06:43 2023 -0500 Checkstyle: @author tags are deprecated --- src/conf/checkstyle.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index 8ce9863c..72f7d45a 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -153,5 +153,11 @@ - + + + + + + +
(commons-io) branch master updated (5ecbd832 -> 8c7a2313)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-io.git from 5ecbd832 Checkstyle: @author tags are deprecated new 613ab48e Javadoc new dd44d7d1 Javadoc new 8c7a2313 Javadoc The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/changes/changes.xml | 1 + src/main/java/org/apache/commons/io/IOUtils.java | 2 +- src/main/java/org/apache/commons/io/LineIterator.java | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-)
(commons-io) 03/03: Javadoc
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-io.git commit 8c7a2313277bb67d6a0c872786fd81a2cb1a1e9c Author: Gary Gregory AuthorDate: Thu Nov 23 09:42:47 2023 -0500 Javadoc --- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index cc57c611..b77ba06c 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -52,6 +52,7 @@ The type attribute can be add,update,fix,remove. Fix wrong issue id in change log #503. Add test for FileChannels.contentEquals() #509. Fix FileChannels.contentEquals(). + Fix some Javadoc issues in LineIterator and IOUtils. Bump org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.1.1 #512. Bump commons-lang3 from 3.13.0 to 3.14.0.
(commons-io) 02/03: Javadoc
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit dd44d7d170674295c667fe899b6c78a4c6142308
Author: Gary Gregory
AuthorDate: Thu Nov 23 09:42:42 2023 -0500
Javadoc
---
src/main/java/org/apache/commons/io/IOUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/io/IOUtils.java
b/src/main/java/org/apache/commons/io/IOUtils.java
index dfb4c19e..9752615a 100644
--- a/src/main/java/org/apache/commons/io/IOUtils.java
+++ b/src/main/java/org/apache/commons/io/IOUtils.java
@@ -1888,7 +1888,7 @@ public class IOUtils {
*
* @param reader the {@link Reader} to read, not null
* @return an Iterator of the lines in the reader, never null
- * @throws IllegalArgumentException if the reader is null
+ * @throws NullPointerException if the reader is null
* @since 1.2
*/
public static LineIterator lineIterator(final Reader reader) {
(commons-io) 01/03: Javadoc
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 613ab48e700fb97aff8ee078fd102979dad532c2
Author: Gary Gregory
AuthorDate: Thu Nov 23 09:42:33 2023 -0500
Javadoc
---
src/main/java/org/apache/commons/io/LineIterator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/LineIterator.java
b/src/main/java/org/apache/commons/io/LineIterator.java
index 437360da..28cb62e8 100644
--- a/src/main/java/org/apache/commons/io/LineIterator.java
+++ b/src/main/java/org/apache/commons/io/LineIterator.java
@@ -78,10 +78,10 @@ public class LineIterator implements Iterator,
Closeable {
* Constructs an iterator of the lines for a {@link Reader}.
*
* @param reader the {@link Reader} to read from, not null
- * @throws IllegalArgumentException if the reader is null
+ * @throws NullPointerException if the reader is null
*/
@SuppressWarnings("resource") // Caller closes Reader
-public LineIterator(final Reader reader) throws IllegalArgumentException {
+public LineIterator(final Reader reader) {
Objects.requireNonNull(reader, "reader");
if (reader instanceof BufferedReader) {
bufferedReader = (BufferedReader) reader;
(commons-io) branch master updated (8c7a2313 -> 512c183d)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-io.git from 8c7a2313 Javadoc new 0783bafe Format tweak new 512c183d Fix SpotBugs issues in DelegateFileFilter The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/changes/changes.xml | 2 ++ .../java/org/apache/commons/io/filefilter/DelegateFileFilter.java| 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-)
(commons-io) 02/02: Fix SpotBugs issues in DelegateFileFilter
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-io.git commit 512c183dc9eae68db766ec6cc432efdfb259c911 Author: Gary Gregory AuthorDate: Thu Nov 23 10:15:32 2023 -0500 Fix SpotBugs issues in DelegateFileFilter - [ERROR] Medium: Class org.apache.commons.io.filefilter.DelegateFileFilter defines non-transient non-serializable instance field fileFilter [org.apache.commons.io.filefilter.DelegateFileFilter] In DelegateFileFilter.java SE_BAD_FIELD - [ERROR] Medium: Class org.apache.commons.io.filefilter.DelegateFileFilter defines non-transient non-serializable instance field fileNameFilter [org.apache.commons.io.filefilter.DelegateFileFilter] In DelegateFileFilter.java SE_BAD_FIELD --- src/changes/changes.xml | 2 ++ .../java/org/apache/commons/io/filefilter/DelegateFileFilter.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index b77ba06c..8ce88278 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -53,6 +53,8 @@ The type attribute can be add,update,fix,remove. Add test for FileChannels.contentEquals() #509. Fix FileChannels.contentEquals(). Fix some Javadoc issues in LineIterator and IOUtils. + Fix SpotBugs error: Class org.apache.commons.io.filefilter.DelegateFileFilter defines non-transient non-serializable instance field fileFilter [org.apache.commons.io.filefilter.DelegateFileFilter] In DelegateFileFilter.java SE_BAD_FIELD. + Fix SpotBugs error: Class org.apache.commons.io.filefilter.DelegateFileFilter defines non-transient non-serializable instance field fileNameFilter [org.apache.commons.io.filefilter.DelegateFileFilter] In DelegateFileFilter.java SE_BAD_FIELD. Bump org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.1.1 #512. Bump commons-lang3 from 3.13.0 to 3.14.0. diff --git a/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java index 70c94818..e2d305c8 100644 --- a/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java @@ -38,9 +38,9 @@ public class DelegateFileFilter extends AbstractFileFilter implements Serializab private static final long serialVersionUID = -8723373124984771318L; /** The File filter */ -private final FileFilter fileFilter; +private transient final FileFilter fileFilter; /** The Filename filter */ -private final FilenameFilter fileNameFilter; +private transient final FilenameFilter fileNameFilter; /** * Constructs a delegate file filter around an existing FileFilter.
(commons-io) 01/02: Format tweak
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 0783bafeb0fe83221d516a595581c589aae6b198
Author: Gary Gregory
AuthorDate: Thu Nov 23 10:09:33 2023 -0500
Format tweak
---
src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java
index ee2bb02b..70c94818 100644
--- a/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java
@@ -36,6 +36,7 @@ import java.util.Objects;
public class DelegateFileFilter extends AbstractFileFilter implements
Serializable {
private static final long serialVersionUID = -8723373124984771318L;
+
/** The File filter */
private final FileFilter fileFilter;
/** The Filename filter */
(commons-jexl) branch master updated: JEXL-414: added performance tests; - added another JexlCache implementation for testing; - only kept one implementation as default;
This is an automated email from the ASF dual-hosted git repository.
henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
The following commit(s) were added to refs/heads/master by this push:
new b3689079 JEXL-414: added performance tests; - added another JexlCache
implementation for testing; - only kept one implementation as default;
b3689079 is described below
commit b36890794bcbef32acc6b11899e5848f10905609
Author: Henri Biestro
AuthorDate: Thu Nov 23 16:39:02 2023 +0100
JEXL-414: added performance tests;
- added another JexlCache implementation for testing;
- only kept one implementation as default;
---
RELEASE-NOTES.txt | 1 +
pom.xml| 1 +
src/changes/changes.xml| 3 +
.../java/org/apache/commons/jexl3/JexlBuilder.java | 3 +-
.../java/org/apache/commons/jexl3/JexlCache.java | 24 +--
.../apache/commons/jexl3/internal/SoftCache.java | 144 ++---
.../apache/commons/jexl3/CachePerformanceTest.java | 179 +
.../java/org/apache/commons/jexl3/CacheTest.java | 3 +-
.../org/apache/commons/jexl3}/ConcurrentCache.java | 15 +-
.../java/org/apache/commons/jexl3/SpreadCache.java | 147 +
10 files changed, 397 insertions(+), 123 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 1d173c6f..ef675164 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -38,6 +38,7 @@ New Features in 3.3.1:
Bugs Fixed in 3.3.1:
===
* JEXL-415: Incorrect template eval result
+* JEXL-414: SoftCache may suffer from race conditions
* JEXL-412: Ambiguous syntax between namespace function call and map
object definition.
* JEXL-410: JexlFeatures: ctor does not enable all features
* JEXL-409: Disable LEXICAL should disable LEXICAL_SHADE
diff --git a/pom.xml b/pom.xml
index 04f3cf3b..482ba00b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,6 +126,7 @@
com.googlecode.concurrentlinkedhashmap
concurrentlinkedhashmap-lru
1.4.2
+test
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 80fc9107..48c734d0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -45,6 +45,9 @@
Incorrect template eval result.
+
+SoftCache may suffer from race conditions
+
Ambiguous syntax between namespace function call and map
object definition.
diff --git a/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
b/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
index b67640d7..babc6655 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.function.IntFunction;
import org.apache.commons.jexl3.internal.Engine;
+import org.apache.commons.jexl3.internal.SoftCache;
import org.apache.commons.jexl3.introspection.JexlPermissions;
import org.apache.commons.jexl3.introspection.JexlSandbox;
import org.apache.commons.jexl3.introspection.JexlUberspect;
@@ -134,7 +135,7 @@ public class JexlBuilder {
private int cache = -1;
/** The cache class factory. */
-private IntFunction> cacheFactory =
JexlCache.createConcurrent();
+private IntFunction> cacheFactory = SoftCache::new;
/** The stack overflow limit. */
private int stackOverflow = Integer.MAX_VALUE;
diff --git a/src/main/java/org/apache/commons/jexl3/JexlCache.java
b/src/main/java/org/apache/commons/jexl3/JexlCache.java
index c7776e02..1b13c04f 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlCache.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlCache.java
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.Map;
import java.util.function.IntFunction;
-import org.apache.commons.jexl3.internal.ConcurrentCache;
import org.apache.commons.jexl3.internal.SoftCache;
/**
@@ -31,7 +30,14 @@ import org.apache.commons.jexl3.internal.SoftCache;
*/
public interface JexlCache {
/**
- * Returns the cache size.
+ * Returns the cache capacity, the maximum number of elements it can contain.
+ *
+ * @return the cache capacity
+ */
+ int capacity();
+
+ /**
+ * Returns the cache size, the actual number of elements it contains.
*
* @return the cache size
*/
@@ -69,18 +75,4 @@ public interface JexlCache {
default Collection> entries() {
return Collections.emptyList();
}
-
- /**
- * @return a synchronized cache factory amenable to low concurrency usage
- */
- static IntFunction> createSynchronized() {
-return SoftCache::new;
- }
-
- /**
- * @return a concurrent cache factory amenable to high concurrency usage
- */
- static IntFunction> createConcurrent() {
(commons-jexl) branch master updated: JEXL-414: added performance tests; - added another JexlCache implementation for testing; - only kept one implementation as default;
This is an automated email from the ASF dual-hosted git repository.
henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
The following commit(s) were added to refs/heads/master by this push:
new 2255bb35 JEXL-414: added performance tests; - added another JexlCache
implementation for testing; - only kept one implementation as default;
2255bb35 is described below
commit 2255bb3584e4102e401b15ab1f888f9169ad8bc8
Author: Henri Biestro
AuthorDate: Thu Nov 23 16:42:47 2023 +0100
JEXL-414: added performance tests;
- added another JexlCache implementation for testing;
- only kept one implementation as default;
---
src/test/java/org/apache/commons/jexl3/CachePerformanceTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/commons/jexl3/CachePerformanceTest.java
b/src/test/java/org/apache/commons/jexl3/CachePerformanceTest.java
index 4906f988..86c23052 100644
--- a/src/test/java/org/apache/commons/jexl3/CachePerformanceTest.java
+++ b/src/test/java/org/apache/commons/jexl3/CachePerformanceTest.java
@@ -124,7 +124,7 @@ public class CachePerformanceTest {
for (int c = 0; c < CACHED; ++c) {
final int ctl = rnd.nextInt(SCRIPTS);
for (int r = 0; r < HIT; ++r) {
-JexlScript script = jexl.createScript(Integer.toString(ctl) +
" + 42 - 42");
+JexlScript script = jexl.createScript(Integer.toString(ctl));
Object result = script.execute(null);
assert ((Number) result).intValue() == ctl;
count += 1;
(commons-jexl) branch master updated: JEXL-414: removed unused import;
This is an automated email from the ASF dual-hosted git repository. henrib pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-jexl.git The following commit(s) were added to refs/heads/master by this push: new 44963a75 JEXL-414: removed unused import; 44963a75 is described below commit 44963a75e242dbb758fff18b1edd4a3041631d06 Author: Henri Biestro AuthorDate: Thu Nov 23 17:01:45 2023 +0100 JEXL-414: removed unused import; --- src/main/java/org/apache/commons/jexl3/JexlCache.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/org/apache/commons/jexl3/JexlCache.java b/src/main/java/org/apache/commons/jexl3/JexlCache.java index 1b13c04f..ff6afb1c 100644 --- a/src/main/java/org/apache/commons/jexl3/JexlCache.java +++ b/src/main/java/org/apache/commons/jexl3/JexlCache.java @@ -19,9 +19,6 @@ package org.apache.commons.jexl3; import java.util.Collection; import java.util.Collections; import java.util.Map; -import java.util.function.IntFunction; - -import org.apache.commons.jexl3.internal.SoftCache; /** * Caching scripts or templates interface.
(commons-jexl) branch master updated: JEXL-416: fixed edge case of null pragma value; - added unit test;
This is an automated email from the ASF dual-hosted git repository.
henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
The following commit(s) were added to refs/heads/master by this push:
new 0a2e9432 JEXL-416: fixed edge case of null pragma value; - added unit
test;
0a2e9432 is described below
commit 0a2e94323a642cc224b1b97ce28e87aaf073408e
Author: Henri Biestro
AuthorDate: Thu Nov 23 17:04:41 2023 +0100
JEXL-416: fixed edge case of null pragma value;
- added unit test;
---
RELEASE-NOTES.txt | 1 +
src/changes/changes.xml| 3 +++
.../apache/commons/jexl3/parser/JexlParser.java| 24 +-
.../java/org/apache/commons/jexl3/PragmaTest.java | 9
4 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index ef675164..5de131f8 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -37,6 +37,7 @@ New Features in 3.3.1:
Bugs Fixed in 3.3.1:
===
+* JEXL-416: Null-valued pragma throws NPE in 3.3
* JEXL-415: Incorrect template eval result
* JEXL-414: SoftCache may suffer from race conditions
* JEXL-412: Ambiguous syntax between namespace function call and map
object definition.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 48c734d0..d058c067 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -42,6 +42,9 @@
Allow 'trailing commas' or ellipsis while defining array, map
and set literals
+
+Null-valued pragma throws NPE in 3.3
+
Incorrect template eval result.
diff --git a/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
b/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
index fa5f127f..5b6f1147 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
@@ -562,16 +562,20 @@ public abstract class JexlParser extends StringParser {
}
}
// merge new value into a set created on the fly if key is already
mapped
-pragmas.merge(key, value, (previous, newValue)->{
-if (previous instanceof Set) {
-((Set) previous).add(newValue);
-return previous;
-}
-final Set values = new LinkedHashSet<>();
-values.add(previous);
-values.add(newValue);
-return values;
-});
+if (value == null) {
+pragmas.putIfAbsent(key, null);
+} else {
+pragmas.merge(key, value, (previous, newValue) -> {
+if (previous instanceof Set) {
+((Set) previous).add(newValue);
+return previous;
+}
+final Set values = new LinkedHashSet<>();
+values.add(previous);
+values.add(newValue);
+return values;
+});
+}
}
/**
diff --git a/src/test/java/org/apache/commons/jexl3/PragmaTest.java
b/src/test/java/org/apache/commons/jexl3/PragmaTest.java
index a80ed537..95ba9068 100644
--- a/src/test/java/org/apache/commons/jexl3/PragmaTest.java
+++ b/src/test/java/org/apache/commons/jexl3/PragmaTest.java
@@ -376,4 +376,13 @@ public class PragmaTest extends JexlTestCase {
final Object result = script.execute(jc);
Assert.assertEquals(42, result);
}
+
+@Test
+public void testIssue416() {
+final JexlEngine jexl = new JexlBuilder().create();
+JexlScript script = jexl.createScript("#pragma myNull null\n");
+Map pragmas = script.getPragmas();
+Assert.assertTrue("pragma key present?",
pragmas.containsKey("myNull"));
+Assert.assertNull("expected null value", pragmas.get("myNull"));
+}
}
(commons-io) branch master updated: Avoid NullPointerException in RegexFileFilter.RegexFileFilter(Pattern).
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new 94d36ef6 Avoid NullPointerException in
RegexFileFilter.RegexFileFilter(Pattern).
94d36ef6 is described below
commit 94d36ef673bdd58b53da0f0283b22f1852adc7ca
Author: Gary Gregory
AuthorDate: Thu Nov 23 11:16:41 2023 -0500
Avoid NullPointerException in RegexFileFilter.RegexFileFilter(Pattern).
Avoid NullPointerException in RegexFileFilter.accept(Path,
BasicFileAttributes)
---
src/changes/changes.xml| 2 ++
.../java/org/apache/commons/io/filefilter/RegexFileFilter.java | 7 ---
.../java/org/apache/commons/io/filefilter/RegexFileFilterTest.java | 4 +++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 8ce88278..3fe59b8f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -53,6 +53,8 @@ The type attribute can be add,update,fix,remove.
Add test for FileChannels.contentEquals() #509.
Fix
FileChannels.contentEquals().
Fix some Javadoc
issues in LineIterator and IOUtils.
+ Avoid
NullPointerException in RegexFileFilter.RegexFileFilter(Pattern).
+ Avoid
NullPointerException in RegexFileFilter.accept(Path,
BasicFileAttributes).
Fix SpotBugs
error: Class org.apache.commons.io.filefilter.DelegateFileFilter defines
non-transient non-serializable instance field fileFilter
[org.apache.commons.io.filefilter.DelegateFileFilter] In
DelegateFileFilter.java SE_BAD_FIELD.
Fix SpotBugs
error: Class org.apache.commons.io.filefilter.DelegateFileFilter defines
non-transient non-serializable instance field fileNameFilter
[org.apache.commons.io.filefilter.DelegateFileFilter] In
DelegateFileFilter.java SE_BAD_FIELD.
diff --git
a/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
index 9bcdd806..7c3067c4 100644
--- a/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
@@ -111,7 +111,7 @@ public class RegexFileFilter extends AbstractFileFilter
implements Serializable
*/
@SuppressWarnings("unchecked")
public RegexFileFilter(final Pattern pattern) {
-this(pattern, (Function & Serializable) p ->
p.getFileName().toString());
+this(pattern, (Function & Serializable) p ->
Objects.toString(p.getFileName(), null));
}
/**
@@ -125,7 +125,7 @@ public class RegexFileFilter extends AbstractFileFilter
implements Serializable
public RegexFileFilter(final Pattern pattern, final Function
pathToString) {
Objects.requireNonNull(pattern, "pattern");
this.pattern = pattern;
-this.pathToString = pathToString;
+this.pathToString = pathToString != null ? pathToString :
Objects::toString;
}
/**
@@ -181,7 +181,8 @@ public class RegexFileFilter extends AbstractFileFilter
implements Serializable
*/
@Override
public FileVisitResult accept(final Path path, final BasicFileAttributes
attributes) {
-return
toFileVisitResult(pattern.matcher(pathToString.apply(path)).matches());
+final String result = pathToString.apply(path);
+return toFileVisitResult(result != null &&
pattern.matcher(result).matches());
}
/**
diff --git
a/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTest.java
b/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTest.java
index c0571299..bfdd0377 100644
--- a/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTest.java
+++ b/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTest.java
@@ -166,7 +166,9 @@ public class RegexFileFilterTest {
final String patternStr = "Foo.*";
assertFiltering(assertSerializable(new RegexFileFilter(patternStr)),
path, true);
assertFiltering(assertSerializable(new
RegexFileFilter(Pattern.compile(patternStr), (Function &
Serializable) Path::toString)), path,
-false);
+false);
+assertFiltering(new RegexFileFilter(Pattern.compile(patternStr),
(Function & Serializable) null), path, false);
+assertFiltering(new RegexFileFilter(Pattern.compile(patternStr),
(Function & Serializable) p -> null), path, false);
}
}
(commons-io) branch master updated: Fix SpotBugs error: Class org.apache.commons.io.filefilter.RegexFileFilter defines non-transient non-serializable instance field pathToString [org.apache.commons.io
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new 509395d0 Fix SpotBugs error: Class
org.apache.commons.io.filefilter.RegexFileFilter defines non-transient
non-serializable instance field pathToString
[org.apache.commons.io.filefilter.RegexFileFilter] In RegexFileFilter.java
SE_BAD_FIELD
509395d0 is described below
commit 509395d05399509715c63197437fb307ae76e647
Author: Gary Gregory
AuthorDate: Thu Nov 23 11:18:53 2023 -0500
Fix SpotBugs error: Class
org.apache.commons.io.filefilter.RegexFileFilter defines non-transient
non-serializable instance field pathToString
[org.apache.commons.io.filefilter.RegexFileFilter] In
RegexFileFilter.java SE_BAD_FIELD
---
src/changes/changes.xml| 1 +
.../commons/io/filefilter/RegexFileFilter.java | 2 +-
.../commons/io/filefilter/RegexFileFilterTest.java | 23 +++---
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3fe59b8f..c46bb862 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -55,6 +55,7 @@ The type attribute can be add,update,fix,remove.
Fix some Javadoc
issues in LineIterator and IOUtils.
Avoid
NullPointerException in RegexFileFilter.RegexFileFilter(Pattern).
Avoid
NullPointerException in RegexFileFilter.accept(Path,
BasicFileAttributes).
+ Fix SpotBugs
error: Class org.apache.commons.io.filefilter.RegexFileFilter defines
non-transient non-serializable instance field pathToString
[org.apache.commons.io.filefilter.RegexFileFilter] In RegexFileFilter.java
SE_BAD_FIELD.
Fix SpotBugs
error: Class org.apache.commons.io.filefilter.DelegateFileFilter defines
non-transient non-serializable instance field fileFilter
[org.apache.commons.io.filefilter.DelegateFileFilter] In
DelegateFileFilter.java SE_BAD_FIELD.
Fix SpotBugs
error: Class org.apache.commons.io.filefilter.DelegateFileFilter defines
non-transient non-serializable instance field fileNameFilter
[org.apache.commons.io.filefilter.DelegateFileFilter] In
DelegateFileFilter.java SE_BAD_FIELD.
diff --git
a/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
index 7c3067c4..757b1353 100644
--- a/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
@@ -101,7 +101,7 @@ public class RegexFileFilter extends AbstractFileFilter
implements Serializable
private final Pattern pattern;
/** How convert a path to a string. */
-private final Function pathToString;
+private transient final Function pathToString;
/**
* Constructs a new regular expression filter for a compiled regular
expression
diff --git
a/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTest.java
b/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTest.java
index bfdd0377..181d13b9 100644
--- a/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTest.java
+++ b/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTest.java
@@ -42,20 +42,16 @@ public class RegexFileFilterTest {
public void assertFiltering(final IOFileFilter filter, final File file,
final boolean expected) {
// Note. This only tests the (File, String) version if the parent of
-// the File passed in is not null
-assertEquals(expected, filter.accept(file),
-"Filter(File) " + filter.getClass().getName() + " not " +
expected + " for " + file);
+// the File passed in is not null
+assertEquals(expected, filter.accept(file), "Filter(File) " +
filter.getClass().getName() + " not " + expected + " for " + file);
if (file != null && file.getParentFile() != null) {
assertEquals(expected, filter.accept(file.getParentFile(),
file.getName()),
"Filter(File, String) " + filter.getClass().getName() + "
not " + expected + " for " + file);
-assertEquals(expected, filter.matches(file.toPath()),
-"Filter(File, String) " + filter.getClass().getName() + "
not " + expected + " for " + file);
+assertEquals(expected, filter.matches(file.toPath()),
"Filter(File, String) " + filter.getClass().getName() + " not " + expected + "
for " + file);
} else if (file == null) {
-assertEquals(expected, filter.accept(file),
-"Filter(File, String) " + filter.getClass().getName() + "
not " + expected + " for null");
-assertEquals(expected, filter.matches(null),
-"Filter(File, String) " + filter.getClass().getName() + "
n
(commons-io) branch master updated: Fix SpotBugs error: org.apache.commons.io.function.IOStream$1.next() cannot throw NoSuchElementException [org.apache.commons.io.function.IOStream$1] At IOStream.jav
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new 7fd53e9f Fix SpotBugs error:
org.apache.commons.io.function.IOStream$1.next() cannot throw
NoSuchElementException [org.apache.commons.io.function.IOStream$1] At
IOStream.java:[line 98] IT_NO_SUCH_ELEMENT
7fd53e9f is described below
commit 7fd53e9f0a8b2ce09a1a5f364e8838c74e292b7c
Author: Gary Gregory
AuthorDate: Thu Nov 23 11:33:22 2023 -0500
Fix SpotBugs error: org.apache.commons.io.function.IOStream$1.next()
cannot throw NoSuchElementException
[org.apache.commons.io.function.IOStream$1] At IOStream.java:[line 98]
IT_NO_SUCH_ELEMENT
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/commons/io/function/IOStream.java| 11 +--
.../java/org/apache/commons/io/function/IOStreamTest.java | 3 ++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c46bb862..6518d1dc 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -58,6 +58,7 @@ The type attribute can be add,update,fix,remove.
Fix SpotBugs
error: Class org.apache.commons.io.filefilter.RegexFileFilter defines
non-transient non-serializable instance field pathToString
[org.apache.commons.io.filefilter.RegexFileFilter] In RegexFileFilter.java
SE_BAD_FIELD.
Fix SpotBugs
error: Class org.apache.commons.io.filefilter.DelegateFileFilter defines
non-transient non-serializable instance field fileFilter
[org.apache.commons.io.filefilter.DelegateFileFilter] In
DelegateFileFilter.java SE_BAD_FIELD.
Fix SpotBugs
error: Class org.apache.commons.io.filefilter.DelegateFileFilter defines
non-transient non-serializable instance field fileNameFilter
[org.apache.commons.io.filefilter.DelegateFileFilter] In
DelegateFileFilter.java SE_BAD_FIELD.
+ Fix SpotBugs
error: org.apache.commons.io.function.IOStream$1.next() cannot throw
NoSuchElementException [org.apache.commons.io.function.IOStream$1] At
IOStream.java:[line 98] IT_NO_SUCH_ELEMENT.
Bump
org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.1.1 #512.
Bump
commons-lang3 from 3.13.0 to 3.14.0.
diff --git a/src/main/java/org/apache/commons/io/function/IOStream.java
b/src/main/java/org/apache/commons/io/function/IOStream.java
index 5e78e6c9..3eac5bfb 100644
--- a/src/main/java/org/apache/commons/io/function/IOStream.java
+++ b/src/main/java/org/apache/commons/io/function/IOStream.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.Optional;
import java.util.Spliterator;
@@ -93,8 +94,14 @@ public interface IOStream extends IOBaseStream, Stream> {
}
@Override
-public T next() {
-return t = t == IOStreams.NONE ? seed : Erase.apply(f, t);
+public T next() throws NoSuchElementException {
+try {
+return t = t == IOStreams.NONE ? seed : f.apply(t);
+} catch (IOException e) {
+final NoSuchElementException nsee = new
NoSuchElementException();
+nsee.initCause(e);
+throw nsee;
+}
}
};
return
adapt(StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator,
Spliterator.ORDERED | Spliterator.IMMUTABLE), false));
diff --git a/src/test/java/org/apache/commons/io/function/IOStreamTest.java
b/src/test/java/org/apache/commons/io/function/IOStreamTest.java
index 3e2ef9c5..08f7e445 100644
--- a/src/test/java/org/apache/commons/io/function/IOStreamTest.java
+++ b/src/test/java/org/apache/commons/io/function/IOStreamTest.java
@@ -29,6 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
+import java.util.NoSuchElementException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
@@ -296,7 +297,7 @@ public class IOStreamTest {
final IOStream stream = IOStream.iterate(1L,
TestUtils.throwingIOUnaryOperator());
final IOIterator iterator = stream.iterator();
assertEquals(1L, iterator.next());
-assertThrows(IOException.class, () -> iterator.next());
+assertThrows(NoSuchElementException.class, () -> iterator.next());
}
@SuppressWarnings("resource") // custom stream not recognized by compiler
warning machinery
(commons-io) branch master updated: Fix SpotBugs errors
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new c39be8e3 Fix SpotBugs errors
c39be8e3 is described below
commit c39be8e39a24198725a105170464b74c40ba1083
Author: Gary Gregory
AuthorDate: Thu Nov 23 11:57:05 2023 -0500
Fix SpotBugs errors
- [ERROR] Medium: Class
org.apache.commons.io.monitor.FileAlterationObserver defines
non-transient non-serializable instance field fileFilter
[org.apache.commons.io.monitor.FileAlterationObserver] In
FileAlterationObserver.java SE_BAD_FIELD
- [ERROR] Medium: Class
org.apache.commons.io.monitor.FileAlterationObserver defines
non-transient non-serializable instance field listeners
[org.apache.commons.io.monitor.FileAlterationObserver] In
FileAlterationObserver.java SE_BAD_FIELD
---
src/changes/changes.xml | 2 ++
.../java/org/apache/commons/io/monitor/FileAlterationObserver.java| 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6518d1dc..741fd2d9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -59,6 +59,8 @@ The type attribute can be add,update,fix,remove.
Fix SpotBugs
error: Class org.apache.commons.io.filefilter.DelegateFileFilter defines
non-transient non-serializable instance field fileFilter
[org.apache.commons.io.filefilter.DelegateFileFilter] In
DelegateFileFilter.java SE_BAD_FIELD.
Fix SpotBugs
error: Class org.apache.commons.io.filefilter.DelegateFileFilter defines
non-transient non-serializable instance field fileNameFilter
[org.apache.commons.io.filefilter.DelegateFileFilter] In
DelegateFileFilter.java SE_BAD_FIELD.
Fix SpotBugs
error: org.apache.commons.io.function.IOStream$1.next() cannot throw
NoSuchElementException [org.apache.commons.io.function.IOStream$1] At
IOStream.java:[line 98] IT_NO_SUCH_ELEMENT.
+ Fix SpotBugs
error: Class org.apache.commons.io.monitor.FileAlterationObserver defines
non-transient non-serializable instance field fileFilter
[org.apache.commons.io.monitor.FileAlterationObserver] In
FileAlterationObserver.java SE_BAD_FIELD.
+ Fix SpotBugs
error: Class org.apache.commons.io.monitor.FileAlterationObserver defines
non-transient non-serializable instance field listeners
[org.apache.commons.io.monitor.FileAlterationObserver] In
FileAlterationObserver.java SE_BAD_FIELD.
Bump
org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.1.1 #512.
Bump
commons-lang3 from 3.13.0 to 3.14.0.
diff --git
a/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
b/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
index d34e825b..33311b53 100644
--- a/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
+++ b/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
@@ -128,9 +128,9 @@ import org.apache.commons.io.comparator.NameFileComparator;
public class FileAlterationObserver implements Serializable {
private static final long serialVersionUID = 118515658782848L;
-private final List listeners = new
CopyOnWriteArrayList<>();
+private transient final List listeners = new
CopyOnWriteArrayList<>();
private final FileEntry rootEntry;
-private final FileFilter fileFilter;
+private transient final FileFilter fileFilter;
private final Comparator comparator;
/**
(commons-io) branch master updated: Fix SpotBugs error
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new 05e745f7 Fix SpotBugs error
05e745f7 is described below
commit 05e745f77e57475832c3fdc3520ee14dfb9412d2
Author: Gary Gregory
AuthorDate: Thu Nov 23 12:03:58 2023 -0500
Fix SpotBugs error
[ERROR] Medium:
org.apache.commons.io.FileCleaningTracker.getDeleteFailures() may expose
internal representation by returning FileCleaningTracker.deleteFailures
[org.apache.commons.io.FileCleaningTracker] At
FileCleaningTracker.java:[line 218] EI_EXPOSE_REP
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/commons/io/FileCleaningTracker.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 741fd2d9..24b75e50 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -61,6 +61,7 @@ The type attribute can be add,update,fix,remove.
Fix SpotBugs
error: org.apache.commons.io.function.IOStream$1.next() cannot throw
NoSuchElementException [org.apache.commons.io.function.IOStream$1] At
IOStream.java:[line 98] IT_NO_SUCH_ELEMENT.
Fix SpotBugs
error: Class org.apache.commons.io.monitor.FileAlterationObserver defines
non-transient non-serializable instance field fileFilter
[org.apache.commons.io.monitor.FileAlterationObserver] In
FileAlterationObserver.java SE_BAD_FIELD.
Fix SpotBugs
error: Class org.apache.commons.io.monitor.FileAlterationObserver defines
non-transient non-serializable instance field listeners
[org.apache.commons.io.monitor.FileAlterationObserver] In
FileAlterationObserver.java SE_BAD_FIELD.
+ Fix SpotBugs
error: org.apache.commons.io.FileCleaningTracker.getDeleteFailures() may expose
internal representation by returning FileCleaningTracker.deleteFailures
[org.apache.commons.io.FileCleaningTracker] At FileCleaningTracker.java:[line
218] EI_EXPOSE_REP.
Bump
org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.1.1 #512.
Bump
commons-lang3 from 3.13.0 to 3.14.0.
diff --git a/src/main/java/org/apache/commons/io/FileCleaningTracker.java
b/src/main/java/org/apache/commons/io/FileCleaningTracker.java
index 98c33b0d..cd0ca864 100644
--- a/src/main/java/org/apache/commons/io/FileCleaningTracker.java
+++ b/src/main/java/org/apache/commons/io/FileCleaningTracker.java
@@ -209,13 +209,13 @@ public class FileCleaningTracker {
}
/**
- * Gets the file paths that failed to delete.
+ * Gets a copy of the file paths that failed to delete.
*
- * @return the file paths that failed to delete
+ * @return a copy of the file paths that failed to delete
* @since 2.0
*/
public List getDeleteFailures() {
-return deleteFailures;
+return new ArrayList<>(deleteFailures);
}
/**
(commons-io) branch master updated: Fix SpotBugs errors
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new 4a3e4f28 Fix SpotBugs errors
4a3e4f28 is described below
commit 4a3e4f284477ac6a43fea2f0c2cb0e210483c627
Author: Gary Gregory
AuthorDate: Thu Nov 23 12:07:30 2023 -0500
Fix SpotBugs errors
- [ERROR] Medium: org.apache.commons.io.IOExceptionList.getCauseList()
may expose internal representation by returning
IOExceptionList.causeList [org.apache.commons.io.IOExceptionList] At
IOExceptionList.java:[line 118] EI_EXPOSE_REP
- [ERROR] Medium:
org.apache.commons.io.IOExceptionList.getCauseList(Class) may expose
internal representation by returning IOExceptionList.causeList
[org.apache.commons.io.IOExceptionList] At IOExceptionList.java:[line
129] EI_EXPOSE_REP
---
src/changes/changes.xml | 2 ++
src/main/java/org/apache/commons/io/IOExceptionList.java | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 24b75e50..a0d4e4e1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -62,6 +62,8 @@ The type attribute can be add,update,fix,remove.
Fix SpotBugs
error: Class org.apache.commons.io.monitor.FileAlterationObserver defines
non-transient non-serializable instance field fileFilter
[org.apache.commons.io.monitor.FileAlterationObserver] In
FileAlterationObserver.java SE_BAD_FIELD.
Fix SpotBugs
error: Class org.apache.commons.io.monitor.FileAlterationObserver defines
non-transient non-serializable instance field listeners
[org.apache.commons.io.monitor.FileAlterationObserver] In
FileAlterationObserver.java SE_BAD_FIELD.
Fix SpotBugs
error: org.apache.commons.io.FileCleaningTracker.getDeleteFailures() may expose
internal representation by returning FileCleaningTracker.deleteFailures
[org.apache.commons.io.FileCleaningTracker] At FileCleaningTracker.java:[line
218] EI_EXPOSE_REP.
+ Fix SpotBugs
error: org.apache.commons.io.IOExceptionList.getCauseList() may expose internal
representation by returning IOExceptionList.causeList
[org.apache.commons.io.IOExceptionList] At IOExceptionList.java:[line 118]
EI_EXPOSE_REP.
+ Fix SpotBugs
error: org.apache.commons.io.IOExceptionList.getCauseList(Class) may expose
internal representation by returning IOExceptionList.causeList
[org.apache.commons.io.IOExceptionList] At IOExceptionList.java:[line 129]
EI_EXPOSE_REP.
Bump
org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.1.1 #512.
Bump
commons-lang3 from 3.13.0 to 3.14.0.
diff --git a/src/main/java/org/apache/commons/io/IOExceptionList.java
b/src/main/java/org/apache/commons/io/IOExceptionList.java
index 8ee519b5..c8bd4bf9 100644
--- a/src/main/java/org/apache/commons/io/IOExceptionList.java
+++ b/src/main/java/org/apache/commons/io/IOExceptionList.java
@@ -18,6 +18,7 @@
package org.apache.commons.io;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -115,7 +116,7 @@ public class IOExceptionList extends IOException implements
Iterable
* @return The list of causes.
*/
public List getCauseList() {
-return (List) causeList;
+return (List) new ArrayList<>(causeList);
}
/**
@@ -126,7 +127,7 @@ public class IOExceptionList extends IOException implements
Iterable
* @return The list of causes.
*/
public List getCauseList(final Class clazz) {
-return (List) causeList;
+return (List) new ArrayList<>(causeList);
}
@Override
(commons-crypto) branch unused created (now 8e45a6f1)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch unused in repository https://gitbox.apache.org/repos/asf/commons-crypto.git at 8e45a6f1 These appear to be unused This branch includes the following new commits: new 8e45a6f1 These appear to be unused The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(commons-crypto) 01/01: These appear to be unused
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch unused
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
commit 8e45a6f192c98a62d45c9bac424eabe9cf16e975
Author: Sebb
AuthorDate: Thu Nov 23 17:08:39 2023 +
These appear to be unused
---
.../commons/crypto/org_apache_commons_crypto.h | 41 --
.../random/org_apache_commons_crypto_random.h | 2 --
2 files changed, 43 deletions(-)
diff --git
a/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
b/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
index 4c16db1c..210715b1 100644
--- a/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
+++ b/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
@@ -46,22 +46,6 @@
} \
}
-/* Helper macro to return if an exception is pending */
-#define PASS_EXCEPTIONS(env) \
- { \
-if ((*env)->ExceptionCheck(env)) return; \
- }
-
-#define PASS_EXCEPTIONS_GOTO(env, target) \
- { \
-if ((*env)->ExceptionCheck(env)) goto target; \
- }
-
-#define PASS_EXCEPTIONS_RET(env, ret) \
- { \
-if ((*env)->ExceptionCheck(env)) return (ret); \
- }
-
void close_library();
/**
@@ -260,25 +244,6 @@ static FARPROC WINAPI do_dlsym_fallback(JNIEnv *env,
HMODULE handle, LPCSTR symb
#endif
// Windows part end
-
-#define LOCK_CLASS(env, clazz, classname) \
- if ((*env)->MonitorEnter(env, clazz) != 0) { \
-char exception_msg[128]; \
-snprintf(exception_msg, sizeof(exception_msg), "Failed to lock %s",
classname); \
-THROW(env, "java/lang/InternalError", exception_msg); \
- }
-
-#define UNLOCK_CLASS(env, clazz, classname) \
- if ((*env)->MonitorExit(env, clazz) != 0) { \
-char exception_msg[128]; \
-snprintf(exception_msg, sizeof(exception_msg), "Failed to unlock %s",
classname); \
-THROW(env, "java/lang/InternalError", exception_msg); \
- }
-
-#define RETRY_ON_EINTR(ret, expr) do { \
- ret = expr; \
-} while ((ret == -1) && (errno == EINTR));
-
#include "config.h"
#include
@@ -286,12 +251,6 @@ static FARPROC WINAPI do_dlsym_fallback(JNIEnv *env,
HMODULE handle, LPCSTR symb
#include
#include
-/**
- * A helper macro to convert the java 'context-handle'
- * to a EVP_CIPHER_CTX pointer.
- */
-#define CONTEXT(context) ((EVP_CIPHER_CTX*)((ptrdiff_t)(context)))
-
/**
* A helper macro to convert the EVP_CIPHER_CTX pointer to the
* java 'context-handle'.
diff --git
a/src/main/native/org/apache/commons/crypto/random/org_apache_commons_crypto_random.h
b/src/main/native/org/apache/commons/crypto/random/org_apache_commons_crypto_random.h
index 41e5cf37..8e93a57c 100644
---
a/src/main/native/org/apache/commons/crypto/random/org_apache_commons_crypto_random.h
+++
b/src/main/native/org/apache/commons/crypto/random/org_apache_commons_crypto_random.h
@@ -21,8 +21,6 @@
#include "org_apache_commons_crypto.h"
-#define UNUSED(x) ((void)(x))
-
#include
#include
#include
(commons-io) branch master updated: Fix SpotBugs errors
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new e539867f Fix SpotBugs errors
e539867f is described below
commit e539867f5912a565d88d843bace0b9f429483723
Author: Gary Gregory
AuthorDate: Thu Nov 23 12:09:50 2023 -0500
Fix SpotBugs errors
- [ERROR] Medium:
org.apache.commons.io.file.AccumulatorPathVisitor.getDirList() may
expose internal representation by returning
AccumulatorPathVisitor.dirList
[org.apache.commons.io.file.AccumulatorPathVisitor]
At AccumulatorPathVisitor.java:[line 179] EI_EXPOSE_REP
- [ERROR] Medium:
org.apache.commons.io.file.AccumulatorPathVisitor.getFileList() may
expose internal representation by returning
AccumulatorPathVisitor.fileList
[org.apache.commons.io.file.AccumulatorPathVisitor]
At AccumulatorPathVisitor.java:[line 188] EI_EXPOSE_REP
---
src/changes/changes.xml | 2 ++
.../org/apache/commons/io/file/AccumulatorPathVisitor.java | 12 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a0d4e4e1..2b74571c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -64,6 +64,8 @@ The type attribute can be add,update,fix,remove.
Fix SpotBugs
error: org.apache.commons.io.FileCleaningTracker.getDeleteFailures() may expose
internal representation by returning FileCleaningTracker.deleteFailures
[org.apache.commons.io.FileCleaningTracker] At FileCleaningTracker.java:[line
218] EI_EXPOSE_REP.
Fix SpotBugs
error: org.apache.commons.io.IOExceptionList.getCauseList() may expose internal
representation by returning IOExceptionList.causeList
[org.apache.commons.io.IOExceptionList] At IOExceptionList.java:[line 118]
EI_EXPOSE_REP.
Fix SpotBugs
error: org.apache.commons.io.IOExceptionList.getCauseList(Class) may expose
internal representation by returning IOExceptionList.causeList
[org.apache.commons.io.IOExceptionList] At IOExceptionList.java:[line 129]
EI_EXPOSE_REP.
+ Fix SpotBugs
error: org.apache.commons.io.file.AccumulatorPathVisitor.getDirList() may
expose internal representation by returning AccumulatorPathVisitor.dirList
[org.apache.commons.io.file.AccumulatorPathVisitor] At
AccumulatorPathVisitor.java:[line 179] EI_EXPOSE_REP.
+ Fix SpotBugs
error: org.apache.commons.io.file.AccumulatorPathVisitor.getFileList() may
expose internal representation by returning AccumulatorPathVisitor.fileList
[org.apache.commons.io.file.AccumulatorPathVisitor] At
AccumulatorPathVisitor.java:[line 188] EI_EXPOSE_REP.
Bump
org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.1.1 #512.
Bump
commons-lang3 from 3.13.0 to 3.14.0.
diff --git
a/src/main/java/org/apache/commons/io/file/AccumulatorPathVisitor.java
b/src/main/java/org/apache/commons/io/file/AccumulatorPathVisitor.java
index ecfdd2b7..6aa26789 100644
--- a/src/main/java/org/apache/commons/io/file/AccumulatorPathVisitor.java
+++ b/src/main/java/org/apache/commons/io/file/AccumulatorPathVisitor.java
@@ -171,21 +171,21 @@ public class AccumulatorPathVisitor extends
CountingPathVisitor {
}
/**
- * Gets the list of visited directories.
+ * Gets a copy of the list of visited directories.
*
- * @return the list of visited directories.
+ * @return a copy of the list of visited directories.
*/
public List getDirList() {
-return dirList;
+return new ArrayList<>(dirList);
}
/**
- * Gets the list of visited files.
+ * Gets a copy of the list of visited files.
*
- * @return the list of visited files.
+ * @return a copy of the list of visited files.
*/
public List getFileList() {
-return fileList;
+return new ArrayList<>(fileList);
}
@Override
(commons-crypto) branch master updated: These appear to be unused (#278)
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
The following commit(s) were added to refs/heads/master by this push:
new 53d910ba These appear to be unused (#278)
53d910ba is described below
commit 53d910ba09f2271ec5d895afecc33c0a1c3ea07b
Author: sebbASF
AuthorDate: Thu Nov 23 17:13:44 2023 +
These appear to be unused (#278)
---
.../commons/crypto/org_apache_commons_crypto.h | 41 --
.../random/org_apache_commons_crypto_random.h | 2 --
2 files changed, 43 deletions(-)
diff --git
a/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
b/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
index 4c16db1c..210715b1 100644
--- a/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
+++ b/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
@@ -46,22 +46,6 @@
} \
}
-/* Helper macro to return if an exception is pending */
-#define PASS_EXCEPTIONS(env) \
- { \
-if ((*env)->ExceptionCheck(env)) return; \
- }
-
-#define PASS_EXCEPTIONS_GOTO(env, target) \
- { \
-if ((*env)->ExceptionCheck(env)) goto target; \
- }
-
-#define PASS_EXCEPTIONS_RET(env, ret) \
- { \
-if ((*env)->ExceptionCheck(env)) return (ret); \
- }
-
void close_library();
/**
@@ -260,25 +244,6 @@ static FARPROC WINAPI do_dlsym_fallback(JNIEnv *env,
HMODULE handle, LPCSTR symb
#endif
// Windows part end
-
-#define LOCK_CLASS(env, clazz, classname) \
- if ((*env)->MonitorEnter(env, clazz) != 0) { \
-char exception_msg[128]; \
-snprintf(exception_msg, sizeof(exception_msg), "Failed to lock %s",
classname); \
-THROW(env, "java/lang/InternalError", exception_msg); \
- }
-
-#define UNLOCK_CLASS(env, clazz, classname) \
- if ((*env)->MonitorExit(env, clazz) != 0) { \
-char exception_msg[128]; \
-snprintf(exception_msg, sizeof(exception_msg), "Failed to unlock %s",
classname); \
-THROW(env, "java/lang/InternalError", exception_msg); \
- }
-
-#define RETRY_ON_EINTR(ret, expr) do { \
- ret = expr; \
-} while ((ret == -1) && (errno == EINTR));
-
#include "config.h"
#include
@@ -286,12 +251,6 @@ static FARPROC WINAPI do_dlsym_fallback(JNIEnv *env,
HMODULE handle, LPCSTR symb
#include
#include
-/**
- * A helper macro to convert the java 'context-handle'
- * to a EVP_CIPHER_CTX pointer.
- */
-#define CONTEXT(context) ((EVP_CIPHER_CTX*)((ptrdiff_t)(context)))
-
/**
* A helper macro to convert the EVP_CIPHER_CTX pointer to the
* java 'context-handle'.
diff --git
a/src/main/native/org/apache/commons/crypto/random/org_apache_commons_crypto_random.h
b/src/main/native/org/apache/commons/crypto/random/org_apache_commons_crypto_random.h
index 41e5cf37..8e93a57c 100644
---
a/src/main/native/org/apache/commons/crypto/random/org_apache_commons_crypto_random.h
+++
b/src/main/native/org/apache/commons/crypto/random/org_apache_commons_crypto_random.h
@@ -21,8 +21,6 @@
#include "org_apache_commons_crypto.h"
-#define UNUSED(x) ((void)(x))
-
#include
#include
#include
(commons-io) branch master updated: Fix SpotBugs errors
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new 3a0bf1c3 Fix SpotBugs errors
3a0bf1c3 is described below
commit 3a0bf1c32274559d2dfa52da5b762b71ad8fc291
Author: Gary Gregory
AuthorDate: Thu Nov 23 13:18:30 2023 -0500
Fix SpotBugs errors
[ERROR] Medium:
org.apache.commons.io.monitor.FileAlterationMonitor.getObservers() may
expose internal representation by returning
FileAlterationMonitor.observers
[org.apache.commons.io.monitor.FileAlterationMonitor]
At FileAlterationMonitor.java:[line 124] EI_EXPOSE_REP
[ERROR] Medium:
org.apache.commons.io.monitor.FileAlterationObserver.getListeners() may
expose internal representation by returning
FileAlterationObserver.listeners
[org.apache.commons.io.monitor.FileAlterationObserver]
At FileAlterationObserver.java:[line 397] EI_EXPOSE_REP
---
src/changes/changes.xml| 1 +
src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java | 3 ++-
.../java/org/apache/commons/io/monitor/FileAlterationObserver.java | 3 ++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2b74571c..2a27ab63 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -59,6 +59,7 @@ The type attribute can be add,update,fix,remove.
Fix SpotBugs
error: Class org.apache.commons.io.filefilter.DelegateFileFilter defines
non-transient non-serializable instance field fileFilter
[org.apache.commons.io.filefilter.DelegateFileFilter] In
DelegateFileFilter.java SE_BAD_FIELD.
Fix SpotBugs
error: Class org.apache.commons.io.filefilter.DelegateFileFilter defines
non-transient non-serializable instance field fileNameFilter
[org.apache.commons.io.filefilter.DelegateFileFilter] In
DelegateFileFilter.java SE_BAD_FIELD.
Fix SpotBugs
error: org.apache.commons.io.function.IOStream$1.next() cannot throw
NoSuchElementException [org.apache.commons.io.function.IOStream$1] At
IOStream.java:[line 98] IT_NO_SUCH_ELEMENT.
+ Fix SpotBugs
error: org.apache.commons.io.monitor.FileAlterationMonitor.getObservers() may
expose internal representation by returning FileAlterationMonitor.observers
[org.apache.commons.io.monitor.FileAlterationMonitor] At
FileAlterationMonitor.java:[line 124] EI_EXPOSE_REP.
Fix SpotBugs
error: Class org.apache.commons.io.monitor.FileAlterationObserver defines
non-transient non-serializable instance field fileFilter
[org.apache.commons.io.monitor.FileAlterationObserver] In
FileAlterationObserver.java SE_BAD_FIELD.
Fix SpotBugs
error: Class org.apache.commons.io.monitor.FileAlterationObserver defines
non-transient non-serializable instance field listeners
[org.apache.commons.io.monitor.FileAlterationObserver] In
FileAlterationObserver.java SE_BAD_FIELD.
Fix SpotBugs
error: org.apache.commons.io.FileCleaningTracker.getDeleteFailures() may expose
internal representation by returning FileCleaningTracker.deleteFailures
[org.apache.commons.io.FileCleaningTracker] At FileCleaningTracker.java:[line
218] EI_EXPOSE_REP.
diff --git
a/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java
b/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java
index f4c07e18..4fc26d9c 100644
--- a/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java
+++ b/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java
@@ -17,6 +17,7 @@
package org.apache.commons.io.monitor;
import java.time.Duration;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -121,7 +122,7 @@ public final class FileAlterationMonitor implements
Runnable {
* @return The set of {@link FileAlterationObserver}
*/
public Iterable getObservers() {
-return observers;
+return new ArrayList<>(observers);
}
/**
diff --git
a/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
b/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
index 33311b53..c0946bd8 100644
--- a/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
+++ b/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
@@ -19,6 +19,7 @@ package org.apache.commons.io.monitor;
import java.io.File;
import java.io.FileFilter;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
@@ -394,7 +395,7 @@ public class FileAlterationObserver implements Serializable
{
* @return The file system listeners
*/
public Iterable getListeners() {
-return listeners;
+return new ArrayList<>(liste
(commons-io) branch master updated: Fix SpotBugs errors
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new bc51547e Fix SpotBugs errors
bc51547e is described below
commit bc51547e7c8619163078ec81938babf6733777f5
Author: Gary Gregory
AuthorDate: Thu Nov 23 13:26:55 2023 -0500
Fix SpotBugs errors
[ERROR] Medium:
org.apache.commons.io.input.ObservableInputStream.getObservers() may
expose internal representation by returning
ObservableInputStream.observers
[org.apache.commons.io.input.ObservableInputStream]
At ObservableInputStream.java:[line 187] EI_EXPOSE_REP
---
src/changes/changes.xml | 1 +
.../java/org/apache/commons/io/input/ObservableInputStream.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2a27ab63..8f09cdf9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -67,6 +67,7 @@ The type attribute can be add,update,fix,remove.
Fix SpotBugs
error: org.apache.commons.io.IOExceptionList.getCauseList(Class) may expose
internal representation by returning IOExceptionList.causeList
[org.apache.commons.io.IOExceptionList] At IOExceptionList.java:[line 129]
EI_EXPOSE_REP.
Fix SpotBugs
error: org.apache.commons.io.file.AccumulatorPathVisitor.getDirList() may
expose internal representation by returning AccumulatorPathVisitor.dirList
[org.apache.commons.io.file.AccumulatorPathVisitor] At
AccumulatorPathVisitor.java:[line 179] EI_EXPOSE_REP.
Fix SpotBugs
error: org.apache.commons.io.file.AccumulatorPathVisitor.getFileList() may
expose internal representation by returning AccumulatorPathVisitor.fileList
[org.apache.commons.io.file.AccumulatorPathVisitor] At
AccumulatorPathVisitor.java:[line 188] EI_EXPOSE_REP.
+ Fix SpotBugs
error: org.apache.commons.io.input.ObservableInputStream.getObservers() may
expose internal representation by returning ObservableInputStream.observers
[org.apache.commons.io.input.ObservableInputStream] At
ObservableInputStream.java:[line 187] EI_EXPOSE_REP.
Bump
org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.1.1 #512.
Bump
commons-lang3 from 3.13.0 to 3.14.0.
diff --git
a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
index a97702fb..5fd27b2c 100644
--- a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
@@ -178,13 +178,13 @@ public class ObservableInputStream extends
ProxyInputStream {
}
/**
- * Gets all currently registered observers.
+ * Gets a copy of currently registered observers.
*
- * @return a list of the currently registered observers.
+ * @return a copy of the list of currently registered observers.
* @since 2.9.0
*/
public List getObservers() {
-return observers;
+return new ArrayList<>(observers);
}
/**
(commons-io) branch master updated: Fix SpotBugs errors
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new c070fefb Fix SpotBugs errors
c070fefb is described below
commit c070fefba1f8e4e9725dcce9da67ce3edbb76743
Author: Gary Gregory
AuthorDate: Thu Nov 23 17:10:41 2023 -0500
Fix SpotBugs errors
- [ERROR] Medium: Exception thrown in class
org.apache.commons.io.input.UnsynchronizedByteArrayInputStream at new
org.apache.commons.io.input.UnsynchronizedByteArrayInputStream(byte[],
int) will leave the constructor. The object under construction remains
partially initialized and may be vulnerable to Finalizer attacks.
[org.apache.commons.io.input.UnsynchronizedByteArrayInputStream,
org.apache.commons.io.input.UnsynchronizedByteArrayInputStream] At
UnsynchronizedByteArrayInputStream.java:[line 202]At
UnsynchronizedByteArrayInputStream.java:[line 202] CT_CONSTRUCTOR_THROW
- [ERROR] Medium: Exception thrown in class
org.apache.commons.io.input.UnsynchronizedByteArrayInputStream at new
org.apache.commons.io.input.UnsynchronizedByteArrayInputStream(byte[],
int, int) will leave the constructor. The object under construction
remains partially initialized and may be vulnerable to Finalizer
attacks. [org.apache.commons.io.input.UnsynchronizedByteArrayInputStream,
org.apache.commons.io.input.UnsynchronizedByteArrayInputStream] At
UnsynchronizedByteArrayInputStream.java:[line 223]At
UnsynchronizedByteArrayInputStream.java:[line 223] CT_CONSTRUCTOR_THROW
---
src/changes/changes.xml| 2 +
.../input/UnsynchronizedByteArrayInputStream.java | 73 ++
2 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 8f09cdf9..e3f41b24 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -68,6 +68,8 @@ The type attribute can be add,update,fix,remove.
Fix SpotBugs
error: org.apache.commons.io.file.AccumulatorPathVisitor.getDirList() may
expose internal representation by returning AccumulatorPathVisitor.dirList
[org.apache.commons.io.file.AccumulatorPathVisitor] At
AccumulatorPathVisitor.java:[line 179] EI_EXPOSE_REP.
Fix SpotBugs
error: org.apache.commons.io.file.AccumulatorPathVisitor.getFileList() may
expose internal representation by returning AccumulatorPathVisitor.fileList
[org.apache.commons.io.file.AccumulatorPathVisitor] At
AccumulatorPathVisitor.java:[line 188] EI_EXPOSE_REP.
Fix SpotBugs
error: org.apache.commons.io.input.ObservableInputStream.getObservers() may
expose internal representation by returning ObservableInputStream.observers
[org.apache.commons.io.input.ObservableInputStream] At
ObservableInputStream.java:[line 187] EI_EXPOSE_REP.
+ Fix SpotBugs
error: Exception thrown in class
org.apache.commons.io.input.UnsynchronizedByteArrayInputStream at new
org.apache.commons.io.input.UnsynchronizedByteArrayInputStream(byte[], int)
will leave the constructor. The object under construction remains partially
initialized and may be vulnerable to Finalizer attacks.
[org.apache.commons.io.input.UnsynchronizedByteArrayInputStream,
org.apache.commons.io.input.Unsynchronize [...]
+ Fix SpotBugs
error: Exception thrown in class
org.apache.commons.io.input.UnsynchronizedByteArrayInputStream at new
org.apache.commons.io.input.UnsynchronizedByteArrayInputStream(byte[], int,
int) will leave the constructor. The object under construction remains
partially initialized and may be vulnerable to Finalizer attacks.
[org.apache.commons.io.input.UnsynchronizedByteArrayInputStream,
org.apache.commons.io.input.Unsynchr [...]
Bump
org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.1.1 #512.
Bump
commons-lang3 from 3.13.0 to 3.14.0.
diff --git
a/src/main/java/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.java
b/src/main/java/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.java
index f3bead5e..0b5c1145 100644
---
a/src/main/java/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.java
+++
b/src/main/java/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.java
@@ -16,8 +16,6 @@
*/
package org.apache.commons.io.input;
-import static java.lang.Math.min;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -46,33 +44,25 @@ public class UnsynchronizedByteArrayInputStream extends
InputStream {
*
*
* {@code
- * UnsynchronizedByteArrayInputStream s =
UnsynchronizedByteArrayInputStream.builder()
- * .setByteArray(byteArray)
- * .setOffset(0)
- * .setLength(byteArray.length)
- * .get();}
+ * UnsynchronizedByteArrayInputStream s =
UnsynchronizedByteArrayInpu
(commons-scxml) branch dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.1.1 created (now 2831665a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.1.1 in repository https://gitbox.apache.org/repos/asf/commons-scxml.git at 2831665a Bump org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.1.1 No new revisions were added by this update.
(commons-io) branch dependabot/maven/commons.bytebuddy.version-1.14.10 created (now 5cda3ada)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/commons.bytebuddy.version-1.14.10 in repository https://gitbox.apache.org/repos/asf/commons-io.git at 5cda3ada Bump commons.bytebuddy.version from 1.14.9 to 1.14.10 No new revisions were added by this update.
(commons-scxml) branch dependabot/github_actions/github/codeql-action-2.22.8 created (now b532c14f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-2.22.8 in repository https://gitbox.apache.org/repos/asf/commons-scxml.git at b532c14f Bump github/codeql-action from 2.22.7 to 2.22.8 No new revisions were added by this update.
(commons-io) branch dependabot/github_actions/github/codeql-action-2.22.8 created (now da7f0267)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-2.22.8 in repository https://gitbox.apache.org/repos/asf/commons-io.git at da7f0267 Bump github/codeql-action from 2.22.7 to 2.22.8 No new revisions were added by this update.
(commons-io) branch master updated: Bump github/codeql-action from 2.22.7 to 2.22.8 (#517)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new 607d5592 Bump github/codeql-action from 2.22.7 to 2.22.8 (#517)
607d5592 is described below
commit 607d55928c83d30b8f8707156cf666559f300f0f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Nov 23 20:22:41 2023 -0500
Bump github/codeql-action from 2.22.7 to 2.22.8 (#517)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from
2.22.7 to 2.22.8.
- [Release notes](https://github.com/github/codeql-action/releases)
-
[Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
-
[Commits](https://github.com/github/codeql-action/compare/66b90a5db151a8042fa97405c6cf843bbe433f7b...407ffafae6a767df3e0230c3df91b6443ae8df75)
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/codeql-analysis.yml | 6 +++---
.github/workflows/scorecards-analysis.yml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
index 6f845caf..5ed6d2b5 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -57,7 +57,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@66b90a5db151a8042fa97405c6cf843bbe433f7b
# v2.22.7
+ uses: github/codeql-action/init@407ffafae6a767df3e0230c3df91b6443ae8df75
# v2.22.8
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a
config file.
@@ -68,7 +68,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually
(see below)
- name: Autobuild
- uses:
github/codeql-action/autobuild@66b90a5db151a8042fa97405c6cf843bbe433f7b #
v2.22.7
+ uses:
github/codeql-action/autobuild@407ffafae6a767df3e0230c3df91b6443ae8df75 #
v2.22.8
# âšī¸ Command-line programs to run using the OS shell.
# đ https://git.io/JvXDl
@@ -82,4 +82,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
- uses:
github/codeql-action/analyze@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
+ uses:
github/codeql-action/analyze@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
diff --git a/.github/workflows/scorecards-analysis.yml
b/.github/workflows/scorecards-analysis.yml
index 890164f6..d4f7fe8e 100644
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -64,6 +64,6 @@ jobs:
retention-days: 5
- name: "Upload to code-scanning"
-uses:
github/codeql-action/upload-sarif@66b90a5db151a8042fa97405c6cf843bbe433f7b#
2.22.7
+uses:
github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75#
2.22.8
with:
sarif_file: results.sarif
(commons-io) branch dependabot/github_actions/github/codeql-action-2.22.8 deleted (was da7f0267)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch dependabot/github_actions/github/codeql-action-2.22.8 in repository https://gitbox.apache.org/repos/asf/commons-io.git was da7f0267 Bump github/codeql-action from 2.22.7 to 2.22.8 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(commons-scxml) 01/01: Merge pull request #169 from apache/dependabot/github_actions/github/codeql-action-2.22.8
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-scxml.git commit 70ce7367df13c67bbb3e73090eabcaeae921d9d6 Merge: ef2f7b04 b532c14f Author: Gary Gregory AuthorDate: Thu Nov 23 20:23:34 2023 -0500 Merge pull request #169 from apache/dependabot/github_actions/github/codeql-action-2.22.8 Bump github/codeql-action from 2.22.7 to 2.22.8 .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
(commons-scxml) branch master updated (ef2f7b04 -> 70ce7367)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-scxml.git from ef2f7b04 Checkstyle: @author tags are deprecated add b532c14f Bump github/codeql-action from 2.22.7 to 2.22.8 new 70ce7367 Merge pull request #169 from apache/dependabot/github_actions/github/codeql-action-2.22.8 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
(commons-scxml) branch dependabot/github_actions/github/codeql-action-2.22.8 deleted (was b532c14f)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch dependabot/github_actions/github/codeql-action-2.22.8 in repository https://gitbox.apache.org/repos/asf/commons-scxml.git was b532c14f Bump github/codeql-action from 2.22.7 to 2.22.8 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(commons-net) branch dependabot/github_actions/github/codeql-action-2.22.8 created (now 26db16f8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-2.22.8 in repository https://gitbox.apache.org/repos/asf/commons-net.git at 26db16f8 Bump github/codeql-action from 2.22.7 to 2.22.8 No new revisions were added by this update.
(commons-net) 01/01: Merge pull request #198 from apache/dependabot/github_actions/github/codeql-action-2.22.8
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-net.git commit 4c370dde6b30d8eff7faf2c8be9e56df819a1787 Merge: 5b07e872 26db16f8 Author: Gary Gregory AuthorDate: Thu Nov 23 21:44:24 2023 -0500 Merge pull request #198 from apache/dependabot/github_actions/github/codeql-action-2.22.8 Bump github/codeql-action from 2.22.7 to 2.22.8 .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
(commons-net) branch master updated (5b07e872 -> 4c370dde)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-net.git from 5b07e872 Checkstyle: @author tags are deprecated add 26db16f8 Bump github/codeql-action from 2.22.7 to 2.22.8 new 4c370dde Merge pull request #198 from apache/dependabot/github_actions/github/codeql-action-2.22.8 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
(commons-net) branch dependabot/github_actions/github/codeql-action-2.22.8 deleted (was 26db16f8)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch dependabot/github_actions/github/codeql-action-2.22.8 in repository https://gitbox.apache.org/repos/asf/commons-net.git was 26db16f8 Bump github/codeql-action from 2.22.7 to 2.22.8 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(commons-jci) branch dependabot/github_actions/github/codeql-action-2.22.8 created (now f08f58e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-2.22.8 in repository https://gitbox.apache.org/repos/asf/commons-jci.git at f08f58e Bump github/codeql-action from 2.22.7 to 2.22.8 No new revisions were added by this update.
(commons-compress) branch dependabot/github_actions/github/codeql-action-2.22.8 created (now cd760aa8f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-2.22.8 in repository https://gitbox.apache.org/repos/asf/commons-compress.git at cd760aa8f Bump github/codeql-action from 2.22.7 to 2.22.8 No new revisions were added by this update.
(commons-dbcp) branch dependabot/github_actions/github/codeql-action-2.22.8 created (now 20dcfc71)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-2.22.8 in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git at 20dcfc71 Bump github/codeql-action from 2.22.7 to 2.22.8 No new revisions were added by this update.
(commons-digester) branch dependabot/github_actions/github/codeql-action-2.22.8 created (now 3b89fa06)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-2.22.8 in repository https://gitbox.apache.org/repos/asf/commons-digester.git at 3b89fa06 Bump github/codeql-action from 2.22.7 to 2.22.8 No new revisions were added by this update.
(commons-build-plugin) branch dependabot/github_actions/github/codeql-action-2.22.8 created (now 7f90bc3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-2.22.8 in repository https://gitbox.apache.org/repos/asf/commons-build-plugin.git at 7f90bc3 Bump github/codeql-action from 2.22.7 to 2.22.8 No new revisions were added by this update.
(commons-cli) branch dependabot/github_actions/github/codeql-action-2.22.8 created (now 833e907)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-2.22.8 in repository https://gitbox.apache.org/repos/asf/commons-cli.git at 833e907 Bump github/codeql-action from 2.22.7 to 2.22.8 No new revisions were added by this update.
(commons-jcs) branch dependabot/github_actions/github/codeql-action-2.22.8 created (now cc83b4cf)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-2.22.8 in repository https://gitbox.apache.org/repos/asf/commons-jcs.git at cc83b4cf Bump github/codeql-action from 2.22.7 to 2.22.8 No new revisions were added by this update.
