switch to dropwizard httpclient config

Author: stefanseifert

maven-nodejs-proxy/config.yml

@@ -20,10 +20,15 @@ npmBinariesUrl: "/npm/npm-${version}.${type}"
 nodeJsChecksumUrl: "/v${version}/SHASUMS.txt"
 
 # HTTP Client settings
-httpClientConnectTimeout: 5000
-httpClientSocketTimeout: 15000
+httpClient:
+  connectionTimeout: 2s
+  timeout: 5s
+  timeToLive: 1h
+  cookiesEnabled: false
+  retries: 2
+  userAgent: Maven NodeJS Proxy
 
-# Dropwizard config
+# Jetty configuration
 server:
   # Disable gzip compression to avoid corruption of tar.gz files
   gzip:

maven-nodejs-proxy/pom.xml

@@ -49,11 +49,10 @@
       <version>${dropwizard.version}</version>
       <scope>compile</scope>
     </dependency>
-    
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.5</version>
+      <groupId>io.dropwizard</groupId>
+      <artifactId>dropwizard-client</artifactId>
+      <version>${dropwizard.version}</version>
       <scope>compile</scope>
     </dependency>
 

maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/MavenProxyApplication.java

@@ -20,11 +20,14 @@
 package io.wcm.devops.maven.nodejsproxy;
 
 import io.dropwizard.Application;
+import io.dropwizard.client.HttpClientBuilder;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
 import io.wcm.devops.maven.nodejsproxy.health.NodeJsDistHealthCheck;
 import io.wcm.devops.maven.nodejsproxy.resource.MavenProxyResource;
 
+import org.apache.http.impl.client.CloseableHttpClient;
+
 /**
  * Dropwizard Application for Maven NodeJS Proxy.
  */
@@ -41,11 +44,14 @@ public void initialize(Bootstrap<MavenProxyConfiguration> bootstrap) {
   }
 
   @Override
