Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #981 from druid-io/strictModuleTyping 

Use Module instead of generic Object in Guice related items
This commit is contained in:
Fangjin Yang 2015-01-05 12:43:20 -08:00
parent ab0ddc0d7c 7c8d4a7433
commit 852e863425
18 changed files with 41 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java
View File

@ -92,7 +92,7 @@ public class HadoopDruidIndexerConfig
static {
injector = Initialization.makeInjectorWithModules(
GuiceInjectors.makeStartupInjector(),
ImmutableList.<Object>of(
ImmutableList.<Module>of(
new Module()
{
@Override

31
processing/src/main/java/io/druid/guice/GuiceInjectors.java
View File

@ -19,6 +19,7 @@
package io.druid.guice;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.inject.Binder;
import com.google.inject.Guice;
@ -27,15 +28,16 @@ import com.google.inject.Module;
import io.druid.jackson.JacksonModule;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
/**
*/
public class GuiceInjectors
{
public static Injector makeStartupInjector()
public static Collection<Module> makeDefaultStartupModules()
{
return Guice.createInjector(
return ImmutableList.<Module>of(
new DruidGuiceExtensions(),
new JacksonModule(),
new PropertiesModule(Arrays.asList("common.runtime.properties", "runtime.properties")),
@ -52,29 +54,18 @@ public class GuiceInjectors
);
}
public static Injector makeStartupInjectorWithModules(Iterable<Module> modules)
public static Injector makeStartupInjector()
{
return Guice.createInjector(makeDefaultStartupModules());
}
public static Injector makeStartupInjectorWithModules(Iterable<? extends Module> modules)
{
List<Module> theModules = Lists.newArrayList();
theModules.add(new DruidGuiceExtensions());
theModules.add(new JacksonModule());
theModules.add(new PropertiesModule(Arrays.asList("common.runtime.properties", "runtime.properties")));
theModules.add(new ConfigModule());
theModules.add(
new Module()
{
@Override
public void configure(Binder binder)
{
binder.bind(DruidSecondaryModule.class);
JsonConfigProvider.bind(binder, "druid.extensions", ExtensionsConfig.class);
}
}
);
theModules.addAll(makeDefaultStartupModules());
for (Module theModule : modules) {
theModules.add(theModule);
}
return Guice.createInjector(theModules);
}
}

2
server/src/main/java/io/druid/initialization/Initialization.java
View File

@ -328,7 +328,7 @@ public class Initialization
}
}
public static Injector makeInjectorWithModules(final Injector baseInjector, Iterable<Object> modules)
public static Injector makeInjectorWithModules(final Injector baseInjector, Iterable<? extends Module> modules)
{
final ModuleList defaultModules = new ModuleList(baseInjector);
defaultModules.addModules(

2
server/src/test/java/io/druid/initialization/InitializationTest.java
View File

@ -102,7 +102,7 @@ public class InitializationTest
{
Injector startupInjector = GuiceInjectors.makeStartupInjector();
Injector injector = Initialization.makeInjectorWithModules(
startupInjector, ImmutableList.<Object>of(
startupInjector, ImmutableList.<com.google.inject.Module>of(
new com.google.inject.Module()
{
@Override

2
server/src/test/java/io/druid/server/initialization/JettyTest.java
View File

@ -97,7 +97,7 @@ public class JettyTest
{
setProperties();
Injector injector = Initialization.makeInjectorWithModules(
GuiceInjectors.makeStartupInjector(), ImmutableList.<Object>of(
GuiceInjectors.makeStartupInjector(), ImmutableList.<Module>of(
new Module()
{
@Override

4
services/src/main/java/io/druid/cli/CliBridge.java
View File

@ -62,9 +62,9 @@ public class CliBridge extends ServerRunnable
}
@Override
protected List<Object> getModules()
protected List<? extends Module> getModules()
{
return ImmutableList.<Object>of(
return ImmutableList.<Module>of(
new Module()
{
@Override

4
services/src/main/java/io/druid/cli/CliBroker.java
View File

@ -72,9 +72,9 @@ public class CliBroker extends ServerRunnable
}
@Override
protected List<Object> getModules()
protected List<? extends Module> getModules()
{
return ImmutableList.<Object>of(
return ImmutableList.<Module>of(
new Module()
{
@Override

4
services/src/main/java/io/druid/cli/CliCoordinator.java
View File

@ -80,9 +80,9 @@ public class CliCoordinator extends ServerRunnable
}
@Override
protected List<Object> getModules()
protected List<? extends Module> getModules()
{
return ImmutableList.<Object>of(
return ImmutableList.<Module>of(
new Module()
{
@Override

4
services/src/main/java/io/druid/cli/CliHistorical.java
View File

@ -62,9 +62,9 @@ public class CliHistorical extends ServerRunnable
}
@Override
protected List<Object> getModules()
protected List<? extends Module> getModules()
{
return ImmutableList.<Object>of(
return ImmutableList.<Module>of(
new Module()
{
@Override

4
services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java
View File

@ -66,9 +66,9 @@ public class CliInternalHadoopIndexer extends GuiceRunnable
}
@Override
protected List<Object> getModules()
protected List<? extends Module> getModules()
{
return ImmutableList.<Object>of(
return ImmutableList.<Module>of(
new Module()
{
@Override

4
services/src/main/java/io/druid/cli/CliMiddleManager.java
View File

@ -67,9 +67,9 @@ public class CliMiddleManager extends ServerRunnable
}
@Override
protected List<Object> getModules()
protected List<? extends Module> getModules()
{
return ImmutableList.<Object>of(
return ImmutableList.<Module>of(
new Module()
{
@Override

4
services/src/main/java/io/druid/cli/CliOverlord.java
View File

@ -105,9 +105,9 @@ public class CliOverlord extends ServerRunnable
}
@Override
protected List<Object> getModules()
protected List<? extends Module> getModules()
{
return ImmutableList.<Object>of(
return ImmutableList.<Module>of(
new Module()
{
@Override

4
services/src/main/java/io/druid/cli/CliPeon.java
View File

@ -101,9 +101,9 @@ public class CliPeon extends GuiceRunnable
}
@Override
protected List<Object> getModules()
protected List<? extends Module> getModules()
{
return ImmutableList.<Object>of(
return ImmutableList.<Module>of(
new Module()
{
@Override

4
services/src/main/java/io/druid/cli/CliRealtime.java
View File

@ -45,9 +45,9 @@ public class CliRealtime extends ServerRunnable
}
@Override
protected List<Object> getModules()
protected List<? extends Module> getModules()
{
return ImmutableList.<Object>of(
return ImmutableList.<Module>of(
new RealtimeModule(),
new Module() {
@Override

4
services/src/main/java/io/druid/cli/CliRealtimeExample.java
View File

@ -55,9 +55,9 @@ public class CliRealtimeExample extends ServerRunnable
}
@Override
protected List<Object> getModules()
protected List<? extends Module> getModules()
{
return ImmutableList.<Object>of(
return ImmutableList.<Module>of(
new RealtimeModule(),
new Module()
{

4
services/src/main/java/io/druid/cli/CliRouter.java
View File

@ -64,9 +64,9 @@ public class CliRouter extends ServerRunnable
}
@Override
protected List<Object> getModules()
protected List<? extends Module> getModules()
{
return ImmutableList.<Object>of(
return ImmutableList.<Module>of(
new JettyHttpClientModule("druid.router.http", Router.class),
new Module()
{

4
services/src/main/java/io/druid/cli/CreateTables.java
View File

@ -62,9 +62,9 @@ public class CreateTables extends GuiceRunnable
}
@Override
protected List<Object> getModules()
protected List<? extends Module> getModules()
{
return ImmutableList.<Object>of(
return ImmutableList.<Module>of(
new Module()
{
@Override

3
services/src/main/java/io/druid/cli/GuiceRunnable.java
View File

@ -22,6 +22,7 @@ package io.druid.cli;
import com.google.common.base.Throwables;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.metamx.common.lifecycle.Lifecycle;
import com.metamx.common.logger.Logger;
import io.druid.initialization.Initialization;
@ -48,7 +49,7 @@ public abstract class GuiceRunnable implements Runnable
this.baseInjector = injector;
}
protected abstract List<Object> getModules();
protected abstract List<? extends Module> getModules();
public Injector makeInjector()
{