Skip to content

Commit 50f24f0

Browse files
MitchellGaleMitchellGale
committed
fix import order and add import order to build.gradle.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
1 parent 605f3df commit 50f24f0

63 files changed

Lines changed: 143 additions & 167 deletions

File tree

Some content is hidden

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

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ spotless {
8787
include '**/*.java'
8888
exclude '**/build/**', '**/build-*/**'
8989
}
90-
// importOrder()
90+
importOrder()
9191
// licenseHeader("/*\n" +
9292
// " * Copyright OpenSearch Contributors\n" +
9393
// " * SPDX-License-Identifier: Apache-2.0\n" +

‎integ-test/src/test/java/org/opensearch/sql/bwc/SQLBackwardsCompatibilityIT.java‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,6 @@
77
package org.opensearch.sql.bwc;
88

99

10-
import org.json.JSONObject;
11-
import org.junit.Assert;
12-
import org.opensearch.client.Request;
13-
import org.opensearch.client.RequestOptions;
14-
import org.opensearch.client.Response;
15-
import org.opensearch.common.settings.Settings;
16-
import org.opensearch.sql.legacy.SQLIntegTestCase;
17-
import org.opensearch.sql.legacy.TestsConstants;
18-
import org.opensearch.test.rest.OpenSearchRestTestCase;
19-
20-
import java.io.IOException;
21-
import java.util.List;
22-
import java.util.Locale;
23-
import java.util.Map;
24-
import java.util.Set;
25-
import java.util.stream.Collectors;
26-
2710
import static org.opensearch.sql.legacy.TestUtils.createIndexByRestClient;
2811
import static org.opensearch.sql.legacy.TestUtils.isIndexExist;
2912
import static org.opensearch.sql.legacy.TestUtils.loadDataByRestClient;
@@ -36,6 +19,22 @@
3619
import static org.opensearch.sql.util.MatcherUtils.verifySchema;
3720
import static org.opensearch.sql.util.TestUtils.getResponseBody;
3821

22+
import java.io.IOException;
23+
import java.util.List;
24+
import java.util.Locale;
25+
import java.util.Map;
26+
import java.util.Set;
27+
import java.util.stream.Collectors;
28+
import org.json.JSONObject;
29+
import org.junit.Assert;
30+
import org.opensearch.client.Request;
31+
import org.opensearch.client.RequestOptions;
32+
import org.opensearch.client.Response;
33+
import org.opensearch.common.settings.Settings;
34+
import org.opensearch.sql.legacy.SQLIntegTestCase;
35+
import org.opensearch.sql.legacy.TestsConstants;
36+
import org.opensearch.test.rest.OpenSearchRestTestCase;
37+
3938
public class SQLBackwardsCompatibilityIT extends SQLIntegTestCase {
4039

4140
private static final ClusterType CLUSTER_TYPE = ClusterType.parse(System.getProperty("tests.rest.bwcsuite"));

‎integ-test/src/test/java/org/opensearch/sql/correctness/CorrectnessIT.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
1212
import com.google.common.collect.Maps;
13-
1413
import java.net.URISyntaxException;
1514
import java.nio.file.Files;
1615
import java.nio.file.Path;

‎integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestConfigTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
package org.opensearch.sql.correctness.tests;
88

99
import static java.util.Collections.emptyMap;
10+
import static org.hamcrest.MatcherAssert.assertThat;
1011
import static org.hamcrest.Matchers.allOf;
1112
import static org.hamcrest.Matchers.emptyString;
1213
import static org.hamcrest.Matchers.hasEntry;
1314
import static org.hamcrest.Matchers.is;
14-
import static org.hamcrest.MatcherAssert.assertThat;
1515

1616
import com.google.common.collect.ImmutableMap;
1717
import java.util.Map;

‎integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestDataSetTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
package org.opensearch.sql.correctness.tests;
88

9+
import static org.hamcrest.MatcherAssert.assertThat;
910
import static org.hamcrest.Matchers.contains;
1011
import static org.junit.Assert.assertEquals;
11-
import static org.hamcrest.MatcherAssert.assertThat;
1212

1313
import org.junit.Test;
1414
import org.opensearch.sql.correctness.testset.TestDataSet;

‎integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestQuerySetTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
package org.opensearch.sql.correctness.tests;
88

9-
import static org.hamcrest.Matchers.contains;
109
import static org.hamcrest.MatcherAssert.assertThat;
10+
import static org.hamcrest.Matchers.contains;
1111

1212
import org.junit.Test;
1313
import org.opensearch.sql.correctness.testset.TestQuerySet;

‎integ-test/src/test/java/org/opensearch/sql/jdbc/CursorIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
import org.junit.AfterClass;
2929
import org.junit.Assume;
3030
import org.junit.BeforeClass;
31-
import org.junit.jupiter.api.BeforeEach;
32-
import org.junit.jupiter.api.Test;
3331
import org.junit.jupiter.api.AfterAll;
3432
import org.junit.jupiter.api.BeforeAll;
33+
import org.junit.jupiter.api.BeforeEach;
3534
import org.junit.jupiter.api.DisplayNameGeneration;
3635
import org.junit.jupiter.api.DisplayNameGenerator;
36+
import org.junit.jupiter.api.Test;
3737
import org.opensearch.client.Request;
3838
import org.opensearch.client.RequestOptions;
3939
import org.opensearch.client.Response;

‎integ-test/src/test/java/org/opensearch/sql/legacy/NestedFieldQueryIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
import org.opensearch.client.ResponseException;
3535
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
3636
import org.opensearch.common.xcontent.json.JsonXContentParser;
37+
import org.opensearch.core.rest.RestStatus;
3738
import org.opensearch.core.xcontent.NamedXContentRegistry;
3839
import org.opensearch.core.xcontent.XContentParser;
39-
import org.opensearch.core.rest.RestStatus;
4040
import org.opensearch.search.SearchHit;
4141

4242
/**

‎integ-test/src/test/java/org/opensearch/sql/legacy/OpenSearchSQLRestTestCase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
package org.opensearch.sql.legacy;
88

9+
import static java.util.Collections.unmodifiableList;
10+
911
import java.io.IOException;
1012
import java.util.ArrayList;
1113
import java.util.List;
@@ -40,8 +42,6 @@
4042
import org.opensearch.common.util.io.IOUtils;
4143
import org.opensearch.test.rest.OpenSearchRestTestCase;
4244

43-
import static java.util.Collections.unmodifiableList;
44-
4545
/**
4646
* OpenSearch SQL integration test base class to support both security disabled and enabled OpenSearch cluster.
4747
* Allows interaction with multiple external test clusters using OpenSearch's {@link RestClient}.

‎integ-test/src/test/java/org/opensearch/sql/legacy/RestIntegTestCase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
import org.opensearch.client.Request;
4646
import org.opensearch.client.Response;
4747
import org.opensearch.common.Strings;
48-
import org.opensearch.core.xcontent.XContentBuilder;
4948
import org.opensearch.common.xcontent.XContentFactory;
5049
import org.opensearch.core.rest.RestStatus;
50+
import org.opensearch.core.xcontent.XContentBuilder;
5151

5252
/**
5353
* SQL plugin integration test base class (migrated from SQLIntegTestCase)

0 commit comments

Comments
 (0)