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 2015/06/01 19:23:58 UTC
[07/50] incubator-ignite git commit: # IGNITE-943
DiscoverySpi.setNodeAttributes should return void
# IGNITE-943 DiscoverySpi.setNodeAttributes should return void
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/966276e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/966276e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/966276e1
Branch: refs/heads/ignite-218
Commit: 966276e11b593f09d8f211aa1d2e6e51671d6bf7
Parents: 0e192ef
Author: sevdokimov <se...@gridgain.com>
Authored: Thu May 28 12:28:49 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu May 28 14:46:07 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/DiscoverySpi.java | 2 +-
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 4 +---
.../org/apache/ignite/internal/GridReleaseTypeSelfTest.java | 8 ++------
...acheAffinityFunctionExcludeNeighborsAbstractSelfTest.java | 4 +---
4 files changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/966276e1/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 4996d16..f9cec34 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
@@ -81,7 +81,7 @@ public interface DiscoverySpi extends IgniteSpi {
* @param attrs Map of node attributes.
* @param ver Product version.
*/
- public TcpDiscoverySpi setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver);
+ public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver);
/**
* Sets a listener for discovery events. Refer to
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/966276e1/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 5676fd5..71ba0f1 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
@@ -769,7 +769,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
}
/** {@inheritDoc} */
- @Override public TcpDiscoverySpi setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver) {
+ @Override public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver) {
assert locNodeAttrs == null;
assert locNodeVer == null;
@@ -780,8 +780,6 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
locNodeAttrs = attrs;
locNodeVer = ver;
-
- return this;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/966276e1/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
index 603f66c..e6a69cc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
@@ -49,13 +49,11 @@ public class GridReleaseTypeSelfTest extends GridCommonAbstractTest {
if (clientMode) {
discoSpi = new TcpDiscoverySpi() {
- @Override public TcpDiscoverySpi setNodeAttributes(Map<String, Object> attrs,
+ @Override public void setNodeAttributes(Map<String, Object> attrs,
IgniteProductVersion ver) {
super.setNodeAttributes(attrs, ver);
attrs.put(IgniteNodeAttributes.ATTR_BUILD_VER, nodeVer);
-
- return this;
}
};
@@ -65,13 +63,11 @@ public class GridReleaseTypeSelfTest extends GridCommonAbstractTest {
}
else {
discoSpi = new TcpDiscoverySpi() {
- @Override public TcpDiscoverySpi setNodeAttributes(Map<String, Object> attrs,
+ @Override public void setNodeAttributes(Map<String, Object> attrs,
IgniteProductVersion ver) {
super.setNodeAttributes(attrs, ver);
attrs.put(IgniteNodeAttributes.ATTR_BUILD_VER, nodeVer);
-
- return this;
}
};
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/966276e1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
index e7daec3..7cdf265 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
@@ -55,7 +55,7 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest
// Override node attributes in discovery spi.
TcpDiscoverySpi spi = new TcpDiscoverySpi() {
- @Override public TcpDiscoverySpi setNodeAttributes(Map<String, Object> attrs,
+ @Override public void setNodeAttributes(Map<String, Object> attrs,
IgniteProductVersion ver) {
super.setNodeAttributes(attrs, ver);
@@ -65,8 +65,6 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest
attrs.put(IgniteNodeAttributes.ATTR_MACS, macAddrs);
gridInstanceNum++;
-
- return this;
}
};