[ant] branch master updated: Use Bulk operation instead of iteration.

[bo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git


The following commit(s) were added to refs/heads/master by this push:
     new 6718c52  Use Bulk operation instead of iteration.
     new 35ccd1f  Merge pull request #162 from arturobernalg/feature/bulk
6718c52 is described below

commit 6718c526a8be707af73e726cda559c7f1374586a
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Sat Oct 2 16:41:11 2021 +0200

    Use Bulk operation instead of iteration.
---
 .../tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java      | 2 +-
 src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java | 2 +-
 src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java | 2 +-
 .../apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java    | 2 +-
 src/main/org/apache/tools/tar/TarOutputStream.java                   | 5 ++---
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
index 1f66ce0..018156b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
@@ -470,7 +470,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
                 try (InputStream in = Files.newInputStream(weblogicDD.toPath())) {
                     saxParser.parse(new InputSource(in), handler);
                 }
-                handler.getFiles().forEach(ejbFiles::put);
+                ejbFiles.putAll(handler.getFiles());
             } catch (Exception e) {
                 throw new BuildException(
                     "Exception while adding Vendor specific files: "
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index ef1e293..2f6b42e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -1220,7 +1220,7 @@ public class JUnitTask extends Task {
                                       + propsFile.getAbsolutePath());
         final Hashtable<String, Object> p = getProject().getProperties();
         final Properties props = new Properties();
-        p.forEach(props::put);
+        props.putAll(p);
         try {
             final OutputStream outstream = Files.newOutputStream(propsFile.toPath());
             props.store(outstream, "Ant JUnitTask generated properties file");
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
index d321bdc..1646b7d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
@@ -472,7 +472,7 @@ public class JUnitTest extends BaseTest implements Cloneable {
      */
     public void setProperties(Hashtable<?, ?> p) {
         props = new Properties();
-        p.forEach(props::put);
+        props.putAll(p);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
index 971fa7d..8c35e9d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
@@ -981,7 +981,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
         }
 
         // Add/overlay system properties on the properties from the Ant project
-        System.getProperties().forEach(props::put);
+        props.putAll(System.getProperties());
 
         int returnCode = SUCCESS;
         if (multipleTests) {
diff --git a/src/main/org/apache/tools/tar/TarOutputStream.java b/src/main/org/apache/tools/tar/TarOutputStream.java
index ccf1f42..76460e9 100644
--- a/src/main/org/apache/tools/tar/TarOutputStream.java
+++ b/src/main/org/apache/tools/tar/TarOutputStream.java
@@ -29,6 +29,7 @@ import java.io.OutputStream;
 import java.io.StringWriter;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -537,9 +538,7 @@ public class TarOutputStream extends FilterOutputStream {
      * An EOF record consists of a record of all zeros.
      */
     private void writeEOFRecord() throws IOException {
-        for (int i = 0; i < recordBuf.length; ++i) {
-            recordBuf[i] = 0;
-        }
+        Arrays.fill(recordBuf, (byte) 0);
 
         buffer.writeRecord(recordBuf);
     }