Change to use CompletableFuture based rest client lib