java: Remove debug logic

Author: svix-mman

java/lib/src/main/java/com/svix/SvixHttpClient.java

@@ -7,14 +7,11 @@
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.svix.exceptions.ApiException;
 
-import lombok.Getter;
-
 import okhttp3.*;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.locks.LockSupport;
 
@@ -24,14 +21,12 @@ public class SvixHttpClient {
     private final List<Long> retrySchedule;
     private final OkHttpClient client;
     private final ObjectMapper objectMapper;
-    private final boolean debug;
 
     public SvixHttpClient(
             HttpUrl baseUrl, Map<String, String> defaultHeaders, List<Long> retrySchedule) {
         this.baseUrl = baseUrl;
         this.defaultHeaders = defaultHeaders;
         this.retrySchedule = retrySchedule;
-        this.debug = Objects.equals(System.getenv("DEBUG"), "YES");
         this.client = new OkHttpClient();
 
         ObjectMapper mapper = new ObjectMapper();
@@ -77,14 +72,13 @@ public <Req, Res> Res executeRequest(
                 String.valueOf(ThreadLocalRandom.current().nextLong(0, Long.MAX_VALUE)));
 
         Request request = reqBuilder.build();
-        Result res = executeRequestWithRetry(request, jsonBody);
-        Response response = res.getSecond();
+        Response response = executeRequestWithRetry(request, jsonBody);
 
         if (response.body() == null) {
             throw new ApiException("Body is null", response.code(), "");
         }
 
-        String bodyString = res.getFirst(); //  response.body().string();
+        String bodyString = response.body().string();
 
         if (response.code() == 204) {
             return null;
@@ -98,10 +92,8 @@ public <Req, Res> Res executeRequest(
                 "Non 200 status code: `" + response.code() + "`", response.code(), bodyString);
     }
 
-    private Result executeRequestWithRetry(Request request, String body) throws IOException {
-        dbgReq(request, body);
+    private Response executeRequestWithRetry(Request request, String body) throws IOException {
         Response response = client.newCall(request).execute();
-        String resBody = dbgRes(response);
 
         int retryCount = 0;
         while (response.code() >= 500 && retryCount < retrySchedule.size()) {
@@ -114,87 +106,9 @@ private Result executeRequestWithRetry(Request request, String body) throws IOEx
                     request.newBuilder()
                             .header("svix-retry-count", String.valueOf(retryCount + 1))
                             .build();
-            dbgReq(retryRequest, body);
             response = client.newCall(retryRequest).execute();
-            resBody = dbgRes(response);
             retryCount++;
         }
-        return new Result(resBody, response);
-    }
-
-    private void dbgReq(Request request, String body) {
-        StringBuilder dump = new StringBuilder();
-        dump.append("--------- start req ---------\n");
-
-        // Request line
-        dump.append(request.method()).append(" ").append(request.url().encodedPath());
-
-        // Add query parameters if present
-        if (request.url().encodedQuery() != null) {
-            dump.append("?").append(request.url().encodedQuery());
-        }
-
-        dump.append(" HTTP/1.1\r\n");
-
-        // Headers
-        Headers headers = request.headers();
-        for (int i = 0; i < headers.size(); i++) {
-            dump.append(headers.name(i)).append(": ").append(headers.value(i)).append("\r\n");
-        }
-
-        // Empty line between headers and body
-        dump.append("\r\n");
-
-        // Body
-        dump.append(body);
-        if (this.debug) {
-            System.out.println(dump.toString());
-        }
-    }
-
-    private String dbgRes(Response response) throws IOException {
-        StringBuilder dump = new StringBuilder();
-
-        // Status line with protocol and status code
-        dump.append(response.protocol()) // Will show HTTP/1.1 【1】【2】
-                .append(" ")
-                .append(response.code())
-                .append(" ")
-                .append(response.message())
-                .append("\r\n");
-
-        // Headers
-        Headers headers = response.headers();
-        for (int i = 0; i < headers.size(); i++) {
-            dump.append(headers.name(i)).append(": ").append(headers.value(i)).append("\r\n");
-        }
-
-        // Empty line between headers and body
-        dump.append("\r\n");
-
-        // Body - note that response body can only be consumed once 【3】【2】
-        ResponseBody body = response.body();
-        String bodyString = "";
-        if (body != null) {
-            bodyString = body.string();
-            dump.append(bodyString);
-        }
-        dump.append("\n--------- end req ---------");
-        if (this.debug) {
-            System.out.println(dump.toString());
-        }
-        return bodyString;
-    }
-
-    @Getter
-    static class Result {
-        // Getters
-        private final String first;
-        private final Response second;
-
-        public Result(String first, Response second) {
-            this.first = first;
-            this.second = second;
-        }
+        return response;
     }
 }