You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2020/11/24 20:33:21 UTC

[httpcomponents-client] 03/07: Use Collections.addAll() and Collection.addAll() APIs instead of loops.

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

ggregory pushed a commit to branch 4.5.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git

commit 3334f2d4476ad4c764124ec834b8143a0d11af7d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 23 12:02:05 2020 -0500

    Use Collections.addAll() and Collection.addAll() APIs instead of loops.
---
 .../org/apache/http/conn/ssl/SSLContextBuilder.java              | 9 +++------
 .../src/main/java/org/apache/http/client/utils/URIBuilder.java   | 4 +---
 .../apache/http/impl/client/DefaultHttpRequestRetryHandler.java  | 4 +---
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContextBuilder.java b/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContextBuilder.java
index fec0ca0..a2a2ba4 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContextBuilder.java
+++ b/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContextBuilder.java
@@ -38,6 +38,7 @@ import java.security.SecureRandom;
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
@@ -112,9 +113,7 @@ public class SSLContextBuilder {
                     }
                 }
             }
-            for (final TrustManager tm : tms) {
-                this.trustmanagers.add(tm);
-            }
+            Collections.addAll(this.trustmanagers, tms);
         }
         return this;
     }
@@ -151,9 +150,7 @@ public class SSLContextBuilder {
                     }
                 }
             }
-            for (final KeyManager km : kms) {
-                keymanagers.add(km);
-            }
+            Collections.addAll(keymanagers, kms);
         }
         return this;
     }
diff --git a/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java b/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
index 8838598..d7c9b0f 100644
--- a/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
+++ b/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
@@ -410,9 +410,7 @@ public class URIBuilder {
         } else {
             this.queryParams.clear();
         }
-        for (final NameValuePair nvp: nvps) {
-            this.queryParams.add(nvp);
-        }
+        Collections.addAll(this.queryParams, nvps);
         this.encodedQuery = null;
         this.encodedSchemeSpecificPart = null;
         this.query = null;
diff --git a/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java b/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
index 33ecf97..7ac2890 100644
--- a/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
+++ b/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
@@ -82,9 +82,7 @@ public class DefaultHttpRequestRetryHandler implements HttpRequestRetryHandler {
         this.retryCount = retryCount;
         this.requestSentRetryEnabled = requestSentRetryEnabled;
         this.nonRetriableClasses = new HashSet<Class<? extends IOException>>();
-        for (final Class<? extends IOException> clazz: clazzes) {
-            this.nonRetriableClasses.add(clazz);
-        }
+        this.nonRetriableClasses.addAll(clazzes);
     }
 
     /**