From e907ae6d194bac7fbdb2b0331cd0c40a3f072818 Mon Sep 17 00:00:00 2001
From: Ilanji Rajamanickam <ilanji@confluent.io>
Date: Wed, 23 Jun 2021 09:50:43 -0700
Subject: [PATCH 1/4] Upgrade ES client to latest version

---
 pom.xml                                                   | 4 ++--
 .../connect/elasticsearch/ElasticsearchClient.java        | 8 ++++----
 .../elasticsearch/helper/ElasticsearchHelperClient.java   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 841789356..db043b012 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
     </scm>
 
     <properties>
-        <es.version>7.0.1</es.version>
+        <es.version>7.13.2</es.version>
         <hamcrest.version>1.3</hamcrest.version>
         <mockito.version>2.28.2</mockito.version>
         <gson.version>2.8.6</gson.version>
@@ -292,7 +292,7 @@
                 <configuration>
                     <compilerArgs>
                         <arg>-Xlint:all,-try</arg>
-                        <arg>-Werror</arg>
+<!--                        <arg>-Werror</arg>-->
                     </compilerArgs>
                 </configuration>
             </plugin>
diff --git a/src/main/java/io/confluent/connect/elasticsearch/ElasticsearchClient.java b/src/main/java/io/confluent/connect/elasticsearch/ElasticsearchClient.java
index 636549986..ee7f206a2 100644
--- a/src/main/java/io/confluent/connect/elasticsearch/ElasticsearchClient.java
+++ b/src/main/java/io/confluent/connect/elasticsearch/ElasticsearchClient.java
@@ -57,7 +57,7 @@
 import org.elasticsearch.client.indices.GetMappingsRequest;
 import org.elasticsearch.client.indices.GetMappingsResponse;
 import org.elasticsearch.client.indices.PutMappingRequest;
-import org.elasticsearch.cluster.metadata.MappingMetaData;
+import org.elasticsearch.cluster.metadata.MappingMetadata;
 import org.elasticsearch.common.unit.TimeValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -229,7 +229,7 @@ public void flush() {
    * @return true if a mapping exists, false if it does not
    */
   public boolean hasMapping(String index) {
-    MappingMetaData mapping = mapping(index);
+    MappingMetadata mapping = mapping(index);
     return mapping != null && mapping.sourceAsMap() != null && !mapping.sourceAsMap().isEmpty();
   }
 
@@ -470,9 +470,9 @@ private boolean isFailed() {
    * Gets the mapping for an index.
    *
    * @param index the index to fetch the mapping for
-   * @return the MappingMetaData for the index
+   * @return the MappingMetadata for the index
    */
-  private MappingMetaData mapping(String index) {
+  private MappingMetadata mapping(String index) {
     GetMappingsRequest request = new GetMappingsRequest().indices(index);
     GetMappingsResponse response = callWithRetries(
         "get mapping for index " + index,
diff --git a/src/test/java/io/confluent/connect/elasticsearch/helper/ElasticsearchHelperClient.java b/src/test/java/io/confluent/connect/elasticsearch/helper/ElasticsearchHelperClient.java
index 93939c3a3..4a13aefe3 100644
--- a/src/test/java/io/confluent/connect/elasticsearch/helper/ElasticsearchHelperClient.java
+++ b/src/test/java/io/confluent/connect/elasticsearch/helper/ElasticsearchHelperClient.java
@@ -37,7 +37,7 @@
 import org.elasticsearch.client.security.RefreshPolicy;
 import org.elasticsearch.client.security.user.User;
 import org.elasticsearch.client.security.user.privileges.Role;
-import org.elasticsearch.cluster.metadata.MappingMetaData;
+import org.elasticsearch.cluster.metadata.MappingMetadata;
 import org.elasticsearch.search.SearchHits;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,7 +68,7 @@ public long getDocCount(String index) throws IOException {
     return client.count(request, RequestOptions.DEFAULT).getCount();
   }
 
-  public MappingMetaData getMapping(String index) throws IOException {
+  public MappingMetadata getMapping(String index) throws IOException {
     GetMappingsRequest request = new GetMappingsRequest().indices(index);
     GetMappingsResponse response = client.indices().getMapping(request, RequestOptions.DEFAULT);
     return response.mappings().get(index);

From 460abacec06eda96ccd34da1ce0c72780d81e9c6 Mon Sep 17 00:00:00 2001
From: Ilanji Rajamanickam <ilanji@confluent.io>
Date: Wed, 23 Jun 2021 10:01:49 -0700
Subject: [PATCH 2/4] fix pom

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index db043b012..02a715b5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,7 +292,7 @@
                 <configuration>
                     <compilerArgs>
                         <arg>-Xlint:all,-try</arg>
-<!--                        <arg>-Werror</arg>-->
+                        <arg>-Werror</arg>
                     </compilerArgs>
                 </configuration>
             </plugin>

From 4e6275747e3792370538b7a75a1cc7e22c413cfa Mon Sep 17 00:00:00 2001
From: Ilanji Rajamanickam <ilanji@confluent.io>
Date: Wed, 23 Jun 2021 10:27:35 -0700
Subject: [PATCH 3/4] Remove werror flag that is failing build

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 02a715b5a..96871ae62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,7 +292,6 @@
                 <configuration>
                     <compilerArgs>
                         <arg>-Xlint:all,-try</arg>
-                        <arg>-Werror</arg>
                     </compilerArgs>
                 </configuration>
             </plugin>

From f3b4417bf10db541482f9f2d57d01db62337209d Mon Sep 17 00:00:00 2001
From: Ilanji Rajamanickam <ilanji@confluent.io>
Date: Wed, 23 Jun 2021 11:01:44 -0700
Subject: [PATCH 4/4] Add werror back to pom

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 96871ae62..c4ff070f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
     </scm>
 
     <properties>
-        <es.version>7.13.2</es.version>
+        <es.version>7.9.3</es.version>
         <hamcrest.version>1.3</hamcrest.version>
         <mockito.version>2.28.2</mockito.version>
         <gson.version>2.8.6</gson.version>
@@ -292,6 +292,7 @@
                 <configuration>
                     <compilerArgs>
                         <arg>-Xlint:all,-try</arg>
+                        <arg>-Werror</arg>
                     </compilerArgs>
                 </configuration>
             </plugin>