From aab6f5a071b754a7b64885fb6ae6d0c17eca46e2 Mon Sep 17 00:00:00 2001
From: Zoltan Haindrich <kirk@rxd.hu>
Date: Mon, 16 Dec 2024 08:11:35 +0000
Subject: [PATCH] remove configGuice half

---
 .../org/apache/druid/sql/calcite/CalciteExportTest.java    | 4 ++--
 .../apache/druid/sql/calcite/CalciteIngestionDmlTest.java  | 4 ++--
 .../druid/sql/calcite/CalciteNestedDataQueryTest.java      | 4 ++--
 .../apache/druid/sql/calcite/util/SqlTestFramework.java    | 7 -------
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteExportTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteExportTest.java
index a69ac8735671..11ffacc6ed78 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteExportTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteExportTest.java
@@ -63,9 +63,9 @@ public ExportComponentSupplier(TempDirProducer tempFolderProducer)
     }
 
     @Override
-    public void configureGuice(DruidInjectorBuilder builder)
+    public void configureGuice(DruidInjectorBuilder builder, List<com.google.inject.Module> overrideModules)
     {
-      super.configureGuice(builder);
+      super.configureGuice(builder, overrideModules);
       builder.addModule(
           new DruidModule()
           {
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteIngestionDmlTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteIngestionDmlTest.java
index 8edbce199965..dc81179fe893 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteIngestionDmlTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteIngestionDmlTest.java
@@ -140,9 +140,9 @@ public SqlEngine createEngine(QueryLifecycleFactory qlf, ObjectMapper queryJsonM
     }
 
     @Override
-    public void configureGuice(DruidInjectorBuilder builder)
+    public void configureGuice(DruidInjectorBuilder builder, List<com.google.inject.Module> overrideModules)
     {
-      super.configureGuice(builder);
+      super.configureGuice(builder, overrideModules);
 
       builder.addModule(new DruidModule() {
 
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
index 9f33756e7b59..0f842d8cb965 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
@@ -194,9 +194,9 @@ public NestedComponentSupplier(TempDirProducer tempFolderProducer)
     }
 
     @Override
-    public void configureGuice(DruidInjectorBuilder builder)
+    public void configureGuice(DruidInjectorBuilder builder, List<com.google.inject.Module> overrideModules)
     {
-      super.configureGuice(builder);
+      super.configureGuice(builder, overrideModules);
     }
 
     @SuppressWarnings("resource")
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java
index a12cacebeb2e..38d6d8bc8c17 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java
@@ -344,12 +344,6 @@ public void gatherProperties(Properties properties)
     {
     }
 
-    public void configureGuice(DruidInjectorBuilder builder)
-    {
-      // This shell exists to minimize changes to child classes.  This method should probably be removed and
-      // places that extend this just updated, but that generates a lot of changes that could introduce conflicts
-    }
-
     @Override
     public void configureGuice(DruidInjectorBuilder builder, List<Module> overrideModules)
     {
@@ -365,7 +359,6 @@ public void configureGuice(DruidInjectorBuilder builder, List<Module> overrideMo
                           .to(SpecificSegmentsQuerySegmentWalker.class)
                           .in(LazySingleton.class)
       );
-      configureGuice(builder);
     }
 
     @Override