OS 211

Signed-off-by: Julien Nioche <julien@digitalpebble.com>
apache · Oct 29, 2023 · 435d5a5 · 435d5a5
1 parent e9d0ede
commit 435d5a5
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/external/opensearch/pom.xml b/external/opensearch/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<properties>
-		<opensearch.version>2.9.0</opensearch.version>
+		<opensearch.version>2.11.0</opensearch.version>
 	</properties>
 
 	<artifactId>storm-crawler-opensearch</artifactId>

diff --git a/...src/main/java/com/digitalpebble/stormcrawler/opensearch/BulkItemResponseToFailedFlag.java b/...src/main/java/com/digitalpebble/stormcrawler/opensearch/BulkItemResponseToFailedFlag.java
@@ -5,10 +5,10 @@
 import org.opensearch.action.DocWriteRequest;
 import org.opensearch.action.DocWriteResponse;
 import org.opensearch.action.bulk.BulkItemResponse;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
-import org.opensearch.rest.RestStatus;
 
 public final class BulkItemResponseToFailedFlag {
     @NotNull public final BulkItemResponse response;

diff --git a/...opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/bolt/DeletionBolt.java b/...opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/bolt/DeletionBolt.java
@@ -44,7 +44,7 @@
 import org.opensearch.action.bulk.BulkRequest;
 import org.opensearch.action.bulk.BulkResponse;
 import org.opensearch.action.delete.DeleteRequest;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.core.rest.RestStatus;
 import org.slf4j.LoggerFactory;
 
 /**

diff --git a/.../opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/bolt/IndexerBolt.java b/.../opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/bolt/IndexerBolt.java
@@ -57,8 +57,8 @@
 import org.opensearch.action.bulk.BulkRequest;
 import org.opensearch.action.bulk.BulkResponse;
 import org.opensearch.action.index.IndexRequest;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.XContentBuilder;
-import org.opensearch.rest.RestStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...ch/src/main/java/com/digitalpebble/stormcrawler/opensearch/metrics/StatusMetricsBolt.java b/...ch/src/main/java/com/digitalpebble/stormcrawler/opensearch/metrics/StatusMetricsBolt.java
@@ -26,10 +26,10 @@
 import org.apache.storm.topology.base.BaseRichBolt;
 import org.apache.storm.tuple.Tuple;
 import org.apache.storm.utils.TupleUtils;
-import org.opensearch.action.ActionListener;
 import org.opensearch.client.RequestOptions;
 import org.opensearch.client.core.CountRequest;
 import org.opensearch.client.core.CountResponse;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.slf4j.Logger;

diff --git a/...src/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/AggregationSpout.java b/...src/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/AggregationSpout.java
@@ -31,10 +31,10 @@
 import org.apache.storm.spout.SpoutOutputCollector;
 import org.apache.storm.task.TopologyContext;
 import org.joda.time.format.ISODateTimeFormat;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.RequestOptions;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.SearchHit;

diff --git a/...arch/src/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/HybridSpout.java b/...arch/src/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/HybridSpout.java
@@ -28,10 +28,10 @@
 import org.apache.storm.spout.SpoutOutputCollector;
 import org.apache.storm.task.TopologyContext;
 import org.joda.time.format.ISODateTimeFormat;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.RequestOptions;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.SearchHit;

diff --git a/...rc/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/StatusUpdaterBolt.java b/...rc/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/StatusUpdaterBolt.java
@@ -54,8 +54,8 @@
 import org.opensearch.action.bulk.BulkResponse;
 import org.opensearch.action.index.IndexRequest;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.XContentBuilder;
-import org.opensearch.rest.RestStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;