Merge pull request apache#1628 from druid-io/revert-1608-guice40

Revert "Update to guice 4.0"
ghostsun · Aug 14, 2015 · c1d274f · c1d274f
2 parents 8d6fe02 + db19d2d
commit c1d274f
Show file tree

Hide file tree

Showing 30 changed files with 66 additions and 81 deletions.
diff --git a/common/src/main/java/io/druid/guice/DruidSecondaryModule.java b/common/src/main/java/io/druid/guice/DruidSecondaryModule.java
@@ -72,14 +72,14 @@ public void configure(Binder binder)
   }
 
   @Provides @LazySingleton @Json
-  public final ObjectMapper getJsonMapper(final Injector injector)
+  public ObjectMapper getJsonMapper(final Injector injector)
   {
     setupJackson(injector, jsonMapper);
     return jsonMapper;
   }
 
   @Provides @LazySingleton @Smile
-  public final ObjectMapper getSmileMapper(Injector injector)
+  public ObjectMapper getSmileMapper(Injector injector)
   {
     setupJackson(injector, smileMapper);
     return smileMapper;

diff --git a/common/src/main/java/io/druid/guice/JacksonConfigManagerModule.java b/common/src/main/java/io/druid/guice/JacksonConfigManagerModule.java
@@ -40,7 +40,7 @@ public void configure(Binder binder)
   }
 
   @Provides @ManageLifecycle
