ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/46] ignite git commit: IGNITE-3689 .NET: Remove IgniteProxy
Date Tue, 18 Apr 2017 05:39:03 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1561-1 84df73e30 -> 84d4dec1f


IGNITE-3689 .NET: Remove IgniteProxy

This closes #1797


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5e66294
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5e66294
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5e66294

Branch: refs/heads/ignite-1561-1
Commit: d5e662940c4d5b4b3ae219e9d4d21b86fc7458c6
Parents: ded599a
Author: Pavel Tupitsyn <ptupitsyn@apache.org>
Authored: Mon Apr 17 11:40:49 2017 +0300
Committer: Pavel Tupitsyn <ptupitsyn@apache.org>
Committed: Mon Apr 17 11:40:49 2017 +0300

----------------------------------------------------------------------
 .../Apache.Ignite.Core.Tests/ExecutableTest.cs  |   2 +-
 .../Apache.Ignite.Core.Tests/LifecycleTest.cs   |   7 -
 .../Log/CustomLoggerTest.cs                     |   4 +-
 .../Apache.Ignite.Core.csproj                   |   1 -
 .../dotnet/Apache.Ignite.Core/Ignition.cs       |   2 +-
 .../Impl/Binary/BinarySystemHandlers.cs         |  10 +
 .../Impl/Binary/Marshaller.cs                   |   1 -
 .../Impl/Compute/ComputeFunc.cs                 |   2 +-
 .../Impl/Compute/ComputeJob.cs                  |   2 +-
 .../Impl/Compute/ComputeOutFunc.cs              |   2 +-
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs    |  14 -
 .../Apache.Ignite.Core/Impl/IgniteProxy.cs      | 464 -------------------
 .../Impl/Resource/ResourceProcessor.cs          |  10 -
 .../Impl/Resource/ResourceTypeDescriptor.cs     |  12 +-
 14 files changed, 18 insertions(+), 515 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExecutableTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExecutableTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExecutableTest.cs
