From 51f648ec114df19828de663965770d84038151b6 Mon Sep 17 00:00:00 2001 From: cheddar Date: Tue, 6 Aug 2013 12:05:56 -0700 Subject: [PATCH] 1) Rename QueryToolChestModule back --- ...olChestModuleStupidCase.java => QueryToolChestModule.java} | 2 +- ...oryModuleStupidCase.java => QueryRunnerFactoryModule.java} | 2 +- services/src/main/java/io/druid/cli/CliBroker.java | 4 ++-- services/src/main/java/io/druid/cli/CliHistorical.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename client/src/main/java/com/metamx/druid/guice/{QueryToolChestModuleStupidCase.java => QueryToolChestModule.java} (97%) rename server/src/main/java/com/metamx/druid/guice/{QueryRunnerFactoryModuleStupidCase.java => QueryRunnerFactoryModule.java} (96%) diff --git a/client/src/main/java/com/metamx/druid/guice/QueryToolChestModuleStupidCase.java b/client/src/main/java/com/metamx/druid/guice/QueryToolChestModule.java similarity index 97% rename from client/src/main/java/com/metamx/druid/guice/QueryToolChestModuleStupidCase.java rename to client/src/main/java/com/metamx/druid/guice/QueryToolChestModule.java index 54a9f46b94c..3a5e39833c5 100644 --- a/client/src/main/java/com/metamx/druid/guice/QueryToolChestModuleStupidCase.java +++ b/client/src/main/java/com/metamx/druid/guice/QueryToolChestModule.java @@ -23,7 +23,7 @@ import java.util.Map; /** */ -public class QueryToolChestModuleStupidCase implements Module +public class QueryToolChestModule implements Module { final Map, Class> mappings = ImmutableMap., Class>builder() diff --git a/server/src/main/java/com/metamx/druid/guice/QueryRunnerFactoryModuleStupidCase.java b/server/src/main/java/com/metamx/druid/guice/QueryRunnerFactoryModule.java similarity index 96% rename from server/src/main/java/com/metamx/druid/guice/QueryRunnerFactoryModuleStupidCase.java rename to server/src/main/java/com/metamx/druid/guice/QueryRunnerFactoryModule.java index 6e6c015ab38..81078b56595 100644 --- a/server/src/main/java/com/metamx/druid/guice/QueryRunnerFactoryModuleStupidCase.java +++ b/server/src/main/java/com/metamx/druid/guice/QueryRunnerFactoryModule.java @@ -22,7 +22,7 @@ import java.util.Map; /** */ -public class QueryRunnerFactoryModuleStupidCase extends QueryToolChestModuleStupidCase +public class QueryRunnerFactoryModule extends QueryToolChestModule { final Map, Class> mappings = ImmutableMap., Class>builder() diff --git a/services/src/main/java/io/druid/cli/CliBroker.java b/services/src/main/java/io/druid/cli/CliBroker.java index 53aa0d8554b..d5e00e4c7ff 100644 --- a/services/src/main/java/io/druid/cli/CliBroker.java +++ b/services/src/main/java/io/druid/cli/CliBroker.java @@ -6,7 +6,7 @@ import com.metamx.druid.curator.CuratorModule; import com.metamx.druid.guice.BrokerModule; import com.metamx.druid.guice.HttpClientModule; import com.metamx.druid.guice.LifecycleModule; -import com.metamx.druid.guice.QueryToolChestModuleStupidCase; +import com.metamx.druid.guice.QueryToolChestModule; import com.metamx.druid.guice.QueryableModule; import com.metamx.druid.guice.ServerModule; import com.metamx.druid.guice.ServerViewModule; @@ -47,7 +47,7 @@ public class CliBroker extends ServerRunnable new JettyServerModule(new QueryJettyServerInitializer()) .addResource(StatusResource.class), new QueryableModule(ClientQuerySegmentWalker.class), - new QueryToolChestModuleStupidCase(), + new QueryToolChestModule(), new ServerViewModule(), new HttpClientModule("druid.broker.http", Client.class), new BrokerModule() diff --git a/services/src/main/java/io/druid/cli/CliHistorical.java b/services/src/main/java/io/druid/cli/CliHistorical.java index 654f9b7d58e..01bb7484198 100644 --- a/services/src/main/java/io/druid/cli/CliHistorical.java +++ b/services/src/main/java/io/druid/cli/CliHistorical.java @@ -8,7 +8,7 @@ import com.metamx.druid.curator.CuratorModule; import com.metamx.druid.guice.HistoricalModule; import com.metamx.druid.guice.HttpClientModule; import com.metamx.druid.guice.LifecycleModule; -import com.metamx.druid.guice.QueryRunnerFactoryModuleStupidCase; +import com.metamx.druid.guice.QueryRunnerFactoryModule; import com.metamx.druid.guice.QueryableModule; import com.metamx.druid.guice.ServerModule; import com.metamx.druid.http.StatusResource; @@ -47,7 +47,7 @@ public class CliHistorical extends ServerRunnable new JettyServerModule(new QueryJettyServerInitializer()) .addResource(StatusResource.class), new QueryableModule(ServerManager.class), - new QueryRunnerFactoryModuleStupidCase(), + new QueryRunnerFactoryModule(), HistoricalModule.class ); }