From 72b75d809dc00dfe91f087473f555216590609bb Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Mon, 12 Mar 2018 22:59:42 +0900
Subject: [PATCH] fix #1556 add createTransportClient
---
.../codelibs/fess/es/client/FessEsClient.java | 26 +++++++++++--------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
index 448e8036e..76d0fdc72 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -269,17 +269,7 @@ public class FessEsClient implements Client {
client = runner.client();
addTransportAddress("localhost", runner.node().settings().getAsInt("transport.tcp.port", 9300));
} else {
- final Builder settingsBuilder = Settings.builder();
- settingsBuilder.put("cluster.name", fessConfig.getElasticsearchClusterName());
- settingsBuilder.put("client.transport.sniff", fessConfig.isElasticsearchTransportSniff());
- settingsBuilder.put("client.transport.ping_timeout", fessConfig.getElasticsearchTransportPingTimeout());
- settingsBuilder.put("client.transport.nodes_sampler_interval", fessConfig.getElasticsearchTransportNodesSamplerInterval());
- final Settings settings = settingsBuilder.build();
- final TransportClient transportClient = new PreBuiltTransportClient(settings);
- for (final TransportAddress address : transportAddressList) {
- transportClient.addTransportAddress(address);
- }
- client = transportClient;
+ client = createTransportClient(fessConfig);
}
if (StringUtil.isBlank(transportAddressesValue)) {
@@ -353,6 +343,20 @@ public class FessEsClient implements Client {
});
}
+ protected Client createTransportClient(final FessConfig fessConfig) {
+ final Builder settingsBuilder = Settings.builder();
+ settingsBuilder.put("cluster.name", fessConfig.getElasticsearchClusterName());
+ settingsBuilder.put("client.transport.sniff", fessConfig.isElasticsearchTransportSniff());
+ settingsBuilder.put("client.transport.ping_timeout", fessConfig.getElasticsearchTransportPingTimeout());
+ settingsBuilder.put("client.transport.nodes_sampler_interval", fessConfig.getElasticsearchTransportNodesSamplerInterval());
+ final Settings settings = settingsBuilder.build();
+ final TransportClient transportClient = new PreBuiltTransportClient(settings);
+ for (final TransportAddress address : transportAddressList) {
+ transportClient.addTransportAddress(address);
+ }
+ return transportClient;
+ }
+
public boolean existsIndex(final String indexName) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
boolean exists = false;
--
GitLab