X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Ffacebook%2Ferrors%2FGraphApiExchangeFilterFunctionIntegrationTest.java;h=306f04452326058e49df4b694c4ec63b7d533ff3;hb=15f9e41fc87c2cc44058af0b2822d96baf599c35;hp=a10066b016abfdcaf93d331ba2dea392a065b998;hpb=e3cbe5e272845110ebe7862bcb35bc9999c416fe;p=facebook-errors

diff --git a/src/test/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunctionIntegrationTest.java b/src/test/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunctionIntegrationTest.java
index a10066b..306f044 100644
--- a/src/test/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunctionIntegrationTest.java
+++ b/src/test/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunctionIntegrationTest.java
@@ -3,7 +3,6 @@ package de.juplo.facebook.errors;
 
 import de.juplo.facebook.errors.GraphApiException.Type;
 import java.time.Duration;
-import java.util.List;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import org.junit.After;
@@ -42,7 +41,6 @@ public class GraphApiExchangeFilterFunctionIntegrationTest
             .builder()
             .clientConnector(new JettyClientHttpConnector())
             .baseUrl(server.url("/").toString())
-            .filter(GraphApiExchangeFilterFunction.INSTANCE)
             .build();
 	}
 
@@ -76,6 +74,7 @@ public class GraphApiExchangeFilterFunctionIntegrationTest
             .get()
             .uri("/egal")
             .retrieve()
+            .onStatus(status -> status.is4xxClientError(), response -> GraphApiException.create(response))
             .bodyToMono(String.class);
 
     StepVerifier
@@ -95,32 +94,60 @@ public class GraphApiExchangeFilterFunctionIntegrationTest
   @Test
   public void testTest()
   {
-    WebClient webClient =
-        WebClient
-            .builder()
-            .clientConnector(new JettyClientHttpConnector())
-            .baseUrl(server.url("/").toString())
-            .filter(ExchangeFilterFunction.ofResponseProcessor(response ->
-            {
-							List<String> headerValues = response.headers().header("Foo");
-							return headerValues.isEmpty() ? Mono.error(
-									new Exception("Response does not contain Foo header")) :
-									Mono.just(response);
-						}))
-            .build();
-
     server
         .enqueue(new MockResponse()
+            .setResponseCode(400)
             .setHeader("Content-Type", "text/plain")
             .setBody("Hello Spring!"));
 
-		Mono<String> result = webClient.get()
+		Mono<String> result;
+
+    result = webClient.get()
 				.uri("/greeting?name=Spring")
 				.retrieve()
+        .onStatus(status -> status.is4xxClientError(), response -> GraphApiException.create(response))
 				.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()
+        .onStatus(status -> status.is4xxClientError(), response -> GraphApiException.create(response))
+				.bodyToMono(String.class);
+
+		StepVerifier.create(result)
+				.expectNext("Hello Spring!")
+        .expectComplete()
+				.verify(Duration.ofSeconds(3));
+  }
+
+  public static ExchangeFilterFunction errorHandlingFilter()
+  {
+    return ExchangeFilterFunction.ofResponseProcessor(clientResponse ->
+    {
+      if (clientResponse.statusCode() != null && (clientResponse.statusCode()
+          .is5xxServerError() || clientResponse.statusCode().is4xxClientError()))
+      {
+        return clientResponse.bodyToMono(String.class)
+            .flatMap(errorBody ->
+            {
+              return Mono.error(new Exception(errorBody));
+            });
+      }
+      else
+      {
+        return Mono.just(clientResponse);
+      }
+    });
   }
 }