index ae945e9..8fcd99b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExecutableTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExecutableTest.cs
@@ -440,7 +440,7 @@ namespace Apache.Ignite.Core.Tests
 
             public RemoteConfiguration Invoke()
             {
-                var grid0 = ((IgniteProxy) _grid).Target;
+                var grid0 = (Ignite) _grid;
 
                 var cfg = grid0.Configuration;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core.Tests/LifecycleTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/LifecycleTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/LifecycleTest.cs
index 7c9c10d..2180a74 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/LifecycleTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/LifecycleTest.cs
@@ -21,7 +21,6 @@ namespace Apache.Ignite.Core.Tests
     using System.Collections;
     using System.Collections.Generic;
     using Apache.Ignite.Core.Common;
-    using Apache.Ignite.Core.Impl;
     using Apache.Ignite.Core.Lifecycle;
     using Apache.Ignite.Core.Resource;
     using NUnit.Framework;
@@ -214,12 +213,6 @@ namespace Apache.Ignite.Core.Tests
         /// <param name="expProp2">Expected property 2.</param>
         private static void CheckEvent(Event evt, IIgnite expGrid1, IIgnite expGrid2, int
expProp1, string expProp2)
         {
-            if (evt.Grid1 != null && evt.Grid1 is IgniteProxy)
-                evt.Grid1 = (evt.Grid1 as IgniteProxy).Target;
-
-            if (evt.Grid2 != null && evt.Grid2 is IgniteProxy)
-                evt.Grid2 = (evt.Grid2 as IgniteProxy).Target;
-
             Assert.AreEqual(expGrid1, evt.Grid1);
             Assert.AreEqual(expGrid2, evt.Grid2);
             Assert.AreEqual(expProp1, evt.Prop1);

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs
index f8f7f7a..567ca2f 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs
@@ -25,7 +25,6 @@ namespace Apache.Ignite.Core.Tests.Log
     using Apache.Ignite.Core.Common;
     using Apache.Ignite.Core.Communication.Tcp;
     using Apache.Ignite.Core.Compute;
-    using Apache.Ignite.Core.Impl;
     using Apache.Ignite.Core.Lifecycle;
     using Apache.Ignite.Core.Log;
     using Apache.Ignite.Core.Resource;
@@ -58,7 +57,7 @@ namespace Apache.Ignite.Core.Tests.Log
             using (var ignite = Ignition.Start(cfg))
             {
                 // Check injection
-                Assert.AreEqual(((Ignite) ignite).Proxy, ((TestLogger) cfg.Logger).Ignite);
+                Assert.AreEqual(ignite, ((TestLogger) cfg.Logger).Ignite);
 
                 // Check initial message
                 Assert.IsTrue(TestLogger.Entries[0].Message.StartsWith("Starting Ignite.NET"));
@@ -137,6 +136,7 @@ namespace Apache.Ignite.Core.Tests.Log
                 TestUtils.WaitForCondition(() => TestLogger.Entries.Any(x => x.Exception
!= null), 3000);
 
                 var errFromJava = TestLogger.Entries.Single(x => x.Exception != null);
+                Assert.IsNotNull(errFromJava.Exception.InnerException);
                 Assert.AreEqual("Error in func.", ((ArithmeticException) errFromJava.Exception.InnerException).Message);
             }
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index a1307e7..16e2552 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -359,7 +359,6 @@
     <Compile Include="Impl\ExceptionUtils.cs" />
     <Compile Include="Impl\Ignite.cs" />
     <Compile Include="Impl\IgniteManager.cs" />
-    <Compile Include="Impl\IgniteProxy.cs" />
     <Compile Include="Impl\Log\JavaLogger.cs" />
     <Compile Include="Impl\PlatformTarget.cs" />
     <Compile Include="Impl\IgniteUtils.cs" />

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs
index 6bc3b34..d2be92a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs
@@ -782,7 +782,7 @@ namespace Apache.Ignite.Core
             public void OnLifecycleEvent(LifecycleEventType evt)
             {
                 if (evt == LifecycleEventType.BeforeNodeStop && _ignite != null)
-                    ((IgniteProxy) _ignite).Target.BeforeNodeStop();
+                    ((Ignite) _ignite).BeforeNodeStop();
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs
index 60bbb46..a30b981 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs
@@ -197,6 +197,8 @@ namespace Apache.Ignite.Core.Impl.Binary
                 return WriteBinaryEnum;
             if (type.IsEnum)
                 return WriteEnum;
+            if (type == typeof(Ignite))
+                return WriteIgnite;
 
             // All types below can be written as handles.
             supportsHandles = true;
@@ -638,6 +640,14 @@ namespace Apache.Ignite.Core.Impl.Binary
         {
             return BinaryUtils.ReadDictionary(ctx, null);
         }
+                
+        /// <summary>
+        /// Write Ignite.
+        /// </summary>
+        private static void WriteIgnite(BinaryWriter ctx, object obj)
+        {
+            ctx.Stream.WriteByte(BinaryUtils.HdrNull);
+        }
 
         /**
          * <summary>Read delegate.</summary>

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Marshaller.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Marshaller.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Marshaller.cs
index f47cbe2..b60ced9 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Marshaller.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Marshaller.cs
@@ -703,7 +703,6 @@ namespace Apache.Ignite.Core.Impl.Binary
         {
             AddSystemType(BinaryUtils.TypeNativeJobHolder, r => new ComputeJobHolder(r));
             AddSystemType(BinaryUtils.TypeComputeJobWrapper, r => new ComputeJobWrapper(r));
-            AddSystemType(BinaryUtils.TypeIgniteProxy, r => new IgniteProxy());
             AddSystemType(BinaryUtils.TypeComputeOutFuncJob, r => new ComputeOutFuncJob(r));
             AddSystemType(BinaryUtils.TypeComputeOutFuncWrapper, r => new ComputeOutFuncWrapper(r));
             AddSystemType(BinaryUtils.TypeComputeFuncWrapper, r => new ComputeFuncWrapper(r));

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeFunc.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeFunc.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeFunc.cs
index 62261c9..951e179 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeFunc.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeFunc.cs
@@ -100,7 +100,7 @@ namespace Apache.Ignite.Core.Impl.Compute
         public void InjectIgnite(IIgnite ignite)
         {
             // Propagate injection
-            ResourceProcessor.Inject(_func, (IgniteProxy) ignite);
+            ResourceProcessor.Inject(_func, (Ignite) ignite);
         }
     }    
     

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeJob.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeJob.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeJob.cs
index d2beb2c..4c0b536 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeJob.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeJob.cs
@@ -118,7 +118,7 @@ namespace Apache.Ignite.Core.Impl.Compute
         public void InjectIgnite(IIgnite ignite)
         {
             // Propagate injection
-            ResourceProcessor.Inject(Job, (IgniteProxy)ignite);
+            ResourceProcessor.Inject(Job, (Ignite)ignite);
         }
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeOutFunc.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeOutFunc.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeOutFunc.cs
index f973ae5..71934d4 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeOutFunc.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeOutFunc.cs
@@ -103,7 +103,7 @@ namespace Apache.Ignite.Core.Impl.Compute
         public void InjectIgnite(IIgnite ignite)
         {
             // Propagate injection
-            ResourceProcessor.Inject(_func, (IgniteProxy)ignite);
+            ResourceProcessor.Inject(_func, (Ignite)ignite);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Ignite.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Ignite.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Ignite.cs
index 35950b6..9cd1aa5 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Ignite.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Ignite.cs
@@ -75,9 +75,6 @@ namespace Apache.Ignite.Core.Impl
         /** Binary processor. */
         private readonly BinaryProcessor _binaryProc;
 
-        /** Cached proxy. */
-        private readonly IgniteProxy _proxy;
-
         /** Lifecycle handlers. */
         private readonly IList<LifecycleHandlerHolder> _lifecycleHandlers;
 
@@ -134,8 +131,6 @@ namespace Apache.Ignite.Core.Impl
 
             _binaryProc = new BinaryProcessor(UU.ProcessorBinaryProcessor(proc), marsh);
 
-            _proxy = new IgniteProxy(this);
-
             cbs.Initialize(this);
 
             // Grid is not completely started here, can't initialize interop transactions
right away.
@@ -177,15 +172,6 @@ namespace Apache.Ignite.Core.Impl
                 lifecycleBean.OnStart(this);
         }
 
-        /// <summary>
-        /// Gets Ignite proxy.
-        /// </summary>
-        /// <returns>Proxy.</returns>
-        public IgniteProxy Proxy
-        {
-            get { return _proxy; }
-        }
-
         /** <inheritdoc /> */
         public string Name
         {

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteProxy.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteProxy.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteProxy.cs
deleted file mode 100644
index 5e17853..0000000
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteProxy.cs
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Apache.Ignite.Core.Impl
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Threading.Tasks;
-    using Apache.Ignite.Core.Binary;
-    using Apache.Ignite.Core.Cache;
-    using Apache.Ignite.Core.Cache.Configuration;
-    using Apache.Ignite.Core.Cluster;
-    using Apache.Ignite.Core.Compute;
-    using Apache.Ignite.Core.Datastream;
-    using Apache.Ignite.Core.DataStructures;
-    using Apache.Ignite.Core.Events;
-    using Apache.Ignite.Core.Impl.Binary;
-    using Apache.Ignite.Core.Log;
-    using Apache.Ignite.Core.Lifecycle;
-    using Apache.Ignite.Core.Messaging;
-    using Apache.Ignite.Core.Services;
-    using Apache.Ignite.Core.Transactions;
-
-    /// <summary>
-    /// Grid proxy with fake serialization.
-    /// </summary>
-    [Serializable]
-    [ExcludeFromCodeCoverage]
-    internal class IgniteProxy : IIgnite, IBinaryWriteAware, ICluster
-    {
-        /** */
-        [NonSerialized]
-        private readonly Ignite _ignite;
-
-        /// <summary>
-        /// Default ctor for marshalling.
-        /// </summary>
-        public IgniteProxy()
-        {
-            // No-op.
-        }
-
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="ignite">Grid.</param>
-        public IgniteProxy(Ignite ignite)
-        {
-            _ignite = ignite;
-        }
-
-        /** <inheritdoc /> */
-        public string Name
-        {
-            get { return _ignite.Name; }
-        }
-
-        /** <inheritdoc /> */
-
-        public ICluster GetCluster()
-        {
-            return this;
-        }
-
-        /** <inheritdoc /> */
-        public IIgnite Ignite
-        {
-            get { return this; }
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForLocal()
-        {
-            return _ignite.GetCluster().ForLocal();
-        }
-
-        /** <inheritdoc /> */
-        public ICompute GetCompute()
-        {
-            return _ignite.GetCompute();
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForNodes(IEnumerable<IClusterNode> nodes)
-        {
-            return _ignite.GetCluster().ForNodes(nodes);
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForNodes(params IClusterNode[] nodes)
-        {
-            return _ignite.GetCluster().ForNodes(nodes);
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForNodeIds(IEnumerable<Guid> ids)
-        {
-            return _ignite.GetCluster().ForNodeIds(ids);
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForNodeIds(ICollection<Guid> ids)
-        {
-            return _ignite.GetCluster().ForNodeIds(ids);
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForNodeIds(params Guid[] ids)
-        {
-            return _ignite.GetCluster().ForNodeIds(ids);
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForPredicate(Func<IClusterNode, bool> p)
-        {
-            return _ignite.GetCluster().ForPredicate(p);
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForAttribute(string name, string val)
-        {
-            return _ignite.GetCluster().ForAttribute(name, val);
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForCacheNodes(string name)
-        {
-            return _ignite.GetCluster().ForCacheNodes(name);
-        }
-        
-        /** <inheritdoc /> */
-        public IClusterGroup ForDataNodes(string name)
-        {
-            return _ignite.GetCluster().ForDataNodes(name);
-        }
-        
-        /** <inheritdoc /> */
-        public IClusterGroup ForClientNodes(string name)
-        {
-            return _ignite.GetCluster().ForClientNodes(name);
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForRemotes()
-        {
-            return _ignite.GetCluster().ForRemotes();
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForDaemons()
-        {
-            return _ignite.GetCluster().ForDaemons();
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForHost(IClusterNode node)
-        {
-            return _ignite.GetCluster().ForHost(node);
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForRandom()
-        {
-            return _ignite.GetCluster().ForRandom();
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForOldest()
-        {
-            return _ignite.GetCluster().ForOldest();
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForYoungest()
-        {
-            return _ignite.GetCluster().ForYoungest();
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForDotNet()
-        {
-            return _ignite.GetCluster().ForDotNet();
-        }
-
-        /** <inheritdoc /> */
-        public IClusterGroup ForServers()
-        {
-            return _ignite.GetCluster().ForServers();
-        }
-
-        /** <inheritdoc /> */
-        public ICollection<IClusterNode> GetNodes()
-        {
-            return _ignite.GetCluster().GetNodes();
-        }
-
-        /** <inheritdoc /> */
-        public IClusterNode GetNode(Guid id)
-        {
-            return _ignite.GetCluster().GetNode(id);
-        }
-
-        /** <inheritdoc /> */
-        public IClusterNode GetNode()
-        {
-            return _ignite.GetCluster().GetNode();
-        }
-
-        /** <inheritdoc /> */
-        public IClusterMetrics GetMetrics()
-        {
-            return _ignite.GetCluster().GetMetrics();
-        }
-
-        /** <inheritdoc /> */
-        [SuppressMessage("Microsoft.Usage", "CA1816:CallGCSuppressFinalizeCorrectly", 
-            Justification = "There is no finalizer.")]
-        public void Dispose()
-        {
-            _ignite.Dispose();
-        }
-
-        /** <inheritdoc /> */
-        public ICache<TK, TV> GetCache<TK, TV>(string name)
-        {
-            return _ignite.GetCache<TK, TV>(name);
-        }
-
-        /** <inheritdoc /> */
-        public ICache<TK, TV> GetOrCreateCache<TK, TV>(string name)
-        {
-            return _ignite.GetOrCreateCache<TK, TV>(name);
-        }
-
-        /** <inheritdoc /> */
-        public ICache<TK, TV> GetOrCreateCache<TK, TV>(CacheConfiguration configuration)
-        {
-            return _ignite.GetOrCreateCache<TK, TV>(configuration);
-        }
-
-        /** <inheritdoc /> */
-        public ICache<TK, TV> GetOrCreateCache<TK, TV>(CacheConfiguration configuration,
NearCacheConfiguration nearConfiguration)
-        {
-            return _ignite.GetOrCreateCache<TK, TV>(configuration, nearConfiguration);
-        }
-
-        /** <inheritdoc /> */
-        public ICache<TK, TV> CreateCache<TK, TV>(string name)
-        {
-            return _ignite.CreateCache<TK, TV>(name);
-        }
-
-        /** <inheritdoc /> */
-        public ICache<TK, TV> CreateCache<TK, TV>(CacheConfiguration configuration)
-        {
-            return _ignite.CreateCache<TK, TV>(configuration);
-        }
-
-        /** <inheritdoc /> */
-        public ICache<TK, TV> CreateCache<TK, TV>(CacheConfiguration configuration,
NearCacheConfiguration nearConfiguration)
-        {
-            return _ignite.CreateCache<TK, TV>(configuration, nearConfiguration);
-        }
-
-        /** <inheritdoc /> */
-        public void DestroyCache(string name)
-        {
-            _ignite.DestroyCache(name);
-        }
-
-        /** <inheritdoc /> */
-        public IClusterNode GetLocalNode()
-        {
-            return _ignite.GetCluster().GetLocalNode();
-        }
-
-        /** <inheritdoc /> */
-        public bool PingNode(Guid nodeId)
-        {
-            return _ignite.GetCluster().PingNode(nodeId);
-        }
-
-        /** <inheritdoc /> */
-        public long TopologyVersion
-        {
-            get { return _ignite.GetCluster().TopologyVersion; }
-        }
-
-        /** <inheritdoc /> */
-        public ICollection<IClusterNode> GetTopology(long ver)
-        {
-            return _ignite.GetCluster().GetTopology(ver);
-        }
-
-        /** <inheritdoc /> */
-        public void ResetMetrics()
-        {
-            _ignite.GetCluster().ResetMetrics();
-        }
-
-        /** <inheritdoc /> */
-        public Task<bool> ClientReconnectTask
-        {
-            get { return _ignite.GetCluster().ClientReconnectTask; }
-        }
-
-        /** <inheritdoc /> */
-        public IDataStreamer<TK, TV> GetDataStreamer<TK, TV>(string cacheName)
-        {
-            return _ignite.GetDataStreamer<TK, TV>(cacheName);
-        }
-
-        /** <inheritdoc /> */
-        public IBinary GetBinary()
-        {
-            return _ignite.GetBinary();
-        }
-
-        /** <inheritdoc /> */
-        public ICacheAffinity GetAffinity(string name)
-        {
-            return _ignite.GetAffinity(name);
-        }
-
-        /** <inheritdoc /> */
-
-        public ITransactions GetTransactions()
-        {
-            return _ignite.GetTransactions();
-        }
-
-        /** <inheritdoc /> */
-        public IMessaging GetMessaging()
-        {
-            return _ignite.GetMessaging();
-        }
-
-        /** <inheritdoc /> */
-        public IEvents GetEvents()
-        {
-            return _ignite.GetEvents();
-        }
-
-        /** <inheritdoc /> */
-        public IServices GetServices()
-        {
-            return _ignite.GetServices();
-        }
-
-        /** <inheritdoc /> */
-        public IAtomicLong GetAtomicLong(string name, long initialValue, bool create)
-        {
-            return _ignite.GetAtomicLong(name, initialValue, create);
-        }
-
-        /** <inheritdoc /> */
-        public IgniteConfiguration GetConfiguration()
-        {
-            return _ignite.GetConfiguration();
-        }
-
-        /** <inheritdoc /> */
-        public ICache<TK, TV> CreateNearCache<TK, TV>(string name, NearCacheConfiguration
configuration)
-        {
-            return _ignite.CreateNearCache<TK, TV>(name, configuration);
-        }
-
-        /** <inheritdoc /> */
-        public ICache<TK, TV> GetOrCreateNearCache<TK, TV>(string name, NearCacheConfiguration
configuration)
-        {
-            return _ignite.GetOrCreateNearCache<TK, TV>(name, configuration);
-        }
-
-        /** <inheritdoc /> */
-        public ICollection<string> GetCacheNames()
-        {
-            return _ignite.GetCacheNames();
-        }
-
-        /** <inheritdoc /> */
-        public ILogger Logger
-        {
-            get { return _ignite.Logger; }
-        }
-
-        /** <inheritdoc /> */
-        public event EventHandler Stopping
-        {
-            add { _ignite.Stopping += value; }
-            remove { _ignite.Stopping -= value; }
-        }
-
-        /** <inheritdoc /> */
-        public event EventHandler Stopped
-        {
-            add { _ignite.Stopped += value; }
-            remove { _ignite.Stopped -= value; }
-        }
-
-        /** <inheritdoc /> */
-        public event EventHandler ClientDisconnected
-        {
-            add { _ignite.ClientDisconnected += value; }
-            remove { _ignite.ClientDisconnected -= value; }
-        }
-
-        /** <inheritdoc /> */
-        public event EventHandler<ClientReconnectEventArgs> ClientReconnected
-        {
-            add { _ignite.ClientReconnected += value; }
-            remove { _ignite.ClientReconnected -= value; }
-        }
-
-        /** <inheritdoc /> */
-        public T GetPlugin<T>(string name) where T : class
-        {
-            return _ignite.GetPlugin<T>(name);
-        }
-
-        /** <inheritdoc /> */
-        public IAtomicSequence GetAtomicSequence(string name, long initialValue, bool create)
-        {
-            return _ignite.GetAtomicSequence(name, initialValue, create);
-        }
-
-        /** <inheritdoc /> */
-        public IAtomicReference<T> GetAtomicReference<T>(string name, T initialValue,
bool create)
-        {
-            return _ignite.GetAtomicReference(name, initialValue, create);
-        }
-
-        /** <inheritdoc /> */
-        public void WriteBinary(IBinaryWriter writer)
-        {
-            // No-op.
-        }
-
-        /// <summary>
-        /// Target grid.
-        /// </summary>
-        internal Ignite Target
-        {
-            get
-            {
-                return _ignite;
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Resource/ResourceProcessor.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Resource/ResourceProcessor.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Resource/ResourceProcessor.cs
index 99023b7..fc677b0 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Resource/ResourceProcessor.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Resource/ResourceProcessor.cs
@@ -73,16 +73,6 @@ namespace Apache.Ignite.Core.Impl.Resource
         /// <param name="grid">Grid.</param>
         public static void Inject(object target, Ignite grid)
         {
-            Inject(target, grid.Proxy);
-        }
-
-        /// <summary>
-        /// Inject resources to the given target.
-        /// </summary>
-        /// <param name="target">Target object.</param>
-        /// <param name="grid">Grid.</param>
-        public static void Inject(object target, IgniteProxy grid)
-        {
             if (target != null) {
                 var desc = Descriptor(target.GetType());
     

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e66294/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Resource/ResourceTypeDescriptor.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Resource/ResourceTypeDescriptor.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Resource/ResourceTypeDescriptor.cs
index 6d2b7b0..3a3f629 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Resource/ResourceTypeDescriptor.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Resource/ResourceTypeDescriptor.cs
@@ -89,17 +89,7 @@ namespace Apache.Ignite.Core.Impl.Resource
         /// <param name="ignite">Grid.</param>
         public void InjectIgnite(object target, Ignite ignite)
         {
-            InjectIgnite(target, ignite.Proxy);
-        }
-
-        /// <summary>
-        /// Inject resources to the given object.
-        /// </summary>
-        /// <param name="target">Target.</param>
-        /// <param name="igniteProxy">Grid proxy.</param>
-        public void InjectIgnite(object target, IgniteProxy igniteProxy)
-        {
-            Inject0(target, igniteProxy, _igniteInjectors);
+            Inject0(target, ignite, _igniteInjectors);
         }
 
         /// <summary>


Mime
View raw message