clkeaup

integration-tests/src/main/resources/log4j2.xml

@@ -25,7 +25,7 @@
     </Console>
   </Appenders>
   <Loggers>
-    <Root level="debug">
+    <Root level="info">
       <AppenderRef ref="Console"/>
     </Root>
     <Logger name="org.apache.druid.segment.metadata" level="debug" additivity="false">

processing/src/main/java/org/apache/druid/guice/BaseInjectorBuilder.java

@@ -33,7 +33,7 @@ import java.util.List;
  */
 public class BaseInjectorBuilder<T extends BaseInjectorBuilder<?>>
 {
-  protected final List<Module> modules = new ArrayList<>();
+  private final List<Module> modules = new ArrayList<>();
 
   @SuppressWarnings("unchecked")
   public T add(Module... modules)

sql/src/test/java/org/apache/druid/sql/calcite/SqlTestFrameworkConfig.java

@@ -341,20 +341,10 @@ public class SqlTestFrameworkConfig
   public static class ConfigurationInstance
   {
     public SqlTestFramework framework;
-    private SqlTestFrameworkConfig config;
-    private QueryComponentSupplier testHost;
 
     ConfigurationInstance(SqlTestFrameworkConfig config, QueryComponentSupplier testHost)
     {
-      this.config = config;
-      this.testHost = testHost;
-      SqlTestFramework framework1 = extracted();
-      framework=framework1;
-    }
-
-    //FIXME remove
-    public SqlTestFramework extracted(Module ...modules)
-    {
+      Module[] modules = {};
       SqlTestFramework.Builder builder = new SqlTestFramework.Builder(testHost)
           .withConfig(config)
           .catalogResolver(testHost.createCatalogResolver())
@@ -365,8 +355,7 @@ public class SqlTestFrameworkConfig
         builder.withOverrideModule(m);
       }
 
-      SqlTestFramework framework1 = builder.build();
-      return framework1;
+      framework = builder.build();
     }
 
     public ConfigurationInstance(
@@ -435,7 +424,7 @@ public class SqlTestFrameworkConfig
     catch (URISyntaxException e) {
       throw new SQLException("Can't decode URI", e);
     }
-  
+
     return new SqlTestFrameworkConfig(queryParams);
   }
 

sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java

@@ -654,12 +654,6 @@ return      componentSupplier.getPlannerComponentSupplier().createViewManager();
         // test pulls in a module, then pull in that module, even though we are
         // not the Druid node to which the module is scoped.
         .ignoreLoadScopes()
-//        .addModule(new LookylooModule())
-//        .addModule(new SegmentWranglerModule())
-//      .addModule(new SqlAggregationModule())
-//      .addModule(new SqlModule())
-//        .addModule(new ExpressionModule());
-//        .addModule(testSetupModule());
         ;
 
     List<Module> overrideModules = new ArrayList<>(builder.overrideModules);