Simplify containsConnectionUpgrade

Author: arturobernalg

httpclient5/src/main/java/org/apache/hc/client5/http/impl/ProtocolSwitchStrategy.java

@@ -26,6 +26,7 @@
  */
 package org.apache.hc.client5.http.impl;
 
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.hc.core5.annotation.Internal;
@@ -95,29 +96,14 @@ public ProtocolVersion switchProtocol(final HttpMessage response) throws Protoco
         }
     }
 
-    private boolean containsConnectionUpgrade(final HttpMessage message) throws ProtocolException {
-        final Iterator<Header> it = message.headerIterator(HttpHeaders.CONNECTION);
-        while (it.hasNext()) {
-            final Header header = it.next();
-            if (header instanceof FormattedHeader) {
-                final CharArrayBuffer buf = ((FormattedHeader) header).getBuffer();
-                final ParserCursor cursor = new ParserCursor(0, buf.length());
-                cursor.updatePos(((FormattedHeader) header).getValuePos());
-                if (containsUpgradeToken(buf, cursor)) {
-                    return true;
-                }
-            } else {
-                final String value = header.getValue();
-                if (value == null) {
-                    continue;
-                }
-                final ParserCursor cursor = new ParserCursor(0, value.length());
-                if (containsUpgradeToken(value, cursor)) {
-                    return true;
-                }
+    private boolean containsConnectionUpgrade(final HttpMessage message) {
+        final AtomicBoolean found = new AtomicBoolean(false);
+        MessageSupport.parseTokens(message, HttpHeaders.CONNECTION, token -> {
+            if ("upgrade".equalsIgnoreCase(token)) {
+                found.set(true);
             }
-        }
-        return false;
+        });
+        return found.get();
     }
 
     private boolean containsUpgradeToken(final CharSequence buffer, final ParserCursor cursor) throws ProtocolException {

httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestProtocolSwitchStrategy.java

@@ -105,15 +105,6 @@ void testSwitchInvalid() {
         Assertions.assertThrows(ProtocolException.class, () -> switchStrategy.switchProtocol(response3));
     }
 
-    @Test
-    void testNullToken() throws ProtocolException {
-        final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_SWITCHING_PROTOCOLS);
-        response.addHeader(HttpHeaders.CONNECTION, "Upgrade");
-        response.addHeader(HttpHeaders.UPGRADE, "TLS,");
-        response.addHeader(HttpHeaders.UPGRADE, null);
-        Assertions.assertEquals(TLS.V_1_2.getVersion(), switchStrategy.switchProtocol(response));
-    }
-
     @Test
     void testWhitespaceOnlyToken() throws ProtocolException {
         final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_SWITCHING_PROTOCOLS);