You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/31 07:35:34 UTC
[03/19] ignite git commit: Fixed DiscoverySpi methods return types.
Fixed DiscoverySpi methods return types.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0f8af137
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0f8af137
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0f8af137
Branch: refs/heads/ignite-5075
Commit: 0f8af137caa6d2ab5bd00ea33a34d4a969adff2b
Parents: 6987611
Author: Ижиков Николай Владимирович <ni...@gmail.com>
Authored: Mon May 29 17:23:17 2017 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon May 29 17:23:17 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/DiscoverySpi.java | 9 +++------
.../apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 8 ++------
.../ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java | 4 ++--
3 files changed, 7 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0f8af137/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
index 2379337..98222a3 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
@@ -26,7 +26,6 @@ import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.spi.IgniteSpi;
import org.apache.ignite.spi.IgniteSpiException;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.jetbrains.annotations.Nullable;
/**
@@ -89,7 +88,7 @@ public interface DiscoverySpi extends IgniteSpi {
/**
* Sets node attributes and node version which will be distributed in grid during
* join process. Note that these attributes cannot be changed and set only once.
- *
+ *set
* @param attrs Map of node attributes.
* @param ver Product version.
*/
@@ -113,9 +112,8 @@ public interface DiscoverySpi extends IgniteSpi {
* Sets a handler for initial data exchange between Ignite nodes.
*
* @param exchange Discovery data exchange handler.
- * @return {@code this} for chaining.
*/
- public TcpDiscoverySpi setDataExchange(DiscoverySpiDataExchange exchange);
+ public void setDataExchange(DiscoverySpiDataExchange exchange);
/**
* Sets discovery metrics provider. Use metrics provided by
@@ -123,9 +121,8 @@ public interface DiscoverySpi extends IgniteSpi {
* dynamic metrics between nodes.
*
* @param metricsProvider Provider of metrics data.
- * @return {@code this} for chaining.
*/
- public TcpDiscoverySpi setMetricsProvider(DiscoveryMetricsProvider metricsProvider);
+ public void setMetricsProvider(DiscoveryMetricsProvider metricsProvider);
/**
* Tells discovery SPI to disconnect from topology. This is very close to calling
http://git-wip-us.apache.org/repos/asf/ignite/blob/0f8af137/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 2a55412..371f308 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1311,17 +1311,13 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
}
/** {@inheritDoc} */
- @Override public TcpDiscoverySpi setDataExchange(DiscoverySpiDataExchange exchange) {
+ @Override public void setDataExchange(DiscoverySpiDataExchange exchange) {
this.exchange = exchange;
-
- return this;
}
/** {@inheritDoc} */
- @Override public TcpDiscoverySpi setMetricsProvider(DiscoveryMetricsProvider metricsProvider) {
+ @Override public void setMetricsProvider(DiscoveryMetricsProvider metricsProvider) {
this.metricsProvider = metricsProvider;
-
- return this;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/0f8af137/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
index 641c7d1..bf48fcc 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
@@ -2132,8 +2132,8 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
static volatile int marshalledItems;
/** {@inheritDoc} */
- @Override public TcpDiscoverySpi setDataExchange(final DiscoverySpiDataExchange exchange) {
- return super.setDataExchange(new DiscoverySpiDataExchange() {
+ @Override public void setDataExchange(final DiscoverySpiDataExchange exchange) {
+ super.setDataExchange(new DiscoverySpiDataExchange() {
@Override public DiscoveryDataBag collect(DiscoveryDataBag dataBag) {
DiscoveryDataBag bag = exchange.collect(dataBag);