From f9277f89397240953bb17448562b17b0a47fe02c Mon Sep 17 00:00:00 2001
From: Andrzej Ludwikowski <andrzej.ludwikowski@lightbend.com>
Date: Mon, 26 Jun 2023 15:37:51 +0200
Subject: [PATCH] reverting test changes

---
 .../FibonacciActionIntegrationTest.java       | 31 ++++---------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/samples/java-spring-fibonacci-action/src/it/java/com/example/fibonacci/FibonacciActionIntegrationTest.java b/samples/java-spring-fibonacci-action/src/it/java/com/example/fibonacci/FibonacciActionIntegrationTest.java
index 7cadcf17d6..e158c18168 100644
--- a/samples/java-spring-fibonacci-action/src/it/java/com/example/fibonacci/FibonacciActionIntegrationTest.java
+++ b/samples/java-spring-fibonacci-action/src/it/java/com/example/fibonacci/FibonacciActionIntegrationTest.java
@@ -1,26 +1,17 @@
 package com.example.fibonacci;
 
 import com.example.Main;
-import com.google.protobuf.any.Any;
-import kalix.javasdk.DeferredCall;
-import kalix.javasdk.client.ComponentClient;
 import kalix.spring.testkit.KalixIntegrationTestKitSupport;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Mono;
 
 import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import static java.time.temporal.ChronoUnit.SECONDS;
 
@@ -31,18 +22,16 @@ public class FibonacciActionIntegrationTest extends KalixIntegrationTestKitSuppo
   @Autowired
   private WebClient webClient;
 
-  @Autowired
-  private ComponentClient componentClient;
-  private Duration timeout = Duration.of(5, SECONDS);
-
   @Test
   public void calculateNextNumber() {
 
-    Number response = execute(componentClient.forAction()
-        .call(FibonacciAction::getNumber)
-        .params(5L));
+    Mono<Number> response =
+      webClient.get()
+        .uri("/fibonacci/5/next")
+        .retrieve().bodyToMono(Number.class);
 
-    Assertions.assertEquals(8, response.value());
+    long next = response.block(Duration.of(5, SECONDS)).value();
+    Assertions.assertEquals(8, next);
 
   }
 
@@ -77,12 +66,4 @@ public void wrongNumberReturnsError() {
       Assertions.assertTrue(bodyErrorMessage.contains("Input number is not a Fibonacci number"));
     }
   }
-
-  private <T> T execute(DeferredCall<Any, T> deferredCall) {
-    try {
-      return deferredCall.execute().toCompletableFuture().get(timeout.toMillis(), TimeUnit.MILLISECONDS);
-    } catch (InterruptedException | ExecutionException | TimeoutException e) {
-      throw new RuntimeException(e);
-    }
-  }
 }