From 6cdd9ee35adf5f50c4a5e98664dbec5376d01e4b Mon Sep 17 00:00:00 2001
From: Sylvain Wallez <sylvain@elastic.co>
Date: Fri, 18 Jun 2021 11:44:52 +0200
Subject: [PATCH] Fix HLRC compatibility with Java 8

Optional.isEmpty() was added in Java 11. In Java 8 we only have
Optional.isPresent()
---
 .../java/org/elasticsearch/client/RestHighLevelClient.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java
index 74e51ded1de7b..a742fcb0f1a0f 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java
@@ -2043,7 +2043,7 @@ void runIfNotCancelled(Runnable runnable) {
         versionCheck.addListener(new ActionListener<Optional<String>>() {
             @Override
             public void onResponse(Optional<String> validation) {
-                if (validation.isEmpty()) {
+                if (validation.isPresent() == false) {
                     // Send the request and propagate cancellation
                     Cancellable call = client.performRequestAsync(request, listener);
                     cancellationForwarder.whenComplete((r, t) ->
@@ -2078,7 +2078,7 @@ private Response performClientRequest(Request request) throws IOException {
             throw new ElasticsearchException(e);
         }
 
-        if (versionValidation.isEmpty()) {
+        if (versionValidation.isPresent() == false) {
             return client.performRequest(request);
         } else {
             throw new ElasticsearchException(versionValidation.get());