honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 18:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adopt changes to TransportClient constructor (elastic/elasticsearch#4141)

Browse Source 
Follow-up for elastic/elasticsearchelastic/elasticsearch#21709

Original commit: elastic/x-pack-elasticsearch@40d3725ac2
This commit is contained in:
Simon Willnauer 2016-11-22 20:46:43 +01:00 committed by GitHub
parent 7821203422
commit 7f28ca7fb7
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elasticsearch-transport-client/src/main/java/org/elasticsearch/xpack/client/PreBuiltXPackTransportClient.java
View File

@ -35,7 +35,11 @@ public class PreBuiltXPackTransportClient extends PreBuiltTransportClient {
}
public PreBuiltXPackTransportClient(Settings settings, Collection<Class<? extends Plugin>> plugins) {
super(settings, addPlugins(plugins, Collections.singletonList(XPackPlugin.class)));
this(settings, addPlugins(plugins, Collections.singletonList(XPackPlugin.class)), null);
}
public PreBuiltXPackTransportClient(Settings settings, Collection<Class<? extends Plugin>> plugins, HostFailureListener hostFailureListener) {
super(settings, addPlugins(plugins, Collections.singletonList(XPackPlugin.class)), hostFailureListener);
}
@Override

2
elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrail.java
View File

@ -805,7 +805,7 @@ public class IndexAuditTrail extends AbstractComponent implements AuditTrail, Cl
final Settings theClientSetting = clientSettings.filter((s) -> s.startsWith("hosts") == false); // hosts is not a valid setting
final TransportClient transportClient = new TransportClient(Settings.builder()
.put("node.name", DEFAULT_CLIENT_NAME + "-" + Node.NODE_NAME_SETTING.get(settings))
.put(theClientSetting).build(), Settings.EMPTY, Collections.singletonList(XPackPlugin.class)) {};
.put(theClientSetting).build(), Settings.EMPTY, Collections.singletonList(XPackPlugin.class), null) {};
for (Tuple<String, Integer> pair : hostPortPairs) {
try {
transportClient.addTransportAddress(new TransportAddress(InetAddress.getByName(pair.v1()), pair.v2()));

2
elasticsearch/src/test/java/org/elasticsearch/xpack/TestXPackTransportClient.java
View File

@ -25,6 +25,6 @@ public class TestXPackTransportClient extends TransportClient {
}
public TestXPackTransportClient(Settings settings, Collection<Class<? extends Plugin>> plugins) {
super(settings, Settings.EMPTY, addPlugins(plugins, XPackPlugin.class, MockTcpTransportPlugin.class));
super(settings, Settings.EMPTY, addPlugins(plugins, XPackPlugin.class, MockTcpTransportPlugin.class), null);
}
}