[tomcat] 01/02: Refactor - use enhanced for loops - no functional change

[markt]

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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 00847a5bba969d77d7b50204422ade542c73f7a6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 15 15:29:35 2023 +0000

    Refactor - use enhanced for loops - no functional change
---
 java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java           | 5 +----
 java/org/apache/catalina/loader/WebappClassLoaderBase.java           | 4 +---
 java/org/apache/tomcat/websocket/server/UriTemplate.java             | 5 +----
 .../catalina/tribes/group/TestGroupChannelSenderConnections.java     | 4 ++--
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
index b5761fd1bd..4f8aa81b46 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
@@ -17,7 +17,6 @@
 package org.apache.catalina.ant.jmx;
 
 
-import java.util.Iterator;
 import java.util.Set;
 
 import javax.management.MBeanAttributeInfo;
@@ -117,11 +116,9 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
         }
 
         if (resultproperty != null) {
-            Iterator<ObjectName> it = names.iterator();
             int oindex = 0;
             String pname = null;
-            while (it.hasNext()) {
-                ObjectName oname = it.next();
+            for (ObjectName oname : names) {
                 pname = resultproperty + "." + Integer.toString(oindex) + ".";
                 oindex++;
                 setProperty(pname + "Name", oname.toString());
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 3602ca8f7b..aa747a5873 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -2143,10 +2143,8 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
         }
 
         if (o instanceof Collection<?>) {
-            Iterator<?> iter = ((Collection<?>) o).iterator();
             try {
-                while (iter.hasNext()) {
-                    Object entry = iter.next();
+                for (Object entry : ((Collection<?>) o)) {
                     if (loadedByThisOrChild(entry)) {
                         return true;
                     }
diff --git a/java/org/apache/tomcat/websocket/server/UriTemplate.java 
b/java/org/apache/tomcat/websocket/server/UriTemplate.java
index cb3da5782b..35a82eed10 100644
--- a/java/org/apache/tomcat/websocket/server/UriTemplate.java
+++ b/java/org/apache/tomcat/websocket/server/UriTemplate.java
@@ -110,12 +110,9 @@ public class UriTemplate {
             return null;
         }
 
-        Iterator<Segment> candidateSegments =
-                candidate.getSegments().iterator();
         Iterator<Segment> targetSegments = segments.iterator();
 
-        while (candidateSegments.hasNext()) {
-            Segment candidateSegment = candidateSegments.next();
+        for (Segment candidateSegment : candidate.getSegments()) {
             Segment targetSegment = targetSegments.next();
 
             if (targetSegment.getParameterIndex() == -1) {
diff --git 
a/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java 
b/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
index 62fc35f5c5..f78644756f 100644
--- 
a/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
+++ 
b/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
@@ -97,7 +97,7 @@ public class TestGroupChannelSenderConnections extends 
LoggingBaseTest {
     @Test
     public void testKeepAliveCount() throws Exception {
         log.info("Setting keep alive count to 0");
-        for (int i = 0; i < channels.length; i++) {
+        for (ManagedChannel channel : channels) {
             ReplicationTransmitter t = 
(ReplicationTransmitter)channels[0].getChannelSender();
             t.getTransport().setKeepAliveCount(0);
         }
@@ -107,7 +107,7 @@ public class TestGroupChannelSenderConnections extends 
LoggingBaseTest {
     @Test
     public void testKeepAliveTime() throws Exception {
         log.info("Setting keep alive count to 1 second");
-        for (int i = 0; i < channels.length; i++) {
+        for (ManagedChannel channel : channels) {
             ReplicationTransmitter t = 
(ReplicationTransmitter)channels[0].getChannelSender();
             t.getTransport().setKeepAliveTime(1000);
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org