Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Rename] o.e.common.util #337

Merged
merged 3 commits into from
Mar 17, 2021
Merged

[Rename] o.e.common.util #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
631462f
[Rename] o.e.common.util
nknize Mar 16, 2021
2c5dd20
fix imports
nknize Mar 16, 2021
bb7b297
fix classpath change
nknize Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.lucene.uid.Versions;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.CollectionUtils;
import org.opensearch.common.util.CollectionUtils;
import org.elasticsearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContent;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.opensearch.action.support.IndicesOptions;
import org.opensearch.client.TimedRequest;
import org.elasticsearch.common.util.ArrayUtils;
import org.opensearch.common.util.ArrayUtils;

/**
* A request to retrieve information about an index.
Expand Down
2 changes: 1 addition & 1 deletion ...nt/rest-high-level/src/test/java/org/opensearch/client/ClusterRequestConvertersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.opensearch.client.cluster.RemoteInfoRequest;
import org.opensearch.cluster.health.ClusterHealthStatus;
import org.opensearch.common.Priority;
import org.elasticsearch.common.util.CollectionUtils;
import org.opensearch.common.util.CollectionUtils;
import org.elasticsearch.test.ESTestCase;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
Expand Down
2 changes: 1 addition & 1 deletion ...nt/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
import org.opensearch.common.Strings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.CollectionUtils;
import org.opensearch.common.util.CollectionUtils;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.test.ESTestCase;
import org.junit.Assert;
Expand Down
2 changes: 1 addition & 1 deletion ...high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.elasticsearch.common.CheckedRunnable;
import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentType;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
import org.elasticsearch.common.CheckedFunction;
import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.util.set.Sets;
import org.opensearch.common.util.set.Sets;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.ToXContentFragment;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/test/java/org/opensearch/client/core/CountRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.opensearch.action.support.IndicesOptions;
import org.opensearch.client.AbstractRequestTestCase;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.ArrayUtils;
import org.opensearch.common.util.ArrayUtils;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.MatchAllQueryBuilder;
Expand Down
2 changes: 1 addition & 1 deletion libs/nio/src/test/java/org/opensearch/nio/BytesChannelContextTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.opensearch.nio;

import org.elasticsearch.common.CheckedFunction;
import org.elasticsearch.common.util.PageCacheRecycler;
import org.opensearch.common.util.PageCacheRecycler;
import org.elasticsearch.test.ESTestCase;
import org.junit.Before;

Expand Down
2 changes: 1 addition & 1 deletion libs/nio/src/test/java/org/opensearch/nio/NioSelectorGroupTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.net.InetSocketAddress;
import java.util.function.Consumer;

import static org.elasticsearch.common.util.concurrent.EsExecutors.daemonThreadFactory;
import static org.opensearch.common.util.concurrent.EsExecutors.daemonThreadFactory;
import static org.mockito.Mockito.mock;

public class NioSelectorGroupTests extends ESTestCase {
Expand Down
2 changes: 1 addition & 1 deletion libs/nio/src/test/java/org/opensearch/nio/NioSelectorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.elasticsearch.common.CheckedRunnable;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
import org.opensearch.common.util.concurrent.AbstractRunnable;
import org.elasticsearch.test.ESTestCase;
import org.junit.Before;
import org.mockito.ArgumentCaptor;
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.ScoreMode;
import org.opensearch.common.lease.Releasables;
import org.elasticsearch.common.util.BigArrays;
import org.elasticsearch.common.util.ObjectArray;
import org.opensearch.common.util.BigArrays;
import org.opensearch.common.util.ObjectArray;
import org.elasticsearch.index.fielddata.NumericDoubleValues;
import org.opensearch.search.MultiValueMode;
import org.elasticsearch.search.aggregations.Aggregator;
Expand Down
2 changes: 1 addition & 1 deletion ...lysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import java.util.Set;

import static java.util.Collections.unmodifiableSet;
import static org.elasticsearch.common.util.set.Sets.newHashSet;
import static org.opensearch.common.util.set.Sets.newHashSet;

public class HtmlStripCharFilterFactory extends AbstractCharFilterFactory {
private final Set<String> escapedTags;
Expand Down
2 changes: 1 addition & 1 deletion modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.common.Nullable;
import org.opensearch.common.time.DateFormatter;
import org.elasticsearch.common.util.LocaleUtils;
import org.opensearch.common.util.LocaleUtils;
import org.elasticsearch.ingest.AbstractProcessor;
import org.elasticsearch.ingest.ConfigurationUtils;
import org.elasticsearch.ingest.IngestDocument;
Expand Down
2 changes: 1 addition & 1 deletion modules/ingest-common/src/main/java/org/opensearch/ingest/common/KeyValueProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.opensearch.ingest.common;

import org.elasticsearch.common.util.set.Sets;
import org.opensearch.common.util.set.Sets;
import org.elasticsearch.ingest.AbstractProcessor;
import org.elasticsearch.ingest.ConfigurationUtils;
import org.elasticsearch.ingest.IngestDocument;
Expand Down
10 changes: 5 additions & 5 deletions modules/ingest-common/src/main/java/org/opensearch/ingest/common/ScriptProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
import org.elasticsearch.common.Nullable;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.util.CollectionUtils;
import org.opensearch.common.util.CollectionUtils;
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.common.xcontent.json.JsonXContent;
import org.elasticsearch.ingest.AbstractProcessor;
import org.elasticsearch.ingest.IngestDocument;
import org.elasticsearch.ingest.Processor;
import org.opensearch.ingest.AbstractProcessor;
import org.opensearch.ingest.IngestDocument;
import org.opensearch.ingest.Processor;
import org.opensearch.script.DynamicMap;
import org.opensearch.script.IngestScript;
import org.opensearch.script.Script;
Expand All @@ -44,7 +44,7 @@
import java.util.Map;
import java.util.function.Function;

import static org.elasticsearch.ingest.ConfigurationUtils.newConfigurationException;
import static org.opensearch.ingest.ConfigurationUtils.newConfigurationException;

/**
* Processor that evaluates a script with an ingest document in its context.
Expand Down
2 changes: 1 addition & 1 deletion modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.opensearch.ingest.common;

import org.elasticsearch.common.util.set.Sets;
import org.opensearch.common.util.set.Sets;
import org.elasticsearch.ingest.IngestDocument;
import org.elasticsearch.ingest.IngestDocument.Metadata;
import org.elasticsearch.ingest.Processor;
Expand Down
2 changes: 1 addition & 1 deletion ...gest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.opensearch.OpenSearchException;
import org.opensearch.OpenSearchParseException;
import org.elasticsearch.common.util.set.Sets;
import org.opensearch.common.util.set.Sets;
import org.elasticsearch.test.ESTestCase;

import java.util.Arrays;
Expand Down
2 changes: 1 addition & 1 deletion modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.opensearch.ingest.common;

import org.elasticsearch.common.util.set.Sets;
import org.opensearch.common.util.set.Sets;
import org.elasticsearch.ingest.IngestDocument;
import org.elasticsearch.ingest.Processor;
import org.elasticsearch.ingest.RandomDocumentPicks;
Expand Down
4 changes: 2 additions & 2 deletions ...-mustache/src/main/java/org/opensearch/script/mustache/CustomReflectionObjectHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
package org.opensearch.script.mustache;

import com.github.mustachejava.reflect.ReflectionObjectHandler;
import org.elasticsearch.common.util.CollectionUtils;
import org.elasticsearch.common.util.iterable.Iterables;
import org.opensearch.common.util.CollectionUtils;
import org.opensearch.common.util.iterable.Iterables;

import java.lang.reflect.Array;
import java.util.AbstractMap;
Expand Down
2 changes: 1 addition & 1 deletion modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.opensearch.painless.lookup;

import org.elasticsearch.common.util.CollectionUtils;
import org.opensearch.common.util.CollectionUtils;

import java.lang.invoke.MethodHandle;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessLookup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.opensearch.painless.lookup;

import org.elasticsearch.common.util.CollectionUtils;
import org.opensearch.common.util.CollectionUtils;

import java.lang.invoke.MethodHandle;
import java.util.Map;
Expand Down
4 changes: 2 additions & 2 deletions modules/parent-join/src/main/java/org/opensearch/join/aggregations/ParentJoinAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import org.opensearch.common.lease.Releasable;
import org.opensearch.common.lease.Releasables;
import org.opensearch.common.lucene.Lucene;
import org.elasticsearch.common.util.BigArrays;
import org.elasticsearch.common.util.BitArray;
import org.opensearch.common.util.BigArrays;
import org.opensearch.common.util.BitArray;
import org.elasticsearch.search.aggregations.Aggregator;
import org.elasticsearch.search.aggregations.AggregatorFactories;
import org.elasticsearch.search.aggregations.CardinalityUpperBound;
Expand Down
2 changes: 1 addition & 1 deletion modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.opensearch.action.support.IndicesOptions;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.opensearch.common.io.stream.Writeable.Reader;
import org.elasticsearch.common.util.ArrayUtils;
import org.opensearch.common.util.ArrayUtils;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.test.AbstractWireSerializingTestCase;
import org.junit.AfterClass;
Expand Down
2 changes: 1 addition & 1 deletion ...s/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import org.elasticsearch.common.Nullable;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
import org.opensearch.common.util.concurrent.AbstractRunnable;
import org.elasticsearch.index.VersionType;
import org.elasticsearch.index.mapper.IdFieldMapper;
import org.elasticsearch.index.mapper.IndexFieldMapper;
Expand Down
2 changes: 1 addition & 1 deletion modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.opensearch.common.ParsingException;
import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.opensearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
Expand Down
6 changes: 3 additions & 3 deletions .../reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
import org.opensearch.common.Strings;
import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentParseException;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.reindex.RejectAwareActionListener;
import org.elasticsearch.index.reindex.ScrollableHitSource;
import org.opensearch.index.reindex.RejectAwareActionListener;
import org.opensearch.index.reindex.ScrollableHitSource;
import org.opensearch.rest.RestStatus;
import org.opensearch.threadpool.ThreadPool;

Expand Down
4 changes: 2 additions & 2 deletions modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
import org.elasticsearch.common.settings.Settings;
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;
import org.opensearch.common.util.concurrent.AbstractRunnable;
import org.opensearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.common.xcontent.XContentType;
import org.opensearch.index.Index;
import org.opensearch.index.engine.VersionConflictEngineException;
Expand Down
2 changes: 1 addition & 1 deletion ...es/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.text.Text;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.opensearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.index.reindex.ClientScrollableHitSource;
import org.elasticsearch.index.reindex.ScrollableHitSource;
import org.opensearch.search.SearchHit;
Expand Down
2 changes: 1 addition & 1 deletion ...es/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import org.opensearch.common.network.NetworkModule;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.opensearch.env.Environment;
import org.opensearch.env.NodeEnvironment;
Expand Down
3 changes: 1 addition & 2 deletions ...eindex/src/test/java/org/opensearch/index/reindex/ReindexSourceTargetValidationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@
import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.index.reindex.RemoteInfo;
import org.opensearch.indices.SystemIndices;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.test.ESTestCase;

import java.util.HashMap;
Expand Down
2 changes: 1 addition & 1 deletion modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.opensearch.common.bytes.BytesArray;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.opensearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.http.HttpInfo;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.reindex.AbstractBulkByScrollRequestBuilder;
Expand Down
4 changes: 2 additions & 2 deletions ...reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteResponseParsersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
package org.opensearch.index.reindex.remote;

import org.opensearch.action.search.ShardSearchFailure;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.opensearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.reindex.ScrollableHitSource;
import org.opensearch.index.reindex.ScrollableHitSource;
import org.elasticsearch.test.ESTestCase;
import org.hamcrest.Matchers;

Expand Down
4 changes: 2 additions & 2 deletions ...dex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
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;
import org.opensearch.common.util.concurrent.EsExecutors;
import org.opensearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.index.reindex.RejectAwareActionListener;
import org.elasticsearch.index.reindex.ScrollableHitSource;
import org.elasticsearch.index.reindex.ScrollableHitSource.Response;
Expand Down
2 changes: 1 addition & 1 deletion modules/repository-url/src/main/java/org/opensearch/repositories/url/URLRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.opensearch.common.blobstore.url.URLBlobStore;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.util.URIPattern;
import org.opensearch.common.util.URIPattern;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.opensearch.env.Environment;
import org.elasticsearch.indices.recovery.RecoverySettings;
Expand Down
4 changes: 2 additions & 2 deletions .../transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
import org.elasticsearch.common.settings.Settings;
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.opensearch.common.util.BigArrays;
import org.opensearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.core.internal.io.IOUtils;
import org.elasticsearch.core.internal.net.NetUtils;
Expand Down
4 changes: 2 additions & 2 deletions modules/transport-netty4/src/main/java/org/opensearch/transport/Netty4Plugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.BigArrays;
import org.elasticsearch.common.util.PageCacheRecycler;
import org.opensearch.common.util.BigArrays;
import org.opensearch.common.util.PageCacheRecycler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.http.HttpServerTransport;
import org.opensearch.http.netty4.Netty4HttpServerTransport;
Expand Down
2 changes: 1 addition & 1 deletion modules/transport-netty4/src/main/java/org/opensearch/transport/SharedGroupFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.elasticsearch.common.util.concurrent.EsExecutors.daemonThreadFactory;
import static org.opensearch.common.util.concurrent.EsExecutors.daemonThreadFactory;

/**
* Creates and returns {@link io.netty.channel.EventLoopGroup} instances. It will return a shared group for
Expand Down
2 changes: 1 addition & 1 deletion ...ort-netty4/src/main/java/org/opensearch/transport/netty4/Netty4MessageChannelHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.bytes.ReleasableBytesReference;
import org.opensearch.common.lease.Releasables;
import org.elasticsearch.common.util.PageCacheRecycler;
import org.opensearch.common.util.PageCacheRecycler;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.InboundPipeline;
import org.opensearch.transport.Transport;
Expand Down
Loading