Reordered imports to match with OpenSearch (#11)

Signed-off-by: Owais Kazi <[email protected]>
opensearch-project · Aug 22, 2023 · dcf605a · dcf605a
1 parent f6cb12c
commit dcf605a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/formatter/formatting.gradle b/formatter/formatting.gradle
@@ -6,7 +6,21 @@ allprojects {
             target '**/*.java'
 
             removeUnusedImports()
-            importOrder 'java', 'javax', 'org', 'com'
+            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('formatter/formatterConfig.xml')
             trimTrailingWhitespace()
             endWithNewline();

diff --git a/src/test/java/org/opensearch/flowframework/FlowFrameworkPluginIT.java b/src/test/java/org/opensearch/flowframework/FlowFrameworkPluginIT.java
@@ -8,12 +8,7 @@
  */
 package org.opensearch.flowframework;
 
-import static org.hamcrest.Matchers.containsString;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.Collections;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 
 import org.apache.hc.core5.http.ParseException;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
@@ -22,7 +17,12 @@
 import org.opensearch.plugins.Plugin;
 import org.opensearch.test.OpenSearchIntegTestCase;
 
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.Collections;
+
+import static org.hamcrest.Matchers.containsString;
 
 @ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.SUITE)

diff --git a/src/yamlRestTest/java/org/opensearch/flowframework/FlowFrameworkPluginYamlTestSuiteIT.java b/src/yamlRestTest/java/org/opensearch/flowframework/FlowFrameworkPluginYamlTestSuiteIT.java
@@ -8,12 +8,12 @@
  */
 package org.opensearch.flowframework;
 
-import org.opensearch.test.rest.yaml.ClientYamlTestCandidate;
-import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase;
-
 import com.carrotsearch.randomizedtesting.annotations.Name;
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
+import org.opensearch.test.rest.yaml.ClientYamlTestCandidate;
+import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase;
+
 public class FlowFrameworkPluginYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase {
 
     public FlowFrameworkPluginYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {