Merge pull request #72 from apache/dependabot/maven/commons-io-commons-io-2.10.0
Bump commons-io from 2.9.0 to 2.10.0
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index ce18252..0bbe302 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -38,7 +38,7 @@
steps:
- uses: actions/checkout@v2.3.4
- - uses: actions/cache@v2.1.5
+ - uses: actions/cache@v2.1.6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDisk.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDisk.java
index 93854ad..bf5e280 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDisk.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDisk.java
@@ -73,10 +73,10 @@
private final FileChannel fc;
/** How many bytes have we put to disk */
- private final AtomicLong putBytes = new AtomicLong(0);
+ private final AtomicLong putBytes = new AtomicLong();
/** How many items have we put to disk */
- private final AtomicLong putCount = new AtomicLong(0);
+ private final AtomicLong putCount = new AtomicLong();
/**
* Constructor for the Disk object
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
index c93928e..3d4d030 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
@@ -127,7 +127,7 @@
private int startupSize;
/** the number of bytes free on disk. */
- private final AtomicLong bytesFree = new AtomicLong(0);
+ private final AtomicLong bytesFree = new AtomicLong();
/** mode we are working on (size or count limited **/
private DiskLimitType diskLimitType = DiskLimitType.COUNT;
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java
index c77e0d8..965fda3 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java
@@ -141,12 +141,12 @@
this.attr = attr;
this.cacheAttr = cattr;
this.alive = new AtomicBoolean(true);
- this.updateCount = new AtomicLong(0);
- this.removeCount = new AtomicLong(0);
- this.hitCountRam = new AtomicLong(0);
- this.hitCountAux = new AtomicLong(0);
- this.missCountNotFound = new AtomicLong(0);
- this.missCountExpired = new AtomicLong(0);
+ this.updateCount = new AtomicLong();
+ this.removeCount = new AtomicLong();
+ this.hitCountRam = new AtomicLong();
+ this.hitCountAux = new AtomicLong();
+ this.missCountNotFound = new AtomicLong();
+ this.missCountExpired = new AtomicLong();
createMemoryCache(cattr);
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java
index 4af7a3d..b491404 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java
@@ -23,7 +23,6 @@
import java.io.InputStream;
import java.lang.management.ManagementFactory;
import java.security.AccessControlException;
-import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.Properties;
@@ -35,6 +34,7 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -831,7 +831,7 @@
// force the array elements into a string.
final StringBuilder buf = new StringBuilder();
- Arrays.stream(stats).forEach(stat -> {
+ Stream.of(stats).forEach(stat -> {
buf.append( "\n---------------------------\n" );
buf.append( stat );
});
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java
index 322a0c3..5cc78c0 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java
@@ -86,9 +86,9 @@
@Override
public void initialize( final CompositeCache<K, V> hub )
{
- hitCnt = new AtomicLong(0);
- missCnt = new AtomicLong(0);
- putCnt = new AtomicLong(0);
+ hitCnt = new AtomicLong();
+ missCnt = new AtomicLong();
+ putCnt = new AtomicLong();
this.cacheAttributes = hub.getCacheAttributes();
this.chunkSize = cacheAttributes.getSpoolChunkSize();
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/log/MessageFormatter.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/log/MessageFormatter.java
index 8c93f05..ef94d45 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/log/MessageFormatter.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/log/MessageFormatter.java
@@ -18,9 +18,9 @@
*/
import java.text.MessageFormat;
-import java.util.Arrays;
import java.util.IllegalFormatException;
import java.util.function.Supplier;
+import java.util.stream.Stream;
/**
* Handles messages that consist of a format string conforming to
@@ -64,7 +64,7 @@
public MessageFormatter(final String messagePattern, final Supplier<?>... paramSuppliers)
{
this.messagePattern = messagePattern;
- this.parameters = Arrays.stream(paramSuppliers)
+ this.parameters = Stream.of(paramSuppliers)
.map(Supplier::get)
.toArray();
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fdec0c9..85cecda 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -87,6 +87,9 @@
<action type="update" dev="ggregory" due-to="Gary Gregory">
Update from Apache Commons IO 2.8.0 to 2.9.0.
</action>
+ <action type="update" dev="ggregory" due-to="Dependabot">
+ Bump actions/cache from 2.1.5 to 2.1.6 #70.
+ </action>
</release>
<release version="3.0" date="2020-08-16">
<action issue="JCS-205" dev="tv" type="fix">
