提交 ebf1ac47 编写于 作者: F fjy

Merge branch 'master' of github.com:metamx/druid

...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.5.28-SNAPSHOT</version> <version>0.5.29-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.5.28-SNAPSHOT</version> <version>0.5.29-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.5.28-SNAPSHOT</version> <version>0.5.29-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.5.28-SNAPSHOT</version> <version>0.5.29-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.5.28-SNAPSHOT</version> <version>0.5.29-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.5.28-SNAPSHOT</version> <version>0.5.29-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
......
package com.metamx.druid.indexing.worker.executor; package com.metamx.druid.indexing.worker.executor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.metamx.druid.indexing.common.index.ChatHandler; import com.metamx.druid.indexing.common.index.ChatHandler;
import com.metamx.druid.indexing.common.index.EventReceivingChatHandlerProvider; import com.metamx.druid.indexing.common.index.ChatHandlerProvider;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.PathParam; import javax.ws.rs.PathParam;
...@@ -13,13 +12,11 @@ import javax.ws.rs.core.Response; ...@@ -13,13 +12,11 @@ import javax.ws.rs.core.Response;
@Path("/druid/worker/v1") @Path("/druid/worker/v1")
public class ChatHandlerResource public class ChatHandlerResource
{ {
private final ObjectMapper jsonMapper; private final ChatHandlerProvider handlers;
private final EventReceivingChatHandlerProvider handlers;
@Inject @Inject
public ChatHandlerResource(ObjectMapper jsonMapper, EventReceivingChatHandlerProvider handlers) public ChatHandlerResource(ChatHandlerProvider handlers)
{ {
this.jsonMapper = jsonMapper;
this.handlers = handlers; this.handlers = handlers;
} }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>0.5.28-SNAPSHOT</version> <version>0.5.29-SNAPSHOT</version>
<name>druid</name> <name>druid</name>
<description>druid</description> <description>druid</description>
<scm> <scm>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.5.28-SNAPSHOT</version> <version>0.5.29-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.5.28-SNAPSHOT</version> <version>0.5.29-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
......
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
<artifactId>druid-services</artifactId> <artifactId>druid-services</artifactId>
<name>druid-services</name> <name>druid-services</name>
<description>druid-services</description> <description>druid-services</description>
<version>0.5.28-SNAPSHOT</version> <version>0.5.29-SNAPSHOT</version>
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.5.28-SNAPSHOT</version> <version>0.5.29-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册