[tomcat] branch main updated: Remove deprecated and unused code.

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 15976a7  Remove deprecated and unused code.
15976a7 is described below

commit 15976a777a94dc6bd0bca81fc9dc3cd81918a0cb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 15 20:57:03 2021 +0100

    Remove deprecated and unused code.
---
 java/org/apache/catalina/valves/RemoteIpValve.java | 28 ----------------------
 1 file changed, 28 deletions(-)

diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java 
b/java/org/apache/catalina/valves/RemoteIpValve.java
index fcae228..e2cd6d3 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -21,9 +21,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Deque;
 import java.util.Enumeration;
-import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.regex.Pattern;
 
 import jakarta.servlet.ServletException;
@@ -377,32 +375,6 @@ public class RemoteIpValve extends ValveBase {
             .split(commaDelimitedStrings);
     }
 
-    /**
-     * Convert an array of strings in a comma delimited string
-     * @param stringList The string list to convert
-     * @return The concatenated string
-     *
-     * @deprecated Unused. This will be removed in Tomcat 10.1.x onwards.
-     *             Use {@link StringUtils#join(java.util.Collection)} instead
-     */
-    @Deprecated
-    protected static String listToCommaDelimitedString(List<String> 
stringList) {
-        if (stringList == null) {
-            return "";
-        }
-        StringBuilder result = new StringBuilder();
-        for (Iterator<String> it = stringList.iterator(); it.hasNext();) {
-            Object element = it.next();
-            if (element != null) {
-                result.append(element);
-                if (it.hasNext()) {
-                    result.append(", ");
-                }
-            }
-        }
-        return result.toString();
-    }
-
     private String hostHeader = null;
 
     private boolean changeLocalName = false;

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