-  public void run(MavenProxyConfiguration configuration,
-      Environment environment) {
-    final MavenProxyResource resource = new MavenProxyResource(configuration);
+  public void run(MavenProxyConfiguration config, Environment environment) {
+    final CloseableHttpClient httpClient = new HttpClientBuilder(environment)
+    .using(config.getHttpClient())
+    .build("default");
+
+    final MavenProxyResource resource = new MavenProxyResource(config, httpClient);
 
-    final NodeJsDistHealthCheck healthCheck = new NodeJsDistHealthCheck(configuration);
+    final NodeJsDistHealthCheck healthCheck = new NodeJsDistHealthCheck(config, httpClient);
     environment.healthChecks().register("nodeJsDist", healthCheck);
 
     environment.jersey().register(resource);

maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/MavenProxyConfiguration.java

@@ -20,6 +20,10 @@
 package io.wcm.devops.maven.nodejsproxy;
 
 import io.dropwizard.Configuration;
+import io.dropwizard.client.HttpClientConfiguration;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 
 import org.hibernate.validator.constraints.NotEmpty;
 
@@ -48,116 +52,59 @@ public class MavenProxyConfiguration extends Configuration {
   private String npmBinariesUrl;
   @NotEmpty
   private String nodeJsChecksumUrl;
-  private int httpClientConnectTimeout = 5000;
-  private int httpClientSocketTimeout = 15000;
+
+  @Valid
+  @NotNull
+  private HttpClientConfiguration httpClient = new HttpClientConfiguration();
 
   @JsonProperty
   public String getGroupId() {
     return this.groupId;
   }
 
-  @JsonProperty
-  public void setGroupId(String groupId) {
-    this.groupId = groupId;
-  }
-
   @JsonProperty
   public String getNodeJsArtifactId() {
     return this.nodeJsArtifactId;
   }
 
-  @JsonProperty
-  public void setNodeJsArtifactId(String nodeJsArtifactId) {
-    this.nodeJsArtifactId = nodeJsArtifactId;
-  }
-
   @JsonProperty
   public String getNpmArtifactId() {
     return this.npmArtifactId;
   }
 
-  @JsonProperty
-  public void setNpmArtifactId(String npmArtifactId) {
-    this.npmArtifactId = npmArtifactId;
-  }
-
   @JsonProperty
   public String getNodeJsBinariesRootUrl() {
     return this.nodeJsBinariesRootUrl;
   }
 
-  @JsonProperty
-  public void setNodeJsBinariesRootUrl(String nodeJsBinariesRootUrl) {
-    this.nodeJsBinariesRootUrl = nodeJsBinariesRootUrl;
-  }
-
   @JsonProperty
   public String getNodeJsBinariesUrl() {
     return this.nodeJsBinariesUrl;
   }
 
-  @JsonProperty
-  public void setNodeJsBinariesUrl(String nodeJsBinariesUrl) {
-    this.nodeJsBinariesUrl = nodeJsBinariesUrl;
-  }
-
   @JsonProperty
   public String getNodeJsBinariesUrlWindows() {
     return this.nodeJsBinariesUrlWindows;
   }
 
-  @JsonProperty
-  public void setNodeJsBinariesUrlWindows(String nodeJsBinariesUrlWindows) {
-    this.nodeJsBinariesUrlWindows = nodeJsBinariesUrlWindows;
-  }
-
   @JsonProperty
   public String getNodeJsBinariesUrlWindowsX86() {
     return this.nodeJsBinariesUrlWindowsX86;
   }
 
-  @JsonProperty
-  public void setNodeJsBinariesUrlWindowsX86(String nodeJsBinariesUrlWindowsX86) {
-    this.nodeJsBinariesUrlWindowsX86 = nodeJsBinariesUrlWindowsX86;
-  }
-
   @JsonProperty
   public String getNpmBinariesUrl() {
     return this.npmBinariesUrl;
   }
 
-  @JsonProperty
-  public void setNpmBinariesUrl(String npmBinariesUrl) {
-    this.npmBinariesUrl = npmBinariesUrl;
-  }
   @JsonProperty
   public String getNodeJsChecksumUrl() {
     return this.nodeJsChecksumUrl;
   }
 
-  @JsonProperty
-  public void setNodeJsChecksumUrl(String nodeJsChecksumUrl) {
-    this.nodeJsChecksumUrl = nodeJsChecksumUrl;
-  }
-
-  @JsonProperty
-  public int getHttpClientConnectTimeout() {
-    return this.httpClientConnectTimeout;
-  }
-
-  @JsonProperty
-  public void setHttpClientConnectTimeout(int httpClientConnectTimeout) {
-    this.httpClientConnectTimeout = httpClientConnectTimeout;
-  }
-
-  @JsonProperty
-  public int getHttpClientSocketTimeout() {
-    return this.httpClientSocketTimeout;
-  }
-
-  @JsonProperty
-  public void setHttpClientSocketTimeout(int httpClientSocketTimeout) {
-    this.httpClientSocketTimeout = httpClientSocketTimeout;
+  @JsonProperty("httpClient")
+  public HttpClientConfiguration getHttpClient() {
+    return httpClient;
   }
 
 }

maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/health/NodeJsDistHealthCheck.java

@@ -20,7 +20,6 @@
 package io.wcm.devops.maven.nodejsproxy.health;
 
 import io.wcm.devops.maven.nodejsproxy.MavenProxyConfiguration;
-import io.wcm.devops.maven.nodejsproxy.resource.HttpClientBuilder;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -46,9 +45,9 @@ public class NodeJsDistHealthCheck extends HealthCheck {
   /**
    * @param config Configuration
    */
-  public NodeJsDistHealthCheck(MavenProxyConfiguration config) {
+  public NodeJsDistHealthCheck(MavenProxyConfiguration config, CloseableHttpClient httpClient) {
     this.config = config;
-    httpClient = HttpClientBuilder.build(config);
+    this.httpClient = httpClient;
   }
 
   @Override

maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/HttpClientBuilder.java

@@ -57,9 +57,9 @@ public class MavenProxyResource {
   /**
    * @param config Configuration
    */
-  public MavenProxyResource(MavenProxyConfiguration config) {
+  public MavenProxyResource(MavenProxyConfiguration config, CloseableHttpClient httpClient) {
     this.config = config;
-    httpClient = HttpClientBuilder.build(config);
+    this.httpClient = httpClient;
   }
 
   /**