Replacing OkHttpClient with Java 11 HttpClient (#1218)

* Replacing OkHttpClient with Java 11 HttpClient

Signed-off-by: Artur Ciocanu <[email protected]>

* Adjusted the Dapr HTTP tests

Signed-off-by: Artur Ciocanu <[email protected]>

* Adjust tests to use Mockito instead of OkHttp mock interceptor

Signed-off-by: Artur Ciocanu <[email protected]>

* Removing OkHTTP from SDK module

Signed-off-by: Artur Ciocanu <[email protected]>

* Apparently there is Kotlin deps issue

Signed-off-by: Artur Ciocanu <[email protected]>

* Add read timeout to HttpClient request

Signed-off-by: Artur Ciocanu <[email protected]>

* Use HTTP 1.1

Signed-off-by: Artur Ciocanu <[email protected]>

* Add file header

Signed-off-by: Artur Ciocanu <[email protected]>

* Adding back the test related to multiple Monos

Signed-off-by: Artur Ciocanu <[email protected]>

---------

Signed-off-by: Artur Ciocanu <[email protected]>
Co-authored-by: Artur Ciocanu <[email protected]>

Author: artur-ciocanu

examples/pom.xml

@@ -134,6 +134,11 @@
       <artifactId>protobuf-java</artifactId>
       <version>${protobuf.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp</artifactId>
+      <version>4.12.0</version>
+    </dependency>
   </dependencies>
 
   <build>

examples/src/main/java/io/dapr/examples/OpenTelemetryInterceptor.java

@@ -19,12 +19,13 @@
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Nullable;
+
 import java.util.Collections;
 
 @Component

sdk-actors/src/test/java/io/dapr/client/DaprHttpProxy.java

@@ -21,8 +21,8 @@
 
 import java.time.Duration;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test SDK resiliency.
@@ -43,7 +43,7 @@ public class WaitForSidecarIT extends BaseIT {
   @BeforeAll
   public static void init() throws Exception {
     daprRun = startDaprApp(WaitForSidecarIT.class.getSimpleName(), 5000);
-    daprNotRunning = startDaprApp(WaitForSidecarIT.class.getSimpleName()+"NotRunning", 5000);
+    daprNotRunning = startDaprApp(WaitForSidecarIT.class.getSimpleName() + "NotRunning", 5000);
     daprNotRunning.stop();
 
     toxiProxyRun = new ToxiProxyRun(daprRun, LATENCY, JITTER);
@@ -61,24 +61,30 @@ public void waitSucceeds() throws Exception {
   public void waitTimeout() {
     int timeoutInMillis = (int)LATENCY.minusMillis(100).toMillis();
     long started = System.currentTimeMillis();
+
     assertThrows(RuntimeException.class, () -> {
       try(var client = toxiProxyRun.newDaprClientBuilder().build()) {
         client.waitForSidecar(timeoutInMillis).block();
       }
     });
+
     long duration = System.currentTimeMillis() - started;
-    assertTrue(duration >= timeoutInMillis);
+
+    assertThat(duration).isGreaterThanOrEqualTo(timeoutInMillis);
   }
 
   @Test
   public void waitSlow() throws Exception {
     int timeoutInMillis = (int)LATENCY.plusMillis(100).toMillis();
     long started = System.currentTimeMillis();
+
     try(var client = toxiProxyRun.newDaprClientBuilder().build()) {
         client.waitForSidecar(timeoutInMillis).block();
     }
+
     long duration = System.currentTimeMillis() - started;
-    assertTrue(duration >= LATENCY.toMillis());
+
+    assertThat(duration).isGreaterThanOrEqualTo(LATENCY.toMillis());
   }
 
   @Test
@@ -87,12 +93,15 @@ public void waitNotRunningTimeout() {
     // This has to do with a previous bug in the implementation.
     int timeoutMilliseconds = 5000;
     long started = System.currentTimeMillis();
+
     assertThrows(RuntimeException.class, () -> {
       try(var client = daprNotRunning.newDaprClientBuilder().build()) {
         client.waitForSidecar(timeoutMilliseconds).block();
       }
     });
+
     long duration = System.currentTimeMillis() - started;
-    assertTrue(duration >= timeoutMilliseconds);
+
+    assertThat(duration).isGreaterThanOrEqualTo(timeoutMilliseconds);
   }
 }

sdk-tests/src/test/java/io/dapr/it/resiliency/WaitForSidecarIT.java

@@ -23,12 +23,13 @@
 import io.dapr.workflows.saga.Saga;
 import io.dapr.workflows.saga.SagaContext;
 
-import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.slf4j.Logger;
 
+import javax.annotation.Nullable;
+
 import java.time.Duration;
 import java.time.Instant;
 import java.time.ZonedDateTime;

sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java

@@ -44,17 +44,6 @@
       <artifactId>reactor-core</artifactId>
       <version>3.5.0</version>
     </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>4.12.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jetbrains.kotlin</groupId>
-          <artifactId>kotlin-stdlib-jdk8</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

sdk/pom.xml

@@ -80,7 +80,6 @@
 import io.grpc.Metadata;
 import io.grpc.stub.AbstractStub;
 import io.grpc.stub.StreamObserver;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Flux;
@@ -90,6 +89,8 @@
 import reactor.util.context.ContextView;
 import reactor.util.retry.Retry;
 
+import javax.annotation.Nonnull;
+
 import java.io.IOException;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -441,7 +442,7 @@ public <T> Subscription subscribeToEvents(
     return buildSubscription(listener, type, request);
   }
 
-  @NotNull
+  @Nonnull
   private <T> Subscription<T> buildSubscription(
       SubscriptionListener<T> listener,
       TypeRef<T> type,