From 77141716ba737af3d6b3672d442384fcb6b3f11e Mon Sep 17 00:00:00 2001 From: javanna Date: Mon, 9 Jan 2017 18:14:26 +0100 Subject: [PATCH] adjust some javadocs and methods visibility --- .../action/search/RemoteClusterService.java | 4 ++-- .../action/search/SearchTransportService.java | 2 -- .../action/search/TransportSearchAction.java | 2 -- .../elasticsearch/transport/TransportActionProxy.java | 10 +++++----- .../org/elasticsearch/transport/TransportService.java | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/action/search/RemoteClusterService.java b/core/src/main/java/org/elasticsearch/action/search/RemoteClusterService.java index c25eeaa7340..a93ba345a5f 100644 --- a/core/src/main/java/org/elasticsearch/action/search/RemoteClusterService.java +++ b/core/src/main/java/org/elasticsearch/action/search/RemoteClusterService.java @@ -108,7 +108,7 @@ public final class RemoteClusterService extends AbstractComponent implements Clo } /** - * This method updates the list of remote clusters. it's intendet to be used as a update consumer on the settings infrastructure + * This method updates the list of remote clusters. It's intended to be used as an update consumer on the settings infrastructure * @param seedSettings the group settings returned from {@link #REMOTE_CLUSTERS_SEEDS} * @param connectionListener a listener invoked once every configured cluster has been connected to */ @@ -288,7 +288,7 @@ public final class RemoteClusterService extends AbstractComponent implements Clo * Returns a connection to the given node on the given remote cluster * @throws IllegalArgumentException if the remote cluster is unknown */ - Transport.Connection getConnection(DiscoveryNode node, String cluster) { + private Transport.Connection getConnection(DiscoveryNode node, String cluster) { RemoteClusterConnection connection = remoteClusters.get(cluster); if (connection == null) { throw new IllegalArgumentException("no such remote cluster: " + cluster); diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java b/core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java index 77754c55bd4..f4ccd837ac6 100644 --- a/core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java +++ b/core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java @@ -411,6 +411,4 @@ public class SearchTransportService extends AbstractLifecycleComponent { protected void doClose() throws IOException { remoteClusterService.close(); } - - } diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java index 17101b3f552..1b080a66211 100644 --- a/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java +++ b/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java @@ -227,8 +227,6 @@ public class TransportSearchAction extends HandledTransportAction listener) { throw new UnsupportedOperationException("the task parameter is required"); diff --git a/core/src/main/java/org/elasticsearch/transport/TransportActionProxy.java b/core/src/main/java/org/elasticsearch/transport/TransportActionProxy.java index f74696a9b40..b10c29c008a 100644 --- a/core/src/main/java/org/elasticsearch/transport/TransportActionProxy.java +++ b/core/src/main/java/org/elasticsearch/transport/TransportActionProxy.java @@ -28,7 +28,7 @@ import java.io.IOException; import java.io.UncheckedIOException; /** - * TransportActionProxy allows an arbitrary action to be executed on a defined target node while the initial request is send to a second + * TransportActionProxy allows an arbitrary action to be executed on a defined target node while the initial request is sent to a second * node that acts as a request proxy to the target node. This is useful if a node is not directly connected to a target node but is * connected to an intermediate node that establishes a transitive connection. */ @@ -42,7 +42,7 @@ public final class TransportActionProxy { private final String action; private final Supplier responseFactory; - public ProxyRequestHandler(TransportService service, String action, Supplier responseFactory) { + ProxyRequestHandler(TransportService service, String action, Supplier responseFactory) { this.service = service; this.action = action; this.responseFactory = responseFactory; @@ -61,7 +61,7 @@ public final class TransportActionProxy { private final Supplier responseFactory; private final TransportChannel channel; - public ProxyResponseHandler(TransportChannel channel, Supplier responseFactory) { + ProxyResponseHandler(TransportChannel channel, Supplier responseFactory) { this.responseFactory = responseFactory; this.channel = channel; @@ -100,11 +100,11 @@ public final class TransportActionProxy { Supplier supplier; DiscoveryNode targetNode; - public ProxyRequest(Supplier supplier) { + ProxyRequest(Supplier supplier) { this.supplier = supplier; } - public ProxyRequest(T wrapped, DiscoveryNode targetNode) { + ProxyRequest(T wrapped, DiscoveryNode targetNode) { this.wrapped = wrapped; this.targetNode = targetNode; } diff --git a/core/src/main/java/org/elasticsearch/transport/TransportService.java b/core/src/main/java/org/elasticsearch/transport/TransportService.java index 28527d938fb..debdea19e01 100644 --- a/core/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/core/src/main/java/org/elasticsearch/transport/TransportService.java @@ -351,7 +351,7 @@ public class TransportService extends AbstractLifecycleComponent { * Executes a high-level handshake using the given connection * and returns the discovery node of the node the connection * was established with. The handshake will fail if the cluster - * name on the target node mismatches the local cluster name. + * name on the target node doesn't match the local cluster name. * * @param connection the connection to a specific node * @param handshakeTimeout handshake timeout