From 3d9f2bf531f4da93a918ea4829f043d5f6ee0c6e Mon Sep 17 00:00:00 2001 From: David Pilato Date: Wed, 27 Jul 2016 12:19:08 +0200 Subject: [PATCH] Revert last change and make generateCustomNameResolvers private in Node class --- .../client/transport/TransportClient.java | 6 +--- .../java/org/elasticsearch/node/Node.java | 19 ++++++++++-- .../plugins/DiscoveryPlugin.java | 30 ------------------- 3 files changed, 17 insertions(+), 38 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/client/transport/TransportClient.java b/core/src/main/java/org/elasticsearch/client/transport/TransportClient.java index 402cb455613..e8b8c5043e5 100644 --- a/core/src/main/java/org/elasticsearch/client/transport/TransportClient.java +++ b/core/src/main/java/org/elasticsearch/client/transport/TransportClient.java @@ -45,7 +45,6 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.node.Node; import org.elasticsearch.node.internal.InternalSettingsPreparer; import org.elasticsearch.plugins.ActionPlugin; -import org.elasticsearch.plugins.DiscoveryPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.plugins.SearchPlugin; @@ -64,8 +63,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static org.elasticsearch.plugins.DiscoveryPlugin.generateCustomNameResolvers; - /** * The transport client allows to create a client that is not part of the cluster, but simply connects to one * or more nodes directly by adding their respective addresses using {@link #addTransportAddress(org.elasticsearch.common.transport.TransportAddress)}. @@ -111,8 +108,7 @@ public abstract class TransportClient extends AbstractClient { final List resourcesToClose = new ArrayList<>(); final ThreadPool threadPool = new ThreadPool(settings); resourcesToClose.add(() -> ThreadPool.terminate(threadPool, 10, TimeUnit.SECONDS)); - final NetworkService networkService = new NetworkService(settings, - generateCustomNameResolvers(settings, pluginsService.filterPlugins(DiscoveryPlugin.class))); + final NetworkService networkService = new NetworkService(settings, Collections.emptyList()); NamedWriteableRegistry namedWriteableRegistry = new NamedWriteableRegistry(); try { final List> additionalSettings = new ArrayList<>(); diff --git a/core/src/main/java/org/elasticsearch/node/Node.java b/core/src/main/java/org/elasticsearch/node/Node.java index a208eec8796..760620af538 100644 --- a/core/src/main/java/org/elasticsearch/node/Node.java +++ b/core/src/main/java/org/elasticsearch/node/Node.java @@ -135,8 +135,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static org.elasticsearch.plugins.DiscoveryPlugin.generateCustomNameResolvers; - /** * A node represent a node within a cluster (cluster.name). The {@link #client()} can be used * in order to use a {@link Client} to perform actions/operations against the cluster. @@ -298,7 +296,7 @@ public class Node implements Closeable { final SettingsModule settingsModule = new SettingsModule(this.settings, additionalSettings, additionalSettingsFilter); resourcesToClose.add(resourceWatcherService); final NetworkService networkService = new NetworkService(settings, - generateCustomNameResolvers(settings, pluginsService.filterPlugins(DiscoveryPlugin.class))); + generateCustomNameResolvers(pluginsService.filterPlugins(DiscoveryPlugin.class))); final ClusterService clusterService = new ClusterService(settings, settingsModule.getClusterSettings(), threadPool); clusterService.add(scriptModule.getScriptService()); resourcesToClose.add(clusterService); @@ -725,4 +723,19 @@ public class Node implements Closeable { BigArrays createBigArrays(Settings settings, CircuitBreakerService circuitBreakerService) { return new BigArrays(settings, circuitBreakerService); } + + /** + * Generate Custom Name Resolvers list based on a Discovery Plugins list + * @param discoveryPlugins Discovery plugins list + */ + private List generateCustomNameResolvers(List discoveryPlugins) { + List customNameResolvers = new ArrayList<>(); + for (DiscoveryPlugin discoveryPlugin : discoveryPlugins) { + NetworkService.CustomNameResolver customNameResolver = discoveryPlugin.getCustomNameResolver(settings); + if (customNameResolver != null) { + customNameResolvers.add(customNameResolver); + } + } + return customNameResolvers; + } } diff --git a/core/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java b/core/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java index 17f6aa089cf..eb9e434e249 100644 --- a/core/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java +++ b/core/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java @@ -19,23 +19,8 @@ package org.elasticsearch.plugins; -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharFilter; -import org.apache.lucene.analysis.TokenFilter; -import org.apache.lucene.analysis.Tokenizer; import org.elasticsearch.common.network.NetworkService; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.index.analysis.AnalyzerProvider; -import org.elasticsearch.index.analysis.CharFilterFactory; -import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.index.analysis.TokenizerFactory; -import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import static java.util.Collections.emptyMap; /** * An additional extension point for {@link Plugin}s that extends Elasticsearch's discovery functionality. To add an additional @@ -57,19 +42,4 @@ public interface DiscoveryPlugin { default NetworkService.CustomNameResolver getCustomNameResolver(Settings settings) { return null; } - - /** - * Generate Custom Name Resolvers list based on a Discovery Plugins list - * @param discoveryPlugins Discovery plugins list - */ - static List generateCustomNameResolvers(Settings settings, List discoveryPlugins) { - List customNameResolvers = new ArrayList<>(); - for (DiscoveryPlugin discoveryPlugin : discoveryPlugins) { - NetworkService.CustomNameResolver customNameResolver = discoveryPlugin.getCustomNameResolver(settings); - if (customNameResolver != null) { - customNameResolvers.add(customNameResolver); - } - } - return customNameResolvers; - } }