use a separate annotation for the router, less confusing

This commit is contained in:
fjy 2014-04-16 10:08:58 -07:00
parent 24a0268036
commit 51e2da9d8d
3 changed files with 40 additions and 2 deletions

View File

@ -30,6 +30,7 @@ import com.metamx.http.client.HttpClient;
import com.metamx.http.client.response.HttpResponseHandler; import com.metamx.http.client.response.HttpResponseHandler;
import io.druid.guice.annotations.Client; import io.druid.guice.annotations.Client;
import io.druid.query.Query; import io.druid.query.Query;
import io.druid.server.router.Router;
import org.jboss.netty.handler.codec.http.HttpHeaders; import org.jboss.netty.handler.codec.http.HttpHeaders;
import javax.inject.Inject; import javax.inject.Inject;
@ -52,7 +53,7 @@ public class RoutingDruidClient<IntermediateType, FinalType>
@Inject @Inject
public RoutingDruidClient( public RoutingDruidClient(
ObjectMapper objectMapper, ObjectMapper objectMapper,
@Client HttpClient httpClient @Router HttpClient httpClient
) )
{ {
this.objectMapper = objectMapper; this.objectMapper = objectMapper;

View File

@ -0,0 +1,36 @@
/*
* Druid - a distributed column store.
* Copyright (C) 2012, 2013 Metamarkets Group Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package io.druid.server.router;
import com.google.inject.BindingAnnotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
*/
@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@BindingAnnotation
public @interface Router
{
}

View File

@ -39,6 +39,7 @@ import io.druid.guice.annotations.Self;
import io.druid.server.initialization.JettyServerInitializer; import io.druid.server.initialization.JettyServerInitializer;
import io.druid.server.router.CoordinatorRuleManager; import io.druid.server.router.CoordinatorRuleManager;
import io.druid.server.router.QueryHostFinder; import io.druid.server.router.QueryHostFinder;
import io.druid.server.router.Router;
import io.druid.server.router.TieredBrokerConfig; import io.druid.server.router.TieredBrokerConfig;
import io.druid.server.router.TieredBrokerHostSelector; import io.druid.server.router.TieredBrokerHostSelector;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
@ -64,7 +65,7 @@ public class CliRouter extends ServerRunnable
protected List<Object> getModules() protected List<Object> getModules()
{ {
return ImmutableList.<Object>of( return ImmutableList.<Object>of(
new HttpClientModule("druid.router.http", Client.class), new HttpClientModule("druid.router.http", Router.class),
new Module() new Module()
{ {
@Override @Override