Skip to content

Commit 0ea7210

Browse files
authored
[Backport 2.x] [Refactor] StreamIO from common to core.common namespace in core lib (#8157) (#8782)
* [Refactor] StreamIO from common to core.common namespace in core lib (#8157) * [Refactor] StreamIO from common to core.common in core lib This PR is a mechanical refactor of all Stream classes in o.o.common.io.stream to o.o.core.common.io.stream namespace. In addition to the namespace refactor several loose end classes in o.o.common.io.stream of the :server module are refactored to o.o.core.common.io.stream of the :libs:opensearch-core library. These classes include the following: * ByteBufferStreamInpu * BytesStreamInput * DataOutputStreamOutput * FilterStreamInput * NamedWriteableAwareStreamInput * OutputStreamStreamOutput * VersionedNamedWriteable Companion tests are also refactored from the server test folder to the corresponding core test folder. Signed-off-by: Nicholas Walter Knize <nknize@apache.org> * update changelog Signed-off-by: Nicholas Walter Knize <nknize@apache.org> --------- Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
1 parent ac52550 commit 0ea7210

2,895 files changed

Lines changed: 5868 additions & 5744 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1818
- Perform aggregation postCollection in ContextIndexSearcher after searching leaves ([#8303](https://github.com/opensearch-project/OpenSearch/pull/8303))
1919
- Make Span exporter configurable ([#8620](https://github.com/opensearch-project/OpenSearch/issues/8620))
2020
- Perform aggregation postCollection in ContextIndexSearcher after searching leaves ([#8303](https://github.com/opensearch-project/OpenSearch/pull/8303))
21+
- [Refactor] StreamIO from common to core.common namespace in core lib ([#8157](https://github.com/opensearch-project/OpenSearch/pull/8157))
2122

2223
### Deprecated
2324

benchmarks/src/main/java/org/opensearch/benchmark/search/aggregations/TermsReduceBenchmark.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
import org.opensearch.action.search.SearchRequest;
4343
import org.opensearch.common.breaker.CircuitBreaker;
4444
import org.opensearch.common.breaker.NoopCircuitBreaker;
45-
import org.opensearch.common.io.stream.NamedWriteableRegistry;
45+
import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
4646
import org.opensearch.common.lucene.search.TopDocsAndMaxScore;
4747
import org.opensearch.common.settings.Settings;
48-
import org.opensearch.index.Index;
49-
import org.opensearch.index.shard.ShardId;
48+
import org.opensearch.core.index.Index;
49+
import org.opensearch.core.index.shard.ShardId;
5050
import org.opensearch.indices.breaker.NoneCircuitBreakerService;
5151
import org.opensearch.search.DocValueFormat;
5252
import org.opensearch.search.SearchModule;

benchmarks/src/main/java/org/opensearch/benchmark/search/aggregations/bucket/terms/StringTermsSerializationBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
import org.apache.lucene.util.BytesRef;
3636
import org.opensearch.common.io.stream.DelayableWriteable;
37-
import org.opensearch.common.io.stream.NamedWriteableRegistry;
37+
import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
3838
import org.opensearch.search.DocValueFormat;
3939
import org.opensearch.search.aggregations.BucketOrder;
4040
import org.opensearch.search.aggregations.InternalAggregation;

client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/bulk/RestNoopBulkAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.opensearch.client.Requests;
4242
import org.opensearch.client.node.NodeClient;
4343
import org.opensearch.core.xcontent.XContentBuilder;
44-
import org.opensearch.index.shard.ShardId;
44+
import org.opensearch.core.index.shard.ShardId;
4545
import org.opensearch.rest.BaseRestHandler;
4646
import org.opensearch.rest.BytesRestResponse;
4747
import org.opensearch.rest.RestChannel;
@@ -56,7 +56,7 @@
5656
import static java.util.Collections.unmodifiableList;
5757
import static org.opensearch.rest.RestRequest.Method.POST;
5858
import static org.opensearch.rest.RestRequest.Method.PUT;
59-
import static org.opensearch.rest.RestStatus.OK;
59+
import static org.opensearch.core.rest.RestStatus.OK;
6060

6161
public class RestNoopBulkAction extends BaseRestHandler {
6262

client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/bulk/TransportNoopBulkAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.opensearch.action.support.HandledTransportAction;
4242
import org.opensearch.action.update.UpdateResponse;
4343
import org.opensearch.common.inject.Inject;
44-
import org.opensearch.index.shard.ShardId;
44+
import org.opensearch.core.index.shard.ShardId;
4545
import org.opensearch.tasks.Task;
4646
import org.opensearch.transport.TransportService;
4747

client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/search/TransportNoopSearchAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.opensearch.action.support.ActionFilters;
4040
import org.opensearch.action.support.HandledTransportAction;
4141
import org.opensearch.common.inject.Inject;
42-
import org.opensearch.common.io.stream.Writeable;
42+
import org.opensearch.core.common.io.stream.Writeable;
4343
import org.opensearch.search.SearchHit;
4444
import org.opensearch.search.SearchHits;
4545
import org.opensearch.search.aggregations.InternalAggregations;

client/rest-high-level/src/main/java/org/opensearch/client/ClusterClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.opensearch.client.indices.GetComponentTemplatesRequest;
4848
import org.opensearch.client.indices.GetComponentTemplatesResponse;
4949
import org.opensearch.client.indices.PutComponentTemplateRequest;
50-
import org.opensearch.rest.RestStatus;
50+
import org.opensearch.core.rest.RestStatus;
5151

5252
import java.io.IOException;
5353

client/rest-high-level/src/main/java/org/opensearch/client/GetAliasesResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.opensearch.core.xcontent.XContentBuilder;
4040
import org.opensearch.core.xcontent.XContentParser;
4141
import org.opensearch.core.xcontent.XContentParser.Token;
42-
import org.opensearch.rest.RestStatus;
42+
import org.opensearch.core.rest.RestStatus;
4343

4444
import java.io.IOException;
4545
import java.util.Collections;
@@ -48,7 +48,7 @@
4848
import java.util.Map;
4949
import java.util.Set;
5050

51-
import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
51+
import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
5252

5353
/**
5454
* Response obtained from the get aliases API.

client/rest-high-level/src/main/java/org/opensearch/client/IndicesClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
import org.opensearch.client.indices.SimulateIndexTemplateResponse;
8989
import org.opensearch.client.indices.rollover.RolloverRequest;
9090
import org.opensearch.client.indices.rollover.RolloverResponse;
91-
import org.opensearch.rest.RestStatus;
91+
import org.opensearch.core.rest.RestStatus;
9292

9393
import java.io.IOException;
9494
import java.util.Collections;

client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
import org.opensearch.common.Nullable;
7474
import org.opensearch.common.Priority;
7575
import org.opensearch.common.SuppressForbidden;
76-
import org.opensearch.common.bytes.BytesReference;
76+
import org.opensearch.core.common.bytes.BytesReference;
7777
import org.opensearch.common.lucene.uid.Versions;
7878
import org.opensearch.common.unit.TimeValue;
7979
import org.opensearch.common.util.CollectionUtils;

0 commit comments

Comments
 (0)