WIP: WebClient - DIE LÖSUNG

[facebook-errors] / src / test / java / de / juplo / facebook / errors / GraphApiExchangeFilterFunctionIntegrationTest.java

diff --git a/src/test/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunctionIntegrationTest.java b/src/test/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunctionIntegrationTest.java
index 87c3fe6..8d21cc5 100644 (file)
--- a/src/test/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunctionIntegrationTest.java
+++ b/src/test/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunctionIntegrationTest.java
@@ -9,13 +9,12 @@ import org.junit.After;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.client.reactive.ClientHttpConnector;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.client.reactive.JettyClientHttpConnector;
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
+import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -25,7 +24,6 @@ import reactor.test.StepVerifier;
  *
  * @author Kai Moritz
  */
-@RunWith(Parameterized.class)
 public class GraphApiExchangeFilterFunctionIntegrationTest
 {
   private static final Logger LOG =
@@ -34,19 +32,6 @@ public class GraphApiExchangeFilterFunctionIntegrationTest
   private MockWebServer server;
        private WebClient webClient;
 
-  @Parameterized.Parameter(0)
-       public ClientHttpConnector connector;
-
-  @Parameterized.Parameters(name = "webClient [{0}]")
-  public static Object[][] arguments()
-  {
-    return new Object[][]
-    {
-      { new JettyClientHttpConnector() },
-      { new ReactorClientHttpConnector() }
-    };
-  }
-
 
        @Before
        public void setup()
@@ -55,9 +40,9 @@ public class GraphApiExchangeFilterFunctionIntegrationTest
     webClient =
         WebClient
             .builder()
-            .clientConnector(this.connector)
+            .clientConnector(new JettyClientHttpConnector())
             .baseUrl(server.url("/").toString())
-            .filter(GraphApiExchangeFilterFunction.INSTANCE)
+            .filter(errorHandlingFilter())
             .build();
        }
 
@@ -71,12 +56,9 @@ public class GraphApiExchangeFilterFunctionIntegrationTest
   @Test
   public void testValidError()
   {
-    LOG.info("testValidError");
-
-
     server
         .enqueue(new MockResponse()
-            .setStatus("400")
+            .setResponseCode(HttpStatus.BAD_REQUEST.value())
             .setHeader("Content-Type", "application/json")
             .setBody(
                 "{\n" +
@@ -109,4 +91,62 @@ public class GraphApiExchangeFilterFunctionIntegrationTest
         })
         .verify(Duration.ofSeconds(3));
   }
+
+  @Test
+  public void testTest()
+  {
+    server
+        .enqueue(new MockResponse()
+            .setResponseCode(400)
+            .setHeader("Content-Type", "text/plain")
+            .setBody("Hello Spring!"));
+
+               Mono<String> result;
+
+    result = webClient.get()
+                               .uri("/greeting?name=Spring")
+                               .retrieve()
+                               .bodyToMono(String.class);
+
+               StepVerifier.create(result)
+                               .expectError(Exception.class)
+                               .verify(Duration.ofSeconds(3));
+
+    server
+        .enqueue(new MockResponse()
+            .setResponseCode(200)
+            .setHeader("Content-Type", "text/plain")
+            .setHeader("Foo", "Bar")
+            .setBody("Hello Spring!"));
+
+               result = webClient.get()
+                               .uri("/greeting?name=Spring")
+                               .retrieve()
+                               .bodyToMono(String.class);
+
+               StepVerifier.create(result)
+                               .expectNext("Hello Spring!")
+        .expectComplete()
+                               .verify(Duration.ofSeconds(3));
+  }
+
+  public static ExchangeFilterFunction errorHandlingFilter()
+  {
+    return ExchangeFilterFunction.ofResponseProcessor(response ->
+    {
+      if (response.statusCode() != null && (response.statusCode()
+          .is5xxServerError() || response.statusCode().is4xxClientError()))
+      {
+        return response.bodyToMono(String.class)
+            .flatMap(errorBody ->
+            {
+              return Mono.error(GraphApiException.create(response.statusCode(), response.headers().asHttpHeaders(), errorBody.getBytes()));
+            });
+      }
+      else
+      {
+        return Mono.just(response);
+      }
+    });
+  }
 }