Refactor Http Client implementation

deploy-service/common/pom.xml

@@ -207,5 +207,11 @@
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <version>${okhttp.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

deploy-service/common/src/main/java/com/pinterest/deployservice/common/ChangeFeedJob.java

@@ -15,9 +15,9 @@
  */
 package com.pinterest.deployservice.common;
 
+import com.pinterest.teletraan.universal.http.HttpClient;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -30,19 +30,17 @@
 
 public final class ChangeFeedJob implements Callable<Void> {
     private static final Logger LOG = LoggerFactory.getLogger(ChangeFeedJob.class);
-    private final int RETRIES = 3;
+    private static final HttpClient httpClient = HttpClient.builder().build();
     private String payload;
     private String changeFeedUrl;
     private Object oriObj;
     private Object curObj;
-    private HTTPClient httpClient;
 
     public ChangeFeedJob(String payload, String changeFeedUrl, Object oriObj, Object curObj) {
         this.payload = payload;
         this.changeFeedUrl = changeFeedUrl;
         this.oriObj = oriObj;
         this.curObj = curObj;
-        this.httpClient = new HTTPClient();
     }
 
     private static String toStringRepresentation(Object object) throws IllegalAccessException {
@@ -184,9 +182,7 @@ public Void call() {
 
             if (!StringUtils.isEmpty(changeFeedUrl)) {
                 LOG.info(String.format("Send change feed %s to %s", payload, changeFeedUrl));
-                Map<String, String> headers = new HashMap<>();
-                headers.put("Content-Type", "application/json");
-                httpClient.post(changeFeedUrl, payload, headers, RETRIES);
+                httpClient.post(changeFeedUrl, payload, null);
             }
         } catch (Throwable t) {
             LOG.error(String.format("Failed to send change feed: %s", payload), t);

deploy-service/common/src/main/java/com/pinterest/deployservice/common/Jenkins.java

@@ -17,6 +17,7 @@
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.pinterest.teletraan.universal.http.HttpClient;
 import java.util.HashMap;
 import java.util.Map;
 import org.slf4j.Logger;
@@ -26,8 +27,7 @@
 /** Wrapper for Jenkins API calls */
 public class Jenkins {
     private static final Logger LOG = LoggerFactory.getLogger(Jenkins.class);
-    private static final int RETRIES = 3;
-    private HTTPClient httpClient = new HTTPClient();
+    private static final HttpClient httpClient = HttpClient.builder().build();
     private String jenkinsUrl;
     private String jenkinsRemoteToken;
 
@@ -87,9 +87,8 @@ public boolean isPinterestJenkinsUrl(String url) {
 
     String getJenkinsToken() throws Exception {
         String url = String.format("%s/%s", this.jenkinsUrl, "crumbIssuer/api/json");
-        String ret = httpClient.get(url, null, null, null, RETRIES);
-        JsonParser parser = new JsonParser();
-        JsonObject json = (JsonObject) parser.parse(ret);
+        String ret = httpClient.get(url, null, null);
+        JsonObject json = (JsonObject) JsonParser.parseString(ret);
         return json.get("crumb").getAsString();
     }
 
@@ -98,7 +97,7 @@ public void startBuild(String url) throws Exception {
         Map<String, String> headers = new HashMap<>(1);
         headers.put(".crumb", token);
         LOG.debug("Calling jenkins with url " + url + " and token " + token);
-        httpClient.post(url, null, headers, RETRIES);
+        httpClient.post(url, null, headers);
     }
 
     public void startBuild(String jobName, String buildParams) throws Exception {
@@ -110,18 +109,16 @@ public void startBuild(String jobName, String buildParams) throws Exception {
                 String.format(
                         "%s/job/%s/buildWithParameters?%s%s",
                         this.jenkinsUrl, jobName, tokenString, buildParams);
-        // startBuild(url);
         // Use GET instead, which is the same as POST but no need for token
-        httpClient.get(url, null, null, null, RETRIES);
+        httpClient.get(url, null, null);
         LOG.info("Successfully post to jenkins for job " + jobName);
     }
 
     public Build getBuild(String jobName, String jobNum) throws Exception {
         String url = String.format("%s/job/%s/%s/api/json", this.jenkinsUrl, jobName, jobNum);
         LOG.debug("Calling jenkins with url " + url);
-        String ret = httpClient.get(url, null, null, null, RETRIES);
-        JsonParser parser = new JsonParser();
-        JsonObject json = (JsonObject) parser.parse(ret);
+        String ret = httpClient.get(url, null, null);
+        JsonObject json = (JsonObject) JsonParser.parseString(ret);
         return new Build(
                 json.get("number").toString(),
                 json.get("result").toString(),

deploy-service/common/src/main/java/com/pinterest/deployservice/handler/CommonHandler.java

@@ -363,8 +363,7 @@ void transition(DeployBean deployBean, DeployBean newDeployBean, EnvironBean env
                         dataHandler.getDataById(
                                 envBean.getWebhooks_config_id(), WebhookDataFactory.class);
                 if (webhooks != null && !CollectionUtils.isEmpty(webhooks.getPostDeployHooks())) {
-                    jobPool.submit(
-                            new WebhookJob(webhooks.getPostDeployHooks(), deployBean, envBean));
+                    jobPool.submit(new WebhookJob(webhooks.getPostDeployHooks(), deployBean));
                     LOG.info("Submitted post deploy hook job for deploy {}.", deployId);
                 }
 

deploy-service/common/src/main/java/com/pinterest/deployservice/handler/DeployHandler.java

@@ -43,7 +43,6 @@
 import com.pinterest.deployservice.common.CommonUtils;
 import com.pinterest.deployservice.common.Constants;
 import com.pinterest.deployservice.common.DeployInternalException;
-import com.pinterest.deployservice.common.HTTPClient;
 import com.pinterest.deployservice.common.StateMachines;
 import com.pinterest.deployservice.common.WebhookDataFactory;
 import com.pinterest.deployservice.dao.AgentDAO;
@@ -56,6 +55,7 @@
 import com.pinterest.deployservice.db.DatabaseUtil;
 import com.pinterest.deployservice.db.DeployQueryFilter;
 import com.pinterest.deployservice.scm.SourceControlManagerProxy;
+import com.pinterest.teletraan.universal.http.HttpClient;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -102,6 +102,7 @@ public class DeployHandler implements DeployHandlerInterface {
             "This stage requires SOX builds. A private build cannot be used in a sox-compliant stage.";
     static final String ERROR_STAGE_REQUIRES_SOX_BUILD_COMPLIANT_SOURCE =
             "This stage requires SOX builds. The build must be from a sox-compliant source. Contact your sox administrators.";
+    private static final HttpClient httpClient = HttpClient.builder().build();
 
     private final DeployDAO deployDAO;
     private final EnvironDAO environDAO;
@@ -126,11 +127,9 @@ private final class NotifyJob implements Callable<Void> {
         private final EnvironBean envBean;
         private final DeployBean newDeployBean;
         private final DeployBean oldDeployBean;
-        private final HTTPClient httpClient;
         private final CommonHandler commonHandler;
         private final String deployBoardUrlPrefix;
         private final String changeFeedUrl;
-        private static final int RETRIES = 3;
 
         public NotifyJob(
                 EnvironBean envBean,
@@ -142,7 +141,6 @@ public NotifyJob(
             this.envBean = envBean;
             this.newDeployBean = newDeployBean;
             this.oldDeployBean = oldDeployBean;
-            this.httpClient = new HTTPClient();
             this.commonHandler = commonHandler;
             this.deployBoardUrlPrefix = deployBoardUrlPrefix;
             this.changeFeedUrl = changeFeedUrl;
@@ -165,7 +163,7 @@ private void updateChangeFeed() {
                                 envBean.getExternal_id());
                 Map<String, String> headers = new HashMap<>();
                 headers.put("Content-Type", "application/json");
-                httpClient.post(changeFeedUrl, feedPayload, headers, RETRIES);
+                httpClient.post(changeFeedUrl, feedPayload, headers);
                 LOG.info("Send change feed {} to {} successfully", feedPayload, changeFeedUrl);
             } catch (Exception e) {
                 LOG.error(
@@ -397,7 +395,7 @@ String internalDeploy(EnvironBean envBean, DeployBean deployBean) throws Excepti
         EnvWebHookBean webhook =
                 dataHandler.getDataById(envBean.getWebhooks_config_id(), WebhookDataFactory.class);
         if (webhook != null && !CollectionUtils.isEmpty(webhook.getPreDeployHooks())) {
-            jobPool.submit(new WebhookJob(webhook.getPreDeployHooks(), deployBean, envBean));
+            jobPool.submit(new WebhookJob(webhook.getPreDeployHooks(), deployBean));
         }
 
         LOG.info("Submitted notify job for deploy {}", deployId);