Revert "FFM-5149 - Avoid using read timeout of 0 for SSE connections to allow stale sockets to be purged"

This reverts commit 90fcef0.

Author: andybharness

src/main/java/io/harness/cf/client/api/CfClient.java

@@ -31,13 +31,11 @@
 import io.jsonwebtoken.Jwts;
 import io.vavr.CheckedRunnable;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
@@ -259,13 +257,7 @@ private void initStreamingMode() {
   }
 
   void startSSE() {
-    long readTimeoutInMins = Math.max(config.getSseReadTimeout(), 1);
-    OkHttpClient sseClient =
-        new OkHttpClient.Builder()
-            .readTimeout(readTimeoutInMins, TimeUnit.MINUTES)
-            .retryOnConnectionFailure(true)
-            .build();
-    OkSse okSse = new OkSse(sseClient);
+    OkSse okSse = new OkSse();
     sse = okSse.newServerSentEvent(sseRequest, listener);
   }
 

src/main/java/io/harness/cf/client/api/Config.java

@@ -54,9 +54,6 @@ public class Config {
   /** If metrics service POST call is taking > this time, we need to know about it */
   @Getter @Builder.Default long metricsServiceAcceptableDuration = 10000;
 
-  /** read timeout in minutes for SSE connections */
-  @Getter @Builder.Default long sseReadTimeout = 30;
-
   public int getFrequency() {
     return Math.max(frequency, Config.MIN_FREQUENCY);
   }

src/main/java/io/harness/cf/client/api/Poller.java

@@ -46,7 +46,7 @@ public Poller(
   protected void runOneIteration() {
 
     if (Thread.currentThread().isInterrupted()) {
-      log.warn("Polling thread interrupted, skipping iteration");
+
       return;
     }
     try {

src/main/java/io/harness/cf/client/api/SSEListener.java

@@ -83,7 +83,7 @@ private void processFeature(JsonObject jsonObject) {
           break;
         } else {
           log.error(
-              "Mismatched versions, payload version [{}] featureConfig version [{}]",
+              format("Mismatched versions, payload version [%s] featureConfig version [%s]"),
               version,
               featureConfig.getFeature());
         }
@@ -124,8 +124,6 @@ public boolean onRetryTime(ServerSentEvent serverSentEvent, long l) {
   @Override
   public boolean onRetryError(
       ServerSentEvent serverSentEvent, Throwable throwable, Response response) {
-    log.warn("onRetryError got {}", throwable.getMessage());
-    log.trace("onRetryError throwable is ", throwable);
     return false;
   }
 

src/test/java/io/harness/cf/client/api/mock/MockedCfConfiguration.java

@@ -29,8 +29,7 @@ public MockedCfConfiguration() {
         30000,
         10000,
         true,
-        10000,
-        30);
+        10000);
   }
 
   @Override