[BUG] The spotless should take care of unified imports ordering (all …

…other subprojects) (#9399) (#9404) Signed-off-by: Andriy Redko <[email protected]> (cherry picked from commit 7ffcd65)
opensearch-project · Aug 17, 2023 · 4cb5e66 · 4cb5e66
1 parent b1c349d
commit 4cb5e66
Show file tree

Hide file tree

Showing 296 changed files with 660 additions and 712 deletions.
diff --git a/...ools/keystore-cli/src/main/java/org/opensearch/common/settings/CreateKeyStoreCommand.java b/...ools/keystore-cli/src/main/java/org/opensearch/common/settings/CreateKeyStoreCommand.java
@@ -32,10 +32,6 @@
 
 package org.opensearch.common.settings;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
 import org.opensearch.cli.ExitCodes;
@@ -45,6 +41,10 @@
 import org.opensearch.core.common.settings.SecureString;
 import org.opensearch.env.Environment;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+
 /**
  * A sub-command for the keystore cli to create a new keystore.
  */

diff --git a/.../tools/keystore-cli/src/main/java/org/opensearch/common/settings/ListKeyStoreCommand.java b/.../tools/keystore-cli/src/main/java/org/opensearch/common/settings/ListKeyStoreCommand.java
@@ -32,14 +32,14 @@
 
 package org.opensearch.common.settings;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import joptsimple.OptionSet;
 import org.opensearch.cli.Terminal;
 import org.opensearch.env.Environment;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * A subcommand for the keystore cli to list all settings in the keystore.
  */

diff --git a/distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java b/distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java
@@ -31,12 +31,12 @@
 
 package org.opensearch.bootstrap;
 
-import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.common.settings.KeyStoreCommandTestCase;
 import org.opensearch.common.settings.KeyStoreWrapper;
 import org.opensearch.common.settings.SecureSettings;
-import org.opensearch.core.common.settings.SecureString;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.io.IOUtils;
+import org.opensearch.core.common.settings.SecureString;
 import org.opensearch.env.Environment;
 import org.opensearch.test.OpenSearchTestCase;
 import org.junit.After;

diff --git a/...keystore-cli/src/test/java/org/opensearch/common/settings/CreateKeyStoreCommandTests.java b/...keystore-cli/src/test/java/org/opensearch/common/settings/CreateKeyStoreCommandTests.java
@@ -32,16 +32,16 @@
 
 package org.opensearch.common.settings;
 
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Map;
-
 import org.opensearch.cli.Command;
 import org.opensearch.cli.ExitCodes;
 import org.opensearch.cli.UserException;
 import org.opensearch.env.Environment;
 
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+
 import static org.hamcrest.Matchers.containsString;
 
 public class CreateKeyStoreCommandTests extends KeyStoreCommandTestCase {

diff --git a/...ls/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java b/...ls/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java
@@ -32,25 +32,25 @@
 
 package org.opensearch.common.settings;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.FileSystem;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
-import org.opensearch.common.util.io.IOUtils;
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.opensearch.cli.CommandTestCase;
 import org.opensearch.common.io.PathUtilsForTesting;
+import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.env.Environment;
 import org.opensearch.env.TestEnvironment;
 import org.junit.After;
 import org.junit.Before;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.FileSystem;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Base test case for manipulating the OpenSearch keystore.
  */

diff --git a/...s/keystore-cli/src/test/java/org/opensearch/common/settings/ListKeyStoreCommandTests.java b/...s/keystore-cli/src/test/java/org/opensearch/common/settings/ListKeyStoreCommandTests.java
@@ -32,13 +32,13 @@
 
 package org.opensearch.common.settings;
 
-import java.util.Map;
-
 import org.opensearch.cli.Command;
 import org.opensearch.cli.ExitCodes;
 import org.opensearch.cli.UserException;
 import org.opensearch.env.Environment;
 
+import java.util.Map;
+
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.containsString;
 

diff --git a/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/PluginCli.java b/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/PluginCli.java
@@ -32,10 +32,10 @@
 
 package org.opensearch.plugins;
 
-import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.cli.Command;
 import org.opensearch.cli.LoggingAwareMultiCommand;
 import org.opensearch.cli.Terminal;
+import org.opensearch.common.util.io.IOUtils;
 
 import java.io.IOException;
 import java.util.Collection;

diff --git a/...tion/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java b/...tion/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java
@@ -33,6 +33,7 @@
 package org.opensearch.plugins;
 
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
 import org.apache.lucene.tests.util.LuceneTestCase;
@@ -63,10 +64,10 @@
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.hash.MessageDigests;
-import org.opensearch.core.util.FileSystemUtils;
 import org.opensearch.common.io.PathUtils;
 import org.opensearch.common.io.PathUtilsForTesting;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.util.FileSystemUtils;
 import org.opensearch.env.Environment;
 import org.opensearch.env.TestEnvironment;
 import org.opensearch.test.OpenSearchTestCase;

diff --git a/...bution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ListPluginsCommandTests.java b/...bution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ListPluginsCommandTests.java
@@ -32,14 +32,6 @@
 
 package org.opensearch.plugins;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.opensearch.LegacyESVersion;
 import org.opensearch.Version;
@@ -52,6 +44,14 @@
 import org.opensearch.test.OpenSearchTestCase;
 import org.junit.Before;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @LuceneTestCase.SuppressFileSystems("*")
 public class ListPluginsCommandTests extends OpenSearchTestCase {
 

diff --git a/...tion/tools/upgrade-cli/src/main/java/org/opensearch/upgrade/DetectEsInstallationTask.java b/...tion/tools/upgrade-cli/src/main/java/org/opensearch/upgrade/DetectEsInstallationTask.java
@@ -9,6 +9,7 @@
 package org.opensearch.upgrade;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.opensearch.Version;
 import org.opensearch.cli.Terminal;
 import org.opensearch.common.SuppressForbidden;

diff --git a/distribution/tools/upgrade-cli/src/main/java/org/opensearch/upgrade/ImportYmlConfigTask.java b/distribution/tools/upgrade-cli/src/main/java/org/opensearch/upgrade/ImportYmlConfigTask.java
@@ -12,9 +12,9 @@
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsException;
+import org.opensearch.common.xcontent.yaml.YamlXContent;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
-import org.opensearch.common.xcontent.yaml.YamlXContent;
 
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/...tools/upgrade-cli/src/test/java/org/opensearch/upgrade/DetectEsInstallationTaskTests.java b/...tools/upgrade-cli/src/test/java/org/opensearch/upgrade/DetectEsInstallationTaskTests.java
@@ -8,7 +8,6 @@
 
 package org.opensearch.upgrade;
 
-import org.junit.Before;
 import org.opensearch.cli.MockTerminal;
 import org.opensearch.cli.Terminal;
 import org.opensearch.common.SuppressForbidden;
@@ -17,6 +16,7 @@
 import org.opensearch.env.Environment;
 import org.opensearch.env.TestEnvironment;
 import org.opensearch.test.OpenSearchTestCase;
+import org.junit.Before;
 
 import java.io.File;
 import java.nio.file.Path;

diff --git a/...ools/upgrade-cli/src/test/java/org/opensearch/upgrade/ImportLog4jPropertiesTaskTests.java b/...ools/upgrade-cli/src/test/java/org/opensearch/upgrade/ImportLog4jPropertiesTaskTests.java
@@ -10,7 +10,6 @@
 
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
-import org.junit.Before;
 import org.opensearch.cli.MockTerminal;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.collect.Tuple;
@@ -19,6 +18,7 @@
 import org.opensearch.env.Environment;
 import org.opensearch.env.TestEnvironment;
 import org.opensearch.test.OpenSearchTestCase;
+import org.junit.Before;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...tion/tools/upgrade-cli/src/test/java/org/opensearch/upgrade/ImportYmlConfigTaskTests.java b/...tion/tools/upgrade-cli/src/test/java/org/opensearch/upgrade/ImportYmlConfigTaskTests.java
@@ -10,7 +10,6 @@
 
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
-import org.junit.Before;
 import org.opensearch.cli.MockTerminal;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.collect.Tuple;
@@ -19,6 +18,7 @@
 import org.opensearch.env.Environment;
 import org.opensearch.env.TestEnvironment;
 import org.opensearch.test.OpenSearchTestCase;
+import org.junit.Before;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...ution/tools/upgrade-cli/src/test/java/org/opensearch/upgrade/InstallPluginsTaskTests.java b/...ution/tools/upgrade-cli/src/test/java/org/opensearch/upgrade/InstallPluginsTaskTests.java
@@ -8,18 +8,19 @@
 
 package org.opensearch.upgrade;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.mockito.Mockito;
 import org.opensearch.cli.MockTerminal;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.env.Environment;
 import org.opensearch.env.TestEnvironment;
 import org.opensearch.test.OpenSearchTestCase;
+import org.junit.Before;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mockito.Mockito;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.mockito.Mockito.spy;

diff --git a/distribution/tools/upgrade-cli/src/test/java/org/opensearch/upgrade/UpgradeCliTests.java b/distribution/tools/upgrade-cli/src/test/java/org/opensearch/upgrade/UpgradeCliTests.java
@@ -10,8 +10,6 @@
 
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
-import org.junit.After;
-import org.junit.Before;
 import org.opensearch.cli.Command;
 import org.opensearch.cli.CommandTestCase;
 import org.opensearch.common.SuppressForbidden;
@@ -21,6 +19,8 @@
 import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.env.Environment;
 import org.opensearch.env.TestEnvironment;
+import org.junit.After;
+import org.junit.Before;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...bution/tools/upgrade-cli/src/test/java/org/opensearch/upgrade/ValidateInputTaskTests.java b/...bution/tools/upgrade-cli/src/test/java/org/opensearch/upgrade/ValidateInputTaskTests.java
@@ -8,7 +8,6 @@
 
 package org.opensearch.upgrade;
 
-import org.junit.Before;
 import org.opensearch.LegacyESVersion;
 import org.opensearch.cli.MockTerminal;
 import org.opensearch.common.collect.Tuple;
@@ -17,6 +16,7 @@
 import org.opensearch.env.Environment;
 import org.opensearch.env.TestEnvironment;
 import org.opensearch.test.OpenSearchTestCase;
+import org.junit.Before;
 
 import java.util.Arrays;
 import java.util.Map;

diff --git a/gradle/formatting.gradle b/gradle/formatting.gradle
@@ -66,6 +66,22 @@ allprojects {
           target '**/*.java'
 
           removeUnusedImports()
+          importOrder(
+              'de.thetaphi',
+              'com.carrotsearch',
+              'com.fasterxml',
+              'com.avast',
+              'com.sun',
+              'com.maxmind|com.github|com.networknt|groovy|nebula',
+              'org.antlr',
+              'software.amazon',
+              'com.azure|com.microsoft|com.ibm|com.google|joptsimple|org.apache|org.bouncycastle|org.codehaus|org.opensearch|org.objectweb|org.joda|org.hamcrest|org.openjdk|org.gradle|org.junit',
+              'javax',
+              'java',
+              '',
+              '\\#java|\\#org.opensearch|\\#org.hamcrest|\\#'
+          )
+
           eclipse().configFile rootProject.file('buildSrc/formatterConfig.xml')
           trimTrailingWhitespace()
           endWithNewline()

diff --git a/libs/core/src/main/java/org/opensearch/core/tasks/resourcetracker/TaskResourceUsage.java b/libs/core/src/main/java/org/opensearch/core/tasks/resourcetracker/TaskResourceUsage.java
@@ -8,11 +8,11 @@
 
 package org.opensearch.core.tasks.resourcetracker;
 
+import org.opensearch.core.ParseField;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
-import org.opensearch.core.ParseField;
 import org.opensearch.core.xcontent.ConstructingObjectParser;
 import org.opensearch.core.xcontent.MediaTypeRegistry;
 import org.opensearch.core.xcontent.ToXContentFragment;

diff --git a/libs/core/src/main/java/org/opensearch/core/tasks/resourcetracker/TaskThreadUsage.java b/libs/core/src/main/java/org/opensearch/core/tasks/resourcetracker/TaskThreadUsage.java
@@ -8,11 +8,11 @@
 
 package org.opensearch.core.tasks.resourcetracker;
 
+import org.opensearch.core.ParseField;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
-import org.opensearch.core.ParseField;
 import org.opensearch.core.xcontent.ConstructingObjectParser;
 import org.opensearch.core.xcontent.MediaTypeRegistry;
 import org.opensearch.core.xcontent.ToXContentFragment;

diff --git a/qa/os/src/test/java/org/opensearch/packaging/test/DebMetadataTests.java b/qa/os/src/test/java/org/opensearch/packaging/test/DebMetadataTests.java
@@ -32,14 +32,15 @@
 
 package org.opensearch.packaging.test;
 
-import junit.framework.TestCase;
 import org.opensearch.packaging.util.Distribution;
 import org.opensearch.packaging.util.FileUtils;
 import org.opensearch.packaging.util.Shell;
 import org.junit.BeforeClass;
 
 import java.util.regex.Pattern;
 
+import junit.framework.TestCase;
+
 import static org.opensearch.packaging.util.FileUtils.getDistributionFile;
 import static org.junit.Assume.assumeTrue;