adding tests

Author: pedrolopes9-7

spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/completablefuturefeignclient/PaymentMethodClient.java

@@ -5,8 +5,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.List;
-
 @FeignClient(name = "paymentClient", url = "http://localhost:8083")
 public interface PaymentMethodClient {
 

spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/completablefuturefeignclient/Purchase.java

@@ -2,7 +2,7 @@
 
 public class Purchase {
 
-    private String siteId;
+    String siteId;
 
     public Purchase(String siteId) {
         this.siteId = siteId;

spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/completablefuturefeignclient/PurchaseService.java

@@ -1,14 +1,13 @@
 package com.baeldung.cloud.openfeign.completablefuturefeignclient;
 
 import feign.FeignException;
+import feign.RetryableException;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-
-import static java.lang.String.format;
+import java.util.concurrent.TimeoutException;
 
 @Service
 public class PurchaseService {
@@ -23,24 +22,28 @@ public PurchaseService(PaymentMethodClient paymentMethodClient, ReportClient rep
 
     public String executePurchase(Purchase purchase) throws ExecutionException, InterruptedException {
         CompletableFuture<String> paymentMethodsFuture = CompletableFuture.supplyAsync(() -> paymentMethodClient.processPurchase(purchase.getSiteId()))
-                .handle((res, ex) -> {
-                    if (ex.getCause() instanceof FeignException) {
-                        int status = ((FeignException) ex.getCause()).status();
+                .orTimeout(400, TimeUnit.MILLISECONDS)
+                .exceptionally(ex -> {
+                    if (ex.getCause() instanceof FeignException && ((FeignException) ex.getCause()).status() == 404) {
+                        return "account_money";
+                    }
 
-                        if (status == 404) {
-                            return null;
-                        }
+                    if (ex.getCause() instanceof RetryableException) {
+                        // handle REST timeout
+                        throw new RuntimeException("REST call network timeout!");
                     }
-                    return res;
-                })
-                .orTimeout(2, TimeUnit.SECONDS);
 
-        CompletableFuture<Void> reportFuture = CompletableFuture.runAsync(() -> reportClient.sendReport("Purchase Order Report"))
-                .orTimeout(1, TimeUnit.SECONDS);
+                    if (ex instanceof TimeoutException) {
+                        // handle thread timeout
+                        throw new RuntimeException("Thread timeout!", ex);
+                    }
+
+                    throw new RuntimeException("Unrecoverable error!", ex);
+                });
 
-        CompletableFuture.allOf(paymentMethodsFuture, reportFuture)
-                .join();
+        CompletableFuture.runAsync(() -> reportClient.sendReport("Purchase Order Report"))
+                .orTimeout(1, TimeUnit.SECONDS);
 
-        return paymentMethodsFuture.get();
+        return String.format("Purchase executed with payment method %s", paymentMethodsFuture.get());
     }
 }

spring-cloud-modules/spring-cloud-openfeign-2/src/test/java/com/baeldung/cloud/openfeign/completablefuturefeignclient/PurchaseServiceIntegrationTest.java

@@ -8,18 +8,21 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.openfeign.FeignClientProperties;
 import org.springframework.http.HttpStatus;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = ExampleApplication.class)
+@TestPropertySource(locations = "classpath:application-integration_test.properties")
 class PurchaseServiceIntegrationTest {
 
     @Autowired
@@ -33,11 +36,18 @@ class PurchaseServiceIntegrationTest {
 
     private WireMockServer wireMockServer;
 
+    private Purchase purchase;
+
     @BeforeEach
     public void startWireMockServer() {
         wireMockServer = new WireMockServer(8083);
         configureFor("localhost", 8083);
         wireMockServer.start();
+
+        stubFor(post(urlEqualTo("/reports"))
+                .willReturn(aResponse().withStatus(HttpStatus.OK.value())));
+
+        purchase = new Purchase("BR");
     }
 
     @AfterEach
@@ -46,17 +56,46 @@ public void stopWireMockServer() {
     }
 
     @Test
-    void executePurchase() throws ExecutionException, InterruptedException {
+    void givenRestCalls_whenBothReturnsOk_thenReturnCorrectResult()
+            throws ExecutionException, InterruptedException {
         stubFor(post(urlEqualTo("/purchase?site_id=BR"))
-                .willReturn(aResponse().withStatus(HttpStatus.NOT_FOUND.value())));
+                .willReturn(aResponse().withStatus(HttpStatus.OK.value()).withBody("credit_card")));
 
-        stubFor(post(urlEqualTo("/reports"))
-                .willReturn(aResponse().withStatus(HttpStatus.OK.value())));
+        String result = purchaseService.executePurchase(purchase);
 
-        Purchase purchase = new Purchase("BR");
+        assertNotNull(result);
+        assertEquals("Purchase executed with payment method credit_card", result);
+    }
+
+    @Test
+    void givenRestCalls_whenPurchaseReturns404_thenReturnDefault()
+            throws ExecutionException, InterruptedException {
+        stubFor(post(urlEqualTo("/purchase?site_id=BR"))
+                .willReturn(aResponse().withStatus(HttpStatus.NOT_FOUND.value())));
 
         String result = purchaseService.executePurchase(purchase);
 
-        assertNull(result);
+        assertNotNull(result);
+        assertEquals("Purchase executed with payment method account_money", result);
+    }
+
+    @Test
+    void givenRestCalls_whenPurchaseCompletableFutureTimeout_thenReturnDefault() {
+        stubFor(post(urlEqualTo("/purchase?site_id=BR"))
+                .willReturn(aResponse().withFixedDelay(450)));
+
+        Throwable error = assertThrows(ExecutionException.class, () -> purchaseService.executePurchase(purchase));
+
+        assertEquals("java.lang.RuntimeException: Thread timeout!", error.getMessage());
     }
+
+//    @Test
+//    void givenRestCalls_whenPurchaseRequestWebTimeout_thenReturnDefault() {
+//        stubFor(post(urlEqualTo("/purchase?site_id=BR"))
+//                .willReturn(aResponse().withFixedDelay(250)));
+//
+//        Throwable error = assertThrows(ExecutionException.class, () -> purchaseService.executePurchase(purchase));
+//
+//        assertEquals("REST call network timeout!", error.getMessage());
+//    }
 }

spring-cloud-modules/spring-cloud-openfeign-2/src/test/resources/application-integration_test.properties

@@ -0,0 +1,4 @@
+feign.client.config.PaymentMethodClient.readTimeout: 200
+feign.client.config.PaymentMethodClient.connectTimeout: 50
+feign.client.config.ReportClient.readTimeout: 100
+feign.client.config.ReportClient.connectTimeout: 50