[Spotless] Remove unused imports (#1927)

* Adding spotless plugin to project build.gradle.

Signed-off-by: Mitchell Gale <[email protected]>

Remove commented out spotless changes.

Signed-off-by: Mitchell Gale <[email protected]>

Adding Spotless to DEVELOPER_GUIDE.rst

Signed-off-by: Mitchell Gale <[email protected]>

Added Google Java format to spotless.

Signed-off-by: Mitchell Gale <[email protected]>

Update DEVELOPER_GUIDE.rst

Co-authored-by: Yury-Fridlyand <[email protected]>

* Added apply false for spotless

Signed-off-by: Mitchell Gale <[email protected]>

* Adding ratchetFrom to build.gradle

Signed-off-by: Mitchell Gale <[email protected]>

* Adding license header to build.gradle for spotless.

Signed-off-by: Mitchell Gale <[email protected]>

* Uncommenting all changes to build.gradle for spotless.

Signed-off-by: Mitchell Gale <[email protected]>

* Commented out spotless checks.

Signed-off-by: Mitchell Gale <[email protected]>

* Removed trailing whitespace

Signed-off-by: Mitchell Gale <[email protected]>

* Remove unused imports.

Signed-off-by: Mitchell Gale <[email protected]>

* Fixed extra tab in import static statement in ConvertTZFunctionIT.java

Signed-off-by: Mitchell Gale <[email protected]>

* Removed space in LocalClusterState.java

Signed-off-by: Mitchell Gale <[email protected]>

* spotless apply

Signed-off-by: Mitchell Gale <[email protected]>

---------

Signed-off-by: Mitchell Gale <[email protected]>
Co-authored-by: Yury-Fridlyand <[email protected]>

build.gradle

@@ -92,8 +92,8 @@ spotless {
 //                " * Copyright OpenSearch Contributors\n" +
 //                " * SPDX-License-Identifier: Apache-2.0\n" +
 //                " */\n\n")
-//        removeUnusedImports()
-//        trimTrailingWhitespace()
+        removeUnusedImports()
+        trimTrailingWhitespace()
         endWithNewline()
 //        googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
     }

common/src/main/java/org/opensearch/sql/common/utils/QueryContext.java

@@ -6,9 +6,7 @@
 
 package org.opensearch.sql.common.utils;
 
-import java.time.LocalDateTime;
 import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 import org.apache.logging.log4j.ThreadContext;
 

common/src/test/java/org/opensearch/sql/common/authinterceptors/AwsSigningInterceptorTest.java

@@ -7,8 +7,6 @@
 
 package org.opensearch.sql.common.authinterceptors;
 
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.auth.AWSSessionCredentials;
@@ -26,7 +24,6 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.sql.common.authinterceptors.AwsSigningInterceptor;
 
 @ExtendWith(MockitoExtension.class)
 public class AwsSigningInterceptorTest {

core/src/main/java/org/opensearch/sql/analysis/Analyzer.java

@@ -29,7 +29,6 @@
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.commons.math3.analysis.function.Exp;
 import org.opensearch.sql.DataSourceSchemaName;
 import org.opensearch.sql.analysis.symbol.Namespace;
 import org.opensearch.sql.analysis.symbol.Symbol;

core/src/main/java/org/opensearch/sql/analysis/DataSourceSchemaIdentifierNameResolver.java

@@ -7,13 +7,8 @@
 
 package org.opensearch.sql.analysis;
 
-import com.google.common.collect.ImmutableSet;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.datasource.DataSourceService;
-import org.opensearch.sql.datasource.model.DataSourceMetadata;
 
 public class DataSourceSchemaIdentifierNameResolver {
 

core/src/main/java/org/opensearch/sql/analysis/ExpressionAnalyzer.java

@@ -49,7 +49,6 @@
 import org.opensearch.sql.ast.expression.When;
 import org.opensearch.sql.ast.expression.WindowFunction;
 import org.opensearch.sql.ast.expression.Xor;
-import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;

core/src/main/java/org/opensearch/sql/analysis/NamedExpressionAnalyzer.java

@@ -10,11 +10,9 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.expression.Alias;
 import org.opensearch.sql.ast.expression.QualifiedName;
-import org.opensearch.sql.ast.expression.Span;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.NamedExpression;
-import org.opensearch.sql.expression.span.SpanExpression;
 
 /**
  * Analyze the Alias node in the {@link AnalysisContext} to construct the list of

core/src/main/java/org/opensearch/sql/ast/expression/NestedAllTupleFields.java

@@ -11,7 +11,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 

core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java

@@ -11,10 +11,8 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import lombok.Setter;
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
-import org.opensearch.sql.ast.expression.Let;
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 

core/src/main/java/org/opensearch/sql/executor/streaming/MicroBatchStreamingExecution.java

@@ -21,7 +21,7 @@
 import org.opensearch.sql.planner.logical.LogicalPlan;
 
 /**
- * Micro batch streaming execution. 
+ * Micro batch streaming execution.
  */
 public class MicroBatchStreamingExecution {
 

core/src/main/java/org/opensearch/sql/expression/DSL.java

@@ -534,7 +534,7 @@ public static FunctionExpression str_to_date(FunctionProperties functionProperti
                                                Expression... expressions) {
     return compile(functionProperties, BuiltinFunctionName.STR_TO_DATE, expressions);
   }
-  
+
   public static FunctionExpression sec_to_time(Expression... expressions) {
     return  compile(FunctionProperties.None, BuiltinFunctionName.SEC_TO_TIME, expressions);
   }

core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFunction.java

@@ -1165,7 +1165,7 @@ private ExprValue exprDateApplyInterval(FunctionProperties functionProperties,
     var dt = extractDateTime(datetime, functionProperties);
     return new ExprDatetimeValue(isAdd ? dt.plus(interval) : dt.minus(interval));
   }
-  
+
   /**
    * Formats date according to format specifier. First argument is time, second is format.
    * Detailed supported signatures:

core/src/main/java/org/opensearch/sql/planner/logical/LogicalFetchCursor.java

@@ -9,8 +9,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
-import org.opensearch.sql.planner.logical.LogicalPlan;
-import org.opensearch.sql.planner.logical.LogicalPlanNodeVisitor;
 import org.opensearch.sql.storage.StorageEngine;
 
 /**

core/src/main/java/org/opensearch/sql/planner/physical/AggregationOperator.java

@@ -17,7 +17,6 @@
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.aggregation.Aggregator;
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
-import org.opensearch.sql.expression.span.SpanExpression;
 import org.opensearch.sql.planner.physical.collector.Collector;
 import org.opensearch.sql.storage.bindingtuple.BindingTuple;
 

core/src/main/java/org/opensearch/sql/planner/physical/PhysicalPlanNodeVisitor.java

@@ -72,7 +72,7 @@ public R visitValues(ValuesOperator node, C context) {
   public R visitSort(SortOperator node, C context) {
     return visitNode(node, context);
   }
-  
+
   public R visitRareTopN(RareTopNOperator node, C context) {
     return visitNode(node, context);
   }

core/src/test/java/org/opensearch/sql/analysis/model/DataSourceSchemaIdentifierNameResolverTest.java

@@ -16,9 +16,7 @@
 import static org.opensearch.sql.analysis.model.DataSourceSchemaIdentifierNameResolverTest.Identifier.identifierOf;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;

core/src/test/java/org/opensearch/sql/executor/pagination/CursorTest.java

@@ -9,7 +9,6 @@
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import org.opensearch.sql.executor.pagination.Cursor;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class CursorTest {

core/src/test/java/org/opensearch/sql/executor/streaming/MicroBatchStreamingExecutionTest.java

@@ -230,7 +230,7 @@ Helper latestOffsetLogShouldBe(Long offsetId) {
    * StreamingSource impl only for testing.
    *
    * <p>initially, offset is -1, getLatestOffset() will return Optional.emtpy().
-   * 
+   *
    * <p>call addData() add offset by one.
    */
   static class TestStreamingSource implements StreamingSource {

core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java

@@ -559,7 +559,7 @@ public void invalidDayOfYearArgument() {
             () ->  invalidDayOfYearQuery("asdfasdfasdf"))
     );
   }
-  
+
   @Test
   public void from_days() {
     FunctionExpression expression = DSL.from_days(DSL.literal(new ExprLongValue(730669)));
@@ -1712,7 +1712,7 @@ private static Stream<Arguments> getInvalidTestDataForTimeFormat() {
             DSL.literal("%h"))
     );
   }
-  
+
   @ParameterizedTest(name = "{0}{1}")
   @MethodSource("getInvalidTestDataForTimeFormat")
   public void testInvalidTimeFormat(LiteralExpression arg, LiteralExpression format) {

core/src/test/java/org/opensearch/sql/expression/datetime/StrToDateTest.java

@@ -15,11 +15,9 @@
 import java.time.LocalTime;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.data.model.ExprDatetimeValue;
 import org.opensearch.sql.data.model.ExprNullValue;
 import org.opensearch.sql.data.model.ExprStringValue;

core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLTestBase.java

@@ -11,7 +11,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.data.model.ExprMissingValue;
 import org.opensearch.sql.data.model.ExprNullValue;
-import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;

core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplNoArgTest.java

@@ -9,7 +9,6 @@
 
 import java.util.List;
 import org.apache.commons.lang3.tuple.Pair;
-import org.junit.jupiter.api.BeforeEach;
 import org.opensearch.sql.expression.Expression;
 
 class FunctionDSLimplNoArgTest extends FunctionDSLimplTestBase {

core/src/test/java/org/opensearch/sql/expression/function/FunctionPropertiesTest.java

@@ -17,9 +17,7 @@
 import java.time.Clock;
 import java.time.Instant;
 import java.time.ZoneId;
-import java.util.concurrent.Callable;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DynamicTest;

core/src/test/java/org/opensearch/sql/expression/function/RelevanceFunctionResolverTest.java

@@ -6,9 +6,7 @@
 package org.opensearch.sql.expression.function;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 

core/src/test/java/org/opensearch/sql/expression/operator/arthmetic/MathematicalFunctionTest.java

@@ -1485,7 +1485,7 @@ public void signum_double_value(Double value) {
         signum.valueOf(valueEnv()),
         allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
     assertEquals(String.format("signum(%s)", value), signum.toString());
-  }  
+  }
 
   /**
    * Test sinh with byte value.

core/src/test/java/org/opensearch/sql/expression/operator/predicate/BinaryPredicateOperatorTest.java

@@ -11,10 +11,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opensearch.sql.config.TestConfig.BOOL_TYPE_MISSING_VALUE_FIELD;
 import static org.opensearch.sql.config.TestConfig.BOOL_TYPE_NULL_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.INT_TYPE_MISSING_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.INT_TYPE_NULL_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.STRING_TYPE_MISSING_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.STRING_TYPE_NULL_VALUE_FIELD;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_FALSE;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_MISSING;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_NULL;
@@ -25,7 +21,6 @@
 import static org.opensearch.sql.data.type.ExprCoreType.BOOLEAN;
 import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
-import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
 import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
 import static org.opensearch.sql.utils.ComparisonUtil.compare;

core/src/test/java/org/opensearch/sql/planner/SerializablePlanTest.java

@@ -6,7 +6,6 @@
 package org.opensearch.sql.planner;
 
 import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Answers.CALLS_REAL_METHODS;
 
 import org.junit.jupiter.api.DisplayNameGeneration;

core/src/test/java/org/opensearch/sql/planner/logical/LogicalRelationTest.java

@@ -12,7 +12,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.storage.Table;
 
 @ExtendWith(MockitoExtension.class)

core/src/test/java/org/opensearch/sql/planner/optimizer/pattern/PatternsTest.java

@@ -8,7 +8,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -17,7 +16,6 @@
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.opensearch.sql.planner.logical.LogicalFilter;
-import org.opensearch.sql.planner.logical.LogicalPaginate;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)

core/src/test/java/org/opensearch/sql/planner/physical/FilterOperatorTest.java

@@ -17,17 +17,12 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.AdditionalAnswers;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.sql.data.model.ExprIntegerValue;
 import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.model.ExprValueUtils;

core/src/test/java/org/opensearch/sql/planner/physical/NestedOperatorTest.java

@@ -8,7 +8,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.when;
 import static org.opensearch.sql.data.model.ExprValueUtils.collectionValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.tupleValue;

core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanTest.java

@@ -5,15 +5,7 @@
 
 package org.opensearch.sql.planner.physical;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.CALLS_REAL_METHODS;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import java.util.List;
 import org.junit.jupiter.api.DisplayNameGeneration;

integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/DBResult.java

@@ -12,7 +12,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.Getter;

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

@@ -12,8 +12,6 @@
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 
 import org.json.JSONObject;
-import org.junit.Assume;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class AggregationExpressionIT extends SQLIntegTestCase {

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

@@ -33,10 +33,8 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.core.AnyOf;
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.jupiter.api.Disabled;
 import org.opensearch.client.Request;
 import org.opensearch.client.RequestOptions;
 import org.opensearch.client.Response;

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

@@ -10,9 +10,7 @@
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_GAME_OF_THRONES;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_UNEXPANDED_OBJECT;
-import static org.opensearch.sql.util.MatcherUtils.columnName;
 import static org.opensearch.sql.util.MatcherUtils.rows;
-import static org.opensearch.sql.util.MatcherUtils.verifyColumn;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 
 import java.io.IOException;

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

@@ -11,7 +11,6 @@
 
 import org.json.JSONObject;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class TypeInformationIT extends SQLIntegTestCase {