add test and configurations. disable thread test to make it work without retries

Author: pedrolopes9-7

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

@@ -5,9 +5,9 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name = "paymentClient", url = "http://localhost:8083")
+@FeignClient(name = "paymentMethodClient", url = "http://localhost:8083")
 public interface PaymentMethodClient {
 
-    @RequestMapping(method = RequestMethod.POST, value = "/purchase")
-    String processPurchase(@RequestParam(name = "site_id") String siteId);
+    @RequestMapping(method = RequestMethod.GET, value = "/payment_methods")
+    String getAvailablePaymentMethods(@RequestParam(name = "site_id") String siteId);
 }

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

@@ -20,12 +20,12 @@ public PurchaseService(PaymentMethodClient paymentMethodClient, ReportClient rep
         this.reportClient = reportClient;
     }
 
-    public String executePurchase(Purchase purchase) throws ExecutionException, InterruptedException {
-        CompletableFuture<String> paymentMethodsFuture = CompletableFuture.supplyAsync(() -> paymentMethodClient.processPurchase(purchase.getSiteId()))
+    public String executePurchase(String siteId) throws ExecutionException, InterruptedException {
+        CompletableFuture<String> paymentMethodsFuture = CompletableFuture.supplyAsync(() -> paymentMethodClient.getAvailablePaymentMethods(siteId))
                 .orTimeout(400, TimeUnit.MILLISECONDS)
                 .exceptionally(ex -> {
                     if (ex.getCause() instanceof FeignException && ((FeignException) ex.getCause()).status() == 404) {
-                        return "account_money";
+                        return "cash";
                     }
 
                     if (ex.getCause() instanceof RetryableException) {
@@ -42,7 +42,7 @@ public String executePurchase(Purchase purchase) throws ExecutionException, Inte
                 });
 
         CompletableFuture.runAsync(() -> reportClient.sendReport("Purchase Order Report"))
-                .orTimeout(1, TimeUnit.SECONDS);
+                .orTimeout(400, TimeUnit.MILLISECONDS);
 
         return String.format("Purchase executed with payment method %s", paymentMethodsFuture.get());
     }

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

@@ -7,4 +7,9 @@ spring.main.allow-bean-definition-overriding=true
 logging.level.com.baeldung.cloud.openfeign.client=INFO
 feign.hystrix.enabled=true
 
-spring.cloud.openfeign.client.config.postClient.url=https://jsonplaceholder.typicode.com/posts/
+spring.cloud.openfeign.client.config.postClient.url=https://jsonplaceholder.typicode.com/posts/
+
+feign.client.config.paymentMethodClient.readTimeout: 200
+feign.client.config.paymentMethodClient.connectTimeout: 100
+feign.client.config.reportClient.readTimeout: 200
+feign.client.config.reportClient.connectTimeout: 100

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

@@ -4,25 +4,26 @@
 import com.github.tomakehurst.wiremock.WireMockServer;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 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 com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 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
@@ -36,8 +37,6 @@ class PurchaseServiceIntegrationTest {
 
     private WireMockServer wireMockServer;
 
-    private Purchase purchase;
-
     @BeforeEach
     public void startWireMockServer() {
         wireMockServer = new WireMockServer(8083);
@@ -46,8 +45,6 @@ public void startWireMockServer() {
 
         stubFor(post(urlEqualTo("/reports"))
                 .willReturn(aResponse().withStatus(HttpStatus.OK.value())));
-
-        purchase = new Purchase("BR");
     }
 
     @AfterEach
@@ -58,10 +55,10 @@ public void stopWireMockServer() {
     @Test
     void givenRestCalls_whenBothReturnsOk_thenReturnCorrectResult()
             throws ExecutionException, InterruptedException {
-        stubFor(post(urlEqualTo("/purchase?site_id=BR"))
+        stubFor(get(urlEqualTo("/payment_methods?site_id=BR"))
                 .willReturn(aResponse().withStatus(HttpStatus.OK.value()).withBody("credit_card")));
 
-        String result = purchaseService.executePurchase(purchase);
+        String result = purchaseService.executePurchase("BR");
 
         assertNotNull(result);
         assertEquals("Purchase executed with payment method credit_card", result);
@@ -70,32 +67,33 @@ void givenRestCalls_whenBothReturnsOk_thenReturnCorrectResult()
     @Test
     void givenRestCalls_whenPurchaseReturns404_thenReturnDefault()
             throws ExecutionException, InterruptedException {
-        stubFor(post(urlEqualTo("/purchase?site_id=BR"))
+        stubFor(get(urlEqualTo("/payment_methods?site_id=BR"))
                 .willReturn(aResponse().withStatus(HttpStatus.NOT_FOUND.value())));
 
-        String result = purchaseService.executePurchase(purchase);
+        String result = purchaseService.executePurchase("BR");
 
         assertNotNull(result);
-        assertEquals("Purchase executed with payment method account_money", result);
+        assertEquals("Purchase executed with payment method cash", result);
     }
 
     @Test
-    void givenRestCalls_whenPurchaseCompletableFutureTimeout_thenReturnDefault() {
-        stubFor(post(urlEqualTo("/purchase?site_id=BR"))
-                .willReturn(aResponse().withFixedDelay(450)));
+    @Disabled
+    void givenRestCalls_whenPurchaseCompletableFutureTimeout_thenThrowNewException() {
+        stubFor(get(urlEqualTo("/payment_methods?site_id=BR"))
+                .willReturn(aResponse().withFixedDelay(550)));
 
-        Throwable error = assertThrows(ExecutionException.class, () -> purchaseService.executePurchase(purchase));
+        Throwable error = assertThrows(ExecutionException.class, () -> purchaseService.executePurchase("BR"));
 
         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());
-//    }
+    @Test
+    void givenRestCalls_whenPurchaseRequestWebTimeout_thenThrowNewException() {
+        stubFor(get(urlEqualTo("/payment_methods?site_id=BR"))
+                .willReturn(aResponse().withFixedDelay(250)));
+
+        Throwable error = assertThrows(ExecutionException.class, () -> purchaseService.executePurchase("BR"));
+
+        assertEquals("java.lang.RuntimeException: REST call network timeout!", error.getMessage());
+    }
 }