You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/10/30 18:04:45 UTC
[commons-io] branch master updated: Use lambdas,
in-line single use local variable, remove some 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-io.git
The following commit(s) were added to refs/heads/master by this push:
new 51f4de0 Use lambdas, in-line single use local variable, remove some whitespace.
51f4de0 is described below
commit 51f4de0c25cb1c9cf8402b9c6c0f20e94112f7ca
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Oct 30 14:04:43 2021 -0400
Use lambdas, in-line single use local variable, remove some whitespace.
---
src/main/java/org/apache/commons/io/IOUtils.java | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/IOUtils.java b/src/main/java/org/apache/commons/io/IOUtils.java
index 3aa0720..be574e5 100644
--- a/src/main/java/org/apache/commons/io/IOUtils.java
+++ b/src/main/java/org/apache/commons/io/IOUtils.java
@@ -45,6 +45,7 @@ import java.nio.channels.Selector;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
@@ -521,11 +522,8 @@ public class IOUtils {
* @see Throwable#addSuppressed(java.lang.Throwable)
*/
public static void closeQuietly(final Closeable... closeables) {
- if (closeables == null) {
- return;
- }
- for (final Closeable closeable : closeables) {
- closeQuietly(closeable);
+ if (closeables != null) {
+ Arrays.stream(closeables).forEach(IOUtils::closeQuietly);
}
}
@@ -1105,10 +1103,8 @@ public class IOUtils {
@SuppressWarnings("resource") // streams are closed by the caller.
public static QueueInputStream copy(final java.io.ByteArrayOutputStream outputStream) throws IOException {
Objects.requireNonNull(outputStream, "outputStream");
-
final QueueInputStream in = new QueueInputStream();
outputStream.writeTo(in.newQueueOutputStream());
-
return in;
}
@@ -2198,11 +2194,9 @@ public class IOUtils {
// What about the thread context class loader?
// What about the system class loader?
final URL resource = classLoader == null ? IOUtils.class.getResource(name) : classLoader.getResource(name);
-
if (resource == null) {
throw new IOException("Resource not found: " + name);
}
-
return resource;
}
@@ -2559,11 +2553,9 @@ public class IOUtils {
* @since 2.1
*/
public static byte[] toByteArray(final InputStream input, final long size) throws IOException {
-
if (size > Integer.MAX_VALUE) {
throw new IllegalArgumentException("Size cannot be greater than Integer max value: " + size);
}
-
return toByteArray(input, (int) size);
}
@@ -2873,8 +2865,7 @@ public class IOUtils {
* @since 1.1
*/
public static InputStream toInputStream(final String input, final String charsetName) {
- final byte[] bytes = input.getBytes(Charsets.toCharset(charsetName));
- return new ByteArrayInputStream(bytes);
+ return new ByteArrayInputStream(input.getBytes(Charsets.toCharset(charsetName)));
}
/**
@@ -3662,7 +3653,6 @@ public class IOUtils {
* Instances should NOT be constructed in standard programming.
*/
public IOUtils() { //NOSONAR
-
}
}