WebReactiveFeign.Builder: use 'errorMapper' from configuration

PlaytikaOSS · Sep 4, 2024 · afb925f · afb925f
1 parent 2650396
commit afb925f
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/feign-reactor-webclient/src/main/java/reactivefeign/webclient/WebReactiveFeign.java b/feign-reactor-webclient/src/main/java/reactivefeign/webclient/WebReactiveFeign.java
@@ -22,6 +22,7 @@
 import reactivefeign.client.ReadTimeoutException;
 import reactor.netty.http.client.HttpClient;
 
+import java.util.Objects;
 import java.util.function.BiFunction;
 
 import static reactivefeign.webclient.NettyClientHttpConnectorBuilder.buildNettyClientHttpConnector;
@@ -78,13 +79,13 @@ protected ClientHttpConnector clientConnector() {
 
         @Override
         public BiFunction<ReactiveHttpRequest, Throwable, Throwable> errorMapper(){
-            return (request, throwable) -> {
-                if(throwable instanceof WebClientRequestException
-                   && throwable.getCause() instanceof io.netty.handler.timeout.ReadTimeoutException){
+            return Objects.requireNonNullElseGet(this.errorMapper, () -> (request, throwable) -> {
+                if (throwable instanceof WebClientRequestException
+                        && throwable.getCause() instanceof io.netty.handler.timeout.ReadTimeoutException) {
                     return new ReadTimeoutException(throwable, request);
                 }
                 return null;
-            };
+            });
         }
     }