-  public final ConfigManager getConfigManager(
+  public ConfigManager getConfigManager(
       final MetadataStorageConnector dbConnector,
       final Supplier<MetadataStorageTablesConfig> dbTables,
       final Supplier<ConfigManagerConfig> config,

diff --git a/...nsions/azure-extensions/src/main/java/io/druid/storage/azure/AzureStorageDruidModule.java b/...nsions/azure-extensions/src/main/java/io/druid/storage/azure/AzureStorageDruidModule.java
@@ -98,7 +98,7 @@ public void configure(Binder binder)
 
   @Provides
   @LazySingleton
-  public final CloudBlobClient getCloudBlobClient(final AzureAccountConfig config)
+  public CloudBlobClient getCloudBlobClient(final AzureAccountConfig config)
       throws URISyntaxException, InvalidKeyException
   {
     CloudStorageAccount account = CloudStorageAccount.parse(
@@ -115,7 +115,7 @@ public final CloudBlobClient getCloudBlobClient(final AzureAccountConfig config)
 
   @Provides
   @LazySingleton
-  public final AzureStorage getAzureStorageContainer(
+  public AzureStorage getAzureStorageContainer(
       final CloudBlobClient cloudBlobClient
   )
   {

diff --git a/...ion-namespace/src/main/java/io/druid/server/namespace/KafkaExtractionNamespaceModule.java b/...ion-namespace/src/main/java/io/druid/server/namespace/KafkaExtractionNamespaceModule.java
@@ -71,15 +71,7 @@ public void setupModule(SetupContext setupContext)
   @Provides
   @Named("renameKafkaProperties")
   @LazySingleton
-  public final Properties getProperties(
-      @Json ObjectMapper mapper,
-      Properties systemProperties
-  ){
-    return getPropertiesInner(mapper, systemProperties);
-  }
-
-  // Protected for use in unit tests
-  protected Properties getPropertiesInner(
+  public Properties getProperties(
       @Json ObjectMapper mapper,
       Properties systemProperties
   )
@@ -106,7 +98,7 @@ protected Properties getPropertiesInner(
 
   @Provides
   @LazySingleton
-  public final KafkaExtractionNamespaceFactory factoryFactory(
+  public KafkaExtractionNamespaceFactory factoryFactory(
       KafkaExtractionManager kafkaManager
   )
   {

diff --git a/...mespace/src/test/java/io/druid/query/extraction/namespace/TestKafkaExtractionCluster.java b/...mespace/src/test/java/io/druid/query/extraction/namespace/TestKafkaExtractionCluster.java
@@ -31,6 +31,9 @@
 import com.google.inject.Module;
 import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
+import com.google.inject.multibindings.MapBinder;
+import com.google.inject.multibindings.Multibinder;
+import com.google.inject.name.Named;
 import com.google.inject.name.Names;
 import com.metamx.common.ISE;
 import com.metamx.common.StringUtils;
@@ -55,6 +58,10 @@
 import org.I0Itec.zkclient.ZkClient;
 import org.apache.commons.io.FileUtils;
 import org.apache.curator.test.TestingServer;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.PatternLayout;
 import org.apache.zookeeper.CreateMode;
 import org.joda.time.DateTime;
 import org.junit.AfterClass;
@@ -90,18 +97,16 @@ public class TestKafkaExtractionCluster
   private static Injector injector;
 
 
+
   public static class KafkaFactoryProvider implements Provider<ExtractionNamespaceFunctionFactory<?>>
   {
     private final KafkaExtractionManager kafkaExtractionManager;
-
     @Inject
     public KafkaFactoryProvider(
         KafkaExtractionManager kafkaExtractionManager
-    )
-    {
+    ){
       this.kafkaExtractionManager = kafkaExtractionManager;
     }
-
     @Override
     public ExtractionNamespaceFunctionFactory<?> get()
     {
@@ -217,10 +222,6 @@ public void sleep(long ms)
     }
 
     System.setProperty("druid.extensions.searchCurrentClassloader", "false");
-    final Properties consumerProperties = new Properties(kafkaProperties);
-    consumerProperties.put("zookeeper.connect", zkTestServer.getConnectString() + "/kafka");
-    consumerProperties.put("zookeeper.session.timeout.ms", "10000");
-    consumerProperties.put("zookeeper.sync.time.ms", "200");
 
     injector = Initialization.makeInjectorWithModules(
         GuiceInjectors.makeStartupInjectorWithModules(
@@ -238,11 +239,15 @@ public void configure(Binder binder)
             new KafkaExtractionNamespaceModule()
             {
               @Override
-              protected Properties getPropertiesInner(
+              public Properties getProperties(
                   @Json ObjectMapper mapper,
                   Properties systemProperties
               )
               {
+                final Properties consumerProperties = new Properties(kafkaProperties);
+                consumerProperties.put("zookeeper.connect", zkTestServer.getConnectString() + "/kafka");
+                consumerProperties.put("zookeeper.session.timeout.ms", "10000");
+                consumerProperties.put("zookeeper.sync.time.ms", "200");
                 return consumerProperties;
               }
             }
@@ -282,8 +287,7 @@ public static void closeStatic() throws IOException
       if (zkClient.exists("/kafka")) {
         try {
           zkClient.deleteRecursive("/kafka");
-        }
-        catch (org.I0Itec.zkclient.exception.ZkException ex) {
+        }catch(org.I0Itec.zkclient.exception.ZkException ex){
           log.warn(ex, "error deleting /kafka zk node");
         }
       }
@@ -292,13 +296,12 @@ public static void closeStatic() throws IOException
     if (null != zkTestServer) {
       zkTestServer.stop();
     }
-    if (tmpDir.exists()) {
+    if(tmpDir.exists()){
       FileUtils.deleteDirectory(tmpDir);
     }
   }
 
-  private static final Properties makeProducerProperties()
-  {
+  private static final Properties makeProducerProperties(){
     final Properties kafkaProducerProperties = new Properties();
     kafkaProducerProperties.putAll(kafkaProperties);
     kafkaProducerProperties.put(
@@ -324,16 +327,7 @@ public void testSimpleRename() throws InterruptedException
     final Producer<byte[], byte[]> producer = new Producer<byte[], byte[]>(new ProducerConfig(kafkaProducerProperties));
     try {
       checkServer();
-      final ConcurrentMap<String, Function<String, String>> fnFn = injector.getInstance(
-          Key.get(
-              new TypeLiteral<ConcurrentMap<String, Function<String, String>>>()
-              {
-              },
-              Names.named(
-                  "namespaceExtractionFunctionCache"
-              )
-          )
-      );
+      final ConcurrentMap<String, Function<String, String>> fnFn = injector.getInstance(Key.get(new TypeLiteral<ConcurrentMap<String, Function<String, String>>>(){}, Names.named("namespaceExtractionFunctionCache")));
       KafkaExtractionNamespace extractionNamespace = new KafkaExtractionNamespace(topicName, namespace);
 
       Assert.assertEquals(null, fnFn.get(extractionNamespace.getNamespace()).apply("foo"));

diff --git a/.../namespace-lookup/src/main/java/io/druid/server/namespace/NamespacedExtractionModule.java b/.../namespace-lookup/src/main/java/io/druid/server/namespace/NamespacedExtractionModule.java
@@ -164,22 +164,22 @@ public void configure(Binder binder)
   @Provides
   @Named("namespaceVersionMap")
   @LazySingleton
-  public final ConcurrentMap<String, String> getVersionMap()
+  public ConcurrentMap<String, String> getVersionMap()
   {
     return new ConcurrentHashMap<>();
   }
 
   @Provides
   @Named("namespaceExtractionFunctionCache")
-  public final ConcurrentMap<String, Function<String, String>> getFnCache()
+  public ConcurrentMap<String, Function<String, String>> getFnCache()
   {
     return fnCache;
   }
 
   @Provides
   @Named("dimExtractionNamespace")
   @LazySingleton
-  public final Function<String, Function<String, String>> getFunctionMaker(
+  public Function<String, Function<String, String>> getFunctionMaker(
       @Named("namespaceExtractionFunctionCache")
       final ConcurrentMap<String, Function<String, String>> fnCache
   )

diff --git a/extensions/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageDruidModule.java b/extensions/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageDruidModule.java
@@ -95,14 +95,14 @@ public void configure(Binder binder)
 
   @Provides
   @LazySingleton
-  public final AWSCredentialsProvider getAWSCredentialsProvider(final AWSCredentialsConfig config)
+  public AWSCredentialsProvider getAWSCredentialsProvider(final AWSCredentialsConfig config)
   {
     return AWSCredentialsUtils.defaultAWSCredentialsProviderChain(config);
   }
 
   @Provides
   @LazySingleton
-  public final RestS3Service getRestS3Service(AWSCredentialsProvider provider)
+  public RestS3Service getRestS3Service(AWSCredentialsProvider provider)
   {
     if(provider.getCredentials() instanceof com.amazonaws.auth.AWSSessionCredentials) {
       return new RestS3Service(new AWSSessionCredentialsAdapter(provider));

diff --git a/integration-tests/src/main/java/io/druid/testing/guice/DruidTestModule.java b/integration-tests/src/main/java/io/druid/testing/guice/DruidTestModule.java
@@ -44,7 +44,7 @@ public void configure(Binder binder)
 
   @Provides
   @LazySingleton
-  public final ServiceEmitter getServiceEmitter(Supplier<LoggingEmitterConfig> config, ObjectMapper jsonMapper)
+  public ServiceEmitter getServiceEmitter(Supplier<LoggingEmitterConfig> config, ObjectMapper jsonMapper)
   {
     return new ServiceEmitter("", "", new LoggingEmitter(config.get(), jsonMapper));
   }

diff --git a/pom.xml b/pom.xml
@@ -69,12 +69,11 @@
         <apache.curator.version>2.8.0</apache.curator.version>
         <jetty.version>9.2.5.v20141112</jetty.version>
         <jersey.version>1.19</jersey.version>
-        <druid.api.version>0.3.10</druid.api.version>
+        <druid.api.version>0.3.9</druid.api.version>
         <jackson.version>2.4.4</jackson.version>
         <log4j.version>2.2</log4j.version>
         <slf4j.version>1.7.10</slf4j.version>
         <hadoop.compile.version>2.3.0</hadoop.compile.version>
-        <guice.version>4.0</guice.version>
     </properties>
 
     <modules>
@@ -236,17 +235,17 @@
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
-                <version>${guice.version}</version>
+                <version>4.0-beta</version>
             </dependency>
             <dependency>
                 <groupId>com.google.inject.extensions</groupId>
                 <artifactId>guice-servlet</artifactId>
-                <version>${guice.version}</version>
+                <version>4.0-beta</version>
             </dependency>
             <dependency>
                 <groupId>com.google.inject.extensions</groupId>
                 <artifactId>guice-multibindings</artifactId>
-                <version>${guice.version}</version>
+                <version>4.0-beta</version>
             </dependency>
             <dependency>
                 <groupId>com.ibm.icu</groupId>

diff --git a/processing/src/main/java/io/druid/guice/ConfigModule.java b/processing/src/main/java/io/druid/guice/ConfigModule.java
@@ -39,7 +39,7 @@ public void configure(Binder binder)
   }
 
   @Provides @LazySingleton
-  public final ConfigurationObjectFactory makeFactory(Properties props)
+  public ConfigurationObjectFactory makeFactory(Properties props)
   {
     return Config.createFactory(props);
   }

diff --git a/processing/src/main/java/io/druid/jackson/JacksonModule.java b/processing/src/main/java/io/druid/jackson/JacksonModule.java
@@ -39,13 +39,13 @@ public void configure(Binder binder)
   }
 
   @Provides @LazySingleton @Json
-  public final ObjectMapper jsonMapper()
+  public ObjectMapper jsonMapper()
   {
     return new DefaultObjectMapper();
   }
 
   @Provides @LazySingleton @Smile
-  public final ObjectMapper smileMapper()
+  public ObjectMapper smileMapper()
   {
     final SmileFactory smileFactory = new SmileFactory();
     smileFactory.configure(SmileGenerator.Feature.ENCODE_BINARY_AS_7BIT, false);

diff --git a/processing/src/test/java/io/druid/guice/MetadataStorageTablesConfigTest.java b/processing/src/test/java/io/druid/guice/MetadataStorageTablesConfigTest.java
@@ -52,7 +52,7 @@ public void configure(Binder binder)
 
           @Provides
           @LazySingleton
-          public final ObjectMapper jsonMapper()
+          public ObjectMapper jsonMapper()
           {
             return new DefaultObjectMapper();
           }

diff --git a/server/src/main/java/io/druid/curator/CuratorModule.java b/server/src/main/java/io/druid/curator/CuratorModule.java
@@ -45,7 +45,7 @@ public void configure(Binder binder)
   }
 
   @Provides @LazySingleton
-  public final CuratorFramework makeCurator(CuratorConfig config, Lifecycle lifecycle) throws IOException
+  public CuratorFramework makeCurator(CuratorConfig config, Lifecycle lifecycle) throws IOException
   {
     final CuratorFramework framework =
         CuratorFrameworkFactory.builder()

diff --git a/server/src/main/java/io/druid/curator/discovery/DiscoveryModule.java b/server/src/main/java/io/druid/curator/discovery/DiscoveryModule.java
@@ -145,7 +145,7 @@ public void configure(Binder binder)
   @Provides
   @LazySingleton
   @Named(NAME)
-  public final CuratorServiceAnnouncer getServiceAnnouncer(
+  public CuratorServiceAnnouncer getServiceAnnouncer(
       final CuratorServiceAnnouncer announcer,
       final Injector injector,
       final Set<KeyHolder<DruidNode>> nodesToAnnounce,
@@ -190,7 +190,7 @@ public void stop()
 
   @Provides
   @LazySingleton
-  public final ServiceDiscovery<Void> getServiceDiscovery(
+  public ServiceDiscovery<Void> getServiceDiscovery(
       CuratorFramework curator,
       CuratorDiscoveryConfig config,
       Lifecycle lifecycle
@@ -233,7 +233,7 @@ public void stop()
 
   @Provides
   @LazySingleton
-  public final ServerDiscoveryFactory getServerDiscoveryFactory(
+  public ServerDiscoveryFactory getServerDiscoveryFactory(
       ServiceDiscovery<Void> serviceDiscovery
   )
   {

diff --git a/server/src/main/java/io/druid/guice/AWSModule.java b/server/src/main/java/io/druid/guice/AWSModule.java
@@ -38,14 +38,14 @@ public void configure(Binder binder)
 
   @Provides
   @LazySingleton
-  public final AWSCredentialsProvider getAWSCredentialsProvider(final AWSCredentialsConfig config)
+  public AWSCredentialsProvider getAWSCredentialsProvider(final AWSCredentialsConfig config)
   {
     return AWSCredentialsUtils.defaultAWSCredentialsProviderChain(config);
   }
 
   @Provides
   @LazySingleton
-  public final AmazonEC2 getEc2Client(AWSCredentialsProvider credentials)
+  public AmazonEC2 getEc2Client(AWSCredentialsProvider credentials)
   {
     return new AmazonEC2Client(credentials);
   }

diff --git a/server/src/main/java/io/druid/guice/AnnouncerModule.java b/server/src/main/java/io/druid/guice/AnnouncerModule.java
@@ -45,7 +45,7 @@ public void configure(Binder binder)
 
   @Provides
   @ManageLifecycle
-  public final Announcer getAnnouncer(CuratorFramework curator)
+  public Announcer getAnnouncer(CuratorFramework curator)
   {
     return new Announcer(curator, Execs.singleThreaded("Announcer-%s"));
   }

diff --git a/server/src/main/java/io/druid/guice/DruidProcessingModule.java b/server/src/main/java/io/druid/guice/DruidProcessingModule.java
@@ -60,7 +60,7 @@ public void configure(Binder binder)
   @Provides
   @BackgroundCaching
   @LazySingleton
-  public final ExecutorService getBackgroundExecutorService(
+  public ExecutorService getBackgroundExecutorService(
       CacheConfig cacheConfig
   )
   {
@@ -81,7 +81,7 @@ public final ExecutorService getBackgroundExecutorService(
   @Provides
   @Processing
   @ManageLifecycle
-  public final ExecutorService getProcessingExecutorService(
+  public ExecutorService getProcessingExecutorService(
       ExecutorServiceConfig config,
       ServiceEmitter emitter,
       Lifecycle lifecycle
@@ -100,7 +100,7 @@ public final ExecutorService getProcessingExecutorService(
   @Provides
   @LazySingleton
   @Global
-  public final StupidPool<ByteBuffer> getIntermediateResultsPool(DruidProcessingConfig config)
+  public StupidPool<ByteBuffer> getIntermediateResultsPool(DruidProcessingConfig config)
   {
     try {
       long maxDirectMemory = VMUtils.getMaxDirectMemory();