From 61c3b16b17e35d5f6f9afe6d3aa044a83d6d9ad5 Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Tue, 6 Aug 2024 09:44:27 +0000 Subject: [PATCH] checkstyle --- .../druid/msq/exec/MSQDrillWindowQueryTest.java | 1 - .../org/apache/druid/msq/exec/TestMSQSqlModule.java | 12 +++++------- .../druid/msq/test/CalciteSelectQueryMSQTest.java | 10 ---------- .../apache/druid/msq/test/ExtractResultsFactory.java | 1 - .../druid/msq/test/StandardMSQComponentSupplier.java | 2 +- .../org/apache/druid/sql/avatica/MSQDruidMeta.java | 3 +-- 6 files changed, 7 insertions(+), 22 deletions(-) diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQDrillWindowQueryTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQDrillWindowQueryTest.java index ea0b45bb686..4e9821d1083 100644 --- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQDrillWindowQueryTest.java +++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQDrillWindowQueryTest.java @@ -27,7 +27,6 @@ import org.apache.druid.msq.exec.MSQDrillWindowQueryTest.DrillWindowQueryMSQComp import org.apache.druid.msq.sql.MSQTaskSqlEngine; import org.apache.druid.msq.test.CalciteMSQTestsHelper; import org.apache.druid.msq.test.ExtractResultsFactory; -import org.apache.druid.msq.test.MSQTestBase; import org.apache.druid.msq.test.MSQTestOverlordServiceClient; import org.apache.druid.msq.test.VerifyMSQSupportedNativeQueriesPredicate; import org.apache.druid.query.groupby.TestGroupByBuffers; diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/TestMSQSqlModule.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/TestMSQSqlModule.java index 90a7bbb8ff6..e4840c8fc28 100644 --- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/TestMSQSqlModule.java +++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/TestMSQSqlModule.java @@ -35,15 +35,14 @@ import org.apache.druid.sql.SqlToolbox; import org.apache.druid.sql.avatica.DruidMeta; import org.apache.druid.sql.avatica.MSQDruidMeta; -public class TestMSQSqlModule extends TestDruidModule { - +public class TestMSQSqlModule extends TestDruidModule +{ @Provides @MultiStageQuery @LazySingleton public SqlStatementFactory makeMSQSqlStatementFactory( final MSQTaskSqlEngine sqlEngine, - SqlToolbox toolbox - ) + SqlToolbox toolbox) { return new SqlStatementFactory(toolbox.withEngine(sqlEngine)); } @@ -52,8 +51,7 @@ public class TestMSQSqlModule extends TestDruidModule { @LazySingleton public MSQTaskSqlEngine createEngine( ObjectMapper queryJsonMapper, - MSQTestOverlordServiceClient indexingServiceClient - ) + MSQTestOverlordServiceClient indexingServiceClient) { return new MSQTaskSqlEngine(indexingServiceClient, queryJsonMapper); } @@ -89,4 +87,4 @@ public class TestMSQSqlModule extends TestDruidModule { { return druidMeta; } -} \ No newline at end of file +} diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectQueryMSQTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectQueryMSQTest.java index 6cd253e3b1c..6e2032a1095 100644 --- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectQueryMSQTest.java +++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectQueryMSQTest.java @@ -19,24 +19,14 @@ package org.apache.druid.msq.test; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.inject.Injector; -import com.google.inject.Module; import org.apache.druid.common.config.NullHandling; -import org.apache.druid.guice.DruidInjectorBuilder; import org.apache.druid.java.util.common.ISE; -import org.apache.druid.msq.exec.TestMSQSqlModule; import org.apache.druid.msq.sql.MSQTaskSqlEngine; -import org.apache.druid.query.groupby.TestGroupByBuffers; -import org.apache.druid.server.QueryLifecycleFactory; import org.apache.druid.sql.calcite.CalciteQueryTest; import org.apache.druid.sql.calcite.QueryTestBuilder; import org.apache.druid.sql.calcite.SqlTestFrameworkConfig; -import org.apache.druid.sql.calcite.TempDirProducer; -import org.apache.druid.sql.calcite.run.SqlEngine; -import org.apache.druid.sql.calcite.util.SqlTestFramework.StandardComponentSupplier; import org.junit.Assert; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/ExtractResultsFactory.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/ExtractResultsFactory.java index 1a05b963afb..d2182b429cf 100644 --- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/ExtractResultsFactory.java +++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/ExtractResultsFactory.java @@ -20,7 +20,6 @@ package org.apache.druid.msq.test; import org.apache.druid.java.util.common.ISE; -import org.apache.druid.msq.indexing.report.MSQResultsReport; import org.apache.druid.msq.indexing.report.MSQResultsReport.ColumnAndType; import org.apache.druid.msq.indexing.report.MSQTaskReport; import org.apache.druid.msq.indexing.report.MSQTaskReportPayload; diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/StandardMSQComponentSupplier.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/StandardMSQComponentSupplier.java index 2bf64408c14..e519a5ca387 100644 --- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/StandardMSQComponentSupplier.java +++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/StandardMSQComponentSupplier.java @@ -57,4 +57,4 @@ public final class StandardMSQComponentSupplier extends StandardComponentSupplie { return injector.getInstance(MSQTaskSqlEngine.class); } -} \ No newline at end of file +} diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/sql/avatica/MSQDruidMeta.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/sql/avatica/MSQDruidMeta.java index 70485ff7e81..845d8adb2b3 100644 --- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/sql/avatica/MSQDruidMeta.java +++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/sql/avatica/MSQDruidMeta.java @@ -62,8 +62,7 @@ public class MSQDruidMeta extends DruidMeta final AuthenticatorMapper authMapper, final MSQTestOverlordServiceClient overlordClient, final ObjectMapper objectMapper, - final DruidHookDispatcher hookDispatcher - ) + final DruidHookDispatcher hookDispatcher) { super(sqlStatementFactory, config, errorHandler, authMapper); this.overlordClient = overlordClient;