WIP: WebClient -- DIE LÖSUNG! -- Feinschliff...

[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 306f044..b9636ce 100644 (file)
--- a/src/test/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunctionIntegrationTest.java
+++ b/src/test/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunctionIntegrationTest.java
@@ -13,7 +13,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.client.reactive.JettyClientHttpConnector;
-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;
@@ -41,6 +40,7 @@ public class GraphApiExchangeFilterFunctionIntegrationTest
             .builder()
             .clientConnector(new JettyClientHttpConnector())
             .baseUrl(server.url("/").toString())
+            .filter(new GraphApiExchangeFilterFunction())
             .build();
        }
 
@@ -74,7 +74,6 @@ public class GraphApiExchangeFilterFunctionIntegrationTest
             .get()
             .uri("/egal")
             .retrieve()
-            .onStatus(status -> status.is4xxClientError(), response -> GraphApiException.create(response))
             .bodyToMono(String.class);
 
     StepVerifier
@@ -105,7 +104,6 @@ public class GraphApiExchangeFilterFunctionIntegrationTest
     result = webClient.get()
                                .uri("/greeting?name=Spring")
                                .retrieve()
-        .onStatus(status -> status.is4xxClientError(), response -> GraphApiException.create(response))
                                .bodyToMono(String.class);
 
                StepVerifier.create(result)
@@ -122,7 +120,6 @@ public class GraphApiExchangeFilterFunctionIntegrationTest
                result = webClient.get()
                                .uri("/greeting?name=Spring")
                                .retrieve()
-        .onStatus(status -> status.is4xxClientError(), response -> GraphApiException.create(response))
                                .bodyToMono(String.class);
 
                StepVerifier.create(result)
@@ -130,24 +127,4 @@ public class GraphApiExchangeFilterFunctionIntegrationTest
         .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);
-      }
-    });
-  }
 }