WIP: WebClient

[facebook-errors] / src / main / java / de / juplo / facebook / errors / GraphApiExchangeFilterFunction.java

diff --git a/src/main/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunction.java b/src/main/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunction.java
index 0b583f4..6ab18b6 100644 (file)
--- a/src/main/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunction.java
+++ b/src/main/java/de/juplo/facebook/errors/GraphApiExchangeFilterFunction.java
@@ -15,22 +15,24 @@ import reactor.core.publisher.Mono;
  */
 public class GraphApiExchangeFilterFunction implements ExchangeFilterFunction
 {
-  public static GraphApiExchangeFilterFunction INSTANCE =
-      new GraphApiExchangeFilterFunction();
-
-
   @Override
   public Mono<ClientResponse> filter(ClientRequest request, ExchangeFunction next)
   {
     return
-    next
-        .exchange(request)
-        .flatMap(response ->
-        {
-          return
-              HttpStatus.Series.CLIENT_ERROR.equals(response.statusCode().series())
-                  ? Mono.error(GraphApiException.create(response))
-                  : Mono.just(response);
-        });
+        next
+            .exchange(request)
+            .flatMap(response ->
+            {
+              return
+                  HttpStatus.Series.CLIENT_ERROR.equals(response.statusCode().series())
+                      ? response
+                          .bodyToMono(String.class)
+                          .map(errorBody -> GraphApiException.create(
+                              response.statusCode(),
+                              response.headers().asHttpHeaders(),
+                              errorBody.getBytes()))
+                          .flatMap(e -> Mono.error(e))
+                      : Mono.just(response);
+            });
   }
 }