From 530a1f8a4bd9ef4c500564eb9c6ae38fdc494ae0 Mon Sep 17 00:00:00 2001
From: Peter-Josef Meisch <pj.meisch@sothawo.com>
Date: Wed, 31 Jul 2019 22:19:30 +0200
Subject: [PATCH] DATAES-405 - use org.springframework.lang.Nullable.

Original PR: #300
---
 .../data/elasticsearch/client/util/RequestConverters.java       | 2 +-
 .../data/elasticsearch/core/query/BulkOptions.java              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java b/src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java
index 08ef2650d..3c74acb41 100644
--- a/src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java
+++ b/src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java
@@ -61,7 +61,6 @@ import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.client.RethrottleRequest;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
-import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Priority;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.SuppressForbidden;
@@ -86,6 +85,7 @@ import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
 import org.elasticsearch.tasks.TaskId;
 import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
 import org.springframework.http.HttpMethod;
+import org.springframework.lang.Nullable;
 
 /**
  * <p>
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/query/BulkOptions.java b/src/main/java/org/springframework/data/elasticsearch/core/query/BulkOptions.java
index d2bccc169..d5a06732f 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/query/BulkOptions.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/query/BulkOptions.java
@@ -19,8 +19,8 @@ import java.util.List;
 
 import org.elasticsearch.action.support.ActiveShardCount;
 import org.elasticsearch.action.support.WriteRequest;
-import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.unit.TimeValue;
+import org.springframework.lang.Nullable;
 
 /**
  * Options that may be passed to an