From 435d5a57a7a574c8a775449897bbb9794e6f351f Mon Sep 17 00:00:00 2001 From: Julien Nioche Date: Sun, 29 Oct 2023 17:26:52 +0000 Subject: [PATCH] OS 211 Signed-off-by: Julien Nioche --- external/opensearch/pom.xml | 2 +- .../stormcrawler/opensearch/BulkItemResponseToFailedFlag.java | 4 ++-- .../stormcrawler/opensearch/bolt/DeletionBolt.java | 2 +- .../stormcrawler/opensearch/bolt/IndexerBolt.java | 2 +- .../stormcrawler/opensearch/metrics/StatusMetricsBolt.java | 2 +- .../stormcrawler/opensearch/persistence/AggregationSpout.java | 2 +- .../stormcrawler/opensearch/persistence/HybridSpout.java | 2 +- .../opensearch/persistence/StatusUpdaterBolt.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/external/opensearch/pom.xml b/external/opensearch/pom.xml index 5ce9925b4..86d8dd42c 100644 --- a/external/opensearch/pom.xml +++ b/external/opensearch/pom.xml @@ -10,7 +10,7 @@ - 2.9.0 + 2.11.0 storm-crawler-opensearch diff --git a/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/BulkItemResponseToFailedFlag.java b/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/BulkItemResponseToFailedFlag.java index 9950b3e1a..f00cdbec4 100644 --- a/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/BulkItemResponseToFailedFlag.java +++ b/external/opensearch/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/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/bolt/DeletionBolt.java b/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/bolt/DeletionBolt.java index 18ccff7b5..1c9da61b8 100644 --- a/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/bolt/DeletionBolt.java +++ b/external/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/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/bolt/IndexerBolt.java b/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/bolt/IndexerBolt.java index d36490004..ed813308e 100644 --- a/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/bolt/IndexerBolt.java +++ b/external/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/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/metrics/StatusMetricsBolt.java b/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/metrics/StatusMetricsBolt.java index 6c66954f4..a0e82f6a5 100644 --- a/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/metrics/StatusMetricsBolt.java +++ b/external/opensearch/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/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/AggregationSpout.java b/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/AggregationSpout.java index d2e6ac800..169208843 100644 --- a/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/AggregationSpout.java +++ b/external/opensearch/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/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/HybridSpout.java b/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/HybridSpout.java index d1b748a72..cb2703a8d 100644 --- a/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/HybridSpout.java +++ b/external/opensearch/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/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/StatusUpdaterBolt.java b/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/StatusUpdaterBolt.java index 1dcd2613e..b905366f5 100644 --- a/external/opensearch/src/main/java/com/digitalpebble/stormcrawler/opensearch/persistence/StatusUpdaterBolt.java +++ b/external/opensearch/src/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;