You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by mi...@apache.org on 2019/11/27 15:23:15 UTC

[httpcomponents-client] branch HTTPCLIENT-2019 updated: Satisfy code style

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

michaelo pushed a commit to branch HTTPCLIENT-2019
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git


The following commit(s) were added to refs/heads/HTTPCLIENT-2019 by this push:
     new 74a3d41  Satisfy code style
74a3d41 is described below

commit 74a3d419965de200d8571a009ac8cae0dd20da6e
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Nov 27 16:23:04 2019 +0100

    Satisfy code style
---
 .../java/org/apache/hc/client5/http/HttpRequestRetryHandler.java    | 2 +-
 .../org/apache/hc/client5/http/ServiceUnavailableRetryStrategy.java | 2 +-
 .../apache/hc/client5/http/impl/DefaultHttpRequestRetryHandler.java | 2 +-
 .../hc/client5/http/impl/DefaultHttpRequestRetryStrategy.java       | 6 +++---
 .../client5/http/impl/DefaultServiceUnavailableRetryStrategy.java   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/HttpRequestRetryHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/HttpRequestRetryHandler.java
index 3c430ad..c1c40d1 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/HttpRequestRetryHandler.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/HttpRequestRetryHandler.java
@@ -43,7 +43,7 @@ import org.apache.hc.core5.http.protocol.HttpContext;
  * from multiple threads.
  *
  * @since 4.0
- * @see HttpRequestRetryStrategy
+ * @deprecated This interface has been replaced by {@link HttpRequestRetryStrategy}
  */
 @Deprecated
 @Contract(threading = ThreadingBehavior.STATELESS)
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ServiceUnavailableRetryStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ServiceUnavailableRetryStrategy.java
index 96804de..60ac3c6 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/ServiceUnavailableRetryStrategy.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ServiceUnavailableRetryStrategy.java
@@ -38,7 +38,7 @@ import org.apache.hc.core5.http.protocol.HttpContext;
  * it should be retried and so on.
  *
  * @since 4.2
- * @see HttpRequestRetryStrategy
+ * @deprecated This interface has been replaced by {@link HttpRequestRetryStrategy}
  */
 @Deprecated
 @Contract(threading = ThreadingBehavior.STATELESS)
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultHttpRequestRetryHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultHttpRequestRetryHandler.java
index 8ae7229..56aec78 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultHttpRequestRetryHandler.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultHttpRequestRetryHandler.java
@@ -51,7 +51,7 @@ import org.apache.hc.core5.util.Args;
  * The default {@link HttpRequestRetryHandler} used by request executors.
  *
  * @since 4.0
- * @see DefaultHttpRequestRetryStrategy
+ * @deprecated This implementation has been replaced by {@link DefaultHttpRequestRetryStrategy}
  */
 @Deprecated
 @Contract(threading = ThreadingBehavior.STATELESS)
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultHttpRequestRetryStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultHttpRequestRetryStrategy.java
index ecdd01f..d45b2a0 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultHttpRequestRetryStrategy.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultHttpRequestRetryStrategy.java
@@ -196,13 +196,13 @@ public class DefaultHttpRequestRetryStrategy implements HttpRequestRetryStrategy
             final HttpContext context) {
         Args.notNull(response, "response");
 
-        return executionCount <= maxRetries && retriableCodes.contains(response.getCode());
+        return executionCount <= this.maxRetries && retriableCodes.contains(response.getCode());
     }
 
     @Override
     public TimeValue getRetryInterval(
             final HttpResponse response,
-            int executionCount,
+            final int executionCount,
             final HttpContext context) {
         Args.notNull(response, "response");
 
@@ -231,7 +231,7 @@ public class DefaultHttpRequestRetryStrategy implements HttpRequestRetryStrategy
      * @return the maximum number of retries for a request
      */
     public int getMaxRetries() {
-        return maxRetries;
+        return this.maxRetries;
     }
 
     protected boolean handleAsIdempotent(final HttpRequest request) {
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultServiceUnavailableRetryStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultServiceUnavailableRetryStrategy.java
index 393de3e..4b78cc2 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultServiceUnavailableRetryStrategy.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultServiceUnavailableRetryStrategy.java
@@ -46,7 +46,7 @@ import org.apache.hc.core5.util.Args;
  * at a fixed interval.
  *
  * @since 4.2
- * @see DefaultHttpRequestRetryStrategy
+ * @deprecated This implementation has been replaced by {@link DefaultHttpRequestRetryStrategy}
  */
 @Deprecated
 @Contract(threading = ThreadingBehavior.STATELESS)