java 8 migrated

Author: pashidlos

build.gradle

@@ -24,6 +24,7 @@ buildscript {
 }
 
 dependencies {
+    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     testImplementation group: 'org.testng', name: 'testng', version: '7.1.0'
     testImplementation 'commons-io:commons-io:2.6'

src/main/java/io/visual_regression_tracker/sdk_java/VisualRegressionTracker.java

@@ -1,47 +1,46 @@
 package io.visual_regression_tracker.sdk_java;
 
 import com.google.gson.Gson;
+import okhttp3.*;
 
 import java.io.IOException;
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
 import java.util.HashMap;
 import java.util.Map;
 
 public class VisualRegressionTracker {
+    static final MediaType JSON = MediaType.get("application/json; charset=utf-8");
     Config config;
     String buildId;
-    HttpClient client;
+    OkHttpClient client;
 
     public VisualRegressionTracker(Config config) {
         this.config = config;
 
-        this.client = HttpClient.newHttpClient();
+        this.client = new OkHttpClient();
     }
 
-    void startBuild() throws IOException, InterruptedException {
+    void startBuild() throws IOException {
         if (this.buildId == null) {
             Map<String, String> data = new HashMap<>();
             data.put("projectId", this.config.projectId);
             data.put("branchName", this.config.branchName);
 
-            HttpRequest request = HttpRequest.newBuilder()
-                    .uri(URI.create(this.config.apiUrl.concat("/builds")))
-                    .header("apiKey", this.config.token)
-                    .header("Content-Type", "application/json")
-                    .POST(HttpRequest.BodyPublishers.ofString(new Gson().toJson(data)))
-                    .build();
+            RequestBody body = RequestBody.create(new Gson().toJson(data), JSON);
 
-            HttpResponse<String> response = this.client.send(request, HttpResponse.BodyHandlers.ofString());
-            BuildDTO buildDTO = new Gson().fromJson(response.body(), BuildDTO.class);
+            Request request = new Request.Builder()
+                    .url(this.config.apiUrl.concat("/builds"))
+                    .addHeader("apiKey", this.config.token)
+                    .post(body)
+                    .build();
 
-            this.buildId = buildDTO.getId();
+            try (ResponseBody responseBody = client.newCall(request).execute().body()) {
+                BuildDTO buildDTO = new Gson().fromJson(responseBody.string(), BuildDTO.class);
+                this.buildId = buildDTO.getId();
+            }
         }
     }
 
-    TestResultDTO submitTestRun(TestRun testRun) throws IOException, InterruptedException {
+    TestResultDTO submitTestRun(TestRun testRun) throws IOException {
         Map<String, Object> data = new HashMap<>();
         data.put("projectId", this.config.projectId);
         data.put("buildId", this.buildId);
@@ -53,30 +52,30 @@ TestResultDTO submitTestRun(TestRun testRun) throws IOException, InterruptedExce
         data.put("device", testRun.getDevice());
         data.put("diffTollerancePercent", testRun.getDiffTollerancePercent());
 
+        RequestBody body = RequestBody.create(new Gson().toJson(data), JSON);
 
-        HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create(this.config.apiUrl.concat("/test")))
-                .header("apiKey", this.config.token)
-                .header("Content-Type", "application/json")
-                .POST(HttpRequest.BodyPublishers.ofString(new Gson().toJson(data)))
+        Request request = new Request.Builder()
+                .url(this.config.apiUrl.concat("/test"))
+                .addHeader("apiKey", this.config.token)
+                .post(body)
                 .build();
 
-        HttpResponse<String> response = this.client.send(request, HttpResponse.BodyHandlers.ofString());
 
-        System.out.println(response.body());
-        return new Gson().fromJson(response.body(), TestResultDTO.class);
+        try (ResponseBody responseBody = client.newCall(request).execute().body()) {
+            return new Gson().fromJson(responseBody.string(), TestResultDTO.class);
+        }
     }
 
-    public void track(TestRun testRun) throws IOException, InterruptedException {
+    public void track(TestRun testRun) throws IOException {
         this.startBuild();
 
         TestResultDTO testResultDTO = this.submitTestRun(testRun);
 
-        if(testResultDTO.getStatus().equals("new")) {
+        if (testResultDTO.getStatus().equals("new")) {
             throw new TestRunException("No baseline: ".concat(testResultDTO.getUrl()));
         }
 
-        if(testResultDTO.getStatus().equals("unresolved")) {
+        if (testResultDTO.getStatus().equals("unresolved")) {
             throw new TestRunException("Difference found: ".concat(testResultDTO.getUrl()));
         }
     }

src/test/java/io/visual_regression_tracker/sdk_java/Example.java

@@ -11,12 +11,12 @@ public class Example {
     Config config = Config.builder()
             .apiUrl("http://localhost:4200")
             .branchName("develop")
-            .projectId("76f0c443-9811-4f4f-b1c2-7c01c5775d9a")
+            .projectId("003f5fcf-6c5f-4f1f-a99f-82a697711382")
             .token("F5Z2H0H2SNMXZVHX0EA4YQM1MGDD")
             .build();
 
     @Test
-    public void asdas() throws IOException, InterruptedException {
+    public void asdas() throws IOException {
         VisualRegressionTracker visualRegressionTracker = new VisualRegressionTracker(config);