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/11/11 10:13:10 UTC
[23/24] ignite git commit: IGNITE-1845: Adopted new binary API in
.Net.
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryAbstractTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryAbstractTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryAbstractTest.cs
index c4d2b36..8005e83 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryAbstractTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryAbstractTest.cs
@@ -24,6 +24,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous
using System.Linq;
using System.Runtime.Serialization;
using System.Threading;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cache;
using Apache.Ignite.Core.Cache.Event;
using Apache.Ignite.Core.Cache.Query;
@@ -31,7 +32,6 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous
using Apache.Ignite.Core.Cluster;
using Apache.Ignite.Core.Common;
using Apache.Ignite.Core.Impl;
- using Apache.Ignite.Core.Portable;
using Apache.Ignite.Core.Resource;
using NUnit.Framework;
using CQU = Apache.Ignite.Core.Impl.Cache.Query.Continuous.ContinuousQueryUtils;
@@ -97,17 +97,17 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous
IgniteConfigurationEx cfg = new IgniteConfigurationEx();
- PortableConfiguration portCfg = new PortableConfiguration();
+ BinaryConfiguration portCfg = new BinaryConfiguration();
- ICollection<PortableTypeConfiguration> portTypeCfgs = new List<PortableTypeConfiguration>();
+ ICollection<BinaryTypeConfiguration> portTypeCfgs = new List<BinaryTypeConfiguration>();
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableEntry)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableFilter)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(KeepPortableFilter)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableEntry)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableFilter)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(KeepPortableFilter)));
portCfg.TypeConfigurations = portTypeCfgs;
- cfg.PortableConfiguration = portCfg;
+ cfg.BinaryConfiguration = portCfg;
cfg.JvmClasspath = TestUtils.CreateTestClasspath();
cfg.JvmOptions = TestUtils.TestJavaOptions();
cfg.SpringConfigUrl = "config\\cache-query-continuous.xml";
@@ -491,7 +491,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous
}
else
{
- Assert.Throws<PortableException>(() =>
+ Assert.Throws<BinaryObjectException>(() =>
{
using (cache1.QueryContinuous(qry))
{
@@ -594,10 +594,10 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous
[Test]
public void TestKeepPortable()
{
- var cache = cache1.WithKeepPortable<int, IPortableObject>();
+ var cache = cache1.WithKeepBinary<int, IBinaryObject>();
- ContinuousQuery<int, IPortableObject> qry = new ContinuousQuery<int, IPortableObject>(
- new Listener<IPortableObject>(), new KeepPortableFilter());
+ ContinuousQuery<int, IBinaryObject> qry = new ContinuousQuery<int, IBinaryObject>(
+ new Listener<IBinaryObject>(), new KeepPortableFilter());
using (cache.QueryContinuous(qry))
{
@@ -610,14 +610,14 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous
Assert.IsTrue(FILTER_EVTS.TryTake(out filterEvt, 500));
Assert.AreEqual(PrimaryKey(cache1), filterEvt.entry.Key);
Assert.AreEqual(null, filterEvt.entry.OldValue);
- Assert.AreEqual(Entry(1), (filterEvt.entry.Value as IPortableObject)
+ Assert.AreEqual(Entry(1), (filterEvt.entry.Value as IBinaryObject)
.Deserialize<PortableEntry>());
Assert.IsTrue(CB_EVTS.TryTake(out cbEvt, 500));
Assert.AreEqual(1, cbEvt.entries.Count);
Assert.AreEqual(PrimaryKey(cache1), cbEvt.entries.First().Key);
Assert.AreEqual(null, cbEvt.entries.First().OldValue);
- Assert.AreEqual(Entry(1), (cbEvt.entries.First().Value as IPortableObject)
+ Assert.AreEqual(Entry(1), (cbEvt.entries.First().Value as IBinaryObject)
.Deserialize<PortableEntry>());
// 2. Remote put.
@@ -626,7 +626,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous
Assert.IsTrue(FILTER_EVTS.TryTake(out filterEvt, 500));
Assert.AreEqual(PrimaryKey(cache2), filterEvt.entry.Key);
Assert.AreEqual(null, filterEvt.entry.OldValue);
- Assert.AreEqual(Entry(2), (filterEvt.entry.Value as IPortableObject)
+ Assert.AreEqual(Entry(2), (filterEvt.entry.Value as IBinaryObject)
.Deserialize<PortableEntry>());
Assert.IsTrue(CB_EVTS.TryTake(out cbEvt, 500));
@@ -634,7 +634,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous
Assert.AreEqual(PrimaryKey(cache2), cbEvt.entries.First().Key);
Assert.AreEqual(null, cbEvt.entries.First().OldValue);
Assert.AreEqual(Entry(2),
- (cbEvt.entries.First().Value as IPortableObject).Deserialize<PortableEntry>());
+ (cbEvt.entries.First().Value as IBinaryObject).Deserialize<PortableEntry>());
}
}
@@ -718,13 +718,13 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous
[Test]
public void TestNestedCallFromCallback()
{
- var cache = cache1.WithKeepPortable<int, IPortableObject>();
+ var cache = cache1.WithKeepBinary<int, IBinaryObject>();
int key = PrimaryKey(cache1);
NestedCallListener cb = new NestedCallListener();
- using (cache.QueryContinuous(new ContinuousQuery<int, IPortableObject>(cb)))
+ using (cache.QueryContinuous(new ContinuousQuery<int, IBinaryObject>(cb)))
{
cache1.GetAndPut(key, Entry(key));
@@ -1021,17 +1021,17 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous
/// <summary>
/// Portable filter.
/// </summary>
- public class PortableFilter : AbstractFilter<PortableEntry>, IPortableMarshalAware
+ public class PortableFilter : AbstractFilter<PortableEntry>, IBinarizable
{
/** <inheritDoc /> */
- public void WritePortable(IPortableWriter writer)
+ public void WriteBinary(IBinaryWriter writer)
{
if (marshErr)
throw new Exception("Filter marshalling error.");
}
/** <inheritDoc /> */
- public void ReadPortable(IPortableReader reader)
+ public void ReadBinary(IBinaryReader reader)
{
if (unmarshErr)
throw new Exception("Filter unmarshalling error.");
@@ -1074,7 +1074,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous
/// <summary>
/// Filter for "keep-portable" scenario.
/// </summary>
- public class KeepPortableFilter : AbstractFilter<IPortableObject>
+ public class KeepPortableFilter : AbstractFilter<IBinaryObject>
{
// No-op.
}
@@ -1103,18 +1103,18 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous
/// <summary>
/// Listener with nested Ignite API call.
/// </summary>
- public class NestedCallListener : ICacheEntryEventListener<int, IPortableObject>
+ public class NestedCallListener : ICacheEntryEventListener<int, IBinaryObject>
{
/** Event. */
public readonly CountdownEvent countDown = new CountdownEvent(1);
- public void OnEvent(IEnumerable<ICacheEntryEvent<int, IPortableObject>> evts)
+ public void OnEvent(IEnumerable<ICacheEntryEvent<int, IBinaryObject>> evts)
{
- foreach (ICacheEntryEvent<int, IPortableObject> evt in evts)
+ foreach (ICacheEntryEvent<int, IBinaryObject> evt in evts)
{
- IPortableObject val = evt.Value;
+ IBinaryObject val = evt.Value;
- IPortableMetadata meta = val.GetMetadata();
+ IBinaryType meta = val.GetBinaryType();
Assert.AreEqual(typeof(PortableEntry).Name, meta.TypeName);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheParallelLoadStoreTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheParallelLoadStoreTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheParallelLoadStoreTest.cs
index a7d9adb..4aa910c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheParallelLoadStoreTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheParallelLoadStoreTest.cs
@@ -18,8 +18,8 @@
namespace Apache.Ignite.Core.Tests.Cache.Store
{
using System;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cache;
- using Apache.Ignite.Core.Portable;
using NUnit.Framework;
/// <summary>
@@ -44,7 +44,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Store
JvmClasspath = TestUtils.CreateTestClasspath(),
JvmOptions = TestUtils.TestJavaOptions(),
SpringConfigUrl = "config\\native-client-test-cache-parallel-store.xml",
- PortableConfiguration = new PortableConfiguration
+ BinaryConfiguration = new BinaryConfiguration
{
Types = new[] {typeof (CacheTestParallelLoadStore.Record).FullName}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreTest.cs
index bd0f3a7..0dc9912 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreTest.cs
@@ -20,9 +20,9 @@ namespace Apache.Ignite.Core.Tests.Cache.Store
using System;
using System.Collections;
using System.Collections.Generic;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cache;
using Apache.Ignite.Core.Impl;
- using Apache.Ignite.Core.Portable;
using NUnit.Framework;
/// <summary>
@@ -125,11 +125,11 @@ namespace Apache.Ignite.Core.Tests.Cache.Store
cfg.JvmOptions = TestUtils.TestJavaOptions();
cfg.SpringConfigUrl = "config\\native-client-test-cache-store.xml";
- PortableConfiguration portCfg = new PortableConfiguration();
+ BinaryConfiguration portCfg = new BinaryConfiguration();
portCfg.Types = new List<string> { typeof(Key).FullName, typeof(Value).FullName };
- cfg.PortableConfiguration = portCfg;
+ cfg.BinaryConfiguration = portCfg;
Ignition.Start(cfg);
}
@@ -212,7 +212,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Store
Assert.AreEqual(3, cache.GetSize());
- var meta = cache.WithKeepPortable<Key, IPortableObject>().Get(new Key(0)).GetMetadata();
+ var meta = cache.WithKeepBinary<Key, IBinaryObject>().Get(new Key(0)).GetBinaryType();
Assert.NotNull(meta);
@@ -267,7 +267,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Store
Assert.AreEqual(1, map.Count);
- IPortableObject v = (IPortableObject)map[1];
+ IBinaryObject v = (IBinaryObject)map[1];
Assert.AreEqual(1, v.GetField<int>("_idx"));
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/AbstractTaskTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/AbstractTaskTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/AbstractTaskTest.cs
index 12c9992..9e96ca2 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/AbstractTaskTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/AbstractTaskTest.cs
@@ -20,7 +20,7 @@ namespace Apache.Ignite.Core.Tests.Compute
using System;
using System.Collections.Generic;
using System.Threading;
- using Apache.Ignite.Core.Portable;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Tests.Process;
using NUnit.Framework;
@@ -167,15 +167,15 @@ namespace Apache.Ignite.Core.Tests.Compute
if (!_fork)
{
- PortableConfiguration portCfg = new PortableConfiguration();
+ BinaryConfiguration portCfg = new BinaryConfiguration();
- ICollection<PortableTypeConfiguration> portTypeCfgs = new List<PortableTypeConfiguration>();
+ ICollection<BinaryTypeConfiguration> portTypeCfgs = new List<BinaryTypeConfiguration>();
PortableTypeConfigurations(portTypeCfgs);
portCfg.TypeConfigurations = portTypeCfgs;
- cfg.PortableConfiguration = portCfg;
+ cfg.BinaryConfiguration = portCfg;
}
cfg.JvmClasspath = TestUtils.CreateTestClasspath();
@@ -209,7 +209,7 @@ namespace Apache.Ignite.Core.Tests.Compute
/// Define portable types.
/// </summary>
/// <param name="portTypeCfgs">Portable type configurations.</param>
- protected virtual void PortableTypeConfigurations(ICollection<PortableTypeConfiguration> portTypeCfgs)
+ protected virtual void PortableTypeConfigurations(ICollection<BinaryTypeConfiguration> portTypeCfgs)
{
// No-op.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs
index cb2c8b4..f02e67e 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs
@@ -23,11 +23,11 @@ namespace Apache.Ignite.Core.Tests.Compute
using System.Collections.Generic;
using System.Linq;
using System.Threading;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cluster;
using Apache.Ignite.Core.Common;
using Apache.Ignite.Core.Compute;
using Apache.Ignite.Core.Impl.Common;
- using Apache.Ignite.Core.Portable;
using Apache.Ignite.Core.Resource;
using NUnit.Framework;
@@ -817,16 +817,16 @@ namespace Apache.Ignite.Core.Tests.Compute
{
ICompute compute = _grid1.GetCompute();
- compute.WithKeepPortable();
+ compute.WithKeepBinary();
- IPortableObject res = compute.ExecuteJavaTask<IPortableObject>(EchoTask, EchoTypePortableJava);
+ IBinaryObject res = compute.ExecuteJavaTask<IBinaryObject>(EchoTask, EchoTypePortableJava);
Assert.AreEqual(1, res.GetField<int>("field"));
// This call must fail because "keepPortable" flag is reset.
- Assert.Catch(typeof(PortableException), () =>
+ Assert.Catch(typeof(BinaryObjectException), () =>
{
- compute.ExecuteJavaTask<IPortableObject>(EchoTask, EchoTypePortableJava);
+ compute.ExecuteJavaTask<IBinaryObject>(EchoTask, EchoTypePortableJava);
});
}
@@ -890,7 +890,7 @@ namespace Apache.Ignite.Core.Tests.Compute
{
ICompute compute = _grid1.GetCompute();
- compute.WithKeepPortable();
+ compute.WithKeepBinary();
PlatformComputeNetPortable arg = new PlatformComputeNetPortable();
@@ -1095,17 +1095,17 @@ namespace Apache.Ignite.Core.Tests.Compute
{
IgniteConfiguration cfg = new IgniteConfiguration();
- PortableConfiguration portCfg = new PortableConfiguration();
+ BinaryConfiguration portCfg = new BinaryConfiguration();
- ICollection<PortableTypeConfiguration> portTypeCfgs = new List<PortableTypeConfiguration>();
+ ICollection<BinaryTypeConfiguration> portTypeCfgs = new List<BinaryTypeConfiguration>();
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PlatformComputePortable)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PlatformComputeNetPortable)));
- portTypeCfgs.Add(new PortableTypeConfiguration(JavaPortableCls));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PlatformComputePortable)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PlatformComputeNetPortable)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(JavaPortableCls));
portCfg.TypeConfigurations = portTypeCfgs;
- cfg.PortableConfiguration = portCfg;
+ cfg.BinaryConfiguration = portCfg;
cfg.JvmClasspath = Classpath.CreateClasspath(cfg, true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/FailoverTaskSelfTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/FailoverTaskSelfTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/FailoverTaskSelfTest.cs
index 2bd8e3a..044b5a6 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/FailoverTaskSelfTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/FailoverTaskSelfTest.cs
@@ -19,9 +19,9 @@ namespace Apache.Ignite.Core.Tests.Compute
{
using System;
using System.Collections.Generic;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cluster;
using Apache.Ignite.Core.Compute;
- using Apache.Ignite.Core.Portable;
using Apache.Ignite.Core.Resource;
using NUnit.Framework;
@@ -111,9 +111,9 @@ namespace Apache.Ignite.Core.Tests.Compute
}
/** <inheritDoc /> */
- override protected void PortableTypeConfigurations(ICollection<PortableTypeConfiguration> portTypeCfgs)
+ override protected void PortableTypeConfigurations(ICollection<BinaryTypeConfiguration> portTypeCfgs)
{
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(TestPortableJob)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(TestPortableJob)));
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/IgniteExceptionTaskSelfTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/IgniteExceptionTaskSelfTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/IgniteExceptionTaskSelfTest.cs
index 31286fe..55d04cd 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/IgniteExceptionTaskSelfTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/IgniteExceptionTaskSelfTest.cs
@@ -21,10 +21,10 @@ namespace Apache.Ignite.Core.Tests.Compute
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cluster;
using Apache.Ignite.Core.Common;
using Apache.Ignite.Core.Compute;
- using Apache.Ignite.Core.Portable;
using Apache.Ignite.Core.Resource;
using NUnit.Framework;
@@ -88,7 +88,7 @@ namespace Apache.Ignite.Core.Tests.Compute
{
Mode = ErrorMode.MapJobNotMarshalable;
- var e = ExecuteWithError() as PortableException;
+ var e = ExecuteWithError() as BinaryObjectException;
Assert.IsNotNull(e);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/PortableClosureTaskTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/PortableClosureTaskTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/PortableClosureTaskTest.cs
index 598a7ea..bca5ab6 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/PortableClosureTaskTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/PortableClosureTaskTest.cs
@@ -19,8 +19,8 @@ namespace Apache.Ignite.Core.Tests.Compute
{
using System;
using System.Collections.Generic;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Compute;
- using Apache.Ignite.Core.Portable;
using NUnit.Framework;
/// <summary>
@@ -40,12 +40,12 @@ namespace Apache.Ignite.Core.Tests.Compute
protected PortableClosureTaskTest(bool fork) : base(fork) { }
/** <inheritDoc /> */
- protected override void PortableTypeConfigurations(ICollection<PortableTypeConfiguration> portTypeCfgs)
+ protected override void PortableTypeConfigurations(ICollection<BinaryTypeConfiguration> portTypeCfgs)
{
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableOutFunc)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableFunc)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableResult)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableException)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableOutFunc)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableFunc)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableResult)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableException)));
}
/** <inheritDoc /> */
@@ -153,7 +153,7 @@ namespace Apache.Ignite.Core.Tests.Compute
/// <summary>
///
/// </summary>
- private class PortableException : Exception, IPortableMarshalAware
+ private class PortableException : Exception, IBinarizable
{
/** */
public string Msg;
@@ -176,13 +176,13 @@ namespace Apache.Ignite.Core.Tests.Compute
}
/** <inheritDoc /> */
- public void WritePortable(IPortableWriter writer)
+ public void WriteBinary(IBinaryWriter writer)
{
writer.GetRawWriter().WriteString(Msg);
}
/** <inheritDoc /> */
- public void ReadPortable(IPortableReader reader)
+ public void ReadBinary(IBinaryReader reader)
{
Msg = reader.GetRawReader().ReadString();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/PortableTaskTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/PortableTaskTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/PortableTaskTest.cs
index c63b4f0..40a0f72 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/PortableTaskTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/PortableTaskTest.cs
@@ -18,9 +18,9 @@
namespace Apache.Ignite.Core.Tests.Compute
{
using System.Collections.Generic;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cluster;
using Apache.Ignite.Core.Compute;
- using Apache.Ignite.Core.Portable;
using Apache.Ignite.Core.Resource;
using NUnit.Framework;
@@ -61,24 +61,24 @@ namespace Apache.Ignite.Core.Tests.Compute
Assert.AreEqual(400, resObj.Val);
}
- private static IPortableObject ToPortable(IIgnite grid, object obj)
+ private static IBinaryObject ToPortable(IIgnite grid, object obj)
{
- var cache = grid.GetCache<object, object>(Cache1Name).WithKeepPortable<object, object>();
+ var cache = grid.GetCache<object, object>(Cache1Name).WithKeepBinary<object, object>();
cache.Put(1, obj);
- return (IPortableObject) cache.Get(1);
+ return (IBinaryObject) cache.Get(1);
}
/** <inheritDoc /> */
- override protected void PortableTypeConfigurations(ICollection<PortableTypeConfiguration> portTypeCfgs)
+ override protected void PortableTypeConfigurations(ICollection<BinaryTypeConfiguration> portTypeCfgs)
{
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableJobArgument)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableJobResult)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableTaskArgument)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableTaskResult)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableJob)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableWrapper)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableJobArgument)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableJobResult)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableTaskArgument)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableTaskResult)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableJob)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableWrapper)));
}
/// <summary>
@@ -263,7 +263,7 @@ namespace Apache.Ignite.Core.Tests.Compute
class PortableWrapper
{
- public IPortableObject Item { get; set; }
+ public IBinaryObject Item { get; set; }
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/TaskAdapterTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/TaskAdapterTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/TaskAdapterTest.cs
index 9b58268..57e23b8 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/TaskAdapterTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/TaskAdapterTest.cs
@@ -19,8 +19,8 @@ namespace Apache.Ignite.Core.Tests.Compute
{
using System;
using System.Collections.Generic;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Compute;
- using Apache.Ignite.Core.Portable;
using Apache.Ignite.Core.Resource;
using NUnit.Framework;
@@ -99,9 +99,9 @@ namespace Apache.Ignite.Core.Tests.Compute
}
/** <inheritDoc /> */
- override protected void PortableTypeConfigurations(ICollection<PortableTypeConfiguration> portTypeCfgs)
+ override protected void PortableTypeConfigurations(ICollection<BinaryTypeConfiguration> portTypeCfgs)
{
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableJob)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableJob)));
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/TaskResultTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/TaskResultTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/TaskResultTest.cs
index 7108f59..20b19a1 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/TaskResultTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/TaskResultTest.cs
@@ -19,9 +19,9 @@ namespace Apache.Ignite.Core.Tests.Compute
{
using System;
using System.Collections.Generic;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cluster;
using Apache.Ignite.Core.Compute;
- using Apache.Ignite.Core.Portable;
using Apache.Ignite.Core.Resource;
using NUnit.Framework;
@@ -156,12 +156,12 @@ namespace Apache.Ignite.Core.Tests.Compute
}
/** <inheritDoc /> */
- override protected void PortableTypeConfigurations(ICollection<PortableTypeConfiguration> portTypeCfgs)
+ override protected void PortableTypeConfigurations(ICollection<BinaryTypeConfiguration> portTypeCfgs)
{
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableResult)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(TestPortableJob)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableOutFunc)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof(PortableFunc)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableResult)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(TestPortableJob)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableOutFunc)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof(PortableFunc)));
}
[Test]
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-standalone.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-standalone.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-standalone.xml
index bd34958..6447b4e 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-standalone.xml
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-standalone.xml
@@ -55,8 +55,8 @@
<property name="platformConfiguration">
<bean class="org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration">
- <property name="portableConfiguration">
- <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetPortableConfiguration">
+ <property name="binaryConfiguration">
+ <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetBinaryConfiguration">
<property name="types">
<list>
<value>Apache.Ignite.Core.Tests.ExecutableTest+RemoteConfiguration</value>
@@ -70,10 +70,10 @@
</property>
<property name="typesConfiguration">
<list>
- <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetPortableTypeConfiguration">
+ <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetBinaryTypeConfiguration">
<property name="typeName" value="org.apache.ignite.platform.PlatformComputePortable"/>
</bean>
- <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetPortableTypeConfiguration">
+ <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetBinaryTypeConfiguration">
<property name="typeName" value="org.apache.ignite.platform.PlatformComputeJavaPortable"/>
</bean>
</list>
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-portables.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-portables.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-portables.xml
index 84f9e5a..26bf87b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-portables.xml
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-portables.xml
@@ -31,8 +31,8 @@
<property name="platformConfiguration">
<bean class="org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration">
- <property name="portableConfiguration">
- <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetPortableConfiguration">
+ <property name="binaryConfiguration">
+ <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetBinaryConfiguration">
<property name="types">
<list>
<value>Apache.Ignite.Core.Tests.TestGenericPortable[System.Int64]</value>
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-query.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-query.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-query.xml
index 787a921..338e7f1 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-query.xml
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-query.xml
@@ -31,8 +31,8 @@
<property name="platformConfiguration">
<bean class="org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration">
- <property name="portableConfiguration">
- <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetPortableConfiguration">
+ <property name="binaryConfiguration">
+ <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetBinaryConfiguration">
<property name="types">
<list>
<value>Apache.Ignite.Core.Tests.Cache.Query.QueryPerson</value>
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache-affinity.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache-affinity.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache-affinity.xml
index f08018d..4c73ff6 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache-affinity.xml
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache-affinity.xml
@@ -28,11 +28,11 @@
<property name="platformConfiguration">
<bean class="org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration">
- <property name="portableConfiguration">
- <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetPortableConfiguration">
+ <property name="binaryConfiguration">
+ <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetBinaryConfiguration">
<property name="typesConfiguration">
<list>
- <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetPortableTypeConfiguration">
+ <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetBinaryTypeConfiguration">
<property name="typeName"
value="Apache.Ignite.Core.Tests.Cache.CacheAffinityTest+AffinityTestKey"/>
<property name="affinityKeyFieldName" value="_affKey"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs
index c9dea5c..2f9f6c9 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs
@@ -22,10 +22,10 @@ namespace Apache.Ignite.Core.Tests.Dataload
using System.Diagnostics;
using System.Linq;
using System.Threading;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cache;
using Apache.Ignite.Core.Datastream;
using Apache.Ignite.Core.Impl;
- using Apache.Ignite.Core.Portable;
using Apache.Ignite.Core.Tests.Cache;
using NUnit.Framework;
@@ -441,14 +441,14 @@ namespace Apache.Ignite.Core.Tests.Dataload
var cache = _grid.GetCache<int, PortableEntry>(CacheName);
using (var ldr0 = _grid.GetDataStreamer<int, int>(CacheName))
- using (var ldr = ldr0.WithKeepPortable<int, IPortableObject>())
+ using (var ldr = ldr0.WithKeepBinary<int, IBinaryObject>())
{
ldr.Receiver = new StreamReceiverKeepPortable();
ldr.AllowOverwrite = true;
for (var i = 0; i < 100; i++)
- ldr.AddData(i, _grid.GetPortables().ToPortable<IPortableObject>(new PortableEntry {Val = i}));
+ ldr.AddData(i, _grid.GetBinary().ToBinary<IBinaryObject>(new PortableEntry {Val = i}));
ldr.Flush();
@@ -468,15 +468,15 @@ namespace Apache.Ignite.Core.Tests.Dataload
GridName = gridName,
SpringConfigUrl = "config\\native-client-test-cache.xml",
JvmClasspath = TestUtils.CreateTestClasspath(),
- PortableConfiguration = new PortableConfiguration
+ BinaryConfiguration = new BinaryConfiguration
{
- TypeConfigurations = new List<PortableTypeConfiguration>
+ TypeConfigurations = new List<BinaryTypeConfiguration>
{
- new PortableTypeConfiguration(typeof (CacheTestKey)),
- new PortableTypeConfiguration(typeof (TestReferenceObject)),
- new PortableTypeConfiguration(typeof (StreamReceiverPortable)),
- new PortableTypeConfiguration(typeof (EntryProcessorPortable)),
- new PortableTypeConfiguration(typeof (PortableEntry))
+ new BinaryTypeConfiguration(typeof (CacheTestKey)),
+ new BinaryTypeConfiguration(typeof (TestReferenceObject)),
+ new BinaryTypeConfiguration(typeof (StreamReceiverPortable)),
+ new BinaryTypeConfiguration(typeof (EntryProcessorPortable)),
+ new BinaryTypeConfiguration(typeof (PortableEntry))
}
},
JvmOptions = TestUtils.TestJavaOptions().Concat(new[]
@@ -512,15 +512,15 @@ namespace Apache.Ignite.Core.Tests.Dataload
/// Test portable receiver.
/// </summary>
[Serializable]
- private class StreamReceiverKeepPortable : IStreamReceiver<int, IPortableObject>
+ private class StreamReceiverKeepPortable : IStreamReceiver<int, IBinaryObject>
{
/** <inheritdoc /> */
- public void Receive(ICache<int, IPortableObject> cache, ICollection<ICacheEntry<int, IPortableObject>> entries)
+ public void Receive(ICache<int, IBinaryObject> cache, ICollection<ICacheEntry<int, IBinaryObject>> entries)
{
- var portables = cache.Ignite.GetPortables();
+ var portables = cache.Ignite.GetBinary();
cache.PutAll(entries.ToDictionary(x => x.Key, x =>
- portables.ToPortable<IPortableObject>(new PortableEntry
+ portables.ToBinary<IBinaryObject>(new PortableEntry
{
Val = x.Value.Deserialize<PortableEntry>().Val + 1
})));
@@ -558,7 +558,7 @@ namespace Apache.Ignite.Core.Tests.Dataload
/// <summary>
/// Test entry processor.
/// </summary>
- private class EntryProcessorPortable : ICacheEntryProcessor<int, int, int, int>, IPortableMarshalAware
+ private class EntryProcessorPortable : ICacheEntryProcessor<int, int, int, int>, IBinarizable
{
/** <inheritdoc /> */
public int Process(IMutableCacheEntry<int, int> entry, int arg)
@@ -569,13 +569,13 @@ namespace Apache.Ignite.Core.Tests.Dataload
}
/** <inheritdoc /> */
- public void WritePortable(IPortableWriter writer)
+ public void WriteBinary(IBinaryWriter writer)
{
// No-op.
}
/** <inheritdoc /> */
- public void ReadPortable(IPortableReader reader)
+ public void ReadBinary(IBinaryReader reader)
{
// No-op.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
index 2dd03da..403f8a7 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
@@ -23,12 +23,12 @@ namespace Apache.Ignite.Core.Tests
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cache.Query;
using Apache.Ignite.Core.Common;
using Apache.Ignite.Core.Events;
using Apache.Ignite.Core.Impl;
using Apache.Ignite.Core.Impl.Events;
- using Apache.Ignite.Core.Portable;
using Apache.Ignite.Core.Tests.Compute;
using NUnit.Framework;
@@ -612,11 +612,11 @@ namespace Apache.Ignite.Core.Tests
SpringConfigUrl = springConfigUrl,
JvmClasspath = TestUtils.CreateTestClasspath(),
JvmOptions = TestUtils.TestJavaOptions(),
- PortableConfiguration = new PortableConfiguration
+ BinaryConfiguration = new BinaryConfiguration
{
- TypeConfigurations = new List<PortableTypeConfiguration>
+ TypeConfigurations = new List<BinaryTypeConfiguration>
{
- new PortableTypeConfiguration(typeof (RemoteEventPortableFilter))
+ new BinaryTypeConfiguration(typeof (RemoteEventPortableFilter))
}
}
};
@@ -884,7 +884,7 @@ namespace Apache.Ignite.Core.Tests
/// <summary>
/// Portable remote event filter.
/// </summary>
- public class RemoteEventPortableFilter : IEventFilter<IEvent>, IPortableMarshalAware
+ public class RemoteEventPortableFilter : IEventFilter<IEvent>, IBinarizable
{
/** */
private int _type;
@@ -905,13 +905,13 @@ namespace Apache.Ignite.Core.Tests
}
/** <inheritdoc /> */
- public void WritePortable(IPortableWriter writer)
+ public void WriteBinary(IBinaryWriter writer)
{
writer.GetRawWriter().WriteInt(_type);
}
/** <inheritdoc /> */
- public void ReadPortable(IPortableReader reader)
+ public void ReadBinary(IBinaryReader reader)
{
_type = reader.GetRawReader().ReadInt();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs
index b971876..196d8ae 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs
@@ -22,11 +22,11 @@ namespace Apache.Ignite.Core.Tests
using System.Linq;
using System.Runtime.Serialization.Formatters.Binary;
using System.Threading.Tasks;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cache;
using Apache.Ignite.Core.Cluster;
using Apache.Ignite.Core.Common;
using Apache.Ignite.Core.Impl;
- using Apache.Ignite.Core.Portable;
using NUnit.Framework;
/// <summary>
@@ -118,7 +118,7 @@ namespace Apache.Ignite.Core.Tests
public void TestPartialUpdateExceptionPortable()
{
// User type
- TestPartialUpdateException(false, (x, g) => g.GetPortables().ToPortable<IPortableObject>(new PortableEntry(x)));
+ TestPartialUpdateException(false, (x, g) => g.GetBinary().ToBinary<IBinaryObject>(new PortableEntry(x)));
}
/// <summary>
@@ -205,7 +205,7 @@ namespace Apache.Ignite.Core.Tests
[Category(TestUtils.CategoryIntensive)]
public void TestPartialUpdateExceptionAsyncPortable()
{
- TestPartialUpdateException(true, (x, g) => g.GetPortables().ToPortable<IPortableObject>(new PortableEntry(x)));
+ TestPartialUpdateException(true, (x, g) => g.GetBinary().ToBinary<IBinaryObject>(new PortableEntry(x)));
}
/// <summary>
@@ -217,8 +217,8 @@ namespace Apache.Ignite.Core.Tests
{
var cache = grid.GetCache<TK, int>("partitioned_atomic").WithNoRetries();
- if (typeof (TK) == typeof (IPortableObject))
- cache = cache.WithKeepPortable<TK, int>();
+ if (typeof (TK) == typeof (IBinaryObject))
+ cache = cache.WithKeepBinary<TK, int>();
// Do cache puts in parallel
var putTask = Task.Factory.StartNew(() =>
@@ -291,11 +291,11 @@ namespace Apache.Ignite.Core.Tests
JvmOptions = TestUtils.TestJavaOptions(),
JvmClasspath = TestUtils.CreateTestClasspath(),
GridName = gridName,
- PortableConfiguration = new PortableConfiguration
+ BinaryConfiguration = new BinaryConfiguration
{
TypeConfigurations = new[]
{
- new PortableTypeConfiguration(typeof (PortableEntry))
+ new BinaryTypeConfiguration(typeof (PortableEntry))
}
}
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/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 abb296c..e34e0ba 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExecutableTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExecutableTest.cs
@@ -22,9 +22,9 @@ namespace Apache.Ignite.Core.Tests
using System;
using System.CodeDom.Compiler;
using System.Collections.Generic;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Compute;
using Apache.Ignite.Core.Impl;
- using Apache.Ignite.Core.Portable;
using Apache.Ignite.Core.Resource;
using Apache.Ignite.Core.Tests.Process;
using Microsoft.CSharp;
@@ -287,16 +287,16 @@ namespace Apache.Ignite.Core.Tests
var cfg = new IgniteConfiguration();
- var portCfg = new PortableConfiguration();
+ var portCfg = new BinaryConfiguration();
- ICollection<PortableTypeConfiguration> portTypeCfgs = new List<PortableTypeConfiguration>();
+ ICollection<BinaryTypeConfiguration> portTypeCfgs = new List<BinaryTypeConfiguration>();
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof (RemoteConfiguration)));
- portTypeCfgs.Add(new PortableTypeConfiguration(typeof (RemoteConfigurationClosure)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof (RemoteConfiguration)));
+ portTypeCfgs.Add(new BinaryTypeConfiguration(typeof (RemoteConfigurationClosure)));
portCfg.TypeConfigurations = portTypeCfgs;
- cfg.PortableConfiguration = portCfg;
+ cfg.BinaryConfiguration = portCfg;
cfg.JvmClasspath = TestUtils.CreateTestClasspath();
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/FutureTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/FutureTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/FutureTest.cs
index be5bbbc..e32f49a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/FutureTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/FutureTest.cs
@@ -20,9 +20,9 @@ namespace Apache.Ignite.Core.Tests
using System;
using System.Collections.Generic;
using System.Threading;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cache;
using Apache.Ignite.Core.Compute;
- using Apache.Ignite.Core.Portable;
using NUnit.Framework;
/// <summary>
@@ -49,10 +49,10 @@ namespace Apache.Ignite.Core.Tests
SpringConfigUrl = "config\\compute\\compute-standalone.xml",
JvmClasspath = TestUtils.CreateTestClasspath(),
JvmOptions = TestUtils.TestJavaOptions(),
- PortableConfiguration = new PortableConfiguration
+ BinaryConfiguration = new BinaryConfiguration
{
TypeConfigurations =
- new List<PortableTypeConfiguration> { new PortableTypeConfiguration(typeof(Portable)) }
+ new List<BinaryTypeConfiguration> { new BinaryTypeConfiguration(typeof(Portable)) }
}
});
@@ -125,20 +125,20 @@ namespace Apache.Ignite.Core.Tests
/// <summary>
/// Portable test class.
/// </summary>
- private class Portable : IPortableMarshalAware
+ private class Portable : IBinarizable
{
public int A;
public string B;
/** <inheritDoc /> */
- public void WritePortable(IPortableWriter writer)
+ public void WriteBinary(IBinaryWriter writer)
{
writer.WriteInt("a", A);
writer.GetRawWriter().WriteString(B);
}
/** <inheritDoc /> */
- public void ReadPortable(IPortableReader reader)
+ public void ReadBinary(IBinaryReader reader)
{
A = reader.ReadInt("a");
B = reader.GetRawReader().ReadString();
http://git-wip-us.apache.org/repos/asf/ignite/blob/894057e5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs
index d302046..b589b2e 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs
@@ -341,7 +341,7 @@ namespace Apache.Ignite.Core.Tests
var comp = ignite.GetCompute();
// ReSharper disable once RedundantAssignment
- comp = comp.WithKeepPortable();
+ comp = comp.WithKeepBinary();
var prj = ignite.GetCluster().ForOldest();