IGNITE-1845 .Net: Adopt portable API changes.

.gitignore

@@ -22,9 +22,8 @@ pom-installed.xml
 git-patch-prop-local.sh
 /slurp.sh
 *.vcxproj.user
-Apache.Ignite.sdf
-ignite.sdf
-ignite.opensdf
+*.sdf
+*.opensdf
 **/cpp/**/vs/x64/
 **/cpp/**/vs/Win32/
 **/dotnet/**/obj/

modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java

@@ -39,8 +39,8 @@
 import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.lang.IgniteUuid;
 import org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration;
-import org.apache.ignite.platform.dotnet.PlatformDotNetPortableConfiguration;
-import org.apache.ignite.platform.dotnet.PlatformDotNetPortableTypeConfiguration;
+import org.apache.ignite.platform.dotnet.PlatformDotNetBinaryConfiguration;
+import org.apache.ignite.platform.dotnet.PlatformDotNetBinaryTypeConfiguration;
 import org.jetbrains.annotations.Nullable;
 
 import javax.cache.CacheException;
@@ -773,14 +773,14 @@ public static void writeDotNetConfiguration(BinaryRawWriterEx writer, PlatformDo
         // 1. Write assemblies.
         writeNullableCollection(writer, cfg.getAssemblies());
 
-        PlatformDotNetPortableConfiguration portableCfg = cfg.getPortableConfiguration();
+        PlatformDotNetBinaryConfiguration binaryCfg = cfg.getBinaryConfiguration();
 
-        if (portableCfg != null) {
+        if (binaryCfg != null) {
             writer.writeBoolean(true);
 
-            writeNullableCollection(writer, portableCfg.getTypesConfiguration(),
-                new PlatformWriterClosure<PlatformDotNetPortableTypeConfiguration>() {
-                @Override public void write(BinaryRawWriterEx writer, PlatformDotNetPortableTypeConfiguration typ) {
+            writeNullableCollection(writer, binaryCfg.getTypesConfiguration(),
+                new PlatformWriterClosure<PlatformDotNetBinaryTypeConfiguration>() {
+                @Override public void write(BinaryRawWriterEx writer, PlatformDotNetBinaryTypeConfiguration typ) {
                     writer.writeString(typ.getTypeName());
                     writer.writeString(typ.getNameMapper());
                     writer.writeString(typ.getIdMapper());
@@ -790,11 +790,11 @@ public static void writeDotNetConfiguration(BinaryRawWriterEx writer, PlatformDo
                 }
             });
 
-            writeNullableCollection(writer, portableCfg.getTypes());
-            writer.writeString(portableCfg.getDefaultNameMapper());
-            writer.writeString(portableCfg.getDefaultIdMapper());
-            writer.writeString(portableCfg.getDefaultSerializer());
-            writer.writeBoolean(portableCfg.isDefaultKeepDeserialized());
+            writeNullableCollection(writer, binaryCfg.getTypes());
+            writer.writeString(binaryCfg.getDefaultNameMapper());
+            writer.writeString(binaryCfg.getDefaultIdMapper());
+            writer.writeString(binaryCfg.getDefaultSerializer());
+            writer.writeBoolean(binaryCfg.isDefaultKeepDeserialized());
         }
         else
             writer.writeBoolean(false);

modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetPortableConfiguration.java → modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java

@@ -23,11 +23,11 @@
 import java.util.Collection;
 
 /**
- * Mirror of .Net class PortableConfiguration.cs
+ * Mirror of .Net class BinaryConfiguration.cs
  */
-public class PlatformDotNetPortableConfiguration {
+public class PlatformDotNetBinaryConfiguration {
     /** Type cfgs. */
-    private Collection<PlatformDotNetPortableTypeConfiguration> typesCfg;
+    private Collection<PlatformDotNetBinaryTypeConfiguration> typesCfg;
 
     /** Types. */
     private Collection<String> types;
@@ -47,20 +47,20 @@ public class PlatformDotNetPortableConfiguration {
     /**
      * Default constructor.
      */
-    public PlatformDotNetPortableConfiguration() {
+    public PlatformDotNetBinaryConfiguration() {
         // No-op.
     }
 
     /**
      * Copy constructor.
      * @param cfg configuration to copy.
      */
-    public PlatformDotNetPortableConfiguration(PlatformDotNetPortableConfiguration cfg) {
+    public PlatformDotNetBinaryConfiguration(PlatformDotNetBinaryConfiguration cfg) {
         if (cfg.getTypesConfiguration() != null) {
             typesCfg = new ArrayList<>();
 
-            for (PlatformDotNetPortableTypeConfiguration typeCfg : cfg.getTypesConfiguration())
-                typesCfg.add(new PlatformDotNetPortableTypeConfiguration(typeCfg));
+            for (PlatformDotNetBinaryTypeConfiguration typeCfg : cfg.getTypesConfiguration())
+                typesCfg.add(new PlatformDotNetBinaryTypeConfiguration(typeCfg));
         }
 
         if (cfg.getTypes() != null)
@@ -75,14 +75,14 @@ public PlatformDotNetPortableConfiguration(PlatformDotNetPortableConfiguration c
     /**
      * @return Type cfgs.
      */
-    public Collection<PlatformDotNetPortableTypeConfiguration> getTypesConfiguration() {
+    public Collection<PlatformDotNetBinaryTypeConfiguration> getTypesConfiguration() {
         return typesCfg;
     }
 
     /**
      * @param typesCfg New type cfgs.
      */
-    public void setTypesConfiguration(Collection<PlatformDotNetPortableTypeConfiguration> typesCfg) {
+    public void setTypesConfiguration(Collection<PlatformDotNetBinaryTypeConfiguration> typesCfg) {
         this.typesCfg = typesCfg;
     }
 
@@ -155,7 +155,7 @@ public boolean isDefaultKeepDeserialized() {
      * Sets default keep deserialized flag.
      * <p />
      * Can be overridden for particular type using
-     * {@link PlatformDotNetPortableTypeConfiguration#setKeepDeserialized(Boolean)}.
+     * {@link PlatformDotNetBinaryTypeConfiguration#setKeepDeserialized(Boolean)}.
      *
      * @param keepDeserialized Keep deserialized flag.
      */
@@ -165,6 +165,6 @@ public void setDefaultKeepDeserialized(boolean keepDeserialized) {
 
     /** {@inheritDoc} */
     @Override public String toString() {
-        return S.toString(PlatformDotNetPortableConfiguration.class, this);
+        return S.toString(PlatformDotNetBinaryConfiguration.class, this);
     }
 }

modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetPortableTypeConfiguration.java → modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryTypeConfiguration.java

@@ -21,9 +21,9 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Mirror of .Net class GridDotNetPortableTypeConfiguration.cs
+ * Mirror of .Net class GridDotNetBinaryTypeConfiguration.cs
  */
-public class PlatformDotNetPortableTypeConfiguration {
+public class PlatformDotNetBinaryTypeConfiguration {
     /** Type name. */
     private String typeName;
 
@@ -39,21 +39,21 @@ public class PlatformDotNetPortableTypeConfiguration {
     /** Affinity key field name. */
     private String affinityKeyFieldName;
 
-    /** Whether to cache deserialized value in IGridPortableObject. */
+    /** Whether to cache deserialized value. */
     private Boolean keepDeserialized;
 
     /**
      * Default constructor.
      */
-    public PlatformDotNetPortableTypeConfiguration() {
+    public PlatformDotNetBinaryTypeConfiguration() {
         // No-op.
     }
 
     /**
      * Copy constructor.
      * @param cfg configuration to copy.
      */
-    public PlatformDotNetPortableTypeConfiguration(PlatformDotNetPortableTypeConfiguration cfg) {
+    public PlatformDotNetBinaryTypeConfiguration(PlatformDotNetBinaryTypeConfiguration cfg) {
         typeName = cfg.getTypeName();
         nameMapper = cfg.getNameMapper();
         idMapper = cfg.getIdMapper();
@@ -135,7 +135,7 @@ public void setAffinityKeyFieldName(String affinityKeyFieldName) {
     /**
      * Gets keep deserialized flag.
      *
-     * @return Flag indicates whether to cache deserialized value in IGridPortableObject.
+     * @return Flag indicates whether to cache deserialized value.
      * @deprecated Use {@link #getKeepDeserialized()} instead.
      */
     @Deprecated
@@ -146,7 +146,7 @@ public void setAffinityKeyFieldName(String affinityKeyFieldName) {
     /**
      * Gets keep deserialized flag. See {@link #setKeepDeserialized(Boolean)} for more information.
      *
-     * @return Flag indicates whether to cache deserialized value in IGridPortableObject.
+     * @return Flag indicates whether to cache deserialized value.
      */
     @Nullable public Boolean getKeepDeserialized() {
         return keepDeserialized;
@@ -156,7 +156,7 @@ public void setAffinityKeyFieldName(String affinityKeyFieldName) {
      * Sets keep deserialized flag.
      * <p />
      * When set to {@code null} default value taken from
-     * {@link PlatformDotNetPortableConfiguration#isDefaultKeepDeserialized()} will be used.
+     * {@link PlatformDotNetBinaryConfiguration#isDefaultKeepDeserialized()} will be used.
      *
      * @param keepDeserialized Keep deserialized flag.
      */
@@ -166,6 +166,6 @@ public void setKeepDeserialized(@Nullable Boolean keepDeserialized) {
 
     /** {@inheritDoc} */
     @Override public String toString() {
-        return S.toString(PlatformDotNetPortableTypeConfiguration.class, this);
+        return S.toString(PlatformDotNetBinaryTypeConfiguration.class, this);
     }
 }

modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java

@@ -28,7 +28,7 @@
  */
 public class PlatformDotNetConfiguration implements PlatformConfiguration {
     /** */
-    private PlatformDotNetPortableConfiguration portableCfg;
+    private PlatformDotNetBinaryConfiguration binaryCfg;
 
     /** */
     private List<String> assemblies;
@@ -46,8 +46,8 @@ public PlatformDotNetConfiguration() {
      * @param cfg Configuration to copy.
      */
     public PlatformDotNetConfiguration(PlatformDotNetConfiguration cfg) {
-        if (cfg.getPortableConfiguration() != null)
-            portableCfg = new PlatformDotNetPortableConfiguration(cfg.getPortableConfiguration());
+        if (cfg.getBinaryConfiguration() != null)
+            binaryCfg = new PlatformDotNetBinaryConfiguration(cfg.getBinaryConfiguration());
 
         if (cfg.getAssemblies() != null)
             assemblies = new ArrayList<>(cfg.getAssemblies());
@@ -56,15 +56,15 @@ public PlatformDotNetConfiguration(PlatformDotNetConfiguration cfg) {
     /**
      * @return Configuration.
      */
-    public PlatformDotNetPortableConfiguration getPortableConfiguration() {
-        return portableCfg;
+    public PlatformDotNetBinaryConfiguration getBinaryConfiguration() {
+        return binaryCfg;
     }
 
     /**
      * @param portableCfg Configuration.
      */
-    public void setPortableConfiguration(PlatformDotNetPortableConfiguration portableCfg) {
-        this.portableCfg = portableCfg;
+    public void setBinaryConfiguration(PlatformDotNetBinaryConfiguration portableCfg) {
+        this.binaryCfg = portableCfg;
     }
 
     /**

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java

@@ -97,13 +97,15 @@ public void testCompareAndSetSimpleValue() throws Exception {
 
         String initVal = "qwerty";
 
-        IgniteAtomicReference<String> atomic = grid(0).atomicReference(atomicName, initVal, true);
+        IgniteAtomicReference<String> atomic = grid(0).atomicReference(atomicName, null, true);
 
-        assertEquals(initVal, atomic.get());
+        assertEquals(null, atomic.get());
 
-        atomic.compareAndSet("h", "j");
+        boolean res = atomic.compareAndSet(null, "x");
 
-        assertEquals(initVal, atomic.get());
+        assertEquals(null, atomic.get());   // ok
+        assertTrue(res);                    // fail
+        assertEquals("x", atomic.get());    // fail
 
         atomic.compareAndSet(initVal, null);
 

modules/platforms/dotnet/Apache.Ignite.Benchmarks/Interop/PlatformBenchmarkBase.cs

@@ -20,7 +20,7 @@ namespace Apache.Ignite.Benchmarks.Interop
     using System.Collections.Generic;
     using Apache.Ignite.Benchmarks.Model;
     using Apache.Ignite.Core;
-    using Apache.Ignite.Core.Portable;
+    using Apache.Ignite.Core.Binary;
 
     /// <summary>
     /// Base class for all platform benchmarks.
@@ -58,7 +58,7 @@ protected override void OnStarted()
 
             var cfg = new IgniteConfiguration
             {
-                PortableConfiguration = GetPortableConfiguration(),
+                BinaryConfiguration = GetPortableConfiguration(),
                 JvmOptions = new List<string>
                 {
                     "-Xms2g",
@@ -78,17 +78,17 @@ protected override void OnStarted()
         /// Get portable configuration.
         /// </summary>
         /// <returns>Portable configuration.</returns>
-        private static PortableConfiguration GetPortableConfiguration()
+        private static BinaryConfiguration GetPortableConfiguration()
         {
-            return new PortableConfiguration
+            return new BinaryConfiguration
             {
-                TypeConfigurations = new List<PortableTypeConfiguration>
+                TypeConfigurations = new List<BinaryTypeConfiguration>
                 {
-                    new PortableTypeConfiguration(typeof (Address)),
-                    new PortableTypeConfiguration(typeof (Company)),
-                    new PortableTypeConfiguration(typeof (Employee)),
-                    new PortableTypeConfiguration(typeof (MyClosure)),
-                    new PortableTypeConfiguration(typeof (MyJob))
+                    new BinaryTypeConfiguration(typeof (Address)),
+                    new BinaryTypeConfiguration(typeof (Company)),
+                    new BinaryTypeConfiguration(typeof (Employee)),
+                    new BinaryTypeConfiguration(typeof (MyClosure)),
+                    new BinaryTypeConfiguration(typeof (MyJob))
                 }
             };
         }

modules/platforms/dotnet/Apache.Ignite.Benchmarks/Model/Address.cs

@@ -17,12 +17,12 @@
 
 namespace Apache.Ignite.Benchmarks.Model
 {
-    using Apache.Ignite.Core.Portable;
+    using Apache.Ignite.Core.Binary;
 
     /// <summary>
     /// Address.
     /// </summary>
-    internal class Address : IPortableMarshalAware
+    internal class Address : IBinarizable
     {
         /// <summary>
         /// City.
@@ -60,7 +60,7 @@ public Address(string city, string street, int streetNum, int flatNum)
         }
 
         /** <inheritDoc /> */
-        public void WritePortable(IPortableWriter writer)
+        public void WriteBinary(IBinaryWriter writer)
         {
             writer.WriteInt("streetNum", StreetNumber);
             writer.WriteInt("flatNum", FlatNumber);
@@ -69,7 +69,7 @@ public void WritePortable(IPortableWriter writer)
         }
 
         /** <inheritDoc /> */
-        public void ReadPortable(IPortableReader reader)
+        public void ReadBinary(IBinaryReader reader)
         {
             StreetNumber = reader.ReadInt("streetNum");
             FlatNumber = reader.ReadInt("flatNum");

modules/platforms/dotnet/Apache.Ignite.Benchmarks/Model/Company.cs

@@ -17,12 +17,12 @@
 
 namespace Apache.Ignite.Benchmarks.Model
 {
-    using Apache.Ignite.Core.Portable;
+    using Apache.Ignite.Core.Binary;
 
     /// <summary>
     /// Company.
     /// </summary>
-    internal class Company : IPortableMarshalAware
+    internal class Company : IBinarizable
     {
         /// <summary>
         /// ID.
@@ -67,7 +67,7 @@ public Company(int id, string name, int size, Address address, string occupation
         }
 
         /** <inheritDoc /> */
-        public void WritePortable(IPortableWriter writer)
+        public void WriteBinary(IBinaryWriter writer)
         {
             writer.WriteInt("id", Id);
             writer.WriteInt("size", Size);
@@ -77,7 +77,7 @@ public void WritePortable(IPortableWriter writer)
         }
 
         /** <inheritDoc /> */
-        public void ReadPortable(IPortableReader reader)
+        public void ReadBinary(IBinaryReader reader)
         {
             Id = reader.ReadInt("id");
             Size = reader.ReadInt("size");