Issue #SB-28950 chore: Updated the elasticsearch version from 6.2.4 t…

…o 6.8.22
rahu-tarento · Apr 13, 2022 · 4fb9a50 · 4fb9a50
1 parent c0bdc49
commit 4fb9a50
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,6 +16,8 @@
 		<scala.version>2.11.12</scala.version>
 		<scalatest.version>3.0.8</scalatest.version>
 		<fasterxml.jackson.version>2.9.8</fasterxml.jackson.version>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
 	</properties>
 	<modules>
 		<module>platform-core</module>

diff --git a/search-api/search-core/pom.xml b/search-api/search-core/pom.xml
@@ -67,12 +67,12 @@
         <dependency>
             <groupId>org.elasticsearch</groupId>
             <artifactId>elasticsearch</artifactId>
-            <version>6.2.4</version>
+            <version>6.8.22</version>
         </dependency>
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-high-level-client</artifactId>
-            <version>6.2.4</version>
+            <version>6.8.22</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/search-api/search-core/src/main/java/org/sunbird/search/client/ElasticSearchUtil.java b/search-api/search-core/src/main/java/org/sunbird/search/client/ElasticSearchUtil.java
@@ -11,14 +11,13 @@
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.util.EntityUtils;
-import org.elasticsearch.client.RestClientBuilder;
+import org.elasticsearch.action.support.master.AcknowledgedResponse;
+import org.elasticsearch.client.*;
 import org.sunbird.search.util.SearchConstants;
 import org.sunbird.telemetry.logger.TelemetryManager;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
-import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
-import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.delete.DeleteRequest;
@@ -34,9 +33,6 @@
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.action.update.UpdateResponse;
-import org.elasticsearch.client.Response;
-import org.elasticsearch.client.RestClient;
-import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -170,9 +166,10 @@ public static boolean addIndex(String indexName, String documentType, String set
 				createRequest.settings(Settings.builder().loadFromSource(settings, XContentType.JSON));
 			if (StringUtils.isNotBlank(documentType) && StringUtils.isNotBlank(mappings))
 				createRequest.mapping(documentType, mappings, XContentType.JSON);
-			CreateIndexResponse createIndexResponse = client.indices().create(createRequest);
+//			RequestOptions.Builder options = RequestOptions.DEFAULT.toBuilder();
+//			CreateIndexResponse createIndexResponse = client.indices().create(createRequest);
 
-			response = createIndexResponse.isAcknowledged();
+			response = client.indices().create(createRequest).isAcknowledged();
 		}
 		return response;
 	}
@@ -228,8 +225,8 @@ public static void deleteDocumentsByQuery(QueryBuilder query, String indexName,
 		TelemetryManager.log("Deleted Documents by Query" + EntityUtils.toString(response.getEntity()));
 	}
 
-	public static void deleteIndex(String indexName) throws InterruptedException, ExecutionException, IOException {
-		DeleteIndexResponse response = getClient(indexName).indices().delete(new DeleteIndexRequest(indexName));
+	public static void deleteIndex(String indexName) throws IOException {
+		AcknowledgedResponse response = getClient(indexName).indices().delete(new DeleteIndexRequest(indexName));
 		esClient.remove(indexName);
 		TelemetryManager.log("Deleted Index" + indexName + " : " + response.isAcknowledged());
 	}

diff --git a/vmsetup.sh b/vmsetup.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 sudo apt update
 sudo apt install redis-server -y
-curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.3.2.deb
-sudo dpkg -i elasticsearch-6.3.2.deb
+curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.22.deb
+sudo dpkg -i elasticsearch-6.8.22.deb
 sudo service elasticsearch start
 sudo service elasticsearch status
 # This should go to the test cases - Start