intg 1575 refactoring under integration service package

Author: shandli123

src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackTestReportForBuild.java

@@ -1,6 +1,7 @@
 package com.browserstack.automate.ci.jenkins;
 
 import com.browserstack.automate.ci.common.constants.Constants;
+import hudson.model.Action;
 import hudson.model.Run;
 import org.json.JSONObject;
 import okhttp3.*;
@@ -12,9 +13,10 @@
 import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
 import static com.browserstack.automate.ci.common.logger.PluginLogger.logError;
 
-public class BrowserStackTestReportForBuild extends AbstractBrowserStackTestReportForBuild {
+public class BrowserStackTestReportAction implements Action {
 
- private BrowserStackCredentials credentials;
+  private Run<?, ?> run;
+  private BrowserStackCredentials credentials;
   private String reportUrl;
   private final String UUID;
   private String reportHtml;
@@ -25,9 +27,9 @@ public class BrowserStackTestReportForBuild extends AbstractBrowserStackTestRepo
   private static final String REPORT_IN_PROGRESS = "REPORT_IN_PROGRESS";
   private static final String REPORT_FAILED = "REPORT_FAILED";
   private static final OkHttpClient client = new OkHttpClient();
-  makeRequestsUtil requestsUtil;
+  RequestsUtil requestsUtil;
 
-  public BrowserStackTestReportForBuild(Run<?, ?> run, BrowserStackCredentials credentials, String reportUrl, String UUID, String reportName, String tabUrl, final PrintStream logger) {
+  public BrowserStackTestReportAction(Run<?, ?> run, BrowserStackCredentials credentials, String reportUrl, String UUID, String reportName, String tabUrl, final PrintStream logger) {
     super();
     setBuild(run);
     this.credentials = credentials;
@@ -38,45 +40,47 @@ public BrowserStackTestReportForBuild(Run<?, ?> run, BrowserStackCredentials cre
     this.logger = logger;
     this.reportName = reportName;
     this.urlName = tabUrl;
-    requestsUtil = new makeRequestsUtil();
+    requestsUtil = new RequestsUtil();
   }
 
 
   public String getReportHtml() {
     fetchReportConditions();
     return reportHtml;
   }
+
   public String getReportStyle() {
     fetchReportConditions();
     return reportStyle;
   }
 
   private void fetchReportConditions() {
-    if ( reportHtml == null || reportHtml.equals(REPORT_IN_PROGRESS)) {
+    if (reportHtml == null || reportHtml.equals(REPORT_IN_PROGRESS)) {
       fetchReport();
     }
   }
+
   private void fetchReport() {
-    if( UUID == null ) {
+    if (UUID == null) {
       reportHtml = REPORT_FAILED;
       return;
     }
     Map<String, String> params = new HashMap<>();
     params.put("UUID", UUID);
-    params.put("report_name",reportName);
+    params.put("report_name", reportName);
     params.put("tool", Constants.INTEGRATIONS_TOOL_KEY);
 
     try {
       String CIReportUrlWithParams = requestsUtil.buildQueryParams(reportUrl, params);
-      log(logger, "Fetching browserstack report " + reportName );
+      log(logger, "Fetching browserstack report " + reportName);
       Response response = requestsUtil.makeRequest(CIReportUrlWithParams, credentials);
       if (response.isSuccessful()) {
         JSONObject reportResponse = new JSONObject(response.body().string());
         String reportStatus = reportResponse.optString("report_status");
-        if(reportStatus.equalsIgnoreCase(Constants.REPORT_COMPLETED_STATUS)) {
+        if (reportStatus.equalsIgnoreCase(String.valueOf(Constants.REPORT_STATUS.COMPLETED))) {
           reportHtml = reportResponse.optString("report_html", null);
           reportStyle = reportResponse.optString("report_style", "");
-        } else if(reportStatus.equalsIgnoreCase(Constants.REPORT_IN_PROGRESS_STATUS)){
+        } else if (reportStatus.equalsIgnoreCase(String.valueOf(Constants.REPORT_STATUS.IN_PROGRESS))) {
           reportHtml = REPORT_IN_PROGRESS;
         } else {
           reportHtml = REPORT_FAILED;
@@ -93,24 +97,37 @@ public boolean isReportInProgress() {
     return reportHtml.equals(REPORT_IN_PROGRESS);
   }
 
-  public  boolean isReportFailed() {
+  public boolean isReportFailed() {
     return reportHtml.equals(REPORT_FAILED);
   }
 
   public boolean isReportAvailable() {
-    if(reportHtml!=null && !reportHtml.equals(REPORT_IN_PROGRESS) && !reportHtml.equals(REPORT_FAILED)){
+    if (reportHtml != null && !reportHtml.equals(REPORT_IN_PROGRESS) && !reportHtml.equals(REPORT_FAILED)) {
       return true;
     }
     return false;
   }
 
+  public Run<?, ?> getBuild() {
+    return run;
+  }
+
+  public void setBuild(Run<?, ?> build) {
+    this.run = build;
+  }
+
+  @Override
+  public String getIconFileName() {
+    return Constants.BROWSERSTACK_LOGO;
+  }
+
   @Override
-  public  String getDisplayName() {
+  public String getDisplayName() {
     return this.reportName;
   }
 
   @Override
-  public String getUrlName(){
+  public String getUrlName() {
     return this.urlName;
   }
 

src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java renamed to src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java

@@ -42,11 +42,12 @@ public class BrowserStackTestReportPublisher extends Recorder implements SimpleB
   private static final int RETRY_DELAY_SECONDS = 10;
   private final Map<String, String> customEnvVars;
 
-  makeRequestsUtil requestsUtil;
+  RequestsUtil requestsUtil;
+
   @DataBoundConstructor
   public BrowserStackTestReportPublisher(Map<String, String> customEnvVars) {
     this.customEnvVars = customEnvVars != null ? new HashMap<>(customEnvVars) : new HashMap<>();
-    requestsUtil = new makeRequestsUtil();
+    requestsUtil = new RequestsUtil();
   }
 
   @Override
@@ -99,20 +100,20 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
       String reportUrl = config.getString("report_fetch_url");
       String reportName = config.getString("report_name");
       String reportTabUrl = config.getString("report_tab_url");
-      log(logger, reportUrl+" "+ UUID );
-      build.addAction(new BrowserStackTestReportForBuild(build, credentials, reportUrl, UUID, reportName, reportTabUrl, logger));
+      log(logger, reportUrl + " " + UUID);
+      build.addAction(new BrowserStackTestReportAction(build, credentials, reportUrl, UUID, reportName, reportTabUrl, logger));
     }
 
   }
 
-  private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCredentials credentials , String buildName, String projectName, String encodedTimestamp) throws InterruptedException {
+  private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCredentials credentials, String buildName, String projectName, String encodedTimestamp) throws InterruptedException {
 
     Map<String, String> params = new HashMap<>();
-    params.put("build_name",buildName);
+    params.put("build_name", buildName);
     params.put("pipeline_timestamp", encodedTimestamp);
     params.put("tool", Constants.INTEGRATIONS_TOOL_KEY);
-    if(projectName != null) {
-      params.put("project_name",projectName);
+    if (projectName != null) {
+      params.put("project_name", projectName);
     }
 
     log(logger, "Fetching build....");
@@ -135,8 +136,8 @@ private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCrede
           JSONObject lookUpResponse = new JSONObject(response.body().string());
           String UUID = lookUpResponse.optString("UUID", null);
 
-          if(UUID !=null) {
-            log(logger, "build found with "+ buildName + " and project name " + projectName);
+          if (UUID != null) {
+            log(logger, "build found with " + buildName + " and project name " + projectName);
             return UUID;
           }
 
@@ -148,16 +149,16 @@ private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCrede
       TimeUnit.SECONDS.sleep(RETRY_DELAY_SECONDS);
     }
 
-    LOGGER.info("build not found even after "+ MAX_ATTEMPTS + "attempts");
+    LOGGER.info("build not found even after " + MAX_ATTEMPTS + "attempts");
     return null;
   }
 
   private JSONObject fetchConfigDetails(PrintStream logger, String configDetailsURL, BrowserStackCredentials credentials) {
     log(logger, "Fetching config details for reports");
     Map<String, String> params = new HashMap<>();
-    params.put("tool",Constants.INTEGRATIONS_TOOL_KEY);
-    params.put("operation",Constants.REPORT_CONFIG_OPERATION_NAME);
-    try  {
+    params.put("tool", Constants.INTEGRATIONS_TOOL_KEY);
+    params.put("operation", Constants.REPORT_CONFIG_OPERATION_NAME);
+    try {
       String configDetailsURLWithParams = requestsUtil.buildQueryParams(configDetailsURL, params);
       Response response = requestsUtil.makeRequest(configDetailsURLWithParams, credentials);
       if (response.isSuccessful()) {

src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java renamed to src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java

@@ -10,7 +10,7 @@
 import java.net.URISyntaxException;
 import java.util.Map;
 
-public class makeRequestsUtil {
+public class RequestsUtil {
   OkHttpClient client = new OkHttpClient();
 
   public Response makeRequest(String getUrl, BrowserStackCredentials browserStackCredentials) throws Exception {