You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/17 15:27:03 UTC

[3/5] ignite git commit: IGNITE-1499: Correct method naming conventions on public API.

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5fd4a5b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs
index 75fc712..039813b 100644
--- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs
+++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs
@@ -152,7 +152,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestProjection()
         {
-            IClusterGroup prj = _grid1.Cluster;
+            IClusterGroup prj = _grid1.GetCluster();
 
             Assert.NotNull(prj);
 
@@ -165,7 +165,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestCacheDefaultName()
         {
-            var cache = _grid1.Cache<int, int>(null);
+            var cache = _grid1.GetCache<int, int>(null);
 
             Assert.IsNotNull(cache);
 
@@ -182,7 +182,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             Assert.Catch(typeof(ArgumentException), () =>
             {
-                _grid1.Cache<int, int>("bad_name");
+                _grid1.GetCache<int, int>("bad_name");
             });
         }
 
@@ -192,7 +192,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestNodeContent()
         {
-            ICollection<IClusterNode> nodes = _grid1.Cluster.Nodes();
+            ICollection<IClusterNode> nodes = _grid1.GetCluster().GetNodes();
 
             foreach (IClusterNode node in nodes)
             {
@@ -200,9 +200,9 @@ namespace Apache.Ignite.Core.Tests.Compute
                 Assert.IsTrue(node.Addresses.Count > 0);
                 Assert.Throws<NotSupportedException>(() => node.Addresses.Add("addr"));
 
-                Assert.NotNull(node.Attributes());
-                Assert.IsTrue(node.Attributes().Count > 0);
-                Assert.Throws<NotSupportedException>(() => node.Attributes().Add("key", "val"));
+                Assert.NotNull(node.GetAttributes());
+                Assert.IsTrue(node.GetAttributes().Count > 0);
+                Assert.Throws<NotSupportedException>(() => node.GetAttributes().Add("key", "val"));
 
                 Assert.NotNull(node.HostNames);
                 Assert.Throws<NotSupportedException>(() => node.HostNames.Add("h"));
@@ -211,7 +211,7 @@ namespace Apache.Ignite.Core.Tests.Compute
 
                 Assert.IsTrue(node.Order > 0);
 
-                Assert.NotNull(node.Metrics());
+                Assert.NotNull(node.GetMetrics());
             }
         }
 
@@ -221,17 +221,17 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestClusterMetrics()
         {
-            var cluster = _grid1.Cluster;
+            var cluster = _grid1.GetCluster();
 
-            IClusterMetrics metrics = cluster.Metrics();
+            IClusterMetrics metrics = cluster.GetMetrics();
 
             Assert.IsNotNull(metrics);
 
-            Assert.AreEqual(cluster.Nodes().Count, metrics.TotalNodes);
+            Assert.AreEqual(cluster.GetNodes().Count, metrics.TotalNodes);
 
             Thread.Sleep(2000);
 
-            IClusterMetrics newMetrics = cluster.Metrics();
+            IClusterMetrics newMetrics = cluster.GetMetrics();
 
             Assert.IsFalse(metrics == newMetrics);
             Assert.IsTrue(metrics.LastUpdateTime < newMetrics.LastUpdateTime);
@@ -243,17 +243,17 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestNodeMetrics()
         {
-            var node = _grid1.Cluster.Node();
+            var node = _grid1.GetCluster().GetNode();
 
-            IClusterMetrics metrics = node.Metrics();
+            IClusterMetrics metrics = node.GetMetrics();
 
             Assert.IsNotNull(metrics);
 
-            Assert.IsTrue(metrics == node.Metrics());
+            Assert.IsTrue(metrics == node.GetMetrics());
 
             Thread.Sleep(2000);
 
-            IClusterMetrics newMetrics = node.Metrics();
+            IClusterMetrics newMetrics = node.GetMetrics();
 
             Assert.IsFalse(metrics == newMetrics);
             Assert.IsTrue(metrics.LastUpdateTime < newMetrics.LastUpdateTime);
@@ -265,15 +265,15 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestResetMetrics()
         {
-            var cluster = _grid1.Cluster;
+            var cluster = _grid1.GetCluster();
 
             Thread.Sleep(2000);
 
-            var metrics1 = cluster.Metrics();
+            var metrics1 = cluster.GetMetrics();
 
             cluster.ResetMetrics();
 
-            var metrics2 = cluster.Metrics();
+            var metrics2 = cluster.GetMetrics();
 
             Assert.IsNotNull(metrics1);
             Assert.IsNotNull(metrics2);
@@ -285,9 +285,9 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestPingNode()
         {
-            var cluster = _grid1.Cluster;
+            var cluster = _grid1.GetCluster();
 
-            Assert.IsTrue(cluster.Nodes().Select(node => node.Id).All(cluster.PingNode));
+            Assert.IsTrue(cluster.GetNodes().Select(node => node.Id).All(cluster.PingNode));
             
             Assert.IsFalse(cluster.PingNode(Guid.NewGuid()));
         }
@@ -298,17 +298,17 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestTopologyVersion()
         {
-            var cluster = _grid1.Cluster;
+            var cluster = _grid1.GetCluster();
             
             var topVer = cluster.TopologyVersion;
 
             Ignition.Stop(_grid3.Name, true);
 
-            Assert.AreEqual(topVer + 1, _grid1.Cluster.TopologyVersion);
+            Assert.AreEqual(topVer + 1, _grid1.GetCluster().TopologyVersion);
 
             _grid3 = Ignition.Start(Configuration("config\\compute\\compute-grid3.xml"));
 
-            Assert.AreEqual(topVer + 2, _grid1.Cluster.TopologyVersion);
+            Assert.AreEqual(topVer + 2, _grid1.GetCluster().TopologyVersion);
         }
 
         /// <summary>
@@ -317,18 +317,18 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestTopology()
         {
-            var cluster = _grid1.Cluster;
+            var cluster = _grid1.GetCluster();
 
-            Assert.AreEqual(1, cluster.Topology(1).Count);
+            Assert.AreEqual(1, cluster.GetTopology(1).Count);
 
-            Assert.AreEqual(null, cluster.Topology(int.MaxValue));
+            Assert.AreEqual(null, cluster.GetTopology(int.MaxValue));
 
             // Check that Nodes and Topology return the same for current version
             var topVer = cluster.TopologyVersion;
 
-            var top = cluster.Topology(topVer);
+            var top = cluster.GetTopology(topVer);
 
-            var nodes = cluster.Nodes();
+            var nodes = cluster.GetNodes();
 
             Assert.AreEqual(top.Count, nodes.Count);
 
@@ -339,7 +339,7 @@ namespace Apache.Ignite.Core.Tests.Compute
 
             try
             {
-                top = cluster.Topology(topVer);
+                top = cluster.GetTopology(topVer);
 
                 Assert.AreEqual(top.Count, nodes.Count);
 
@@ -357,31 +357,31 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestNodes()
         {
-            Assert.IsNotNull(_grid1.Cluster.Node());
+            Assert.IsNotNull(_grid1.GetCluster().GetNode());
 
-            ICollection<IClusterNode> nodes = _grid1.Cluster.Nodes();
+            ICollection<IClusterNode> nodes = _grid1.GetCluster().GetNodes();
 
             Assert.IsTrue(nodes.Count == 3);
 
             // Check subsequent call on the same topology.
-            nodes = _grid1.Cluster.Nodes();
+            nodes = _grid1.GetCluster().GetNodes();
 
             Assert.IsTrue(nodes.Count == 3);
 
             Assert.IsTrue(Ignition.Stop(_grid2.Name, true));
 
             // Check subsequent calls on updating topologies.
-            nodes = _grid1.Cluster.Nodes();
+            nodes = _grid1.GetCluster().GetNodes();
 
             Assert.IsTrue(nodes.Count == 2);
 
-            nodes = _grid1.Cluster.Nodes();
+            nodes = _grid1.GetCluster().GetNodes();
 
             Assert.IsTrue(nodes.Count == 2);
 
             _grid2 = Ignition.Start(Configuration("config\\compute\\compute-grid2.xml"));
 
-            nodes = _grid1.Cluster.Nodes();
+            nodes = _grid1.GetCluster().GetNodes();
 
             Assert.IsTrue(nodes.Count == 3);
         }
@@ -392,46 +392,46 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestForNodes()
         {
-            ICollection<IClusterNode> nodes = _grid1.Cluster.Nodes();
+            ICollection<IClusterNode> nodes = _grid1.GetCluster().GetNodes();
 
             IClusterNode first = nodes.ElementAt(0);
             IClusterNode second = nodes.ElementAt(1);
 
-            IClusterGroup singleNodePrj = _grid1.Cluster.ForNodeIds(first.Id);
-            Assert.AreEqual(1, singleNodePrj.Nodes().Count);
-            Assert.AreEqual(first.Id, singleNodePrj.Nodes().First().Id);
-
-            singleNodePrj = _grid1.Cluster.ForNodeIds(new List<Guid> { first.Id });
-            Assert.AreEqual(1, singleNodePrj.Nodes().Count);
-            Assert.AreEqual(first.Id, singleNodePrj.Nodes().First().Id);
-
-            singleNodePrj = _grid1.Cluster.ForNodes(first);
-            Assert.AreEqual(1, singleNodePrj.Nodes().Count);
-            Assert.AreEqual(first.Id, singleNodePrj.Nodes().First().Id);
-
-            singleNodePrj = _grid1.Cluster.ForNodes(new List<IClusterNode> { first });
-            Assert.AreEqual(1, singleNodePrj.Nodes().Count);
-            Assert.AreEqual(first.Id, singleNodePrj.Nodes().First().Id);
-
-            IClusterGroup multiNodePrj = _grid1.Cluster.ForNodeIds(first.Id, second.Id);
-            Assert.AreEqual(2, multiNodePrj.Nodes().Count);
-            Assert.IsTrue(multiNodePrj.Nodes().Contains(first));
-            Assert.IsTrue(multiNodePrj.Nodes().Contains(second));
-
-            multiNodePrj = _grid1.Cluster.ForNodeIds(new[] {first, second}.Select(x => x.Id));
-            Assert.AreEqual(2, multiNodePrj.Nodes().Count);
-            Assert.IsTrue(multiNodePrj.Nodes().Contains(first));
-            Assert.IsTrue(multiNodePrj.Nodes().Contains(second));
-
-            multiNodePrj = _grid1.Cluster.ForNodes(first, second);
-            Assert.AreEqual(2, multiNodePrj.Nodes().Count);
-            Assert.IsTrue(multiNodePrj.Nodes().Contains(first));
-            Assert.IsTrue(multiNodePrj.Nodes().Contains(second));
-
-            multiNodePrj = _grid1.Cluster.ForNodes(new List<IClusterNode> { first, second });
-            Assert.AreEqual(2, multiNodePrj.Nodes().Count);
-            Assert.IsTrue(multiNodePrj.Nodes().Contains(first));
-            Assert.IsTrue(multiNodePrj.Nodes().Contains(second));
+            IClusterGroup singleNodePrj = _grid1.GetCluster().ForNodeIds(first.Id);
+            Assert.AreEqual(1, singleNodePrj.GetNodes().Count);
+            Assert.AreEqual(first.Id, singleNodePrj.GetNodes().First().Id);
+
+            singleNodePrj = _grid1.GetCluster().ForNodeIds(new List<Guid> { first.Id });
+            Assert.AreEqual(1, singleNodePrj.GetNodes().Count);
+            Assert.AreEqual(first.Id, singleNodePrj.GetNodes().First().Id);
+
+            singleNodePrj = _grid1.GetCluster().ForNodes(first);
+            Assert.AreEqual(1, singleNodePrj.GetNodes().Count);
+            Assert.AreEqual(first.Id, singleNodePrj.GetNodes().First().Id);
+
+            singleNodePrj = _grid1.GetCluster().ForNodes(new List<IClusterNode> { first });
+            Assert.AreEqual(1, singleNodePrj.GetNodes().Count);
+            Assert.AreEqual(first.Id, singleNodePrj.GetNodes().First().Id);
+
+            IClusterGroup multiNodePrj = _grid1.GetCluster().ForNodeIds(first.Id, second.Id);
+            Assert.AreEqual(2, multiNodePrj.GetNodes().Count);
+            Assert.IsTrue(multiNodePrj.GetNodes().Contains(first));
+            Assert.IsTrue(multiNodePrj.GetNodes().Contains(second));
+
+            multiNodePrj = _grid1.GetCluster().ForNodeIds(new[] {first, second}.Select(x => x.Id));
+            Assert.AreEqual(2, multiNodePrj.GetNodes().Count);
+            Assert.IsTrue(multiNodePrj.GetNodes().Contains(first));
+            Assert.IsTrue(multiNodePrj.GetNodes().Contains(second));
+
+            multiNodePrj = _grid1.GetCluster().ForNodes(first, second);
+            Assert.AreEqual(2, multiNodePrj.GetNodes().Count);
+            Assert.IsTrue(multiNodePrj.GetNodes().Contains(first));
+            Assert.IsTrue(multiNodePrj.GetNodes().Contains(second));
+
+            multiNodePrj = _grid1.GetCluster().ForNodes(new List<IClusterNode> { first, second });
+            Assert.AreEqual(2, multiNodePrj.GetNodes().Count);
+            Assert.IsTrue(multiNodePrj.GetNodes().Contains(first));
+            Assert.IsTrue(multiNodePrj.GetNodes().Contains(second));
         }
 
         /// <summary>
@@ -440,7 +440,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestForNodesLaziness()
         {
-            var nodes = _grid1.Cluster.Nodes().Take(2).ToArray();
+            var nodes = _grid1.GetCluster().GetNodes().Take(2).ToArray();
 
             var callCount = 0;
             
@@ -456,12 +456,12 @@ namespace Apache.Ignite.Core.Tests.Compute
                 return node.Id;
             };
 
-            var projection = _grid1.Cluster.ForNodes(nodes.Select(nodeSelector));
-            Assert.AreEqual(2, projection.Nodes().Count);
+            var projection = _grid1.GetCluster().ForNodes(nodes.Select(nodeSelector));
+            Assert.AreEqual(2, projection.GetNodes().Count);
             Assert.AreEqual(2, callCount);
             
-            projection = _grid1.Cluster.ForNodeIds(nodes.Select(idSelector));
-            Assert.AreEqual(2, projection.Nodes().Count);
+            projection = _grid1.GetCluster().ForNodeIds(nodes.Select(idSelector));
+            Assert.AreEqual(2, projection.GetNodes().Count);
             Assert.AreEqual(4, callCount);
         }
 
@@ -471,10 +471,10 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestForLocal()
         {
-            IClusterGroup prj = _grid1.Cluster.ForLocal();
+            IClusterGroup prj = _grid1.GetCluster().ForLocal();
 
-            Assert.AreEqual(1, prj.Nodes().Count);
-            Assert.AreEqual(_grid1.Cluster.LocalNode, prj.Nodes().First());
+            Assert.AreEqual(1, prj.GetNodes().Count);
+            Assert.AreEqual(_grid1.GetCluster().GetLocalNode(), prj.GetNodes().First());
         }
 
         /// <summary>
@@ -483,13 +483,13 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestForRemotes()
         {
-            ICollection<IClusterNode> nodes = _grid1.Cluster.Nodes();
+            ICollection<IClusterNode> nodes = _grid1.GetCluster().GetNodes();
 
-            IClusterGroup prj = _grid1.Cluster.ForRemotes();
+            IClusterGroup prj = _grid1.GetCluster().ForRemotes();
 
-            Assert.AreEqual(2, prj.Nodes().Count);
-            Assert.IsTrue(nodes.Contains(prj.Nodes().ElementAt(0)));
-            Assert.IsTrue(nodes.Contains(prj.Nodes().ElementAt(1)));
+            Assert.AreEqual(2, prj.GetNodes().Count);
+            Assert.IsTrue(nodes.Contains(prj.GetNodes().ElementAt(0)));
+            Assert.IsTrue(nodes.Contains(prj.GetNodes().ElementAt(1)));
         }
 
         /// <summary>
@@ -498,14 +498,14 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestForHost()
         {
-            ICollection<IClusterNode> nodes = _grid1.Cluster.Nodes();
+            ICollection<IClusterNode> nodes = _grid1.GetCluster().GetNodes();
 
-            IClusterGroup prj = _grid1.Cluster.ForHost(nodes.First());
+            IClusterGroup prj = _grid1.GetCluster().ForHost(nodes.First());
 
-            Assert.AreEqual(3, prj.Nodes().Count);
-            Assert.IsTrue(nodes.Contains(prj.Nodes().ElementAt(0)));
-            Assert.IsTrue(nodes.Contains(prj.Nodes().ElementAt(1)));
-            Assert.IsTrue(nodes.Contains(prj.Nodes().ElementAt(2)));
+            Assert.AreEqual(3, prj.GetNodes().Count);
+            Assert.IsTrue(nodes.Contains(prj.GetNodes().ElementAt(0)));
+            Assert.IsTrue(nodes.Contains(prj.GetNodes().ElementAt(1)));
+            Assert.IsTrue(nodes.Contains(prj.GetNodes().ElementAt(2)));
         }
 
         /// <summary>
@@ -514,19 +514,19 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestForOldestYoungestRandom()
         {
-            ICollection<IClusterNode> nodes = _grid1.Cluster.Nodes();
+            ICollection<IClusterNode> nodes = _grid1.GetCluster().GetNodes();
 
-            IClusterGroup prj = _grid1.Cluster.ForYoungest();
-            Assert.AreEqual(1, prj.Nodes().Count);
-            Assert.IsTrue(nodes.Contains(prj.Node()));
+            IClusterGroup prj = _grid1.GetCluster().ForYoungest();
+            Assert.AreEqual(1, prj.GetNodes().Count);
+            Assert.IsTrue(nodes.Contains(prj.GetNode()));
 
-            prj = _grid1.Cluster.ForOldest();
-            Assert.AreEqual(1, prj.Nodes().Count);
-            Assert.IsTrue(nodes.Contains(prj.Node()));
+            prj = _grid1.GetCluster().ForOldest();
+            Assert.AreEqual(1, prj.GetNodes().Count);
+            Assert.IsTrue(nodes.Contains(prj.GetNode()));
 
-            prj = _grid1.Cluster.ForRandom();
-            Assert.AreEqual(1, prj.Nodes().Count);
-            Assert.IsTrue(nodes.Contains(prj.Node()));
+            prj = _grid1.GetCluster().ForRandom();
+            Assert.AreEqual(1, prj.GetNodes().Count);
+            Assert.IsTrue(nodes.Contains(prj.GetNode()));
         }
 
         /// <summary>
@@ -535,12 +535,12 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestForAttribute()
         {
-            ICollection<IClusterNode> nodes = _grid1.Cluster.Nodes();
+            ICollection<IClusterNode> nodes = _grid1.GetCluster().GetNodes();
 
-            IClusterGroup prj = _grid1.Cluster.ForAttribute("my_attr", "value1");
-            Assert.AreEqual(1, prj.Nodes().Count);
-            Assert.IsTrue(nodes.Contains(prj.Node()));
-            Assert.AreEqual("value1", prj.Nodes().First().Attribute<string>("my_attr"));
+            IClusterGroup prj = _grid1.GetCluster().ForAttribute("my_attr", "value1");
+            Assert.AreEqual(1, prj.GetNodes().Count);
+            Assert.IsTrue(nodes.Contains(prj.GetNode()));
+            Assert.AreEqual("value1", prj.GetNodes().First().GetAttribute<string>("my_attr"));
         }
         
         /// <summary>
@@ -549,28 +549,28 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestForCacheNodes()
         {
-            ICollection<IClusterNode> nodes = _grid1.Cluster.Nodes();
+            ICollection<IClusterNode> nodes = _grid1.GetCluster().GetNodes();
 
             // Cache nodes.
-            IClusterGroup prjCache = _grid1.Cluster.ForCacheNodes("cache1");
+            IClusterGroup prjCache = _grid1.GetCluster().ForCacheNodes("cache1");
 
-            Assert.AreEqual(2, prjCache.Nodes().Count);
+            Assert.AreEqual(2, prjCache.GetNodes().Count);
 
-            Assert.IsTrue(nodes.Contains(prjCache.Nodes().ElementAt(0)));
-            Assert.IsTrue(nodes.Contains(prjCache.Nodes().ElementAt(1)));
+            Assert.IsTrue(nodes.Contains(prjCache.GetNodes().ElementAt(0)));
+            Assert.IsTrue(nodes.Contains(prjCache.GetNodes().ElementAt(1)));
             
             // Data nodes.
-            IClusterGroup prjData = _grid1.Cluster.ForDataNodes("cache1");
+            IClusterGroup prjData = _grid1.GetCluster().ForDataNodes("cache1");
 
-            Assert.AreEqual(2, prjData.Nodes().Count);
+            Assert.AreEqual(2, prjData.GetNodes().Count);
 
-            Assert.IsTrue(prjCache.Nodes().Contains(prjData.Nodes().ElementAt(0)));
-            Assert.IsTrue(prjCache.Nodes().Contains(prjData.Nodes().ElementAt(1)));
+            Assert.IsTrue(prjCache.GetNodes().Contains(prjData.GetNodes().ElementAt(0)));
+            Assert.IsTrue(prjCache.GetNodes().Contains(prjData.GetNodes().ElementAt(1)));
 
             // Client nodes.
-            IClusterGroup prjClient = _grid1.Cluster.ForClientNodes("cache1");
+            IClusterGroup prjClient = _grid1.GetCluster().ForClientNodes("cache1");
 
-            Assert.AreEqual(0, prjClient.Nodes().Count);
+            Assert.AreEqual(0, prjClient.GetNodes().Count);
         }
         
         /// <summary>
@@ -579,15 +579,15 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestForPredicate()
         {
-            IClusterGroup prj1 = _grid1.Cluster.ForPredicate(new NotAttributePredicate("value1").Apply);
-            Assert.AreEqual(2, prj1.Nodes().Count);
+            IClusterGroup prj1 = _grid1.GetCluster().ForPredicate(new NotAttributePredicate("value1").Apply);
+            Assert.AreEqual(2, prj1.GetNodes().Count);
 
             IClusterGroup prj2 = prj1.ForPredicate(new NotAttributePredicate("value2").Apply);
-            Assert.AreEqual(1, prj2.Nodes().Count);
+            Assert.AreEqual(1, prj2.GetNodes().Count);
 
             string val;
 
-            prj2.Nodes().First().TryGetAttribute("my_attr", out val);
+            prj2.GetNodes().First().TryGetAttribute("my_attr", out val);
 
             Assert.IsTrue(val == null || (!val.Equals("value1") && !val.Equals("value2")));
         }
@@ -628,119 +628,119 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             decimal val;
 
-            Assert.AreEqual(val = decimal.Zero, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-
-            Assert.AreEqual(val = new decimal(0, 0, 1, false, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, 1, true, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, 1, false, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, 1, true, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, 1, false, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, 1, true, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, int.MinValue, false, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, int.MinValue, true, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, int.MinValue, false, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, int.MinValue, true, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, int.MinValue, false, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, int.MinValue, true, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, int.MaxValue, false, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, int.MaxValue, true, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, int.MaxValue, false, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, int.MaxValue, true, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, int.MaxValue, false, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 0, int.MaxValue, true, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-
-            Assert.AreEqual(val = new decimal(0, 1, 0, false, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 1, 0, true, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 1, 0, false, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 1, 0, true, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 1, 0, false, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, 1, 0, true, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, int.MinValue, 0, false, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, int.MinValue, 0, true, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, int.MinValue, 0, false, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, int.MinValue, 0, true, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, int.MinValue, 0, false, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, int.MinValue, 0, true, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, int.MaxValue, 0, false, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, int.MaxValue, 0, true, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, int.MaxValue, 0, false, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, int.MaxValue, 0, true, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, int.MaxValue, 0, false, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(0, int.MaxValue, 0, true, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-
-            Assert.AreEqual(val = new decimal(1, 0, 0, false, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(1, 0, 0, true, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(1, 0, 0, false, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(1, 0, 0, true, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(1, 0, 0, false, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(1, 0, 0, true, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(int.MinValue, 0, 0, false, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(int.MinValue, 0, 0, true, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(int.MinValue, 0, 0, false, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(int.MinValue, 0, 0, true, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(int.MinValue, 0, 0, false, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(int.MinValue, 0, 0, true, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(int.MaxValue, 0, 0, false, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(int.MaxValue, 0, 0, true, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(int.MaxValue, 0, 0, false, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(int.MaxValue, 0, 0, true, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(int.MaxValue, 0, 0, false, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(int.MaxValue, 0, 0, true, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-
-            Assert.AreEqual(val = new decimal(1, 1, 1, false, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(1, 1, 1, true, 0), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(1, 1, 1, false, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(1, 1, 1, true, 0) - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(1, 1, 1, false, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = new decimal(1, 1, 1, true, 0) + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-
-            Assert.AreEqual(val = decimal.Parse("65536"), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-65536"), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("65536") - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-65536") - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("65536") + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-65536") + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-
-            Assert.AreEqual(val = decimal.Parse("4294967296"), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-4294967296"), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("4294967296") - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-4294967296") - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("4294967296") + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-4294967296") + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-
-            Assert.AreEqual(val = decimal.Parse("281474976710656"), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-281474976710656"), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("281474976710656") - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-281474976710656") - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("281474976710656") + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-281474976710656") + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-
-            Assert.AreEqual(val = decimal.Parse("18446744073709551616"), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-18446744073709551616"), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("18446744073709551616") - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-18446744073709551616") - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("18446744073709551616") + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-18446744073709551616") + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-
-            Assert.AreEqual(val = decimal.Parse("1208925819614629174706176"), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-1208925819614629174706176"), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("1208925819614629174706176") - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-1208925819614629174706176") - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("1208925819614629174706176") + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-1208925819614629174706176") + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-
-            Assert.AreEqual(val = decimal.MaxValue, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.MinValue, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.MaxValue - 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.MinValue + 1, _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-
-            Assert.AreEqual(val = decimal.Parse("11,12"), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
-            Assert.AreEqual(val = decimal.Parse("-11,12"), _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Zero, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+
+            Assert.AreEqual(val = new decimal(0, 0, 1, false, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, 1, true, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, 1, false, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, 1, true, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, 1, false, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, 1, true, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, int.MinValue, false, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, int.MinValue, true, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, int.MinValue, false, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, int.MinValue, true, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, int.MinValue, false, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, int.MinValue, true, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, int.MaxValue, false, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, int.MaxValue, true, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, int.MaxValue, false, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, int.MaxValue, true, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, int.MaxValue, false, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 0, int.MaxValue, true, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+
+            Assert.AreEqual(val = new decimal(0, 1, 0, false, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 1, 0, true, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 1, 0, false, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 1, 0, true, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 1, 0, false, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, 1, 0, true, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, int.MinValue, 0, false, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, int.MinValue, 0, true, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, int.MinValue, 0, false, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, int.MinValue, 0, true, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, int.MinValue, 0, false, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, int.MinValue, 0, true, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, int.MaxValue, 0, false, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, int.MaxValue, 0, true, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, int.MaxValue, 0, false, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, int.MaxValue, 0, true, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, int.MaxValue, 0, false, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(0, int.MaxValue, 0, true, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+
+            Assert.AreEqual(val = new decimal(1, 0, 0, false, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(1, 0, 0, true, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(1, 0, 0, false, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(1, 0, 0, true, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(1, 0, 0, false, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(1, 0, 0, true, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(int.MinValue, 0, 0, false, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(int.MinValue, 0, 0, true, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(int.MinValue, 0, 0, false, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(int.MinValue, 0, 0, true, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(int.MinValue, 0, 0, false, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(int.MinValue, 0, 0, true, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(int.MaxValue, 0, 0, false, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(int.MaxValue, 0, 0, true, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(int.MaxValue, 0, 0, false, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(int.MaxValue, 0, 0, true, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(int.MaxValue, 0, 0, false, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(int.MaxValue, 0, 0, true, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+
+            Assert.AreEqual(val = new decimal(1, 1, 1, false, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(1, 1, 1, true, 0), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(1, 1, 1, false, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(1, 1, 1, true, 0) - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(1, 1, 1, false, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = new decimal(1, 1, 1, true, 0) + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+
+            Assert.AreEqual(val = decimal.Parse("65536"), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-65536"), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("65536") - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-65536") - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("65536") + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-65536") + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+
+            Assert.AreEqual(val = decimal.Parse("4294967296"), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-4294967296"), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("4294967296") - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-4294967296") - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("4294967296") + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-4294967296") + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+
+            Assert.AreEqual(val = decimal.Parse("281474976710656"), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-281474976710656"), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("281474976710656") - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-281474976710656") - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("281474976710656") + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-281474976710656") + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+
+            Assert.AreEqual(val = decimal.Parse("18446744073709551616"), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-18446744073709551616"), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("18446744073709551616") - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-18446744073709551616") - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("18446744073709551616") + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-18446744073709551616") + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+
+            Assert.AreEqual(val = decimal.Parse("1208925819614629174706176"), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-1208925819614629174706176"), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("1208925819614629174706176") - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-1208925819614629174706176") - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("1208925819614629174706176") + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-1208925819614629174706176") + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+
+            Assert.AreEqual(val = decimal.MaxValue, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.MinValue, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.MaxValue - 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.MinValue + 1, _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+
+            Assert.AreEqual(val = decimal.Parse("11,12"), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
+            Assert.AreEqual(val = decimal.Parse("-11,12"), _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { val, val.ToString() }));
 
             // Test echo with overflow.
             try
             {
-                _grid1.Compute().ExecuteJavaTask<object>(DecimalTask, new object[] { null, decimal.MaxValue.ToString() + 1 });
+                _grid1.GetCompute().ExecuteJavaTask<object>(DecimalTask, new object[] { null, decimal.MaxValue.ToString() + 1 });
 
                 Assert.Fail();
             }
@@ -756,7 +756,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestEchoTaskNull()
         {
-            Assert.IsNull(_grid1.Compute().ExecuteJavaTask<object>(EchoTask, EchoTypeNull));
+            Assert.IsNull(_grid1.GetCompute().ExecuteJavaTask<object>(EchoTask, EchoTypeNull));
         }
 
         /// <summary>
@@ -765,14 +765,14 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestEchoTaskPrimitives()
         {
-            Assert.AreEqual(1, _grid1.Compute().ExecuteJavaTask<byte>(EchoTask, EchoTypeByte));
-            Assert.AreEqual(true, _grid1.Compute().ExecuteJavaTask<bool>(EchoTask, EchoTypeBool));
-            Assert.AreEqual(1, _grid1.Compute().ExecuteJavaTask<short>(EchoTask, EchoTypeShort));
-            Assert.AreEqual((char)1, _grid1.Compute().ExecuteJavaTask<char>(EchoTask, EchoTypeChar));
-            Assert.AreEqual(1, _grid1.Compute().ExecuteJavaTask<int>(EchoTask, EchoTypeInt));
-            Assert.AreEqual(1, _grid1.Compute().ExecuteJavaTask<long>(EchoTask, EchoTypeLong));
-            Assert.AreEqual((float)1, _grid1.Compute().ExecuteJavaTask<float>(EchoTask, EchoTypeFloat));
-            Assert.AreEqual((double)1, _grid1.Compute().ExecuteJavaTask<double>(EchoTask, EchoTypeDouble));
+            Assert.AreEqual(1, _grid1.GetCompute().ExecuteJavaTask<byte>(EchoTask, EchoTypeByte));
+            Assert.AreEqual(true, _grid1.GetCompute().ExecuteJavaTask<bool>(EchoTask, EchoTypeBool));
+            Assert.AreEqual(1, _grid1.GetCompute().ExecuteJavaTask<short>(EchoTask, EchoTypeShort));
+            Assert.AreEqual((char)1, _grid1.GetCompute().ExecuteJavaTask<char>(EchoTask, EchoTypeChar));
+            Assert.AreEqual(1, _grid1.GetCompute().ExecuteJavaTask<int>(EchoTask, EchoTypeInt));
+            Assert.AreEqual(1, _grid1.GetCompute().ExecuteJavaTask<long>(EchoTask, EchoTypeLong));
+            Assert.AreEqual((float)1, _grid1.GetCompute().ExecuteJavaTask<float>(EchoTask, EchoTypeFloat));
+            Assert.AreEqual((double)1, _grid1.GetCompute().ExecuteJavaTask<double>(EchoTask, EchoTypeDouble));
         }
 
         /// <summary>
@@ -781,17 +781,17 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestEchoTaskCompound()
         {
-            int[] res1 = _grid1.Compute().ExecuteJavaTask<int[]>(EchoTask, EchoTypeArray);
+            int[] res1 = _grid1.GetCompute().ExecuteJavaTask<int[]>(EchoTask, EchoTypeArray);
 
             Assert.AreEqual(1, res1.Length);
             Assert.AreEqual(1, res1[0]);
 
-            IList<int> res2 = _grid1.Compute().ExecuteJavaTask<IList<int>>(EchoTask, EchoTypeCollection);
+            IList<int> res2 = _grid1.GetCompute().ExecuteJavaTask<IList<int>>(EchoTask, EchoTypeCollection);
 
             Assert.AreEqual(1, res2.Count);
             Assert.AreEqual(1, res2[0]);
 
-            IDictionary<int, int> res3 = _grid1.Compute().ExecuteJavaTask<IDictionary<int, int>>(EchoTask, EchoTypeMap);
+            IDictionary<int, int> res3 = _grid1.GetCompute().ExecuteJavaTask<IDictionary<int, int>>(EchoTask, EchoTypeMap);
 
             Assert.AreEqual(1, res3.Count);
             Assert.AreEqual(1, res3[1]);
@@ -803,7 +803,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestEchoTaskPortable()
         {
-            PlatformComputePortable res = _grid1.Compute().ExecuteJavaTask<PlatformComputePortable>(EchoTask, EchoTypePortable);
+            PlatformComputePortable res = _grid1.GetCompute().ExecuteJavaTask<PlatformComputePortable>(EchoTask, EchoTypePortable);
 
             Assert.AreEqual(1, res.Field);
         }
@@ -814,13 +814,13 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestEchoTaskPortableNoClass()
         {
-            ICompute compute = _grid1.Compute();
+            ICompute compute = _grid1.GetCompute();
 
             compute.WithKeepPortable();
 
             IPortableObject res = compute.ExecuteJavaTask<IPortableObject>(EchoTask, EchoTypePortableJava);
 
-            Assert.AreEqual(1, res.Field<int>("field"));
+            Assert.AreEqual(1, res.GetField<int>("field"));
 
             // This call must fail because "keepPortable" flag is reset.
             Assert.Catch(typeof(PortableException), () =>
@@ -835,7 +835,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestEchoTaskObjectArray()
         {
-            var res = _grid1.Compute().ExecuteJavaTask<string[]>(EchoTask, EchoTypeObjArray);
+            var res = _grid1.GetCompute().ExecuteJavaTask<string[]>(EchoTask, EchoTypeObjArray);
             
             Assert.AreEqual(new[] {"foo", "bar", "baz"}, res);
         }
@@ -846,7 +846,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestEchoTaskPortableArray()
         {
-            var res = _grid1.Compute().ExecuteJavaTask<PlatformComputePortable[]>(EchoTask, EchoTypePortableArray);
+            var res = _grid1.GetCompute().ExecuteJavaTask<PlatformComputePortable[]>(EchoTask, EchoTypePortableArray);
             
             Assert.AreEqual(3, res.Length);
 
@@ -860,7 +860,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestEchoTaskEnum()
         {
-            var res = _grid1.Compute().ExecuteJavaTask<InteropComputeEnum>(EchoTask, EchoTypeEnum);
+            var res = _grid1.GetCompute().ExecuteJavaTask<InteropComputeEnum>(EchoTask, EchoTypeEnum);
 
             Assert.AreEqual(InteropComputeEnum.Bar, res);
         }
@@ -871,7 +871,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestEchoTaskEnumArray()
         {
-            var res = _grid1.Compute().ExecuteJavaTask<InteropComputeEnum[]>(EchoTask, EchoTypeEnumArray);
+            var res = _grid1.GetCompute().ExecuteJavaTask<InteropComputeEnum[]>(EchoTask, EchoTypeEnumArray);
 
             Assert.AreEqual(new[]
             {
@@ -887,7 +887,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestPortableArgTask()
         {
-            ICompute compute = _grid1.Compute();
+            ICompute compute = _grid1.GetCompute();
 
             compute.WithKeepPortable();
 
@@ -906,18 +906,18 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestBroadcastTask()
         {
-            ICollection<Guid> res = _grid1.Compute().ExecuteJavaTask<ICollection<Guid>>(BroadcastTask, null);
+            ICollection<Guid> res = _grid1.GetCompute().ExecuteJavaTask<ICollection<Guid>>(BroadcastTask, null);
 
             Assert.AreEqual(3, res.Count);
-            Assert.AreEqual(1, _grid1.Cluster.ForNodeIds(res.ElementAt(0)).Nodes().Count);
-            Assert.AreEqual(1, _grid1.Cluster.ForNodeIds(res.ElementAt(1)).Nodes().Count);
-            Assert.AreEqual(1, _grid1.Cluster.ForNodeIds(res.ElementAt(2)).Nodes().Count);
+            Assert.AreEqual(1, _grid1.GetCluster().ForNodeIds(res.ElementAt(0)).GetNodes().Count);
+            Assert.AreEqual(1, _grid1.GetCluster().ForNodeIds(res.ElementAt(1)).GetNodes().Count);
+            Assert.AreEqual(1, _grid1.GetCluster().ForNodeIds(res.ElementAt(2)).GetNodes().Count);
 
-            var prj = _grid1.Cluster.ForPredicate(node => res.Take(2).Contains(node.Id));
+            var prj = _grid1.GetCluster().ForPredicate(node => res.Take(2).Contains(node.Id));
 
-            Assert.AreEqual(2, prj.Nodes().Count);
+            Assert.AreEqual(2, prj.GetNodes().Count);
 
-            ICollection<Guid> filteredRes = prj.Compute().ExecuteJavaTask<ICollection<Guid>>(BroadcastTask, null);
+            ICollection<Guid> filteredRes = prj.GetCompute().ExecuteJavaTask<ICollection<Guid>>(BroadcastTask, null);
 
             Assert.AreEqual(2, filteredRes.Count);
             Assert.IsTrue(filteredRes.Contains(res.ElementAt(0)));
@@ -930,20 +930,20 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestBroadcastTaskAsync()
         {
-            var gridCompute = _grid1.Compute().WithAsync();
+            var gridCompute = _grid1.GetCompute().WithAsync();
             Assert.IsNull(gridCompute.ExecuteJavaTask<ICollection<Guid>>(BroadcastTask, null));
             ICollection<Guid> res = gridCompute.GetFuture<ICollection<Guid>>().Get();
 
             Assert.AreEqual(3, res.Count);
-            Assert.AreEqual(1, _grid1.Cluster.ForNodeIds(res.ElementAt(0)).Nodes().Count);
-            Assert.AreEqual(1, _grid1.Cluster.ForNodeIds(res.ElementAt(1)).Nodes().Count);
-            Assert.AreEqual(1, _grid1.Cluster.ForNodeIds(res.ElementAt(2)).Nodes().Count);
+            Assert.AreEqual(1, _grid1.GetCluster().ForNodeIds(res.ElementAt(0)).GetNodes().Count);
+            Assert.AreEqual(1, _grid1.GetCluster().ForNodeIds(res.ElementAt(1)).GetNodes().Count);
+            Assert.AreEqual(1, _grid1.GetCluster().ForNodeIds(res.ElementAt(2)).GetNodes().Count);
 
-            var prj = _grid1.Cluster.ForPredicate(node => res.Take(2).Contains(node.Id));
+            var prj = _grid1.GetCluster().ForPredicate(node => res.Take(2).Contains(node.Id));
 
-            Assert.AreEqual(2, prj.Nodes().Count);
+            Assert.AreEqual(2, prj.GetNodes().Count);
 
-            var compute = prj.Compute().WithAsync();
+            var compute = prj.GetCompute().WithAsync();
             Assert.IsNull(compute.ExecuteJavaTask<ICollection<Guid>>(BroadcastTask, null));
             ICollection<Guid> filteredRes = compute.GetFuture<ICollection<Guid>>().Get();
 
@@ -960,9 +960,9 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             ComputeAction.InvokeCount = 0;
             
-            _grid1.Compute().Broadcast(new ComputeAction());
+            _grid1.GetCompute().Broadcast(new ComputeAction());
 
-            Assert.AreEqual(_grid1.Cluster.Nodes().Count, ComputeAction.InvokeCount);
+            Assert.AreEqual(_grid1.GetCluster().GetNodes().Count, ComputeAction.InvokeCount);
         }
 
         /// <summary>
@@ -973,7 +973,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             ComputeAction.InvokeCount = 0;
             
-            _grid1.Compute().Run(new ComputeAction());
+            _grid1.GetCompute().Run(new ComputeAction());
 
             Assert.AreEqual(1, ComputeAction.InvokeCount);
         }
@@ -988,7 +988,7 @@ namespace Apache.Ignite.Core.Tests.Compute
 
             var actions = Enumerable.Range(0, 10).Select(x => new ComputeAction());
             
-            _grid1.Compute().Run(actions);
+            _grid1.GetCompute().Run(actions);
 
             Assert.AreEqual(10, ComputeAction.InvokeCount);
         }
@@ -1002,17 +1002,17 @@ namespace Apache.Ignite.Core.Tests.Compute
             const string cacheName = null;
 
             // Test keys for non-client nodes
-            var nodes = new[] {_grid1, _grid2}.Select(x => x.Cluster.LocalNode);
+            var nodes = new[] {_grid1, _grid2}.Select(x => x.GetCluster().GetLocalNode());
 
-            var aff = _grid1.Affinity(cacheName);
+            var aff = _grid1.GetAffinity(cacheName);
 
             foreach (var node in nodes)
             {
                 var primaryKey = Enumerable.Range(1, int.MaxValue).First(x => aff.IsPrimary(node, x));
 
-                var affinityKey = _grid1.Affinity(cacheName).AffinityKey<int, int>(primaryKey);
+                var affinityKey = _grid1.GetAffinity(cacheName).GetAffinityKey<int, int>(primaryKey);
 
-                _grid1.Compute().AffinityRun(cacheName, affinityKey, new ComputeAction());
+                _grid1.GetCompute().AffinityRun(cacheName, affinityKey, new ComputeAction());
 
                 Assert.AreEqual(node.Id, ComputeAction.LastNodeId);
             }
@@ -1027,17 +1027,17 @@ namespace Apache.Ignite.Core.Tests.Compute
             const string cacheName = null;
 
             // Test keys for non-client nodes
-            var nodes = new[] { _grid1, _grid2 }.Select(x => x.Cluster.LocalNode);
+            var nodes = new[] { _grid1, _grid2 }.Select(x => x.GetCluster().GetLocalNode());
 
-            var aff = _grid1.Affinity(cacheName);
+            var aff = _grid1.GetAffinity(cacheName);
 
             foreach (var node in nodes)
             {
                 var primaryKey = Enumerable.Range(1, int.MaxValue).First(x => aff.IsPrimary(node, x));
 
-                var affinityKey = _grid1.Affinity(cacheName).AffinityKey<int, int>(primaryKey);
+                var affinityKey = _grid1.GetAffinity(cacheName).GetAffinityKey<int, int>(primaryKey);
 
-                var result = _grid1.Compute().AffinityCall(cacheName, affinityKey, new ComputeFunc());
+                var result = _grid1.GetCompute().AffinityCall(cacheName, affinityKey, new ComputeFunc());
 
                 Assert.AreEqual(result, ComputeFunc.InvokeCount);
 
@@ -1051,12 +1051,12 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestWithNoFailover()
         {
-            ICollection<Guid> res = _grid1.Compute().WithNoFailover().ExecuteJavaTask<ICollection<Guid>>(BroadcastTask, null);
+            ICollection<Guid> res = _grid1.GetCompute().WithNoFailover().ExecuteJavaTask<ICollection<Guid>>(BroadcastTask, null);
 
             Assert.AreEqual(3, res.Count);
-            Assert.AreEqual(1, _grid1.Cluster.ForNodeIds(res.ElementAt(0)).Nodes().Count);
-            Assert.AreEqual(1, _grid1.Cluster.ForNodeIds(res.ElementAt(1)).Nodes().Count);
-            Assert.AreEqual(1, _grid1.Cluster.ForNodeIds(res.ElementAt(2)).Nodes().Count);
+            Assert.AreEqual(1, _grid1.GetCluster().ForNodeIds(res.ElementAt(0)).GetNodes().Count);
+            Assert.AreEqual(1, _grid1.GetCluster().ForNodeIds(res.ElementAt(1)).GetNodes().Count);
+            Assert.AreEqual(1, _grid1.GetCluster().ForNodeIds(res.ElementAt(2)).GetNodes().Count);
         }
 
         /// <summary>
@@ -1065,12 +1065,12 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestWithTimeout()
         {
-            ICollection<Guid> res = _grid1.Compute().WithTimeout(1000).ExecuteJavaTask<ICollection<Guid>>(BroadcastTask, null);
+            ICollection<Guid> res = _grid1.GetCompute().WithTimeout(1000).ExecuteJavaTask<ICollection<Guid>>(BroadcastTask, null);
 
             Assert.AreEqual(3, res.Count);
-            Assert.AreEqual(1, _grid1.Cluster.ForNodeIds(res.ElementAt(0)).Nodes().Count);
-            Assert.AreEqual(1, _grid1.Cluster.ForNodeIds(res.ElementAt(1)).Nodes().Count);
-            Assert.AreEqual(1, _grid1.Cluster.ForNodeIds(res.ElementAt(2)).Nodes().Count);
+            Assert.AreEqual(1, _grid1.GetCluster().ForNodeIds(res.ElementAt(0)).GetNodes().Count);
+            Assert.AreEqual(1, _grid1.GetCluster().ForNodeIds(res.ElementAt(1)).GetNodes().Count);
+            Assert.AreEqual(1, _grid1.GetCluster().ForNodeIds(res.ElementAt(2)).GetNodes().Count);
         }
 
         /// <summary>
@@ -1079,10 +1079,10 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestNetTaskSimple()
         {
-            int res = _grid1.Compute().Execute<NetSimpleJobArgument, NetSimpleJobResult, NetSimpleTaskResult>(
+            int res = _grid1.GetCompute().Execute<NetSimpleJobArgument, NetSimpleJobResult, NetSimpleTaskResult>(
                     typeof(NetSimpleTask), new NetSimpleJobArgument(1)).Res;
 
-            Assert.AreEqual(_grid1.Compute().ClusterGroup.Nodes().Count, res);
+            Assert.AreEqual(_grid1.GetCompute().ClusterGroup.GetNodes().Count, res);
         }
 
         /// <summary>
@@ -1228,7 +1228,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         public void Invoke()
         {
             Interlocked.Increment(ref InvokeCount);
-            LastNodeId = _grid.Cluster.LocalNode.Id;
+            LastNodeId = _grid.GetCluster().GetLocalNode().Id;
         }
     }
 
@@ -1255,7 +1255,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         int IComputeFunc<int>.Invoke()
         {
             InvokeCount++;
-            LastNodeId = _grid.Cluster.LocalNode.Id;
+            LastNodeId = _grid.GetCluster().GetLocalNode().Id;
             return InvokeCount;
         }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5fd4a5b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeMultithreadedTest.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeMultithreadedTest.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeMultithreadedTest.cs
index 36a0505..5b6874f 100644
--- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeMultithreadedTest.cs
+++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeMultithreadedTest.cs
@@ -75,7 +75,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             Assert.AreEqual(_actions.Count, 6);
 
-            var compute = Grid1.Compute();
+            var compute = Grid1.GetCompute();
 
             TestUtils.RunMultiThreaded(() =>
             {
@@ -91,7 +91,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             Assert.AreEqual(_actions.Count, 6);
 
-            TestUtils.RunMultiThreaded(() => _actions[0](Grid1.Compute()), 4, 20);
+            TestUtils.RunMultiThreaded(() => _actions[0](Grid1.GetCompute()), 4, 20);
         }
 
         /// <summary>
@@ -102,7 +102,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             Assert.AreEqual(_actions.Count, 6);
 
-            TestUtils.RunMultiThreaded(() => _actions[1](Grid1.Compute()), 4, 20);
+            TestUtils.RunMultiThreaded(() => _actions[1](Grid1.GetCompute()), 4, 20);
         }
 
         /// <summary>
@@ -113,7 +113,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             Assert.AreEqual(_actions.Count, 6);
 
-            TestUtils.RunMultiThreaded(() => _actions[2](Grid1.Compute()), 4, 20);
+            TestUtils.RunMultiThreaded(() => _actions[2](Grid1.GetCompute()), 4, 20);
         }
 
         /// <summary>
@@ -124,7 +124,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             Assert.AreEqual(_actions.Count, 6);
 
-            TestUtils.RunMultiThreaded(() => _actions[3](Grid1.Compute()), 4, 20);
+            TestUtils.RunMultiThreaded(() => _actions[3](Grid1.GetCompute()), 4, 20);
         }
         /// <summary>
         ///
@@ -134,7 +134,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             Assert.AreEqual(_actions.Count, 6);
 
-            TestUtils.RunMultiThreaded(() => _actions[4](Grid1.Compute()), 4, 20);
+            TestUtils.RunMultiThreaded(() => _actions[4](Grid1.GetCompute()), 4, 20);
         }
 
         /// <summary>
@@ -145,7 +145,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             Assert.AreEqual(_actions.Count, 6);
 
-            TestUtils.RunMultiThreaded(() => _actions[5](Grid1.Compute()), 4, 20);
+            TestUtils.RunMultiThreaded(() => _actions[5](Grid1.GetCompute()), 4, 20);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5fd4a5b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/FailoverTaskSelfTest.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/FailoverTaskSelfTest.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/FailoverTaskSelfTest.cs
index 6240bb9..e46ec64 100644
--- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/FailoverTaskSelfTest.cs
+++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/FailoverTaskSelfTest.cs
@@ -55,7 +55,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             for (int i = 0; i < 20; i++)
             {
-                int res = Grid1.Compute().Call(new TestClosure());
+                int res = Grid1.GetCompute().Call(new TestClosure());
 
                 Assert.AreEqual(2, res);
 
@@ -86,14 +86,14 @@ namespace Apache.Ignite.Core.Tests.Compute
         /// </summary>
         private void TestTaskAdapterFailoverException(bool serializable)
         {
-            int res = Grid1.Compute().Execute(new TestTask(),
+            int res = Grid1.GetCompute().Execute(new TestTask(),
                 new Tuple<bool, bool>(serializable, true));
 
             Assert.AreEqual(2, res);
 
             Cleanup();
 
-            res = Grid1.Compute().Execute(new TestTask(),
+            res = Grid1.GetCompute().Execute(new TestTask(),
                 new Tuple<bool, bool>(serializable, false));
 
             Assert.AreEqual(2, res);

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5fd4a5b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/IgniteExceptionTaskSelfTest.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/IgniteExceptionTaskSelfTest.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/IgniteExceptionTaskSelfTest.cs
index 9918dce..62f860d 100644
--- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/IgniteExceptionTaskSelfTest.cs
+++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/IgniteExceptionTaskSelfTest.cs
@@ -308,7 +308,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             JobErrs.Clear();
 
-            object res = Grid1.Compute().Execute(new Task());
+            object res = Grid1.GetCompute().Execute(new Task());
 
             return res is GoodTaskResult ? ((GoodTaskResult)res).Res : ((BadTaskResult)res).Res;
         }
@@ -325,7 +325,7 @@ namespace Apache.Ignite.Core.Tests.Compute
 
             try
             {
-                Grid1.Compute().Execute(new Task());
+                Grid1.GetCompute().Execute(new Task());
 
                 Assert.Fail();
             }
@@ -429,7 +429,7 @@ namespace Apache.Ignite.Core.Tests.Compute
                 var jobs = new Dictionary<IComputeJob<object>, IClusterNode>();
 
                 foreach (IClusterNode node in subgrid)
-                    jobs.Add(new GoodJob(!_grid.Cluster.LocalNode.Id.Equals(node.Id)), node);
+                    jobs.Add(new GoodJob(!_grid.GetCluster().GetLocalNode().Id.Equals(node.Id)), node);
 
                 return jobs;
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5fd4a5b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/PortableTaskTest.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/PortableTaskTest.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/PortableTaskTest.cs
index b3bd1b1..736aa61 100644
--- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/PortableTaskTest.cs
+++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/PortableTaskTest.cs
@@ -50,11 +50,11 @@ namespace Apache.Ignite.Core.Tests.Compute
 
             TestTask task = new TestTask(Grid1, taskArg);
 
-            IPortableObject res = Grid1.Compute().Execute(task, taskArg);
+            IPortableObject res = Grid1.GetCompute().Execute(task, taskArg);
 
             Assert.NotNull(res);
 
-            Assert.AreEqual(400, res.Field<int>("val"));
+            Assert.AreEqual(400, res.GetField<int>("val"));
 
             PortableTaskResult resObj = res.Deserialize<PortableTaskResult>();
 
@@ -63,7 +63,7 @@ namespace Apache.Ignite.Core.Tests.Compute
 
         private static IPortableObject ToPortable(IIgnite grid, object obj)
         {
-            var cache = grid.Cache<object, object>(Cache1Name).WithKeepPortable<object, object>();
+            var cache = grid.GetCache<object, object>(Cache1Name).WithKeepPortable<object, object>();
 
             cache.Put(1, obj);
 
@@ -113,7 +113,7 @@ namespace Apache.Ignite.Core.Tests.Compute
 
                 foreach (IClusterNode node in subgrid)
                 {
-                    if (!Grid3Name.Equals(node.Attribute<string>("org.apache.ignite.ignite.name"))) // Grid3 does not have cache.
+                    if (!Grid3Name.Equals(node.GetAttribute<string>("org.apache.ignite.ignite.name"))) // Grid3 does not have cache.
                     {
                         PortableJob job = new PortableJob();
 
@@ -132,7 +132,7 @@ namespace Apache.Ignite.Core.Tests.Compute
             {
                 Assert.IsNotNull(taskArg);
 
-                Assert.AreEqual(100, taskArg.Field<int>("val"));
+                Assert.AreEqual(100, taskArg.GetField<int>("val"));
 
                 PortableTaskArgument taskArgObj = taskArg.Deserialize<PortableTaskArgument>();
 
@@ -152,7 +152,7 @@ namespace Apache.Ignite.Core.Tests.Compute
 
                     Assert.NotNull(jobRes);
 
-                    Assert.AreEqual(300, jobRes.Field<int>("val"));
+                    Assert.AreEqual(300, jobRes.GetField<int>("val"));
 
                     PortableJobResult jobResObj = jobRes.Deserialize<PortableJobResult>();
 
@@ -235,7 +235,7 @@ namespace Apache.Ignite.Core.Tests.Compute
             {
                 Assert.IsNotNull(Arg);
 
-                Assert.AreEqual(200, Arg.Field<int>("val"));
+                Assert.AreEqual(200, Arg.GetField<int>("val"));
 
                 PortableJobArgument argObj = Arg.Deserialize<PortableJobArgument>();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5fd4a5b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ResourceTaskTest.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ResourceTaskTest.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ResourceTaskTest.cs
index 4cc5982..55bb9d0 100644
--- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ResourceTaskTest.cs
+++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/ResourceTaskTest.cs
@@ -48,9 +48,9 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestTaskInjection()
         {
-            int res = Grid1.Compute().Execute(new InjectionTask(), 0);
+            int res = Grid1.GetCompute().Execute(new InjectionTask(), 0);
 
-            Assert.AreEqual(Grid1.Cluster.Nodes().Count, res);
+            Assert.AreEqual(Grid1.GetCluster().GetNodes().Count, res);
         }
 
         /// <summary>
@@ -59,9 +59,9 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestClosureInjection()
         {
-            var res = Grid1.Compute().Broadcast(new InjectionClosure(), 1);
+            var res = Grid1.GetCompute().Broadcast(new InjectionClosure(), 1);
 
-            Assert.AreEqual(Grid1.Cluster.Nodes().Count, res.Sum());
+            Assert.AreEqual(Grid1.GetCluster().GetNodes().Count, res.Sum());
         }
 
         /// <summary>
@@ -70,9 +70,9 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestReducerInjection()
         {
-            int res = Grid1.Compute().Apply(new InjectionClosure(), new List<int> { 1, 1, 1 }, new InjectionReducer());
+            int res = Grid1.GetCompute().Apply(new InjectionClosure(), new List<int> { 1, 1, 1 }, new InjectionReducer());
 
-            Assert.AreEqual(Grid1.Cluster.Nodes().Count, res);
+            Assert.AreEqual(Grid1.GetCluster().GetNodes().Count, res);
         }
 
         /// <summary>
@@ -81,9 +81,9 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestNoResultCache()
         {
-            int res = Grid1.Compute().Execute(new NoResultCacheTask(), 0);
+            int res = Grid1.GetCompute().Execute(new NoResultCacheTask(), 0);
 
-            Assert.AreEqual(Grid1.Cluster.Nodes().Count, res);
+            Assert.AreEqual(Grid1.GetCluster().GetNodes().Count, res);
         }
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5fd4a5b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/TaskAdapterTest.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/TaskAdapterTest.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/TaskAdapterTest.cs
index cf8c663..f7fb422 100644
--- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/TaskAdapterTest.cs
+++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Compute/TaskAdapterTest.cs
@@ -46,13 +46,13 @@ namespace Apache.Ignite.Core.Tests.Compute
         [Test]
         public void TestTaskAdapter()
         {
-            Assert.AreEqual(3, Grid1.Cluster.Nodes().Count);
+            Assert.AreEqual(3, Grid1.GetCluster().GetNodes().Count);
 
             HashSet<Guid> allNodes = new HashSet<Guid>(); 
 
             for (int i = 0; i < 20 && allNodes.Count < 3; i++)
             {
-                HashSet<Guid> res = Grid1.Compute().Execute(new TestSplitTask(), 1);
+                HashSet<Guid> res = Grid1.GetCompute().Execute(new TestSplitTask(), 1);
 
                 Assert.AreEqual(1, res.Count);
 
@@ -61,11 +61,11 @@ namespace Apache.Ignite.Core.Tests.Compute
 
             Assert.AreEqual(3, allNodes.Count);
 
-            HashSet<Guid> res2 = Grid1.Compute().Execute<int, Guid, HashSet<Guid>>(typeof(TestSplitTask), 3);
+            HashSet<Guid> res2 = Grid1.GetCompute().Execute<int, Guid, HashSet<Guid>>(typeof(TestSplitTask), 3);
 
             Assert.IsTrue(res2.Count > 0);
 
-            Grid1.Compute().Execute(new TestSplitTask(), 100);
+            Grid1.GetCompute().Execute(new TestSplitTask(), 100);
 
             Assert.AreEqual(3, allNodes.Count);
         }
@@ -78,7 +78,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             for (int i = 0; i < 10; i++)
             {
-                bool res = Grid1.Compute().Execute(new TestJobAdapterTask(), true);
+                bool res = Grid1.GetCompute().Execute(new TestJobAdapterTask(), true);
 
                 Assert.IsTrue(res);
             }
@@ -92,7 +92,7 @@ namespace Apache.Ignite.Core.Tests.Compute
         {
             for (int i = 0; i < 10; i++)
             {
-                bool res = Grid1.Compute().Execute(new TestJobAdapterTask(), false);
+                bool res = Grid1.GetCompute().Execute(new TestJobAdapterTask(), false);
 
                 Assert.IsTrue(res);
             }
@@ -188,7 +188,7 @@ namespace Apache.Ignite.Core.Tests.Compute
             {
                 Assert.NotNull(_grid);
 
-                return _grid.Cluster.LocalNode.Id;
+                return _grid.GetCluster().GetLocalNode().Id;
             }
 
             /** <inheritDoc /> */