Skip to content

Commit a1faafe

Browse files
owaiskazi19owaiskazi19
authored
The spotless should take care of unified imports ordering (test/ subprojects) (#9351)
Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
1 parent 34c860d commit a1faafe

File tree

124 files changed

+346
-325
lines changed

Some content is hidden

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

124 files changed

+346
-325
lines changed

‎test/framework/src/main/java/org/opensearch/action/support/ActionTestUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232

3333
package org.opensearch.action.support;
3434

35-
import org.opensearch.core.action.ActionListener;
3635
import org.opensearch.action.ActionRequest;
37-
import org.opensearch.core.action.ActionResponse;
3836
import org.opensearch.common.CheckedConsumer;
37+
import org.opensearch.core.action.ActionListener;
38+
import org.opensearch.core.action.ActionResponse;
3939
import org.opensearch.tasks.Task;
4040

4141
import static org.opensearch.action.support.PlainActionFuture.newFuture;

‎test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,18 @@
3333
package org.opensearch.bootstrap;
3434

3535
import com.carrotsearch.randomizedtesting.RandomizedRunner;
36+
3637
import org.apache.logging.log4j.LogManager;
3738
import org.apache.logging.log4j.Logger;
3839
import org.apache.lucene.tests.util.LuceneTestCase;
3940
import org.opensearch.common.Booleans;
4041
import org.opensearch.common.SuppressForbidden;
41-
import org.opensearch.core.common.Strings;
42-
import org.opensearch.core.util.FileSystemUtils;
4342
import org.opensearch.common.io.PathUtils;
4443
import org.opensearch.common.network.IfConfig;
4544
import org.opensearch.common.network.NetworkAddress;
4645
import org.opensearch.common.settings.Settings;
46+
import org.opensearch.core.common.Strings;
47+
import org.opensearch.core.util.FileSystemUtils;
4748
import org.opensearch.mockito.plugin.PriviledgedMockMaker;
4849
import org.opensearch.plugins.PluginInfo;
4950
import org.opensearch.secure_sm.SecureSM;

‎test/framework/src/main/java/org/opensearch/client/RestClientBuilderTestCase.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@
3232

3333
package org.opensearch.client;
3434

35-
import java.util.HashMap;
36-
import java.util.Map;
37-
3835
import joptsimple.internal.Strings;
39-
4036
import org.apache.hc.core5.http.Header;
4137
import org.opensearch.test.OpenSearchTestCase;
4238

39+
import java.util.HashMap;
40+
import java.util.Map;
41+
4342
/**
4443
* A test case with access to internals of a RestClient.
4544
*/

‎test/framework/src/main/java/org/opensearch/cluster/coordination/AbstractCoordinatorTestCase.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
package org.opensearch.cluster.coordination;
3333

3434
import com.carrotsearch.randomizedtesting.RandomizedContext;
35+
3536
import org.apache.logging.log4j.CloseableThreadContext;
3637
import org.apache.logging.log4j.LogManager;
3738
import org.apache.logging.log4j.Logger;
@@ -42,8 +43,8 @@
4243
import org.opensearch.cluster.ClusterState;
4344
import org.opensearch.cluster.ClusterStateTaskListener;
4445
import org.opensearch.cluster.ClusterStateUpdateTask;
45-
import org.opensearch.cluster.OpenSearchAllocationTestCase;
4646
import org.opensearch.cluster.NodeConnectionsService;
47+
import org.opensearch.cluster.OpenSearchAllocationTestCase;
4748
import org.opensearch.cluster.coordination.AbstractCoordinatorTestCase.Cluster.ClusterNode;
4849
import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfiguration;
4950
import org.opensearch.cluster.coordination.LinearizabilityChecker.History;
@@ -60,27 +61,27 @@
6061
import org.opensearch.common.UUIDs;
6162
import org.opensearch.common.collect.Tuple;
6263
import org.opensearch.common.io.stream.BytesStreamOutput;
63-
import org.opensearch.core.common.io.stream.NamedWriteableAwareStreamInput;
64-
import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
65-
import org.opensearch.core.common.io.stream.StreamInput;
64+
import org.opensearch.common.lease.Releasable;
6665
import org.opensearch.common.settings.ClusterSettings;
6766
import org.opensearch.common.settings.Setting;
6867
import org.opensearch.common.settings.Settings;
69-
import org.opensearch.core.common.transport.TransportAddress;
7068
import org.opensearch.common.unit.TimeValue;
7169
import org.opensearch.common.util.BigArrays;
7270
import org.opensearch.common.util.MockBigArrays;
7371
import org.opensearch.common.util.MockPageCacheRecycler;
7472
import org.opensearch.common.util.concurrent.PrioritizedOpenSearchThreadPoolExecutor;
75-
import org.opensearch.common.lease.Releasable;
73+
import org.opensearch.core.common.io.stream.NamedWriteableAwareStreamInput;
74+
import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
75+
import org.opensearch.core.common.io.stream.StreamInput;
76+
import org.opensearch.core.common.transport.TransportAddress;
77+
import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
7678
import org.opensearch.discovery.DiscoveryModule;
7779
import org.opensearch.discovery.SeedHostsProvider;
7880
import org.opensearch.env.NodeEnvironment;
7981
import org.opensearch.gateway.ClusterStateUpdaters;
8082
import org.opensearch.gateway.GatewayService;
8183
import org.opensearch.gateway.MockGatewayMetaState;
8284
import org.opensearch.gateway.PersistedClusterStateService;
83-
import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
8485
import org.opensearch.monitor.NodeHealthService;
8586
import org.opensearch.monitor.StatusInfo;
8687
import org.opensearch.test.OpenSearchTestCase;

‎test/framework/src/main/java/org/opensearch/cluster/coordination/CoordinationStateTestCluster.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@
4848
import java.util.Set;
4949
import java.util.stream.Collectors;
5050

51-
import static com.carrotsearch.randomizedtesting.RandomizedTest.rarely;
5251
import static java.util.stream.Collectors.toSet;
53-
import static org.apache.lucene.tests.util.LuceneTestCase.random;
5452
import static org.opensearch.test.OpenSearchTestCase.randomBoolean;
5553
import static org.opensearch.test.OpenSearchTestCase.randomFrom;
5654
import static org.opensearch.test.OpenSearchTestCase.randomIntBetween;
5755
import static org.opensearch.test.OpenSearchTestCase.randomLong;
5856
import static org.opensearch.test.OpenSearchTestCase.randomLongBetween;
5957
import static org.opensearch.test.OpenSearchTestCase.randomSubsetOf;
6058
import static org.hamcrest.Matchers.hasSize;
59+
import static com.carrotsearch.randomizedtesting.RandomizedTest.rarely;
60+
import static org.apache.lucene.tests.util.LuceneTestCase.random;
6161
import static org.junit.Assert.assertThat;
6262

6363
public class CoordinationStateTestCluster {

‎test/framework/src/main/java/org/opensearch/cluster/coordination/DeterministicTaskQueue.java

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
package org.opensearch.cluster.coordination;
3434

3535
import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
36+
3637
import org.apache.logging.log4j.LogManager;
3738
import org.apache.logging.log4j.Logger;
3839
import org.opensearch.common.settings.Settings;

‎test/framework/src/main/java/org/opensearch/cluster/routing/TestShardRouting.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
import org.opensearch.snapshots.SnapshotId;
4242
import org.opensearch.test.OpenSearchTestCase;
4343

44-
import static org.apache.lucene.tests.util.LuceneTestCase.random;
4544
import static org.opensearch.test.OpenSearchTestCase.randomAlphaOfLength;
45+
import static org.apache.lucene.tests.util.LuceneTestCase.random;
4646

4747
/**
4848
* A helper that allows to create shard routing instances within tests, while not requiring to expose

‎test/framework/src/main/java/org/opensearch/cluster/service/FakeThreadPoolClusterManagerService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
import org.apache.logging.log4j.LogManager;
3535
import org.apache.logging.log4j.Logger;
36-
import org.opensearch.core.action.ActionListener;
3736
import org.opensearch.cluster.ClusterChangedEvent;
3837
import org.opensearch.cluster.ClusterState;
3938
import org.opensearch.cluster.coordination.ClusterStatePublisher.AckListener;
@@ -44,6 +43,7 @@
4443
import org.opensearch.common.util.concurrent.OpenSearchExecutors;
4544
import org.opensearch.common.util.concurrent.PrioritizedOpenSearchThreadPoolExecutor;
4645
import org.opensearch.common.util.concurrent.ThreadContext;
46+
import org.opensearch.core.action.ActionListener;
4747
import org.opensearch.node.Node;
4848
import org.opensearch.threadpool.ThreadPool;
4949

@@ -52,8 +52,8 @@
5252
import java.util.concurrent.TimeUnit;
5353
import java.util.function.Consumer;
5454

55-
import static org.apache.lucene.tests.util.LuceneTestCase.random;
5655
import static org.opensearch.test.OpenSearchTestCase.randomInt;
56+
import static org.apache.lucene.tests.util.LuceneTestCase.random;
5757

5858
public class FakeThreadPoolClusterManagerService extends ClusterManagerService {
5959
private static final Logger logger = LogManager.getLogger(FakeThreadPoolClusterManagerService.class);

‎test/framework/src/main/java/org/opensearch/common/bytes/AbstractBytesReferenceTestCase.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@
3535
import org.apache.lucene.util.BytesRef;
3636
import org.apache.lucene.util.BytesRefBuilder;
3737
import org.apache.lucene.util.BytesRefIterator;
38-
import org.opensearch.core.common.breaker.CircuitBreaker;
3938
import org.opensearch.common.io.stream.BytesStreamOutput;
4039
import org.opensearch.common.io.stream.ReleasableBytesStreamOutput;
40+
import org.opensearch.common.util.BigArrays;
41+
import org.opensearch.common.util.PageCacheRecycler;
42+
import org.opensearch.core.common.breaker.CircuitBreaker;
4143
import org.opensearch.core.common.bytes.AbstractBytesReference;
4244
import org.opensearch.core.common.bytes.BytesArray;
4345
import org.opensearch.core.common.bytes.BytesReference;
4446
import org.opensearch.core.common.io.stream.StreamInput;
45-
import org.opensearch.common.util.BigArrays;
4647
import org.opensearch.core.common.util.ByteArray;
47-
import org.opensearch.common.util.PageCacheRecycler;
4848
import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
4949
import org.opensearch.test.OpenSearchTestCase;
5050

‎test/framework/src/main/java/org/opensearch/common/logging/JsonLogsStream.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232

3333
package org.opensearch.common.logging;
3434

35+
import org.opensearch.common.xcontent.json.JsonXContent;
3536
import org.opensearch.core.xcontent.DeprecationHandler;
3637
import org.opensearch.core.xcontent.NamedXContentRegistry;
3738
import org.opensearch.core.xcontent.XContentParser;
38-
import org.opensearch.common.xcontent.json.JsonXContent;
3939

4040
import java.io.BufferedReader;
4141
import java.io.IOException;

‎test/framework/src/main/java/org/opensearch/common/logging/TestThreadInfoPatternConverter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@
3232

3333
package org.opensearch.common.logging;
3434

35-
import java.util.Arrays;
36-
import java.util.regex.Matcher;
37-
import java.util.regex.Pattern;
38-
3935
import org.apache.logging.log4j.core.LogEvent;
4036
import org.apache.logging.log4j.core.config.plugins.Plugin;
4137
import org.apache.logging.log4j.core.pattern.ConverterKeys;
4238
import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
4339
import org.apache.logging.log4j.core.pattern.PatternConverter;
4440
import org.opensearch.test.OpenSearchIntegTestCase;
4541

42+
import java.util.Arrays;
43+
import java.util.regex.Matcher;
44+
import java.util.regex.Pattern;
45+
4646
/**
4747
* Converts {@code %test_thread_info} in log4j patterns into information
4848
* based on the loggin thread's name. If that thread is part of an

‎test/framework/src/main/java/org/opensearch/common/lucene/store/OpenSearchIndexInputTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
package org.opensearch.common.lucene.store;
3333

3434
import org.apache.lucene.store.IndexInput;
35-
import org.opensearch.core.action.ActionListener;
3635
import org.opensearch.action.support.PlainActionFuture;
3736
import org.opensearch.common.settings.Settings;
3837
import org.opensearch.common.util.concurrent.AbstractRunnable;
3938
import org.opensearch.common.util.concurrent.OpenSearchExecutors;
4039
import org.opensearch.common.util.concurrent.OpenSearchThreadPoolExecutor;
4140
import org.opensearch.common.util.concurrent.ThreadContext;
41+
import org.opensearch.core.action.ActionListener;
4242
import org.opensearch.test.OpenSearchTestCase;
4343
import org.junit.AfterClass;
4444
import org.junit.BeforeClass;

‎test/framework/src/main/java/org/opensearch/common/util/MockBigArrays.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@
3434

3535
import com.carrotsearch.randomizedtesting.RandomizedContext;
3636
import com.carrotsearch.randomizedtesting.SeedUtils;
37+
38+
import org.apache.lucene.tests.util.LuceneTestCase;
3739
import org.apache.lucene.util.Accountable;
3840
import org.apache.lucene.util.Accountables;
3941
import org.apache.lucene.util.BytesRef;
40-
import org.apache.lucene.tests.util.LuceneTestCase;
41-
import org.opensearch.core.common.breaker.CircuitBreaker;
4242
import org.opensearch.common.util.set.Sets;
43+
import org.opensearch.core.common.breaker.CircuitBreaker;
4344
import org.opensearch.core.common.util.BigArray;
4445
import org.opensearch.core.common.util.ByteArray;
4546
import org.opensearch.core.indices.breaker.CircuitBreakerService;

‎test/framework/src/main/java/org/opensearch/index/MapperTestUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
import java.nio.file.Path;
5353
import java.util.Collections;
5454

55-
import static org.apache.lucene.tests.util.LuceneTestCase.expectThrows;
5655
import static org.opensearch.test.OpenSearchTestCase.createTestAnalysis;
5756
import static org.hamcrest.MatcherAssert.assertThat;
5857
import static org.hamcrest.Matchers.containsString;
58+
import static org.apache.lucene.tests.util.LuceneTestCase.expectThrows;
5959

6060
public class MapperTestUtils {
6161

‎test/framework/src/main/java/org/opensearch/index/MockEngineFactoryPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
package org.opensearch.index;
3333

34-
import org.apache.lucene.tests.index.AssertingDirectoryReader;
3534
import org.apache.lucene.index.FilterDirectoryReader;
35+
import org.apache.lucene.tests.index.AssertingDirectoryReader;
3636
import org.opensearch.common.settings.Setting;
3737
import org.opensearch.index.engine.EngineFactory;
3838
import org.opensearch.plugins.EnginePlugin;

‎test/framework/src/main/java/org/opensearch/index/RandomCreateIndexGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
import org.opensearch.action.admin.indices.alias.Alias;
3636
import org.opensearch.action.admin.indices.create.CreateIndexRequest;
3737
import org.opensearch.common.settings.Settings;
38+
import org.opensearch.common.xcontent.XContentType;
3839
import org.opensearch.core.xcontent.MediaTypeRegistry;
3940
import org.opensearch.core.xcontent.XContentBuilder;
40-
import org.opensearch.common.xcontent.XContentType;
4141

4242
import java.io.IOException;
4343

‎test/framework/src/main/java/org/opensearch/index/analysis/AnalysisTestsHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
import org.opensearch.index.IndexSettings;
4040
import org.opensearch.indices.analysis.AnalysisModule;
4141
import org.opensearch.plugins.AnalysisPlugin;
42-
import org.opensearch.test.OpenSearchTestCase;
4342
import org.opensearch.test.IndexSettingsModule;
43+
import org.opensearch.test.OpenSearchTestCase;
4444

4545
import java.io.IOException;
4646
import java.nio.file.Path;

‎test/framework/src/main/java/org/opensearch/index/engine/EngineTestCase.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@
6262
import org.apache.lucene.store.Directory;
6363
import org.apache.lucene.util.Bits;
6464
import org.apache.lucene.util.BytesRef;
65-
import org.junit.After;
66-
import org.junit.Before;
6765
import org.opensearch.Version;
6866
import org.opensearch.action.index.IndexRequest;
6967
import org.opensearch.action.support.replication.ReplicationResponse;
@@ -73,22 +71,25 @@
7371
import org.opensearch.common.CheckedBiFunction;
7472
import org.opensearch.common.Nullable;
7573
import org.opensearch.common.Randomness;
76-
import org.opensearch.core.common.bytes.BytesArray;
77-
import org.opensearch.core.common.bytes.BytesReference;
7874
import org.opensearch.common.compress.CompressedXContent;
7975
import org.opensearch.common.concurrent.GatedCloseable;
8076
import org.opensearch.common.lucene.Lucene;
8177
import org.opensearch.common.lucene.uid.Versions;
8278
import org.opensearch.common.settings.Settings;
8379
import org.opensearch.common.unit.TimeValue;
8480
import org.opensearch.common.util.BigArrays;
81+
import org.opensearch.common.util.io.IOUtils;
8582
import org.opensearch.common.util.set.Sets;
83+
import org.opensearch.common.xcontent.XContentFactory;
84+
import org.opensearch.core.common.bytes.BytesArray;
85+
import org.opensearch.core.common.bytes.BytesReference;
86+
import org.opensearch.core.index.Index;
87+
import org.opensearch.core.index.shard.ShardId;
88+
import org.opensearch.core.indices.breaker.CircuitBreakerService;
89+
import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
8690
import org.opensearch.core.xcontent.MediaTypeRegistry;
8791
import org.opensearch.core.xcontent.NamedXContentRegistry;
8892
import org.opensearch.core.xcontent.XContentBuilder;
89-
import org.opensearch.common.xcontent.XContentFactory;
90-
import org.opensearch.common.util.io.IOUtils;
91-
import org.opensearch.core.index.Index;
9293
import org.opensearch.index.IndexSettings;
9394
import org.opensearch.index.MapperTestUtils;
9495
import org.opensearch.index.VersionType;
@@ -109,7 +110,6 @@
109110
import org.opensearch.index.seqno.ReplicationTracker;
110111
import org.opensearch.index.seqno.RetentionLeases;
111112
import org.opensearch.index.seqno.SequenceNumbers;
112-
import org.opensearch.core.index.shard.ShardId;
113113
import org.opensearch.index.store.Store;
114114
import org.opensearch.index.translog.InternalTranslogManager;
115115
import org.opensearch.index.translog.LocalTranslog;
@@ -118,13 +118,13 @@
118118
import org.opensearch.index.translog.TranslogDeletionPolicy;
119119
import org.opensearch.index.translog.TranslogManager;
120120
import org.opensearch.index.translog.listener.TranslogEventListener;
121-
import org.opensearch.core.indices.breaker.CircuitBreakerService;
122-
import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
123121
import org.opensearch.test.DummyShardLock;
124122
import org.opensearch.test.IndexSettingsModule;
125123
import org.opensearch.test.OpenSearchTestCase;
126124
import org.opensearch.threadpool.TestThreadPool;
127125
import org.opensearch.threadpool.ThreadPool;
126+
import org.junit.After;
127+
import org.junit.Before;
128128

129129
import java.io.IOException;
130130
import java.nio.charset.Charset;
@@ -149,15 +149,15 @@
149149

150150
import static java.util.Collections.emptyList;
151151
import static java.util.Collections.shuffle;
152+
import static org.opensearch.index.engine.Engine.Operation.Origin.PEER_RECOVERY;
153+
import static org.opensearch.index.engine.Engine.Operation.Origin.PRIMARY;
154+
import static org.opensearch.index.engine.Engine.Operation.Origin.REPLICA;
155+
import static org.opensearch.index.translog.TranslogDeletionPolicies.createTranslogDeletionPolicy;
152156
import static org.hamcrest.Matchers.equalTo;
153157
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
154158
import static org.hamcrest.Matchers.instanceOf;
155159
import static org.hamcrest.Matchers.lessThanOrEqualTo;
156160
import static org.hamcrest.Matchers.notNullValue;
157-
import static org.opensearch.index.engine.Engine.Operation.Origin.PEER_RECOVERY;
158-
import static org.opensearch.index.engine.Engine.Operation.Origin.PRIMARY;
159-
import static org.opensearch.index.engine.Engine.Operation.Origin.REPLICA;
160-
import static org.opensearch.index.translog.TranslogDeletionPolicies.createTranslogDeletionPolicy;
161161

162162
public abstract class EngineTestCase extends OpenSearchTestCase {
163163

‎test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
import org.opensearch.Version;
3939
import org.opensearch.common.compress.CompressedXContent;
4040
import org.opensearch.common.settings.Settings;
41+
import org.opensearch.common.xcontent.json.JsonXContent;
4142
import org.opensearch.core.xcontent.ToXContent;
4243
import org.opensearch.core.xcontent.XContentBuilder;
43-
import org.opensearch.common.xcontent.json.JsonXContent;
4444
import org.opensearch.index.IndexService;
4545
import org.opensearch.index.analysis.AnalyzerScope;
4646
import org.opensearch.index.analysis.NamedAnalyzer;

0 commit comments

Comments
 (0)