diff --git a/ksql-common/src/test/java/io/confluent/ksql/schema/ksql/ColumnTest.java b/ksql-common/src/test/java/io/confluent/ksql/schema/ksql/ColumnTest.java index b570e218c65f..caeb91d0998e 100644 --- a/ksql-common/src/test/java/io/confluent/ksql/schema/ksql/ColumnTest.java +++ b/ksql-common/src/test/java/io/confluent/ksql/schema/ksql/ColumnTest.java @@ -22,8 +22,6 @@ import com.google.common.testing.NullPointerTester; import io.confluent.ksql.schema.ksql.types.SqlType; import io.confluent.ksql.schema.ksql.types.SqlTypes; -import io.confluent.ksql.util.KsqlException; -import java.util.Optional; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/ksql-common/src/test/java/io/confluent/ksql/util/SchemaUtilTest.java b/ksql-common/src/test/java/io/confluent/ksql/util/SchemaUtilTest.java index b715aa7c6373..7a3ae489442a 100644 --- a/ksql-common/src/test/java/io/confluent/ksql/util/SchemaUtilTest.java +++ b/ksql-common/src/test/java/io/confluent/ksql/util/SchemaUtilTest.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Optional; import org.apache.kafka.connect.data.ConnectSchema; -import org.apache.kafka.connect.data.Field; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaBuilder; import org.junit.Rule; diff --git a/ksql-engine/src/test/java/io/confluent/ksql/structured/GroupByMapperTest.java b/ksql-engine/src/test/java/io/confluent/ksql/structured/GroupByMapperTest.java index 5b388c14bfba..f1bf48b5f29b 100644 --- a/ksql-engine/src/test/java/io/confluent/ksql/structured/GroupByMapperTest.java +++ b/ksql-engine/src/test/java/io/confluent/ksql/structured/GroupByMapperTest.java @@ -20,11 +20,11 @@ import com.google.common.collect.ImmutableList; import io.confluent.ksql.GenericRow; +import io.confluent.ksql.execution.codegen.ExpressionMetadata; import io.confluent.ksql.execution.expression.tree.DereferenceExpression; import io.confluent.ksql.execution.expression.tree.Expression; import io.confluent.ksql.execution.expression.tree.QualifiedName; import io.confluent.ksql.execution.expression.tree.QualifiedNameReference; -import io.confluent.ksql.execution.codegen.ExpressionMetadata; import java.util.Collections; import org.apache.kafka.connect.data.Struct; import org.easymock.EasyMock; diff --git a/ksql-execution/src/test/java/io/confluent/ksql/execution/codegen/ExpressionMetadataTest.java b/ksql-execution/src/test/java/io/confluent/ksql/execution/codegen/ExpressionMetadataTest.java index 9e793a19668a..f631567b40df 100644 --- a/ksql-execution/src/test/java/io/confluent/ksql/execution/codegen/ExpressionMetadataTest.java +++ b/ksql-execution/src/test/java/io/confluent/ksql/execution/codegen/ExpressionMetadataTest.java @@ -13,7 +13,6 @@ import com.google.common.collect.ImmutableList; import io.confluent.ksql.GenericRow; import io.confluent.ksql.execution.expression.tree.Expression; -import io.confluent.ksql.execution.codegen.ExpressionMetadata; import io.confluent.ksql.execution.util.GenericRowValueTypeEnforcer; import io.confluent.ksql.function.udf.Kudf; import io.confluent.ksql.schema.ksql.types.SqlType; diff --git a/ksql-execution/src/test/java/io/confluent/ksql/execution/codegen/SqlToJavaVisitorTest.java b/ksql-execution/src/test/java/io/confluent/ksql/execution/codegen/SqlToJavaVisitorTest.java index 8cdd33aaf79c..efe9ec7eba72 100644 --- a/ksql-execution/src/test/java/io/confluent/ksql/execution/codegen/SqlToJavaVisitorTest.java +++ b/ksql-execution/src/test/java/io/confluent/ksql/execution/codegen/SqlToJavaVisitorTest.java @@ -20,9 +20,9 @@ import static io.confluent.ksql.execution.testutil.TestExpressions.COL1; import static io.confluent.ksql.execution.testutil.TestExpressions.COL3; import static io.confluent.ksql.execution.testutil.TestExpressions.COL7; -import static io.confluent.ksql.execution.testutil.TestExpressions.literal; import static io.confluent.ksql.execution.testutil.TestExpressions.MAPCOL; import static io.confluent.ksql.execution.testutil.TestExpressions.SCHEMA; +import static io.confluent.ksql.execution.testutil.TestExpressions.literal; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; @@ -32,36 +32,36 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; +import io.confluent.ksql.execution.expression.tree.ArithmeticBinaryExpression; +import io.confluent.ksql.execution.expression.tree.ArithmeticUnaryExpression; +import io.confluent.ksql.execution.expression.tree.ArithmeticUnaryExpression.Sign; +import io.confluent.ksql.execution.expression.tree.Cast; +import io.confluent.ksql.execution.expression.tree.ComparisonExpression; import io.confluent.ksql.execution.expression.tree.DoubleLiteral; +import io.confluent.ksql.execution.expression.tree.Expression; import io.confluent.ksql.execution.expression.tree.FunctionCall; import io.confluent.ksql.execution.expression.tree.InListExpression; import io.confluent.ksql.execution.expression.tree.InPredicate; import io.confluent.ksql.execution.expression.tree.IntegerLiteral; import io.confluent.ksql.execution.expression.tree.LikePredicate; +import io.confluent.ksql.execution.expression.tree.QualifiedName; +import io.confluent.ksql.execution.expression.tree.QualifiedNameReference; import io.confluent.ksql.execution.expression.tree.SearchedCaseExpression; import io.confluent.ksql.execution.expression.tree.SimpleCaseExpression; import io.confluent.ksql.execution.expression.tree.StringLiteral; import io.confluent.ksql.execution.expression.tree.SubscriptExpression; import io.confluent.ksql.execution.expression.tree.TimeLiteral; import io.confluent.ksql.execution.expression.tree.TimestampLiteral; -import io.confluent.ksql.execution.expression.tree.WhenClause; -import io.confluent.ksql.execution.expression.tree.ArithmeticBinaryExpression; -import io.confluent.ksql.execution.expression.tree.ArithmeticUnaryExpression; -import io.confluent.ksql.execution.expression.tree.ArithmeticUnaryExpression.Sign; -import io.confluent.ksql.execution.expression.tree.Cast; -import io.confluent.ksql.execution.expression.tree.ComparisonExpression; -import io.confluent.ksql.execution.expression.tree.Expression; -import io.confluent.ksql.execution.expression.tree.QualifiedName; -import io.confluent.ksql.execution.expression.tree.QualifiedNameReference; import io.confluent.ksql.execution.expression.tree.Type; -import io.confluent.ksql.schema.Operator; -import io.confluent.ksql.schema.ksql.types.SqlDecimal; -import io.confluent.ksql.schema.ksql.types.SqlTypes; -import java.util.Optional; +import io.confluent.ksql.execution.expression.tree.WhenClause; import io.confluent.ksql.function.FunctionRegistry; import io.confluent.ksql.function.KsqlFunction; import io.confluent.ksql.function.UdfFactory; +import io.confluent.ksql.schema.Operator; +import io.confluent.ksql.schema.ksql.types.SqlDecimal; import io.confluent.ksql.schema.ksql.types.SqlPrimitiveType; +import io.confluent.ksql.schema.ksql.types.SqlTypes; +import java.util.Optional; import org.apache.kafka.connect.data.Schema; import org.junit.Before; import org.junit.Rule; diff --git a/ksql-execution/src/test/java/io/confluent/ksql/execution/codegen/helpers/SearchedCaseFunctionTest.java b/ksql-execution/src/test/java/io/confluent/ksql/execution/codegen/helpers/SearchedCaseFunctionTest.java index 422a67549796..a3b255e3c302 100644 --- a/ksql-execution/src/test/java/io/confluent/ksql/execution/codegen/helpers/SearchedCaseFunctionTest.java +++ b/ksql-execution/src/test/java/io/confluent/ksql/execution/codegen/helpers/SearchedCaseFunctionTest.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import io.confluent.ksql.execution.codegen.helpers.SearchedCaseFunction; import java.util.List; import java.util.Map; import org.junit.Rule; diff --git a/ksql-execution/src/test/java/io/confluent/ksql/execution/testutil/TestExpressions.java b/ksql-execution/src/test/java/io/confluent/ksql/execution/testutil/TestExpressions.java index 033effebe4cf..fba4f3224d64 100644 --- a/ksql-execution/src/test/java/io/confluent/ksql/execution/testutil/TestExpressions.java +++ b/ksql-execution/src/test/java/io/confluent/ksql/execution/testutil/TestExpressions.java @@ -8,9 +8,6 @@ import io.confluent.ksql.schema.ksql.LogicalSchema; import io.confluent.ksql.schema.ksql.types.SqlStruct; import io.confluent.ksql.schema.ksql.types.SqlTypes; -import io.confluent.ksql.util.DecimalUtil; -import org.apache.kafka.connect.data.Schema; -import org.apache.kafka.connect.data.SchemaBuilder; public final class TestExpressions { private TestExpressions() { diff --git a/ksql-execution/src/test/java/io/confluent/ksql/execution/util/ComparisonUtilTest.java b/ksql-execution/src/test/java/io/confluent/ksql/execution/util/ComparisonUtilTest.java index 2adc9b967b63..ca29b9322231 100644 --- a/ksql-execution/src/test/java/io/confluent/ksql/execution/util/ComparisonUtilTest.java +++ b/ksql-execution/src/test/java/io/confluent/ksql/execution/util/ComparisonUtilTest.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList; import io.confluent.ksql.execution.expression.tree.ComparisonExpression; -import io.confluent.ksql.execution.util.ComparisonUtil; import io.confluent.ksql.schema.ksql.SqlBaseType; import io.confluent.ksql.util.DecimalUtil; import io.confluent.ksql.util.KsqlException; diff --git a/ksql-execution/src/test/java/io/confluent/ksql/execution/util/EngineProcessingLogMessageFactoryTest.java b/ksql-execution/src/test/java/io/confluent/ksql/execution/util/EngineProcessingLogMessageFactoryTest.java index 38e0e29ad348..8d86aaa1b88a 100644 --- a/ksql-execution/src/test/java/io/confluent/ksql/execution/util/EngineProcessingLogMessageFactoryTest.java +++ b/ksql-execution/src/test/java/io/confluent/ksql/execution/util/EngineProcessingLogMessageFactoryTest.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.confluent.ksql.GenericRow; -import io.confluent.ksql.execution.util.EngineProcessingLogMessageFactory; import io.confluent.ksql.logging.processing.ProcessingLogConfig; import io.confluent.ksql.logging.processing.ProcessingLogMessageSchema; import io.confluent.ksql.logging.processing.ProcessingLogMessageSchema.MessageType; diff --git a/ksql-execution/src/test/java/io/confluent/ksql/execution/util/ExpressionTypeManagerTest.java b/ksql-execution/src/test/java/io/confluent/ksql/execution/util/ExpressionTypeManagerTest.java index 74b507fca72e..dea1d50b3cce 100644 --- a/ksql-execution/src/test/java/io/confluent/ksql/execution/util/ExpressionTypeManagerTest.java +++ b/ksql-execution/src/test/java/io/confluent/ksql/execution/util/ExpressionTypeManagerTest.java @@ -21,9 +21,9 @@ import static io.confluent.ksql.execution.testutil.TestExpressions.COL2; import static io.confluent.ksql.execution.testutil.TestExpressions.COL3; import static io.confluent.ksql.execution.testutil.TestExpressions.COL7; -import static io.confluent.ksql.execution.testutil.TestExpressions.literal; import static io.confluent.ksql.execution.testutil.TestExpressions.MAPCOL; import static io.confluent.ksql.execution.testutil.TestExpressions.SCHEMA; +import static io.confluent.ksql.execution.testutil.TestExpressions.literal; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/ksql-functional-tests/src/test/java/io/confluent/ksql/test/rest/RestQueryTranslationTest.java b/ksql-functional-tests/src/test/java/io/confluent/ksql/test/rest/RestQueryTranslationTest.java index 8dd442cf1de6..331761093c92 100644 --- a/ksql-functional-tests/src/test/java/io/confluent/ksql/test/rest/RestQueryTranslationTest.java +++ b/ksql-functional-tests/src/test/java/io/confluent/ksql/test/rest/RestQueryTranslationTest.java @@ -36,11 +36,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import kafka.zookeeper.ZooKeeperClientException; -import org.apache.kafka.common.errors.TopicExistsException; import org.apache.kafka.streams.StreamsConfig; import org.junit.After; import org.junit.ClassRule; -import org.junit.Rule; import org.junit.Test; import org.junit.rules.RuleChain; import org.junit.runner.RunWith; diff --git a/ksql-rest-app/src/test/java/io/confluent/ksql/rest/server/execution/ListTypesExecutorTest.java b/ksql-rest-app/src/test/java/io/confluent/ksql/rest/server/execution/ListTypesExecutorTest.java index ff501bda0b8d..42f610868e95 100644 --- a/ksql-rest-app/src/test/java/io/confluent/ksql/rest/server/execution/ListTypesExecutorTest.java +++ b/ksql-rest-app/src/test/java/io/confluent/ksql/rest/server/execution/ListTypesExecutorTest.java @@ -16,8 +16,7 @@ package io.confluent.ksql.rest.server.execution; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; -import static org.mockito.Mockito.mock; +import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; diff --git a/ksql-rest-app/src/test/java/io/confluent/ksql/rest/util/RocksDBConfigSetterHandlerTest.java b/ksql-rest-app/src/test/java/io/confluent/ksql/rest/util/RocksDBConfigSetterHandlerTest.java index f2107532c4c7..f39d80220611 100644 --- a/ksql-rest-app/src/test/java/io/confluent/ksql/rest/util/RocksDBConfigSetterHandlerTest.java +++ b/ksql-rest-app/src/test/java/io/confluent/ksql/rest/util/RocksDBConfigSetterHandlerTest.java @@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableMap; import io.confluent.ksql.util.KsqlConfig; -import io.confluent.ksql.util.KsqlException; import java.util.Map; import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.streams.StreamsConfig; diff --git a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/SelectValueMapperFactoryTest.java b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/SelectValueMapperFactoryTest.java index 3b1732b09823..da6437023138 100644 --- a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/SelectValueMapperFactoryTest.java +++ b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/SelectValueMapperFactoryTest.java @@ -24,13 +24,11 @@ import com.google.common.collect.ImmutableList; import io.confluent.ksql.execution.codegen.CodeGenRunner; +import io.confluent.ksql.execution.codegen.ExpressionMetadata; import io.confluent.ksql.execution.expression.tree.Expression; import io.confluent.ksql.execution.plan.SelectExpression; -import io.confluent.ksql.execution.streams.SelectValueMapper; -import io.confluent.ksql.execution.streams.SelectValueMapperFactory; -import io.confluent.ksql.logging.processing.ProcessingLogger; import io.confluent.ksql.execution.streams.SelectValueMapper.SelectInfo; -import io.confluent.ksql.execution.codegen.ExpressionMetadata; +import io.confluent.ksql.logging.processing.ProcessingLogger; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamMapValuesBuilderTest.java b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamMapValuesBuilderTest.java index 9d9a420aece6..a87c17ff8dca 100644 --- a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamMapValuesBuilderTest.java +++ b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamMapValuesBuilderTest.java @@ -17,9 +17,9 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import static org.hamcrest.Matchers.instanceOf; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify;