Address review comments

Author: nikita-tkachenko-datadog

communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java

@@ -60,9 +60,9 @@ public void createRemaining(Config config) {
     }
 
     httpClientTimeout =
-        !config.isCiVisibilityEnabled()
-            ? TimeUnit.SECONDS.toMillis(config.getAgentTimeout())
-            : config.getCiVisibilityBackendApiTimeoutMillis();
+        config.isCiVisibilityEnabled()
+            ? config.getCiVisibilityBackendApiTimeoutMillis()
+            : TimeUnit.SECONDS.toMillis(config.getAgentTimeout());
 
     forceClearTextHttpForIntakeClient = config.isForceClearTextHttpForIntakeClient();
 
@@ -78,10 +78,7 @@ public void createRemaining(Config config) {
       String namedPipe = config.getAgentNamedPipe();
       agentHttpClient =
           OkHttpUtils.buildHttpClient(
-              agentUrl != null && "http".equals(agentUrl.scheme()),
-              unixDomainSocket,
-              namedPipe,
-              httpClientTimeout);
+              OkHttpUtils.isPlainHttp(agentUrl), unixDomainSocket, namedPipe, httpClientTimeout);
     }
   }
 
@@ -228,9 +225,9 @@ public String get() {
   }
 
   public OkHttpClient getIntakeHttpClient() {
-    OkHttpClient intakeHttpClient = this.intakeHttpClient;
-    if (intakeHttpClient != null) {
-      return intakeHttpClient;
+    OkHttpClient client = this.intakeHttpClient;
+    if (client != null) {
+      return client;
     }
 
     synchronized (this) {

communication/src/main/java/datadog/communication/http/OkHttpUtils.java

@@ -58,7 +58,7 @@ public final class OkHttpUtils {
       SystemProperties.getOrDefault("java.vm.vendor", "unknown");
 
   public static OkHttpClient buildHttpClient(final HttpUrl url, final long timeoutMillis) {
-    return buildHttpClient(url != null && "http".equals(url.scheme()), null, null, timeoutMillis);
+    return buildHttpClient(isPlainHttp(url), null, null, timeoutMillis);
   }
 
   public static OkHttpClient buildHttpClient(
@@ -95,7 +95,7 @@ public static OkHttpClient buildHttpClient(
         discoverApmSocket(config),
         config.getAgentNamedPipe(),
         dispatcher,
-        url != null && "http".equals(url.scheme()),
+        isPlainHttp(url),
         retryOnConnectionFailure,
         maxRunningRequests,
         proxyHost,
@@ -392,4 +392,8 @@ private static void closeQuietly(Response response) {
       // ignore
     }
   }
+
+  public static boolean isPlainHttp(final HttpUrl url) {
+    return url != null && "http".equalsIgnoreCase(url.scheme());
+  }
 }