commit 84e8f3744c015ed264c4dd04b7fccf1a1477b1aa
author Stephen Connolly <stephen.alan.connolly@gmail.com> Wed Nov 01 09:23:20 2017 +0000
committer Stephen Connolly <stephen.alan.connolly@gmail.com> Wed Nov 01 09:23:20 2017 +0000
tree 67d973c0c0b6836efffe3c97db099900da8ed295
parent 1b068556e98461fb8d9b2b48f2d9988be5210b88

[INFRA-15421] Upgrade to async-http-client 1.9.40.0

pom.xml

diff --git a/pom.xml b/pom.xml
index 801c59b..826835c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>async-http-client</artifactId>
-      <version>1.7.24.1</version>
+      <version>1.9.40.0</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

src/main/java/org/apache/jenkins/gitpubsub/GitPubSubPoll.java

diff --git a/src/main/java/org/apache/jenkins/gitpubsub/GitPubSubPoll.java b/src/main/java/org/apache/jenkins/gitpubsub/GitPubSubPoll.java
index 8aacdd1..0606e7c 100644
--- a/src/main/java/org/apache/jenkins/gitpubsub/GitPubSubPoll.java
+++ b/src/main/java/org/apache/jenkins/gitpubsub/GitPubSubPoll.java
@@ -22,7 +22,6 @@
 import com.ning.http.client.AsyncHttpClient;
 import com.ning.http.client.AsyncHttpClientConfig;
 import com.ning.http.client.HttpResponseBodyPart;
-import com.ning.http.client.PerRequestConfig;
 import com.ning.http.client.RequestBuilder;
 import com.ning.http.client.Response;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -107,7 +106,7 @@
     private Future<?> longPollRequest;
 
     public GitPubSubPoll() {
-        super("ASG GitPubSub poll");
+        super("ASF GitPubSub poll");
     }
 
     @Override
@@ -141,11 +140,10 @@
         }
         RequestBuilder builder = new RequestBuilder("GET")
                 .setUrl(JsonHandler.GITPUBSUB_URL)
-                .setPerRequestConfig(new PerRequestConfig(null,
-                                                          requestRecycleMins == -1
-                                                              ? -1
-                                                              : (requestRecycleMins + 1) * 60 * 1000
-                ));
+                .setRequestTimeout(requestRecycleMins == -1
+                        ? -1
+                        : (requestRecycleMins + 1) * 60 * 1000
+                );
         if (lastTS != 0) {
             builder.addHeader("X-Fetch-Since", Long.toString(lastTS));
         }
@@ -153,8 +151,8 @@
             LOGGER.log(Level.FINE, "Starting AsyncHttpClient instance");
             client = new AsyncHttpClient(
                     new AsyncHttpClientConfig.Builder()
-                            .setAllowPoolingConnection(false)
-                            .setRequestTimeoutInMs(
+                            .setAllowPoolingConnections(false)
+                            .setRequestTimeout(
                                     requestRecycleMins == -1
                                     ? -1
                                     : (requestRecycleMins + 1) * 60 * 1000)