Skip to content

Commit 660d036

Browse files
author
Matt Hartzler
committed
allow Client implementation to be set via the config file
1 parent 5e8c6f2 commit 660d036

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClientModule.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,22 @@
2424
import org.elasticsearch.client.ClusterAdminClient;
2525
import org.elasticsearch.client.IndicesAdminClient;
2626
import org.elasticsearch.common.inject.AbstractModule;
27+
import org.elasticsearch.common.settings.Settings;
2728

2829
/**
2930
* @author kimchy (shay.banon)
3031
*/
3132
public class NodeClientModule extends AbstractModule {
33+
private final Settings settings;
34+
35+
public NodeClientModule(Settings settings) {
36+
this.settings = settings;
37+
}
3238

3339
@Override protected void configure() {
3440
bind(ClusterAdminClient.class).to(NodeClusterAdminClient.class).asEagerSingleton();
3541
bind(IndicesAdminClient.class).to(NodeIndicesAdminClient.class).asEagerSingleton();
3642
bind(AdminClient.class).to(NodeAdminClient.class).asEagerSingleton();
37-
bind(Client.class).to(NodeClient.class).asEagerSingleton();
43+
bind(Client.class).to(settings.getAsClass("client.type", NodeClient.class, "org.elasticsearch.client.node", "Client")).asEagerSingleton();
3844
}
3945
}

modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/InternalNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public InternalNode(Settings pSettings, boolean loadConfigSettings) throws Elast
141141
modules.add(new TransportActionModule());
142142
modules.add(new MonitorModule(settings));
143143
modules.add(new GatewayModule(settings));
144-
modules.add(new NodeClientModule());
144+
modules.add(new NodeClientModule(settings));
145145

146146
injector = modules.createInjector();
147147

@@ -320,4 +320,4 @@ public static void main(String[] args) throws Exception {
320320
}
321321
});
322322
}
323-
}
323+
}

0 commit comments

Comments
 (0)