honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Rename] o.e.common subpackages round 1 (#332) 

* [Rename] o.e.common subpackages round 1

This commit refactors the following subpackages of o.e.common:

* o.e.common.joda
* o.e.common.lease
* o.e.common.metrics
* o.e.common.network
* o.e.common.path
* o.e.common.recycling
* o.e.common.regex
* o.e.common.rounding
* o.e.common.text
* o.e.common.time
* o.e.common.transport

to the o.opensearch namespace. All references throughout the codebase have been
refactored.

Signed-off-by: Nicholas Knize <nknize@amazon.com>

* fix imports 1

Signed-off-by: Nicholas Knize <nknize@amazon.com>
This commit is contained in:
Nick Knize 2021-03-16 13:49:12 -05:00 committed by Nick Knize
parent d9d56f5019
commit 946c7bb2dc
597 changed files with 993 additions and 936 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/benchmark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java
View File

@ -29,7 +29,7 @@ import org.opensearch.client.benchmark.ops.bulk.BulkRequestExecutor;
import org.opensearch.client.benchmark.ops.search.SearchRequestExecutor;
import org.opensearch.client.transport.TransportClient;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.TransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.query.QueryBuilders;
import org.opensearch.plugin.noop.NoopPlugin;

2
client/rest-high-level/src/main/java/org/opensearch/client/indices/DataStreamsStatsResponse.java
View File

@ -21,7 +21,7 @@ package org.opensearch.client.indices;
import org.opensearch.client.core.BroadcastResponse;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.XContentParser;

2
client/rest-high-level/src/main/java/org/opensearch/client/indices/rollover/RolloverRequest.java
View File

@ -24,7 +24,7 @@ import org.opensearch.action.admin.indices.rollover.MaxDocsCondition;
import org.opensearch.action.admin.indices.rollover.MaxSizeCondition;
import org.opensearch.client.TimedRequest;
import org.opensearch.client.indices.CreateIndexRequest;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;

4
client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorIT.java
View File

@ -34,8 +34,8 @@ import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.search.SearchRequest;
import org.opensearch.common.Strings;
import org.opensearch.common.bytes.BytesArray;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentType;

2
client/rest-high-level/src/test/java/org/opensearch/client/ClusterClientIT.java
View File

@ -49,7 +49,7 @@ import org.opensearch.cluster.metadata.Template;
import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider;
import org.opensearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.common.xcontent.support.XContentMapValues;

4
client/rest-high-level/src/test/java/org/opensearch/client/CrudIT.java
View File

@ -49,8 +49,8 @@ import org.opensearch.client.indices.GetIndexRequest;
import org.opensearch.common.Strings;
import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentType;

4
client/rest-high-level/src/test/java/org/opensearch/client/IndicesClientIT.java
View File

@ -105,8 +105,8 @@ import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;

2
client/rest-high-level/src/test/java/org/opensearch/client/SnapshotRequestConvertersTests.java
View File

@ -36,7 +36,7 @@ import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusReque
import org.opensearch.action.support.master.AcknowledgedRequest;
import org.elasticsearch.common.io.PathUtils;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.repositories.fs.FsRepository;
import org.elasticsearch.test.ESTestCase;

4
client/rest-high-level/src/test/java/org/opensearch/client/documentation/CRUDDocumentationIT.java
View File

@ -64,8 +64,8 @@ import org.opensearch.client.indices.CreateIndexResponse;
import org.opensearch.common.Strings;
import org.opensearch.common.bytes.BytesArray;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;

2
client/rest-high-level/src/test/java/org/opensearch/client/documentation/ClusterClientDocumentationIT.java
View File

@ -50,7 +50,7 @@ import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider
import org.opensearch.common.Priority;
import org.opensearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.indices.recovery.RecoverySettings;

4
client/rest-high-level/src/test/java/org/opensearch/client/documentation/IndicesClientDocumentationIT.java
View File

@ -93,8 +93,8 @@ import org.opensearch.cluster.metadata.MappingMetadata;
import org.opensearch.cluster.metadata.Template;
import org.opensearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;

2
client/rest-high-level/src/test/java/org/opensearch/client/documentation/QueryDSLDocumentationTests.java
View File

@ -24,7 +24,7 @@ import org.opensearch.common.geo.GeoPoint;
import org.opensearch.common.geo.ShapeRelation;
import org.opensearch.common.geo.builders.CoordinatesBuilder;
import org.opensearch.common.geo.builders.MultiPointBuilder;
import org.elasticsearch.common.unit.DistanceUnit;
import org.opensearch.common.unit.DistanceUnit;
import org.elasticsearch.index.query.GeoShapeQueryBuilder;
import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;

4
client/rest-high-level/src/test/java/org/opensearch/client/documentation/SearchDocumentationIT.java
View File

@ -54,8 +54,8 @@ import org.opensearch.client.indices.CreateIndexRequest;
import org.opensearch.client.indices.CreateIndexResponse;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.document.DocumentField;
import org.elasticsearch.common.text.Text;
import org.elasticsearch.common.unit.Fuzziness;
import org.opensearch.common.text.Text;
import org.opensearch.common.unit.Fuzziness;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentType;

2
client/rest-high-level/src/test/java/org/opensearch/client/indices/DataStreamsStatsResponseTests.java
View File

@ -23,7 +23,7 @@ import org.opensearch.OpenSearchException;
import org.opensearch.action.admin.indices.datastream.DataStreamsStatsAction;
import org.opensearch.action.support.DefaultShardOperationFailedException;
import org.opensearch.client.AbstractResponseTestCase;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType;

2
client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverRequestTests.java
View File

@ -23,7 +23,7 @@ import org.opensearch.action.admin.indices.rollover.Condition;
import org.opensearch.action.admin.indices.rollover.MaxAgeCondition;
import org.opensearch.action.admin.indices.rollover.MaxDocsCondition;
import org.opensearch.action.admin.indices.rollover.MaxSizeCondition;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.test.ESTestCase;

2
client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverResponseTests.java
View File

@ -23,7 +23,7 @@ import org.opensearch.action.admin.indices.rollover.Condition;
import org.opensearch.action.admin.indices.rollover.MaxAgeCondition;
import org.opensearch.action.admin.indices.rollover.MaxDocsCondition;
import org.opensearch.action.admin.indices.rollover.MaxSizeCondition;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;

2
client/rest-high-level/src/test/java/org/opensearch/client/tasks/CancelTasksResponseTests.java
View File

@ -27,7 +27,7 @@ import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.cluster.node.DiscoveryNodes;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.transport.TransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType;

2
client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java
View File

@ -24,7 +24,7 @@ import io.netty.util.concurrent.GlobalEventExecutor;
import org.opensearch.client.transport.TransportClient;
import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.network.NetworkModule;
import org.opensearch.common.network.NetworkModule;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.index.reindex.ReindexPlugin;
import org.opensearch.join.ParentJoinPlugin;

2
client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java
View File

@ -21,7 +21,7 @@ package org.opensearch.transport.client;
import com.carrotsearch.randomizedtesting.RandomizedTest;
import org.opensearch.client.transport.TransportClient;
import org.elasticsearch.common.network.NetworkModule;
import org.opensearch.common.network.NetworkModule;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.index.reindex.ReindexPlugin;
import org.opensearch.join.ParentJoinPlugin;

2
modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java
View File

@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.matrix.stats;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.ScoreMode;
import org.elasticsearch.common.lease.Releasables;
import org.opensearch.common.lease.Releasables;
import org.elasticsearch.common.util.BigArrays;
import org.elasticsearch.common.util.ObjectArray;
import org.elasticsearch.index.fielddata.NumericDoubleValues;

2
modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java
View File

@ -117,7 +117,7 @@ import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.regex.Regex;
import org.opensearch.common.regex.Regex;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.env.Environment;

2
modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternAnalyzerProvider.java
View File

@ -21,7 +21,7 @@ package org.opensearch.analysis.common;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CharArraySet;
import org.elasticsearch.common.regex.Regex;
import org.opensearch.common.regex.Regex;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;

2
modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java
View File

@ -20,7 +20,7 @@ package org.opensearch.analysis.common;
import org.apache.lucene.analysis.pattern.PatternReplaceCharFilter;
import org.opensearch.common.Strings;
import org.elasticsearch.common.regex.Regex;
import org.opensearch.common.regex.Regex;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.env.Environment;
import org.elasticsearch.index.IndexSettings;

2
modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceTokenFilterFactory.java
View File

@ -21,7 +21,7 @@ package org.opensearch.analysis.common;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.pattern.PatternReplaceFilter;
import org.elasticsearch.common.regex.Regex;
import org.opensearch.common.regex.Regex;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.env.Environment;
import org.elasticsearch.index.IndexSettings;

2
modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternTokenizerFactory.java
View File

@ -21,7 +21,7 @@ package org.opensearch.analysis.common;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.pattern.PatternTokenizer;
import org.elasticsearch.common.regex.Regex;
import org.opensearch.common.regex.Regex;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.env.Environment;
import org.elasticsearch.index.IndexSettings;

2
modules/ingest-common/src/main/java/org/opensearch/ingest/common/BytesProcessor.java
View File

@ -19,7 +19,7 @@
package org.opensearch.ingest.common;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeValue;
import java.util.Map;

4
modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateFormat.java
View File

@ -19,8 +19,8 @@
package org.opensearch.ingest.common;
import org.elasticsearch.common.time.DateFormatter;
import org.elasticsearch.common.time.DateFormatters;
import org.opensearch.common.time.DateFormatter;
import org.opensearch.common.time.DateFormatters;
import java.time.Instant;
import java.time.LocalDate;

2
modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateIndexNameProcessor.java
View File

@ -20,7 +20,7 @@
package org.opensearch.ingest.common;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.common.time.DateFormatter;
import org.opensearch.common.time.DateFormatter;
import org.elasticsearch.ingest.AbstractProcessor;
import org.elasticsearch.ingest.ConfigurationUtils;
import org.elasticsearch.ingest.IngestDocument;

2
modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java
View File

@ -21,7 +21,7 @@ package org.opensearch.ingest.common;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.time.DateFormatter;
import org.opensearch.common.time.DateFormatter;
import org.elasticsearch.common.util.LocaleUtils;
import org.elasticsearch.ingest.AbstractProcessor;
import org.elasticsearch.ingest.ConfigurationUtils;

4
modules/ingest-common/src/test/java/org/opensearch/ingest/common/BytesProcessorTests.java
View File

@ -20,8 +20,8 @@
package org.opensearch.ingest.common;
import org.opensearch.OpenSearchException;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.ingest.IngestDocument;
import org.elasticsearch.ingest.Processor;
import org.elasticsearch.ingest.RandomDocumentPicks;

4
modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateFormatTests.java
View File

@ -20,8 +20,8 @@
package org.opensearch.ingest.common;
import org.elasticsearch.bootstrap.JavaVersion;
import org.elasticsearch.common.time.DateFormatter;
import org.elasticsearch.common.time.DateUtils;
import org.opensearch.common.time.DateFormatter;
import org.opensearch.common.time.DateUtils;
import org.elasticsearch.test.ESTestCase;
import java.time.ZoneId;

2
modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameProcessorTests.java
View File

@ -18,7 +18,7 @@
*/
package org.opensearch.ingest.common;
import org.elasticsearch.common.time.DateFormatter;
import org.opensearch.common.time.DateFormatter;
import org.elasticsearch.ingest.IngestDocument;
import org.elasticsearch.ingest.TestTemplateService;
import org.elasticsearch.test.ESTestCase;

4
modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java
View File

@ -31,8 +31,8 @@ import com.maxmind.geoip2.record.Location;
import com.maxmind.geoip2.record.Subdivision;
import org.opensearch.OpenSearchParseException;
import org.elasticsearch.SpecialPermission;
import org.elasticsearch.common.network.InetAddresses;
import org.elasticsearch.common.network.NetworkAddress;
import org.opensearch.common.network.InetAddresses;
import org.opensearch.common.network.NetworkAddress;
import org.elasticsearch.ingest.AbstractProcessor;
import org.elasticsearch.ingest.IngestDocument;
import org.elasticsearch.ingest.Processor;

2
modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpPluginTests.java
View File

@ -20,7 +20,7 @@
package org.opensearch.ingest.geoip;
import com.maxmind.geoip2.model.AbstractResponse;
import org.elasticsearch.common.network.InetAddresses;
import org.opensearch.common.network.InetAddresses;
import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache;
import org.elasticsearch.test.ESTestCase;

2
modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateResponseTests.java
View File

@ -23,7 +23,7 @@ import org.apache.lucene.search.TotalHits;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.ShardSearchFailure;
import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.text.Text;
import org.opensearch.common.text.Text;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;

4
modules/parent-join/src/main/java/org/opensearch/join/aggregations/ParentJoinAggregator.java
View File

@ -28,8 +28,8 @@ import org.apache.lucene.search.ScoreMode;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.Bits;
import org.elasticsearch.common.lease.Releasable;
import org.elasticsearch.common.lease.Releasables;
import org.opensearch.common.lease.Releasable;
import org.opensearch.common.lease.Releasables;
import org.elasticsearch.common.lucene.Lucene;
import org.elasticsearch.common.util.BigArrays;
import org.elasticsearch.common.util.BitArray;

2
modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java
View File

@ -27,7 +27,7 @@ import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.geo.GeoPoint;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.DistanceUnit;
import org.opensearch.common.unit.DistanceUnit;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentType;

2
modules/percolator/src/main/java/org/opensearch/percolator/PercolatorHighlightSubFetchPhase.java
View File

@ -25,7 +25,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryVisitor;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.document.DocumentField;
import org.elasticsearch.common.text.Text;
import org.opensearch.common.text.Text;
import org.elasticsearch.search.SearchHit;
import org.opensearch.search.fetch.FetchContext;
import org.opensearch.search.fetch.FetchSubPhase;

2
modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java
View File

@ -114,7 +114,7 @@ import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import static org.elasticsearch.common.network.InetAddresses.forString;
import static org.opensearch.common.network.InetAddresses.forString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;

2
modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java
View File

@ -53,7 +53,7 @@ import org.opensearch.common.io.stream.InputStreamStreamInput;
import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.opensearch.common.io.stream.StreamInput;
import org.elasticsearch.common.network.InetAddresses;
import org.opensearch.common.network.InetAddresses;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;

2
modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java
View File

@ -60,7 +60,7 @@ import org.opensearch.Version;
import org.elasticsearch.common.lucene.search.function.CombineFunction;
import org.elasticsearch.common.lucene.search.function.FunctionScoreQuery;
import org.elasticsearch.common.lucene.search.function.RandomScoreFunction;
import org.elasticsearch.common.network.InetAddresses;
import org.opensearch.common.network.InetAddresses;
import org.elasticsearch.index.search.ESToParentBlockJoinQuery;
import org.opensearch.percolator.QueryAnalyzer.QueryExtraction;
import org.opensearch.percolator.QueryAnalyzer.Result;

2
modules/rank-eval/src/test/java/org/opensearch/index/rankeval/DiscountedCumulativeGainTests.java
View File

@ -23,7 +23,7 @@ import org.opensearch.action.OriginalIndices;
import org.opensearch.common.Strings;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.text.Text;
import org.opensearch.common.text.Text;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;

2
modules/rank-eval/src/test/java/org/opensearch/index/rankeval/ExpectedReciprocalRankTests.java
View File

@ -22,7 +22,7 @@ package org.opensearch.index.rankeval;
import org.opensearch.action.OriginalIndices;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.text.Text;
import org.opensearch.common.text.Text;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;

2
modules/rank-eval/src/test/java/org/opensearch/index/rankeval/MeanReciprocalRankTests.java
View File

@ -22,7 +22,7 @@ package org.opensearch.index.rankeval;
import org.opensearch.action.OriginalIndices;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.text.Text;
import org.opensearch.common.text.Text;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;

2
modules/rank-eval/src/test/java/org/opensearch/index/rankeval/PrecisionAtKTests.java
View File

@ -22,7 +22,7 @@ package org.opensearch.index.rankeval;
import org.opensearch.action.OriginalIndices;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.text.Text;
import org.opensearch.common.text.Text;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;

2
modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalResponseTests.java
View File

@ -31,7 +31,7 @@ import org.opensearch.common.breaker.CircuitBreakingException;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.io.stream.BytesStreamOutput;
import org.opensearch.common.io.stream.StreamInput;
import org.elasticsearch.common.text.Text;
import org.opensearch.common.text.Text;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;

2
modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedSearchHitTests.java
View File

@ -21,7 +21,7 @@ package org.opensearch.index.rankeval;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.text.Text;
import org.opensearch.common.text.Text;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType;

2
modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RecallAtKTests.java
View File

@ -22,7 +22,7 @@ package org.opensearch.index.rankeval;
import org.opensearch.action.OriginalIndices;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.text.Text;
import org.opensearch.common.text.Text;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;

2
modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java
View File

@ -37,7 +37,7 @@ import org.elasticsearch.action.index.IndexRequest;
import org.opensearch.action.support.TransportAction;
import org.opensearch.client.ParentTaskAssigningClient;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
import org.elasticsearch.index.VersionType;

2
modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexValidator.java
View File

@ -34,7 +34,7 @@ import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.Strings;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.regex.Regex;
import org.opensearch.common.regex.Regex;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.index.reindex.ReindexRequest;

2
modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java
View File

@ -60,7 +60,7 @@ import org.opensearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.CheckedConsumer;
import org.opensearch.common.bytes.BytesArray;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.text.Text;
import org.opensearch.common.text.Text;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;

2
modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java
View File

@ -34,7 +34,7 @@ import org.opensearch.client.ParentTaskAssigningClient;
import org.opensearch.client.support.AbstractClient;
import org.opensearch.common.bytes.BytesArray;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.text.Text;
import org.opensearch.common.text.Text;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.index.reindex.ClientScrollableHitSource;

4
modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java
View File

@ -35,9 +35,9 @@ import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.network.NetworkModule;
import org.opensearch.common.network.NetworkModule;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.TransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.opensearch.env.Environment;

2
modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java
View File

@ -29,7 +29,7 @@ import org.opensearch.action.bulk.Retry;
import org.opensearch.client.Client;
import org.opensearch.common.bytes.BytesArray;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.TransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.http.HttpInfo;
import org.elasticsearch.index.query.QueryBuilders;

4
modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java
View File

@ -47,8 +47,8 @@ import org.opensearch.common.ParsingException;
import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.io.FileSystemUtils;
import org.opensearch.common.io.Streams;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;

2
modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java
View File

@ -25,7 +25,7 @@ import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResp
import org.opensearch.action.support.master.AcknowledgedResponse;
import org.opensearch.client.Client;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.plugin.repository.url.URLRepositoryPlugin;
import org.opensearch.plugins.Plugin;
import org.opensearch.repositories.fs.FsRepository;

4
modules/repository-url/src/main/java/org/opensearch/common/blobstore/url/URLBlobStore.java
View File

@ -24,8 +24,8 @@ import org.opensearch.common.blobstore.BlobPath;
import org.opensearch.common.blobstore.BlobStore;
import org.opensearch.common.blobstore.BlobStoreException;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import java.net.MalformedURLException;
import java.net.URL;

2
modules/transport-netty4/src/internalClusterTest/java/org/opensearch/OpenSearchNetty4IntegTestCase.java
View File

@ -18,7 +18,7 @@
*/
package org.opensearch;
import org.elasticsearch.common.network.NetworkModule;
import org.opensearch.common.network.NetworkModule;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase;

6
modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java
View File

@ -25,9 +25,9 @@ import io.netty.util.ReferenceCounted;
import org.opensearch.OpenSearchNetty4IntegTestCase;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.http.HttpServerTransport;
import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService;
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;

2
modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4PipeliningIT.java
View File

@ -22,7 +22,7 @@ package org.opensearch.http.netty4;
import io.netty.handler.codec.http.FullHttpResponse;
import io.netty.util.ReferenceCounted;
import org.opensearch.OpenSearchNetty4IntegTestCase;
import org.elasticsearch.common.transport.TransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.http.HttpServerTransport;
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
import org.elasticsearch.test.ESIntegTestCase.Scope;

8
modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java
View File

@ -24,11 +24,11 @@ import org.opensearch.action.admin.cluster.node.info.NodeInfo;
import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse;
import org.opensearch.client.transport.TransportClient;
import org.opensearch.cluster.health.ClusterHealthStatus;
import org.elasticsearch.common.network.NetworkAddress;
import org.elasticsearch.common.network.NetworkModule;
import org.opensearch.common.network.NetworkAddress;
import org.opensearch.common.network.NetworkModule;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.BoundTransportAddress;
import org.elasticsearch.common.transport.TransportAddress;
import org.opensearch.common.transport.BoundTransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.env.Environment;
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
import org.elasticsearch.test.ESIntegTestCase.Scope;

8
modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportPublishAddressIT.java
View File

@ -22,11 +22,11 @@ package org.opensearch.transport.netty4;
import org.opensearch.OpenSearchNetty4IntegTestCase;
import org.opensearch.action.admin.cluster.node.info.NodeInfo;
import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse;
import org.elasticsearch.common.network.NetworkModule;
import org.elasticsearch.common.network.NetworkUtils;
import org.opensearch.common.network.NetworkModule;
import org.opensearch.common.network.NetworkUtils;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.BoundTransportAddress;
import org.elasticsearch.common.transport.TransportAddress;
import org.opensearch.common.transport.BoundTransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.test.ESIntegTestCase;
import org.opensearch.transport.Netty4Plugin;
import org.opensearch.transport.TransportInfo;

2
modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java
View File

@ -25,7 +25,7 @@ import org.opensearch.client.Response;
import org.opensearch.client.ResponseException;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.http.HttpTransportSettings;
import org.elasticsearch.test.rest.ESRestTestCase;
import org.elasticsearch.test.rest.yaml.ObjectPath;

6
modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java
View File

@ -42,13 +42,13 @@ import io.netty.util.AttributeKey;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.common.network.NetworkService;
import org.opensearch.common.network.NetworkService;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.util.BigArrays;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;

2
modules/transport-netty4/src/main/java/org/opensearch/transport/CopyBytesSocketChannel.java
View File

@ -39,7 +39,7 @@ import io.netty.channel.ChannelOutboundBuffer;
import io.netty.channel.RecvByteBufAllocator;
import io.netty.channel.socket.nio.NioSocketChannel;
import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeValue;
import java.io.IOException;
import java.nio.ByteBuffer;

4
modules/transport-netty4/src/main/java/org/opensearch/transport/Netty4Plugin.java
View File

@ -22,8 +22,8 @@ package org.opensearch.transport;
import org.apache.lucene.util.SetOnce;
import org.opensearch.Version;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.network.NetworkModule;
import org.elasticsearch.common.network.NetworkService;
import org.opensearch.common.network.NetworkModule;
import org.opensearch.common.network.NetworkService;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;

2
modules/transport-netty4/src/main/java/org/opensearch/transport/NettyAllocator.java
View File

@ -30,7 +30,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.common.Booleans;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.monitor.jvm.JvmInfo;
import java.util.concurrent.atomic.AtomicBoolean;

2
modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4MessageChannelHandler.java
View File

@ -29,7 +29,7 @@ import org.opensearch.OpenSearchException;
import org.elasticsearch.ExceptionsHelper;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.bytes.ReleasableBytesReference;
import org.elasticsearch.common.lease.Releasables;
import org.opensearch.common.lease.Releasables;
import org.elasticsearch.common.util.PageCacheRecycler;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.InboundPipeline;

8
modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Transport.java
View File

@ -40,13 +40,13 @@ import org.opensearch.Version;
import org.opensearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.SuppressForbidden;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.lease.Releasables;
import org.elasticsearch.common.network.NetworkService;
import org.opensearch.common.lease.Releasables;
import org.opensearch.common.network.NetworkService;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.util.PageCacheRecycler;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.core.internal.net.NetUtils;

4
modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java
View File

@ -22,10 +22,10 @@ package org.opensearch.http.netty4;
import io.netty.handler.codec.http.FullHttpResponse;
import io.netty.util.ReferenceCounted;
import org.opensearch.OpenSearchException;
import org.elasticsearch.common.network.NetworkService;
import org.opensearch.common.network.NetworkService;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.TransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.util.MockBigArrays;
import org.elasticsearch.common.util.MockPageCacheRecycler;
import org.elasticsearch.common.util.concurrent.ThreadContext;

4
modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpClient.java
View File

@ -43,8 +43,8 @@ import io.netty.handler.codec.http.HttpResponse;
import io.netty.handler.codec.http.HttpResponseDecoder;
import io.netty.handler.codec.http.HttpVersion;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.opensearch.tasks.Task;
import org.opensearch.transport.NettyAllocator;

4
modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerPipeliningTests.java
View File

@ -29,10 +29,10 @@ import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.handler.codec.http.FullHttpResponse;
import io.netty.util.ReferenceCounted;
import org.opensearch.common.bytes.BytesArray;
import org.elasticsearch.common.network.NetworkService;
import org.opensearch.common.network.NetworkService;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.TransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.util.MockBigArrays;
import org.elasticsearch.common.util.MockPageCacheRecycler;
import org.elasticsearch.http.HttpPipelinedRequest;

8
modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java
View File

@ -46,13 +46,13 @@ import io.netty.handler.codec.http.HttpVersion;
import org.apache.logging.log4j.message.ParameterizedMessage;
import org.opensearch.OpenSearchException;
import org.opensearch.common.bytes.BytesArray;
import org.elasticsearch.common.network.NetworkAddress;
import org.elasticsearch.common.network.NetworkService;
import org.opensearch.common.network.NetworkAddress;
import org.opensearch.common.network.NetworkService;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.MockBigArrays;
import org.elasticsearch.common.util.MockPageCacheRecycler;

4
modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java
View File

@ -21,9 +21,9 @@ package org.opensearch.transport.netty4;
import org.opensearch.Version;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.network.NetworkService;
import org.opensearch.common.network.NetworkService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.TransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.util.MockPageCacheRecycler;
import org.elasticsearch.common.util.PageCacheRecycler;
import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;

4
modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/NettyTransportMultiPortTests.java
View File

@ -21,8 +21,8 @@ package org.opensearch.transport.netty4;
import org.opensearch.Version;
import org.opensearch.common.component.Lifecycle;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.network.NetworkService;
import org.elasticsearch.common.network.NetworkUtils;
import org.opensearch.common.network.NetworkService;
import org.opensearch.common.network.NetworkUtils;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.MockPageCacheRecycler;
import org.elasticsearch.common.util.PageCacheRecycler;

4
modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java
View File

@ -24,10 +24,10 @@ import org.opensearch.action.ActionListener;
import org.elasticsearch.bootstrap.JavaVersion;
import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.network.NetworkService;
import org.opensearch.common.network.NetworkService;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.TransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.util.PageCacheRecycler;
import org.elasticsearch.core.internal.io.IOUtils;
import org.elasticsearch.core.internal.net.NetUtils;

2
server/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java
View File

@ -33,7 +33,7 @@ import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.Strings;
import org.opensearch.common.inject.Inject;
import org.opensearch.common.io.stream.Writeable;
import org.elasticsearch.common.lease.Releasables;
import org.opensearch.common.lease.Releasables;
import org.opensearch.index.IndexService;
import org.opensearch.index.engine.Engine;
import org.opensearch.index.get.GetResult;

2
server/src/main/java/org/elasticsearch/action/index/IndexRequest.java
View File

@ -40,7 +40,7 @@ import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.lucene.uid.Versions;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentHelper;

4
server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java
View File

@ -33,8 +33,8 @@ import org.opensearch.action.support.TransportActions;
import org.opensearch.cluster.ClusterState;
import org.elasticsearch.cluster.routing.GroupShardsIterator;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.lease.Releasable;
import org.elasticsearch.common.lease.Releasables;
import org.opensearch.common.lease.Releasable;
import org.opensearch.common.lease.Releasables;
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
import org.elasticsearch.common.util.concurrent.AtomicArray;
import org.elasticsearch.index.shard.ShardId;

2
server/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java
View File

@ -23,7 +23,7 @@ import org.apache.lucene.util.FixedBitSet;
import org.opensearch.action.ActionListener;
import org.opensearch.cluster.ClusterState;
import org.opensearch.cluster.routing.GroupShardsIterator;
import org.elasticsearch.common.lease.Releasable;
import org.opensearch.common.lease.Releasable;
import org.elasticsearch.search.SearchService.CanMatchResponse;
import org.elasticsearch.search.SearchShardTarget;
import org.opensearch.search.builder.SearchSourceBuilder;

4
server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java
View File

@ -26,8 +26,8 @@ import org.elasticsearch.action.search.SearchPhaseController.TopDocsStats;
import org.opensearch.common.breaker.CircuitBreaker;
import org.opensearch.common.breaker.CircuitBreakingException;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.lease.Releasable;
import org.elasticsearch.common.lease.Releasables;
import org.opensearch.common.lease.Releasable;
import org.opensearch.common.lease.Releasables;
import org.elasticsearch.common.lucene.search.TopDocsAndMaxScore;
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
import org.elasticsearch.search.SearchPhaseResult;

2
server/src/main/java/org/elasticsearch/action/search/SearchPhaseContext.java
View File

@ -21,7 +21,7 @@ package org.elasticsearch.action.search;
import org.apache.logging.log4j.Logger;
import org.opensearch.action.OriginalIndices;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.lease.Releasable;
import org.opensearch.common.lease.Releasable;
import org.elasticsearch.common.util.concurrent.AtomicArray;
import org.elasticsearch.search.SearchPhaseResult;
import org.elasticsearch.search.SearchShardTarget;

4
server/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java
View File

@ -24,8 +24,8 @@ import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.lease.Releasable;
import org.elasticsearch.common.lease.Releasables;
import org.opensearch.common.lease.Releasable;
import org.opensearch.common.lease.Releasables;
import org.elasticsearch.common.util.BigArrays;
import org.elasticsearch.common.util.BytesRefHash;
import org.elasticsearch.common.util.IntArray;

2
server/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java
View File

@ -26,7 +26,7 @@ import org.apache.lucene.search.spell.LevenshteinDistance;
import org.apache.lucene.util.CollectionUtil;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.regex.Regex;
import org.opensearch.common.regex.Regex;
import java.util.ArrayList;
import java.util.Collections;

4
server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java
View File

@ -64,8 +64,8 @@ import org.opensearch.cluster.service.ClusterApplierService;
import org.opensearch.cluster.service.ClusterService;
import org.elasticsearch.cluster.service.MasterService;
import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.common.network.NetworkModule;
import org.elasticsearch.common.network.NetworkService;
import org.opensearch.common.network.NetworkModule;
import org.opensearch.common.network.NetworkService;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.util.PageCacheRecycler;
import org.elasticsearch.common.util.concurrent.EsExecutors;

6
server/src/main/java/org/elasticsearch/common/settings/Setting.java
View File

@ -27,9 +27,9 @@ import org.elasticsearch.common.Booleans;
import org.elasticsearch.common.Nullable;
import org.opensearch.common.Strings;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.regex.Regex;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.MemorySizeValue;
import org.opensearch.common.regex.Regex;
import org.opensearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.MemorySizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;

8
server/src/main/java/org/elasticsearch/common/settings/Settings.java
View File

@ -30,9 +30,9 @@ import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.logging.LogConfigurator;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.MemorySizeValue;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.MemorySizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
@ -73,7 +73,7 @@ import java.util.function.UnaryOperator;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.elasticsearch.common.unit.ByteSizeValue.parseBytesSizeValue;
import static org.opensearch.common.unit.ByteSizeValue.parseBytesSizeValue;
import static org.elasticsearch.common.unit.TimeValue.parseTimeValue;
/**

2
server/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.common.settings;
import org.opensearch.common.Strings;
import org.elasticsearch.common.regex.Regex;
import org.opensearch.common.regex.Regex;
import org.elasticsearch.common.xcontent.ToXContent.Params;
import org.opensearch.rest.RestRequest;

4
server/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java
View File

@ -21,8 +21,8 @@ package org.elasticsearch.common.util;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.RamUsageEstimator;
import org.elasticsearch.common.lease.Releasables;
import org.elasticsearch.common.recycler.Recycler;
import org.opensearch.common.lease.Releasables;
import org.opensearch.common.recycler.Recycler;
import java.lang.reflect.Array;
import java.util.Arrays;

2
server/src/main/java/org/elasticsearch/common/util/AbstractHash.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.common.util;
import org.elasticsearch.common.lease.Releasables;
import org.opensearch.common.lease.Releasables;
/**
* Base implementation for {@link BytesRefHash} and {@link LongHash}, or any class that

2
server/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.common.util;
import com.carrotsearch.hppc.BitMixer;
import org.elasticsearch.common.lease.Releasable;
import org.opensearch.common.lease.Releasable;
/**
* Base implementation for a hash table that is paged, recycles arrays and grows in-place.

2
server/src/main/java/org/elasticsearch/common/util/BigArray.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.common.util;
import org.apache.lucene.util.Accountable;
import org.elasticsearch.common.lease.Releasable;
import org.opensearch.common.lease.Releasable;
/** Base abstraction of an array. */
public interface BigArray extends Releasable, Accountable {

6
server/src/main/java/org/elasticsearch/common/util/BigArrays.java
View File

@ -25,9 +25,9 @@ import org.apache.lucene.util.RamUsageEstimator;
import org.elasticsearch.common.Nullable;
import org.opensearch.common.breaker.CircuitBreaker;
import org.opensearch.common.breaker.CircuitBreakingException;
import org.elasticsearch.common.lease.Releasable;
import org.elasticsearch.common.lease.Releasables;
import org.elasticsearch.common.recycler.Recycler;
import org.opensearch.common.lease.Releasable;
import org.opensearch.common.lease.Releasables;
import org.opensearch.common.recycler.Recycler;
import org.elasticsearch.indices.breaker.CircuitBreakerService;
import java.util.Arrays;

4
server/src/main/java/org/elasticsearch/common/util/BitArray.java
View File

@ -19,8 +19,8 @@
package org.elasticsearch.common.util;
import org.elasticsearch.common.lease.Releasable;
import org.elasticsearch.common.lease.Releasables;
import org.opensearch.common.lease.Releasable;
import org.opensearch.common.lease.Releasables;
/**
* A bit array that is implemented using a growing {@link LongArray}

4
server/src/main/java/org/elasticsearch/common/util/BytesRefHash.java
View File

@ -21,8 +21,8 @@ package org.elasticsearch.common.util;
import com.carrotsearch.hppc.BitMixer;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.common.lease.Releasable;
import org.elasticsearch.common.lease.Releasables;
import org.opensearch.common.lease.Releasable;
import org.opensearch.common.lease.Releasables;
/**
* Specialized hash table implementation similar to Lucene's BytesRefHash that maps

2
server/src/main/java/org/elasticsearch/common/util/CombinedRateLimiter.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.common.util;
import org.apache.lucene.store.RateLimiter;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeValue;
import java.util.concurrent.atomic.AtomicLong;

2
server/src/main/java/org/elasticsearch/common/util/LongHash.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.common.util;
import org.elasticsearch.common.lease.Releasable;
import org.opensearch.common.lease.Releasable;
/**
* Specialized hash table implementation similar to BytesRefHash that maps

2
server/src/main/java/org/elasticsearch/common/util/LongLongHash.java
View File

@ -21,7 +21,7 @@ package org.elasticsearch.common.util;
import com.carrotsearch.hppc.BitMixer;
import org.elasticsearch.common.lease.Releasables;
import org.opensearch.common.lease.Releasables;
/**
* Specialized hash table implementation similar to BytesRefHash that maps

2
server/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.common.util;
import org.elasticsearch.common.lease.Releasables;
import org.opensearch.common.lease.Releasables;
import java.util.Iterator;
import java.util.NoSuchElementException;

14
server/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java
View File

@ -20,21 +20,21 @@
package org.elasticsearch.common.util;
import org.apache.lucene.util.RamUsageEstimator;
import org.elasticsearch.common.recycler.AbstractRecyclerC;
import org.elasticsearch.common.recycler.Recycler;
import org.opensearch.common.recycler.AbstractRecyclerC;
import org.opensearch.common.recycler.Recycler;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import java.util.Arrays;
import java.util.Locale;
import static org.elasticsearch.common.recycler.Recyclers.concurrent;
import static org.elasticsearch.common.recycler.Recyclers.concurrentDeque;
import static org.elasticsearch.common.recycler.Recyclers.dequeFactory;
import static org.elasticsearch.common.recycler.Recyclers.none;
import static org.opensearch.common.recycler.Recyclers.concurrent;
import static org.opensearch.common.recycler.Recyclers.concurrentDeque;
import static org.opensearch.common.recycler.Recyclers.dequeFactory;
import static org.opensearch.common.recycler.Recyclers.none;
/** A recycler of fixed-size pages. */
public class PageCacheRecycler {

Some files were not shown because too many files have changed in this diff Show More