Skip to content

Commit 99abe60

Browse files
committed
Fix spotless
Signed-off-by: Chen Dai <[email protected]>
1 parent 9a77faf commit 99abe60

File tree

6 files changed

+35
-40
lines changed

6 files changed

+35
-40
lines changed

common/src/main/java/org/opensearch/sql/common/setting/Settings.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77

88
import com.google.common.base.Strings;
99
import com.google.common.collect.ImmutableMap;
10-
import lombok.Getter;
11-
import lombok.RequiredArgsConstructor;
12-
1310
import java.util.List;
1411
import java.util.Map;
1512
import java.util.Optional;
13+
import lombok.Getter;
14+
import lombok.RequiredArgsConstructor;
1615

1716
/** Setting. */
1817
public abstract class Settings {

integ-test/src/test/java/org/opensearch/sql/legacy/ExplainIT.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@
55

66
package org.opensearch.sql.legacy;
77

8+
import static org.hamcrest.Matchers.containsString;
9+
import static org.hamcrest.Matchers.equalTo;
10+
import static org.opensearch.sql.legacy.TestsConstants.*;
11+
812
import com.google.common.io.Files;
13+
import java.io.File;
14+
import java.io.IOException;
15+
import java.nio.charset.StandardCharsets;
916
import org.junit.Assert;
1017
import org.junit.Ignore;
1118
import org.junit.Test;
1219
import org.opensearch.client.Request;
1320
import org.opensearch.client.Response;
1421

15-
import java.io.File;
16-
import java.io.IOException;
17-
import java.nio.charset.StandardCharsets;
18-
19-
import static org.hamcrest.Matchers.containsString;
20-
import static org.hamcrest.Matchers.equalTo;
21-
import static org.opensearch.sql.legacy.TestsConstants.*;
22-
2322
public class ExplainIT extends SQLIntegTestCase {
2423

2524
@Override

integ-test/src/test/java/org/opensearch/sql/legacy/PluginIT.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55

66
package org.opensearch.sql.legacy;
77

8+
import static org.hamcrest.Matchers.equalTo;
9+
import static org.opensearch.sql.legacy.TestUtils.getResponseBody;
10+
import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
11+
12+
import java.io.IOException;
13+
import java.util.Locale;
814
import org.json.JSONObject;
915
import org.junit.Test;
1016
import org.opensearch.client.Request;
@@ -13,13 +19,6 @@
1319
import org.opensearch.client.ResponseException;
1420
import org.opensearch.sql.plugin.rest.RestQuerySettingsAction;
1521

16-
import java.io.IOException;
17-
import java.util.Locale;
18-
19-
import static org.hamcrest.Matchers.equalTo;
20-
import static org.opensearch.sql.legacy.TestUtils.getResponseBody;
21-
import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
22-
2322
public class PluginIT extends SQLIntegTestCase {
2423

2524
@Override

legacy/src/main/java/org/opensearch/sql/legacy/query/OpenSearchActionFactory.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
package org.opensearch.sql.legacy.query;
77

8+
import static org.opensearch.sql.legacy.domain.IndexStatement.StatementType;
9+
import static org.opensearch.sql.legacy.utils.Util.toSqlExpr;
10+
811
import com.alibaba.druid.sql.ast.SQLExpr;
912
import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr;
1013
import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr;
@@ -19,6 +22,9 @@
1922
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter;
2023
import com.alibaba.druid.sql.parser.SQLStatementParser;
2124
import com.google.common.annotations.VisibleForTesting;
25+
import java.sql.SQLFeatureNotSupportedException;
26+
import java.util.ArrayList;
27+
import java.util.List;
2228
import org.opensearch.client.Client;
2329
import org.opensearch.search.SearchHit;
2430
import org.opensearch.search.SearchHits;
@@ -49,13 +55,6 @@
4955
import org.opensearch.sql.legacy.rewriter.parent.SQLExprParentSetterRule;
5056
import org.opensearch.sql.legacy.rewriter.subquery.SubQueryRewriteRule;
5157

52-
import java.sql.SQLFeatureNotSupportedException;
53-
import java.util.ArrayList;
54-
import java.util.List;
55-
56-
import static org.opensearch.sql.legacy.domain.IndexStatement.StatementType;
57-
import static org.opensearch.sql.legacy.utils.Util.toSqlExpr;
58-
5958
public class OpenSearchActionFactory {
6059

6160
public static QueryAction create(Client client, String sql)

legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerConfigTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
package org.opensearch.sql.legacy.antlr.semantic;
77

8+
import static org.hamcrest.Matchers.*;
9+
810
import org.junit.Rule;
911
import org.junit.Test;
1012
import org.junit.rules.ExpectedException;
1113
import org.opensearch.sql.legacy.antlr.OpenSearchLegacySqlAnalyzer;
1214
import org.opensearch.sql.legacy.antlr.SqlAnalysisConfig;
1315
import org.opensearch.sql.legacy.esdomain.LocalClusterState;
1416

15-
import static org.hamcrest.Matchers.*;
16-
1717
/** Test cases for semantic analysis configuration */
1818
public class SemanticAnalyzerConfigTest extends SemanticAnalyzerTestBase {
1919

opensearch/src/main/java/org/opensearch/sql/opensearch/setting/OpenSearchSettings.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,21 @@
55

66
package org.opensearch.sql.opensearch.setting;
77

8+
import static org.opensearch.common.settings.Settings.EMPTY;
9+
import static org.opensearch.common.unit.TimeValue.timeValueDays;
10+
import static org.opensearch.common.unit.TimeValue.timeValueMinutes;
11+
import static org.opensearch.sql.common.setting.Settings.Key.ENCYRPTION_MASTER_KEY;
12+
813
import com.google.common.annotations.VisibleForTesting;
914
import com.google.common.collect.ImmutableList;
1015
import com.google.common.collect.ImmutableMap;
16+
import java.io.InputStream;
17+
import java.util.Collections;
18+
import java.util.List;
19+
import java.util.Map;
20+
import java.util.concurrent.ConcurrentHashMap;
21+
import java.util.function.Consumer;
22+
import java.util.function.Function;
1123
import lombok.RequiredArgsConstructor;
1224
import lombok.extern.log4j.Log4j2;
1325
import org.opensearch.cluster.ClusterName;
@@ -20,19 +32,6 @@
2032
import org.opensearch.sql.common.setting.LegacySettings;
2133
import org.opensearch.sql.common.setting.Settings;
2234

23-
import java.io.InputStream;
24-
import java.util.Collections;
25-
import java.util.List;
26-
import java.util.Map;
27-
import java.util.concurrent.ConcurrentHashMap;
28-
import java.util.function.Consumer;
29-
import java.util.function.Function;
30-
31-
import static org.opensearch.common.settings.Settings.EMPTY;
32-
import static org.opensearch.common.unit.TimeValue.timeValueDays;
33-
import static org.opensearch.common.unit.TimeValue.timeValueMinutes;
34-
import static org.opensearch.sql.common.setting.Settings.Key.ENCYRPTION_MASTER_KEY;
35-
3635
/** Setting implementation on OpenSearch. */
3736
@Log4j2
3837
public class OpenSearchSettings extends Settings {

0 commit comments

Comments
 (0)