ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dma...@apache.org
Subject [36/40] ignite git commit: ignite-2065: portable -> binary renaming (methods, javadoc and etc.)
Date Mon, 14 Dec 2015 09:02:03 GMT
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
index f073dd0..6e05b40 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
@@ -41,7 +41,7 @@ import java.util.UUID;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
- * Portable writer implementation.
+ * Binary writer implementation.
  */
 public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, ObjectOutput {
     /** Length: integer. */
@@ -145,7 +145,7 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
         BinaryClassDescriptor desc = ctx.descriptorForClass(cls, false);
 
         if (desc == null)
-            throw new BinaryObjectException("Object is not portable: [class=" + cls + ']');
+            throw new BinaryObjectException("Object is not binary: [class=" + cls + ']');
 
         if (desc.excluded()) {
             out.writeByte(GridBinaryMarshaller.NULL);
@@ -748,7 +748,7 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
     /**
      * @param val Value.
      */
-    void doWritePortableEnum(BinaryEnumObjectImpl val) {
+    void doWriteBinaryEnum(BinaryEnumObjectImpl val) {
         assert val != null;
 
         int typeId = val.typeId();
@@ -819,9 +819,9 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
     }
 
     /**
-     * @param po Portable object.
+     * @param po Binary object.
      */
-    public void doWritePortableObject(@Nullable BinaryObjectImpl po) {
+    public void doWriteBinaryObject(@Nullable BinaryObjectImpl po) {
         if (po == null)
             out.writeByte(GridBinaryMarshaller.NULL);
         else {
@@ -829,7 +829,7 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
 
             out.unsafeEnsure(1 + 4 + poArr.length + 4);
 
-            out.unsafeWriteByte(GridBinaryMarshaller.PORTABLE_OBJ);
+            out.unsafeWriteByte(GridBinaryMarshaller.BINARY_OBJ);
             out.unsafeWriteInt(poArr.length);
             out.writeByteArray(poArr);
             out.unsafeWriteInt(po.start());
@@ -1176,11 +1176,11 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
     }
 
     /**
-     * @param po Portable object.
+     * @param po Binary object.
      * @throws org.apache.ignite.binary.BinaryObjectException In case of error.
      */
-    void writePortableObjectField(@Nullable BinaryObjectImpl po) throws BinaryObjectException {
-        doWritePortableObject(po);
+    void writeBinaryObjectField(@Nullable BinaryObjectImpl po) throws BinaryObjectException {
+        doWriteBinaryObject(po);
     }
 
     /** {@inheritDoc} */
@@ -1760,7 +1760,7 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
     }
 
     /**
-     * @return Portable context.
+     * @return Binary context.
      */
     public BinaryContext context() {
         return ctx;

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
index 277abd0..b21c679 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
@@ -24,11 +24,11 @@ import org.apache.ignite.binary.BinaryObjectException;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Portable objects marshaller.
+ * Binary objects marshaller.
  */
 public class GridBinaryMarshaller {
     /** */
-    public static final ThreadLocal<Boolean> KEEP_PORTABLES = new ThreadLocal<Boolean>() {
+    public static final ThreadLocal<Boolean> KEEP_BINARIES = new ThreadLocal<Boolean>() {
         @Override protected Boolean initialValue() {
             return true;
         }
@@ -119,7 +119,7 @@ public class GridBinaryMarshaller {
     public static final byte MAP = 25;
 
     /** */
-    public static final byte PORTABLE_OBJ = 27;
+    public static final byte BINARY_OBJ = 27;
 
     /** */
     public static final byte ENUM = 28;
@@ -230,7 +230,7 @@ public class GridBinaryMarshaller {
 
     /**
      * @param bytes Bytes array.
-     * @return Portable object.
+     * @return Binary object.
      * @throws org.apache.ignite.binary.BinaryObjectException In case of error.
      */
     @SuppressWarnings("unchecked")
@@ -242,7 +242,7 @@ public class GridBinaryMarshaller {
 
     /**
      * @param in Input stream.
-     * @return Portable object.
+     * @return Binary object.
      * @throws org.apache.ignite.binary.BinaryObjectException In case of error.
      */
     @SuppressWarnings("unchecked")

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
index d8dd00b..bc5eb9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
@@ -46,7 +46,7 @@ public class BinaryBuilderEnum implements BinaryBuilderSerializationAware {
     }
 
     /**
-     * @param reader PortableBuilderReader.
+     * @param reader BinaryBuilderReader.
      */
     public BinaryBuilderEnum(BinaryBuilderReader reader) {
         int typeId = reader.readInt();
@@ -57,13 +57,13 @@ public class BinaryBuilderEnum implements BinaryBuilderSerializationAware {
             Class cls;
 
             try {
-                cls = U.forName(reader.readString(), reader.portableContext().configuration().getClassLoader());
+                cls = U.forName(reader.readString(), reader.binaryContext().configuration().getClassLoader());
             }
             catch (ClassNotFoundException e) {
                 throw new BinaryInvalidTypeException("Failed to load the class: " + clsName, e);
             }
 
-            this.typeId = reader.portableContext().descriptorForClass(cls, false).typeId();
+            this.typeId = reader.binaryContext().descriptorForClass(cls, false).typeId();
         }
         else {
             this.typeId = typeId;

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
index 9b9e8b8..662ad1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
@@ -58,7 +58,7 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
     /*
      * Constructor.
      *
-     * @param objImpl Portable object
+     * @param objImpl Binary object
      */
     BinaryBuilderReader(BinaryObjectImpl objImpl) {
         ctx = objImpl.context();
@@ -89,14 +89,14 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
     }
 
     /**
-     * @return Portable context.
+     * @return Binary context.
      */
-    public BinaryContext portableContext() {
+    public BinaryContext binaryContext() {
         return ctx;
     }
 
     /**
-     * @param obj Mutable portable object.
+     * @param obj Mutable binary object.
      */
     public void registerObject(BinaryObjectBuilderImpl obj) {
         objMap.put(obj.start(), obj);
@@ -343,7 +343,7 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
                 return;
             }
 
-            case GridBinaryMarshaller.PORTABLE_OBJ:
+            case GridBinaryMarshaller.BINARY_OBJ:
                 len = readInt() + 4;
 
                 break;
@@ -460,14 +460,14 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
                 return builderEnum;
             }
 
-            case GridBinaryMarshaller.PORTABLE_OBJ: {
+            case GridBinaryMarshaller.BINARY_OBJ: {
                 int size = readIntPositioned(pos + 1);
 
                 int start = readIntPositioned(pos + 4 + size);
 
-                BinaryObjectImpl portableObj = new BinaryObjectImpl(ctx, arr, pos + 4 + start);
+                BinaryObjectImpl binaryObj = new BinaryObjectImpl(ctx, arr, pos + 4 + start);
 
-                return new BinaryPlainBinaryObject(portableObj);
+                return new BinaryPlainBinaryObject(binaryObj);
             }
 
             default:
@@ -739,17 +739,17 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
             case GridBinaryMarshaller.ENUM_ARR:
                 return new BinaryEnumArrayLazyValue(this);
 
-            case GridBinaryMarshaller.PORTABLE_OBJ: {
+            case GridBinaryMarshaller.BINARY_OBJ: {
                 int size = readInt();
 
                 pos += size;
 
                 int start = readInt();
 
-                BinaryObjectImpl portableObj = new BinaryObjectImpl(ctx, arr,
+                BinaryObjectImpl binaryObj = new BinaryObjectImpl(ctx, arr,
                     pos - 4 - size + start);
 
-                return new BinaryPlainBinaryObject(portableObj);
+                return new BinaryPlainBinaryObject(binaryObj);
             }
 
             default:

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
index 458602d..a095242 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
@@ -37,7 +37,7 @@ class BinaryBuilderSerializer {
     private final Map<BinaryObjectBuilderImpl, Integer> objToPos = new IdentityHashMap<>();
 
     /** */
-    private Map<BinaryObject, BinaryObjectBuilderImpl> portableObjToWrapper;
+    private Map<BinaryObject, BinaryObjectBuilderImpl> binaryObjToWrapper;
 
     /**
      * @param obj Mutable object.
@@ -65,15 +65,15 @@ class BinaryBuilderSerializer {
         }
 
         if (val instanceof BinaryObjectExImpl) {
-            if (portableObjToWrapper == null)
-                portableObjToWrapper = new IdentityHashMap<>();
+            if (binaryObjToWrapper == null)
+                binaryObjToWrapper = new IdentityHashMap<>();
 
-            BinaryObjectBuilderImpl wrapper = portableObjToWrapper.get(val);
+            BinaryObjectBuilderImpl wrapper = binaryObjToWrapper.get(val);
 
             if (wrapper == null) {
                 wrapper = BinaryObjectBuilderImpl.wrap((BinaryObject)val);
 
-                portableObjToWrapper.put((BinaryObject)val, wrapper);
+                binaryObjToWrapper.put((BinaryObject)val, wrapper);
             }
 
             val = wrapper;

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
index db55050..787ff63 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
@@ -50,13 +50,13 @@ class BinaryEnumArrayLazyValue extends BinaryAbstractLazyValue {
             Class cls;
 
             try {
-                cls = U.forName(reader.readString(), reader.portableContext().configuration().getClassLoader());
+                cls = U.forName(reader.readString(), reader.binaryContext().configuration().getClassLoader());
             }
             catch (ClassNotFoundException e) {
                 throw new BinaryInvalidTypeException("Failed to load the class: " + clsName, e);
             }
 
-            compTypeId = reader.portableContext().descriptorForClass(cls, true).typeId();
+            compTypeId = reader.binaryContext().descriptorForClass(cls, true).typeId();
         }
         else {
             compTypeId = typeId;

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
index 3627b1d..21d7dcb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
@@ -160,7 +160,7 @@ class BinaryLazyArrayList extends AbstractList<Object> implements BinaryBuilderS
             for (Object o : delegate)
                 ctx.writeValue(writer, o);
 
-            // PortableBuilderImpl might have been written. It could override reader's position.
+            // BinaryBuilderImpl might have been written. It could override reader's position.
             reader.position(oldPos);
         }
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
index c82ff7d..6afe798 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
@@ -52,7 +52,7 @@ class BinaryLazyMap extends AbstractMap<Object, Object> implements BinaryBuilder
 
     /**
      * @param reader Reader.
-     * @return PortableLazyMap.
+     * @return BinaryLazyMap.
      */
     @Nullable public static BinaryLazyMap parseMap(BinaryBuilderReader reader) {
         int off = reader.position() - 1;

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
index 05713b4..8962107 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
@@ -49,13 +49,13 @@ class BinaryObjectArrayLazyValue extends BinaryAbstractLazyValue {
             Class cls;
 
             try {
-                cls = U.forName(reader.readString(), reader.portableContext().configuration().getClassLoader());
+                cls = U.forName(reader.readString(), reader.binaryContext().configuration().getClassLoader());
             }
             catch (ClassNotFoundException e) {
                 throw new BinaryInvalidTypeException("Failed to load the class: " + clsName, e);
             }
 
-            compTypeId = reader.portableContext().descriptorForClass(cls, true).typeId();
+            compTypeId = reader.binaryContext().descriptorForClass(cls, true).typeId();
         }
         else {
             compTypeId = typeId;

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
index 5e60a20..8353cdb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
@@ -70,7 +70,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
     /** */
     private Map<Integer, Object> readCache;
 
-    /** Position of object in source array, or -1 if object is not created from PortableObject. */
+    /** Position of object in source array, or -1 if object is not created from BinaryObject. */
     private final int start;
 
     /** Flags. */
@@ -79,7 +79,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
     /** Total header length */
     private final int hdrLen;
 
-    /** Context of PortableObject reading process. Or {@code null} if object is not created from PortableObject. */
+    /** Context of BinaryObject reading process. Or {@code null} if object is not created from BinaryObject. */
     private final BinaryBuilderReader reader;
 
     /** */
@@ -87,7 +87,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
 
     /**
      * @param clsName Class name.
-     * @param ctx Portable context.
+     * @param ctx Binary context.
      */
     public BinaryObjectBuilderImpl(BinaryContext ctx, String clsName) {
         this(ctx, ctx.typeId(clsName), BinaryContext.typeName(clsName));
@@ -134,7 +134,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
         BinaryUtils.checkProtocolVersion(ver);
 
         int typeId = reader.readIntPositioned(start + GridBinaryMarshaller.TYPE_ID_POS);
-        ctx = reader.portableContext();
+        ctx = reader.binaryContext();
         hashCode = reader.readIntPositioned(start + GridBinaryMarshaller.HASH_CODE_POS);
 
         if (typeId == GridBinaryMarshaller.UNREGISTERED_TYPE_ID) {
@@ -525,7 +525,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
     }
 
     /**
-     * Removes field from portable object.
+     * Removes field from binary object.
      *
      * @param name Field name.
      * @return {@code this} instance for chaining.
@@ -540,9 +540,9 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
     }
 
     /**
-     * Creates builder initialized by specified portable object.
+     * Creates builder initialized by specified binary object.
      *
-     * @param obj Portable object to initialize builder.
+     * @param obj Binary object to initialize builder.
      * @return New builder.
      */
     public static BinaryObjectBuilderImpl wrap(BinaryObject obj) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
index 5ac4e97..f6432c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
@@ -27,27 +27,27 @@ import org.apache.ignite.binary.BinaryObject;
  */
 public class BinaryPlainBinaryObject implements BinaryLazyValue {
     /** */
-    private final BinaryObject portableObj;
+    private final BinaryObject binaryObj;
 
     /**
-     * @param portableObj Portable object.
+     * @param binaryObj Binary object.
      */
-    public BinaryPlainBinaryObject(BinaryObject portableObj) {
-        this.portableObj = portableObj;
+    public BinaryPlainBinaryObject(BinaryObject binaryObj) {
+        this.binaryObj = binaryObj;
     }
 
     /** {@inheritDoc} */
     @Override public Object value() {
-        return portableObj;
+        return binaryObj;
     }
 
     /** {@inheritDoc} */
     @Override public void writeTo(BinaryWriterExImpl writer, BinaryBuilderSerializer ctx) {
-        BinaryObject val = portableObj;
+        BinaryObject val = binaryObj;
 
         if (val instanceof BinaryObjectOffheapImpl)
             val = ((BinaryObjectOffheapImpl)val).heapCopy();
 
-        writer.doWritePortableObject((BinaryObjectImpl)val);
+        writer.doWriteBinaryObject((BinaryObjectImpl)val);
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java
index f2c4b55..15aa947 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java
@@ -17,6 +17,6 @@
 
 /**
  * <!-- Package description. -->
- * Contains classes specific to portable builder API.
+ * Contains classes specific to binary builder API.
  */
 package org.apache.ignite.internal.binary.builder;

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java
index 4bb0fb1..849ef5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java
@@ -17,6 +17,6 @@
 
 /**
  * <!-- Package description. -->
- * Contains portable APIs internal implementation.
+ * Contains binary APIs internal implementation.
  */
 package org.apache.ignite.internal.binary;

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
index e3be794..334f455 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.streams;
 import org.apache.ignite.binary.BinaryObjectException;
 
 /**
- * Portable abstract input stream.
+ * Binary abstract input stream.
  */
 public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
     implements BinaryInputStream {

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
index 199ee71..4221cbe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.binary.streams;
 
 /**
- * Base portable output stream.
+ * Base binary output stream.
  */
 public abstract class BinaryAbstractOutputStream extends BinaryAbstractStream
     implements BinaryOutputStream {

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
index ce57631..1e8ce09 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
@@ -22,7 +22,7 @@ import org.apache.ignite.internal.util.GridUnsafe;
 import sun.misc.Unsafe;
 
 /**
- * Portable abstract stream.
+ * Binary abstract stream.
  */
 public abstract class BinaryAbstractStream implements BinaryStream {
     /** Byte: zero. */

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
index 502b9dc..732b8c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.streams;
 import java.util.Arrays;
 
 /**
- * Portable off-heap input stream.
+ * Binary off-heap input stream.
  */
 public final class BinaryHeapInputStream extends BinaryAbstractInputStream {
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
index 02c3441..7553f3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.binary.streams;
 
 /**
- * Portable heap output stream.
+ * Binary heap output stream.
  */
 public final class BinaryHeapOutputStream extends BinaryAbstractOutputStream {
     /** Allocator. */

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java
index 63457e4..1765715 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.streams;
 import org.apache.ignite.internal.binary.BinaryPositionReadable;
 
 /**
- * Portable input stream.
+ * Binary input stream.
  */
 public interface BinaryInputStream extends BinaryStream, BinaryPositionReadable {
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
index dc18c9e..cff002f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.binary.streams;
 
 /**
- * Portable off-heap input stream.
+ * Binary off-heap input stream.
  */
 public class BinaryOffheapInputStream extends BinaryAbstractInputStream {
     /** Pointer. */

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
index 24b65b2..080a357 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.binary.streams;
 
 /**
- * Portable offheap output stream.
+ * Binary offheap output stream.
  */
 public class BinaryOffheapOutputStream extends BinaryAbstractOutputStream {
     /** Pointer. */

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java
index 1c3f4bf..8494120 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.binary.streams;
 
 /**
- * Portable output stream.
+ * Binary output stream.
  */
 public interface BinaryOutputStream extends BinaryStream, AutoCloseable {
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
index 229e34c..b868199 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.binary.streams;
 
 /**
- * Portable stream.
+ * Binary stream.
  */
 public interface BinaryStream {
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java
index 2a6ad62..8ce839c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java
@@ -17,6 +17,6 @@
 
 /**
  * <!-- Package description. -->
- * Contains portable APIs implementation for streams.
+ * Contains binary APIs implementation for streams.
  */
 package org.apache.ignite.internal.binary.streams;

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
index 382141c..2e4831e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
@@ -27,15 +27,15 @@ public enum GridClientCacheFlag {
     SKIP_STORE,
 
     /**
-     * Disable deserialization of portable objects on get operations.
-     * If set and portable marshaller is used, {@link GridClientData#get(Object)}
+     * Disable deserialization of binary objects on get operations.
+     * If set and binary marshaller is used, {@link GridClientData#get(Object)}
      * and {@link GridClientData#getAll(Collection)} methods will return
-     * instances of {@code PortableObject} class instead of user objects.
+     * instances of {@code BinaryObject} class instead of user objects.
      * Use this flag if you don't have corresponding class on your client of
      * if you want to get access to some individual fields, but do not want to
      * fully deserialize the object.
      */
-    KEEP_PORTABLES;
+    KEEP_BINARIES;
 
     /** */
     private static final GridClientCacheFlag[] VALS = values();
@@ -49,4 +49,4 @@ public enum GridClientCacheFlag {
     public static GridClientCacheFlag fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
index e7255f9..c0e31c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
@@ -416,5 +416,5 @@ public interface GridClientCompute {
     /**
      * Sets keep binary flag for the next task execution in the current thread.
      */
-    public GridClientCompute withKeepPortables();
-}
\ No newline at end of file
+    public GridClientCompute withKeepBinaries();
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
index 2015970..e9d2958 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
@@ -615,7 +615,7 @@ public class GridClientConfiguration {
      * Options, that can be used out-of-the-box:
      * <ul>
      *     <li>{@link GridClientOptimizedMarshaller} (default) - Ignite's optimized marshaller.</li>
-     *     <li>{@code GridClientPortableMarshaller} - Marshaller that supports portable objects.</li>
+     *     <li>{@code GridClientBinaryMarshaller} - Marshaller that supports binary objects.</li>
      *     <li>{@link org.apache.ignite.internal.client.marshaller.jdk.GridClientJdkMarshaller} - JDK marshaller (not recommended).</li>
      * </ul>
      *
@@ -850,4 +850,4 @@ public class GridClientConfiguration {
     public boolean isDaemon() {
         return daemon;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
index 0c3b155..463a074 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
@@ -41,7 +41,7 @@ import static org.apache.ignite.internal.client.util.GridClientUtils.applyFilter
  */
 class GridClientComputeImpl extends GridClientAbstractProjection<GridClientComputeImpl> implements GridClientCompute {
     /** */
-    private static final ThreadLocal<Boolean> KEEP_PORTABLES = new ThreadLocal<Boolean>() {
+    private static final ThreadLocal<Boolean> KEEP_BINARIES = new ThreadLocal<Boolean>() {
         @Override protected Boolean initialValue() {
             return false;
         }
@@ -125,14 +125,14 @@ class GridClientComputeImpl extends GridClientAbstractProjection<GridClientCompu
     @Override public <R> GridClientFuture<R> executeAsync(final String taskName, final Object taskArg) {
         A.notNull(taskName, "taskName");
 
-        final boolean keepPortables = KEEP_PORTABLES.get();
+        final boolean keepBinaries = KEEP_BINARIES.get();
 
-        KEEP_PORTABLES.set(false);
+        KEEP_BINARIES.set(false);
 
         return withReconnectHandling(new ClientProjectionClosure<R>() {
             @Override public GridClientFuture<R> apply(GridClientConnection conn, UUID destNodeId)
                 throws GridClientConnectionResetException, GridClientClosedException {
-                return conn.execute(taskName, taskArg, destNodeId, keepPortables);
+                return conn.execute(taskName, taskArg, destNodeId, keepBinaries);
             }
         });
     }
@@ -148,14 +148,14 @@ class GridClientComputeImpl extends GridClientAbstractProjection<GridClientCompu
         Object affKey, final Object taskArg) {
         A.notNull(taskName, "taskName");
 
-        final boolean keepPortables = KEEP_PORTABLES.get();
+        final boolean keepBinaries = KEEP_BINARIES.get();
 
-        KEEP_PORTABLES.set(false);
+        KEEP_BINARIES.set(false);
 
         return withReconnectHandling(new ClientProjectionClosure<R>() {
             @Override public GridClientFuture<R> apply(GridClientConnection conn, UUID destNodeId)
                 throws GridClientConnectionResetException, GridClientClosedException {
-                return conn.execute(taskName, taskArg, destNodeId, keepPortables);
+                return conn.execute(taskName, taskArg, destNodeId, keepBinaries);
             }
         }, cacheName, affKey);
     }
@@ -254,8 +254,8 @@ class GridClientComputeImpl extends GridClientAbstractProjection<GridClientCompu
     }
 
     /** {@inheritDoc} */
-    @Override public GridClientCompute withKeepPortables() {
-        KEEP_PORTABLES.set(true);
+    @Override public GridClientCompute withKeepBinaries() {
+        KEEP_BINARIES.set(true);
 
         return this;
     }
@@ -268,4 +268,4 @@ class GridClientComputeImpl extends GridClientAbstractProjection<GridClientCompu
             return new GridClientComputeImpl(client, nodes, filter, balancer);
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
index 8bdb1d0..c129f54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
@@ -313,13 +313,13 @@ public abstract class GridClientConnection {
      * @param taskName Task name.
      * @param arg Task argument.
      * @param destNodeId Destination node ID.
-     * @param keepPortables Keep binary flag.
+     * @param keepBinaries Keep binary flag.
      * @return Task execution result.
      * @throws GridClientConnectionResetException In case of error.
      * @throws GridClientClosedException If client was manually closed before request was sent over network.
      */
     public abstract <R> GridClientFutureAdapter<R> execute(String taskName, Object arg, UUID destNodeId,
-        boolean keepPortables) throws GridClientConnectionResetException, GridClientClosedException;
+        boolean keepBinaries) throws GridClientConnectionResetException, GridClientClosedException;
 
     /**
      * Gets node by node ID.
@@ -514,4 +514,4 @@ public abstract class GridClientConnection {
 
         return null;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
index dedee10..1bea3cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -462,7 +462,7 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo
             if (cfg.getProtocol() == GridClientProtocol.TCP) {
                 conn = new GridClientNioTcpConnection(srv, clientId, addr, sslCtx, pingExecutor,
                     cfg.getConnectTimeout(), cfg.getPingInterval(), cfg.getPingTimeout(),
-                    cfg.isTcpNoDelay(), cfg.getMarshaller(), marshId, top, cred, keepPortablesThreadLocal());
+                    cfg.isTcpNoDelay(), cfg.getMarshaller(), marshId, top, cred, keepBinariesThreadLocal());
             }
             else
                 throw new GridServerUnreachableException("Failed to create client (protocol is not supported): " +
@@ -485,7 +485,7 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo
     /**
      * @return Get thread local used to enable keep binary mode.
      */
-    protected ThreadLocal<Boolean> keepPortablesThreadLocal() {
+    protected ThreadLocal<Boolean> keepBinariesThreadLocal() {
         return null;
     }
 
@@ -668,4 +668,4 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo
             ses.close();
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
index 24c9c70..576df3a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
@@ -79,7 +79,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 import org.jetbrains.annotations.Nullable;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_PORTABLES;
+import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_BINARIES;
 import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.CONN_IDLE;
 import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.FAILED;
 import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.APPEND;
@@ -156,7 +156,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
     private final GridClientMarshaller marsh;
 
     /** */
-    private final ThreadLocal<Boolean> keepPortablesMode;
+    private final ThreadLocal<Boolean> keepBinariesMode;
 
     /**
      * Creates a client facade, tries to connect to remote server, in case of success starts reader thread.
@@ -190,7 +190,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
         Byte marshId,
         GridClientTopology top,
         Object cred,
-        ThreadLocal<Boolean> keepPortablesMode
+        ThreadLocal<Boolean> keepBinariesMode
     ) throws IOException, GridClientException {
         super(clientId, srvAddr, sslCtx, top, cred);
 
@@ -199,7 +199,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
         this.marsh = marsh;
         this.pingInterval = pingInterval;
         this.pingTimeout = pingTimeout;
-        this.keepPortablesMode = keepPortablesMode;
+        this.keepBinariesMode = keepBinariesMode;
 
         SocketChannel ch = null;
         Socket sock = null;
@@ -385,16 +385,16 @@ public class GridClientNioTcpConnection extends GridClientConnection {
      *
      * @param msg Message to request,
      * @param destId Destination node identifier.
-     * @param keepPortables Keep binary flag.
+     * @param keepBinaries Keep binary flag.
      * @return Response object.
      * @throws GridClientConnectionResetException If request failed.
      * @throws GridClientClosedException If client was closed.
      */
-    private <R> GridClientFutureAdapter<R> makeRequest(GridClientMessage msg, UUID destId, boolean keepPortables)
+    private <R> GridClientFutureAdapter<R> makeRequest(GridClientMessage msg, UUID destId, boolean keepBinaries)
         throws GridClientConnectionResetException, GridClientClosedException {
         assert msg != null;
 
-        TcpClientFuture<R> res = new TcpClientFuture<>(false, keepPortables);
+        TcpClientFuture<R> res = new TcpClientFuture<>(false, keepBinaries);
 
         msg.destinationId(destId);
 
@@ -667,7 +667,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
         req.keys((Iterable<Object>)keys);
         req.cacheFlagsOn(encodeCacheFlags(flags));
 
-        return makeRequest(req, destNodeId, flags.contains(KEEP_PORTABLES));
+        return makeRequest(req, destNodeId, flags.contains(KEEP_BINARIES));
     }
 
     /** {@inheritDoc} */
@@ -786,12 +786,12 @@ public class GridClientNioTcpConnection extends GridClientConnection {
 
     /** {@inheritDoc} */
     @Override public <R> GridClientFutureAdapter<R> execute(String taskName, Object arg, UUID destNodeId,
-        final boolean keepPortables) throws GridClientConnectionResetException, GridClientClosedException {
+        final boolean keepBinaries) throws GridClientConnectionResetException, GridClientClosedException {
         GridClientTaskRequest msg = new GridClientTaskRequest();
 
         msg.taskName(taskName);
         msg.argument(arg);
-        msg.keepPortables(keepPortables);
+        msg.keepBinaries(keepBinaries);
 
         return this.<GridClientTaskResultBean>makeRequest(msg, destNodeId).chain(
             new GridClientFutureCallback<GridClientTaskResultBean, R>() {
@@ -1038,7 +1038,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
         private final boolean forward;
 
         /** Keep binary flag. */
-        private final boolean keepPortables;
+        private final boolean keepBinaries;
 
         /** Pending message for this future. */
         private GridClientMessage pendingMsg;
@@ -1052,7 +1052,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
          */
         private TcpClientFuture() {
             forward = false;
-            keepPortables = false;
+            keepBinaries = false;
         }
 
         /**
@@ -1060,9 +1060,9 @@ public class GridClientNioTcpConnection extends GridClientConnection {
          *
          * @param forward Flag value.
          */
-        private TcpClientFuture(boolean forward, boolean keepPortables) {
+        private TcpClientFuture(boolean forward, boolean keepBinaries) {
             this.forward = forward;
-            this.keepPortables = keepPortables;
+            this.keepBinaries = keepBinaries;
         }
 
         /**
@@ -1103,8 +1103,8 @@ public class GridClientNioTcpConnection extends GridClientConnection {
         /**
          * @return Keep binary flag.
          */
-        public boolean keepPortables() {
-            return keepPortables;
+        public boolean keepBinaries() {
+            return keepBinaries;
         }
 
         /** {@inheritDoc} */
@@ -1112,4 +1112,4 @@ public class GridClientNioTcpConnection extends GridClientConnection {
             return "TcpClientFuture [state=" + authRetry + ", forward=" + forward + ", message=" + pendingMsg + "]";
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
index 4f9c188..9b3dd15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
@@ -37,10 +37,10 @@ public class CacheDefaultBinaryAffinityKeyMapper extends GridCacheDefaultAffinit
     /** {@inheritDoc} */
     @Override public Object affinityKey(Object key) {
         try {
-            key = proc.toPortable(key);
+            key = proc.toBinary(key);
         }
         catch (IgniteException e) {
-            U.error(log, "Failed to marshal key to portable: " + key, e);
+            U.error(log, "Failed to marshal key to binary: " + key, e);
         }
 
         if (key instanceof BinaryObject)

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
index 2de26fc..2ecfdbf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
@@ -50,9 +50,9 @@ public class CacheInvokeEntry<K, V> extends CacheLazyEntry<K, V> implements Muta
         KeyCacheObject keyObj,
         @Nullable CacheObject valObj,
         GridCacheVersion ver,
-        boolean keepPortable
+        boolean keepBinary
     ) {
-        super(cctx, keyObj, valObj, keepPortable);
+        super(cctx, keyObj, valObj, keepBinary);
 
         this.hadVal = valObj != null;
         this.ver = ver;
@@ -72,9 +72,9 @@ public class CacheInvokeEntry<K, V> extends CacheLazyEntry<K, V> implements Muta
         @Nullable CacheObject valObj,
         @Nullable V val,
         GridCacheVersion ver,
-        boolean keepPortable
+        boolean keepBinary
     ) {
-        super(ctx, keyObj, key, valObj, val, keepPortable);
+        super(ctx, keyObj, key, valObj, val, keepBinary);
 
         this.hadVal = valObj != null || val != null;
         this.ver = ver;
@@ -152,4 +152,4 @@ public class CacheInvokeEntry<K, V> extends CacheLazyEntry<K, V> implements Muta
         /** */
         REMOVE
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
index 713bb3f..05a6fef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
@@ -43,19 +43,19 @@ public class CacheLazyEntry<K, V> implements Cache.Entry<K, V> {
     @GridToStringInclude
     protected V val;
 
-    /** Keep portable flag. */
-    private boolean keepPortable;
+    /** Keep binary flag. */
+    private boolean keepBinary;
 
     /**
      * @param cctx Cache context.
      * @param keyObj Key cache object.
      * @param valObj Cache object value.
      */
-    public CacheLazyEntry(GridCacheContext cctx, KeyCacheObject keyObj, CacheObject valObj, boolean keepPortable) {
+    public CacheLazyEntry(GridCacheContext cctx, KeyCacheObject keyObj, CacheObject valObj, boolean keepBinary) {
         this.cctx = cctx;
         this.keyObj = keyObj;
         this.valObj = valObj;
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
     }
 
     /**
@@ -63,11 +63,11 @@ public class CacheLazyEntry<K, V> implements Cache.Entry<K, V> {
      * @param val Value.
      * @param cctx Cache context.
      */
-    public CacheLazyEntry(GridCacheContext cctx, KeyCacheObject keyObj, V val, boolean keepPortable) {
+    public CacheLazyEntry(GridCacheContext cctx, KeyCacheObject keyObj, V val, boolean keepBinary) {
         this.cctx = cctx;
         this.keyObj = keyObj;
         this.val = val;
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
     }
 
     /**
@@ -82,38 +82,38 @@ public class CacheLazyEntry<K, V> implements Cache.Entry<K, V> {
         K key,
         CacheObject valObj,
         V val,
-        boolean keepPortable
+        boolean keepBinary
     ) {
         this.cctx = ctx;
         this.keyObj = keyObj;
         this.key = key;
         this.valObj = valObj;
         this.val = val;
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
     }
 
     /** {@inheritDoc} */
     @Override public K getKey() {
         if (key == null)
-            key = (K)cctx.unwrapPortableIfNeeded(keyObj, keepPortable);
+            key = (K)cctx.unwrapBinaryIfNeeded(keyObj, keepBinary);
 
         return key;
     }
 
     /** {@inheritDoc} */
     @Override public V getValue() {
-        return getValue(keepPortable);
+        return getValue(keepBinary);
     }
 
     /**
      * Returns the value stored in the cache when this entry was created.
      *
-     * @param keepPortable Flag to keep portable if needed.
+     * @param keepBinary Flag to keep binary if needed.
      * @return the value corresponding to this entry
      */
-    public V getValue(boolean keepPortable) {
+    public V getValue(boolean keepBinary) {
         if (val == null)
-            val = (V)cctx.unwrapPortableIfNeeded(valObj, keepPortable, false);
+            val = (V)cctx.unwrapBinaryIfNeeded(valObj, keepBinary, false);
 
         return val;
     }
@@ -147,4 +147,4 @@ public class CacheLazyEntry<K, V> implements Cache.Entry<K, V> {
     public String toString() {
         return S.toString(CacheLazyEntry.class, this);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
index 88a8027..7401434 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
@@ -125,69 +125,69 @@ import org.apache.ignite.internal.util.typedef.F;
 
     /**
      * @param o Object to unwrap.
-     * @param keepPortable Keep binary flag.
+     * @param keepBinary Keep binary flag.
      * @return Unwrapped object.
      */
-    public Object unwrapPortableIfNeeded(Object o, boolean keepPortable) {
-        return unwrapPortableIfNeeded(o, keepPortable, true);
+    public Object unwrapBinaryIfNeeded(Object o, boolean keepBinary) {
+        return unwrapBinaryIfNeeded(o, keepBinary, true);
     }
 
     /**
      * @param o Object to unwrap.
-     * @param keepPortable Keep binary flag.
+     * @param keepBinary Keep binary flag.
      * @param cpy Copy value flag.
      * @return Unwrapped object.
      */
-    public Object unwrapPortableIfNeeded(Object o, boolean keepPortable, boolean cpy) {
+    public Object unwrapBinaryIfNeeded(Object o, boolean keepBinary, boolean cpy) {
         if (o == null)
             return null;
 
-        return unwrapPortable(o, keepPortable, cpy);
+        return unwrapBinary(o, keepBinary, cpy);
     }
 
     /**
      * @param col Collection of objects to unwrap.
-     * @param keepPortable Keep binary flag.
+     * @param keepBinary Keep binary flag.
      * @return Unwrapped collection.
      */
-    public Collection<Object> unwrapPortablesIfNeeded(Collection<Object> col, boolean keepPortable) {
-        return unwrapPortablesIfNeeded(col, keepPortable, true);
+    public Collection<Object> unwrapBinariesIfNeeded(Collection<Object> col, boolean keepBinary) {
+        return unwrapBinariesIfNeeded(col, keepBinary, true);
     }
 
     /**
      * @param col Collection to unwrap.
-     * @param keepPortable Keep binary flag.
+     * @param keepBinary Keep binary flag.
      * @param cpy Copy value flag.
      * @return Unwrapped collection.
      */
-    public Collection<Object> unwrapPortablesIfNeeded(Collection<Object> col, boolean keepPortable, boolean cpy) {
+    public Collection<Object> unwrapBinariesIfNeeded(Collection<Object> col, boolean keepBinary, boolean cpy) {
         if (col instanceof ArrayList)
-            return unwrapPortables((ArrayList<Object>)col, keepPortable, cpy);
+            return unwrapBinaries((ArrayList<Object>)col, keepBinary, cpy);
 
         if (col instanceof Set)
-            return unwrapPortables((Set<Object>)col, keepPortable, cpy);
+            return unwrapBinaries((Set<Object>)col, keepBinary, cpy);
 
         Collection<Object> col0 = new ArrayList<>(col.size());
 
         for (Object obj : col)
-            col0.add(unwrapPortable(obj, keepPortable, cpy));
+            col0.add(unwrapBinary(obj, keepBinary, cpy));
 
         return col0;
     }
 
     /**
-     * Unwrap array of portables if needed.
+     * Unwrap array of binaries if needed.
      *
      * @param arr Array.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @param cpy Copy.
      * @return Result.
      */
-    public Object[] unwrapPortablesInArrayIfNeeded(Object[] arr, boolean keepPortable, boolean cpy) {
+    public Object[] unwrapBinariesInArrayIfNeeded(Object[] arr, boolean keepBinary, boolean cpy) {
         Object[] res = new Object[arr.length];
 
         for (int i = 0; i < arr.length; i++)
-            res[i] = unwrapPortable(arr[i], keepPortable, cpy);
+            res[i] = unwrapBinary(arr[i], keepBinary, cpy);
 
         return res;
     }
@@ -196,17 +196,17 @@ import org.apache.ignite.internal.util.typedef.F;
      * Unwraps map.
      *
      * @param map Map to unwrap.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @return Unwrapped collection.
      */
-    private Map<Object, Object> unwrapPortablesIfNeeded(Map<Object, Object> map, boolean keepPortable, boolean cpy) {
-        if (keepPortable)
+    private Map<Object, Object> unwrapBinariesIfNeeded(Map<Object, Object> map, boolean keepBinary, boolean cpy) {
+        if (keepBinary)
             return map;
 
         Map<Object, Object> map0 = BinaryUtils.newMap(map);
 
         for (Map.Entry<Object, Object> e : map.entrySet())
-            map0.put(unwrapPortable(e.getKey(), keepPortable, cpy), unwrapPortable(e.getValue(), keepPortable, cpy));
+            map0.put(unwrapBinary(e.getKey(), keepBinary, cpy), unwrapBinary(e.getValue(), keepBinary, cpy));
 
         return map0;
     }
@@ -217,7 +217,7 @@ import org.apache.ignite.internal.util.typedef.F;
      * @param col List to unwrap.
      * @return Unwrapped list.
      */
-    private Collection<Object> unwrapPortables(ArrayList<Object> col, boolean keepPortable, boolean cpy) {
+    private Collection<Object> unwrapBinaries(ArrayList<Object> col, boolean keepBinary, boolean cpy) {
         int size = col.size();
 
         col = new ArrayList<>(col);
@@ -225,7 +225,7 @@ import org.apache.ignite.internal.util.typedef.F;
         for (int i = 0; i < size; i++) {
             Object o = col.get(i);
 
-            Object unwrapped = unwrapPortable(o, keepPortable, cpy);
+            Object unwrapped = unwrapBinary(o, keepBinary, cpy);
 
             if (o != unwrapped)
                 col.set(i, unwrapped);
@@ -240,11 +240,11 @@ import org.apache.ignite.internal.util.typedef.F;
      * @param set Set to unwrap.
      * @return Unwrapped set.
      */
-    private Set<Object> unwrapPortables(Set<Object> set, boolean keepPortable, boolean cpy) {
+    private Set<Object> unwrapBinaries(Set<Object> set, boolean keepBinary, boolean cpy) {
         Set<Object> set0 = BinaryUtils.newSet(set);
 
         for (Object obj : set)
-            set0.add(unwrapPortable(obj, keepPortable, cpy));
+            set0.add(unwrapBinary(obj, keepBinary, cpy));
 
         return set0;
     }
@@ -253,31 +253,31 @@ import org.apache.ignite.internal.util.typedef.F;
      * @param o Object to unwrap.
      * @return Unwrapped object.
      */
-    private Object unwrapPortable(Object o, boolean keepPortable, boolean cpy) {
+    private Object unwrapBinary(Object o, boolean keepBinary, boolean cpy) {
         if (o instanceof Map.Entry) {
             Map.Entry entry = (Map.Entry)o;
 
             Object key = entry.getKey();
 
-            Object uKey = unwrapPortable(key, keepPortable, cpy);
+            Object uKey = unwrapBinary(key, keepBinary, cpy);
 
             Object val = entry.getValue();
 
-            Object uVal = unwrapPortable(val, keepPortable, cpy);
+            Object uVal = unwrapBinary(val, keepBinary, cpy);
 
             return (key != uKey || val != uVal) ? F.t(uKey, uVal) : o;
         }
         else if (o instanceof Collection)
-            return unwrapPortablesIfNeeded((Collection<Object>)o, keepPortable, cpy);
+            return unwrapBinariesIfNeeded((Collection<Object>)o, keepBinary, cpy);
         else if (o instanceof Map)
-            return unwrapPortablesIfNeeded((Map<Object, Object>)o, keepPortable, cpy);
+            return unwrapBinariesIfNeeded((Map<Object, Object>)o, keepBinary, cpy);
         else if (o instanceof Object[])
-            return unwrapPortablesInArrayIfNeeded((Object[])o, keepPortable, cpy);
+            return unwrapBinariesInArrayIfNeeded((Object[])o, keepBinary, cpy);
         else if (o instanceof CacheObject) {
             CacheObject co = (CacheObject)o;
 
-            if (!keepPortable || co.isPlatformType())
-                return unwrapPortable(co.value(this, cpy), keepPortable, cpy);
+            if (!keepBinary || co.isPlatformType())
+                return unwrapBinary(co.value(this, cpy), keepBinary, cpy);
         }
 
         return o;

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
index 3993146..21934d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
@@ -42,7 +42,7 @@ public class CacheOperationContext implements Serializable {
     /** Client ID which operates over this projection. */
     private final UUID subjId;
 
-    /** Keep portable flag. */
+    /** Keep binary flag. */
     private final boolean keepBinary;
 
     /** Expiry policy. */
@@ -66,7 +66,7 @@ public class CacheOperationContext implements Serializable {
     /**
      * @param skipStore Skip store flag.
      * @param subjId Subject ID.
-     * @param keepBinary Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @param expiryPlc Expiry policy.
      */
     public CacheOperationContext(
@@ -87,16 +87,16 @@ public class CacheOperationContext implements Serializable {
     }
 
     /**
-     * @return Keep portable flag.
+     * @return Keep binary flag.
      */
     public boolean isKeepBinary() {
         return keepBinary;
     }
 
     /**
-     * See {@link IgniteInternalCache#keepPortable()}.
+     * See {@link IgniteInternalCache#keepBinary()}.
      *
-     * @return New instance of CacheOperationContext with keep portable flag.
+     * @return New instance of CacheOperationContext with keep binary flag.
      */
     public CacheOperationContext keepBinary() {
         return new CacheOperationContext(
@@ -200,4 +200,4 @@ public class CacheOperationContext implements Serializable {
     @Override public String toString() {
         return S.toString(CacheOperationContext.class, this);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 034640f..ea57caf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -468,7 +468,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
     }
 
     /** {@inheritDoc} */
-    @Override public <K1, V1> GridCacheProxyImpl<K1, V1> keepPortable() {
+    @Override public <K1, V1> GridCacheProxyImpl<K1, V1> keepBinary() {
         CacheOperationContext opCtx = new CacheOperationContext(false, null, true, null, false);
 
         return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx, (GridCacheAdapter<K1, V1>)this, opCtx);
@@ -608,7 +608,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             /*skip tx*/false,
             /*subj id*/null,
             /*task name*/null,
-            /*deserialize portable*/false,
+            /*deserialize binary*/false,
             /*skip values*/true,
             /*can remap*/true
         );
@@ -634,7 +634,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             /*skip tx*/false,
             /*subj id*/null,
             /*task name*/null,
-            /*deserialize portable*/false,
+            /*deserialize binary*/false,
             /*skip values*/true,
             /*can remap*/true
         ).chain(new CX1<IgniteInternalFuture<Map<K, V>>, Boolean>() {
@@ -669,7 +669,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             modes.backup = true;
 
             if (modes.heap)
-                its.add(iterator(map.entries0().iterator(), !ctx.keepPortable()));
+                its.add(iterator(map.entries0().iterator(), !ctx.keepBinary()));
         }
         else if (modes.heap) {
             if (modes.near && ctx.isNear())
@@ -799,7 +799,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             else
                 cacheVal = localCachePeek0(cacheKey, modes.heap, modes.offheap, modes.swap, plc);
 
-            Object val = ctx.unwrapPortableIfNeeded(cacheVal, ctx.keepPortable(), false);
+            Object val = ctx.unwrapBinaryIfNeeded(cacheVal, ctx.keepBinary(), false);
 
             return (V)val;
         }
@@ -1353,7 +1353,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             /*skip tx*/true,
             null,
             taskName,
-            !ctx.keepPortable(),
+            !ctx.keepBinary(),
             /*skip values*/false,
             /*can remap*/true);
     }
@@ -1375,7 +1375,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
         long start = statsEnabled ? System.nanoTime() : 0L;
 
-        V val = get(key, !ctx.keepPortable());
+        V val = get(key, !ctx.keepBinary());
 
         if (ctx.config().getInterceptor() != null)
             val = (V)ctx.config().getInterceptor().onGet(key, val);
@@ -1394,7 +1394,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
         final long start = statsEnabled ? System.nanoTime() : 0L;
 
-        IgniteInternalFuture<V> fut = getAsync(key, !ctx.keepPortable());
+        IgniteInternalFuture<V> fut = getAsync(key, !ctx.keepBinary());
 
         if (ctx.config().getInterceptor() != null)
             fut =  fut.chain(new CX1<IgniteInternalFuture<V>, V>() {
@@ -1417,7 +1417,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
         long start = statsEnabled ? System.nanoTime() : 0L;
 
-        Map<K, V> map = getAll(keys, !ctx.keepPortable());
+        Map<K, V> map = getAll(keys, !ctx.keepBinary());
 
         if (ctx.config().getInterceptor() != null)
             map = interceptGet(keys, map);
@@ -1436,7 +1436,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
         final long start = statsEnabled ? System.nanoTime() : 0L;
 
-        IgniteInternalFuture<Map<K, V>> fut = getAllAsync(keys, !ctx.keepPortable());
+        IgniteInternalFuture<Map<K, V>> fut = getAllAsync(keys, !ctx.keepBinary());
 
         if (ctx.config().getInterceptor() != null)
             return fut.chain(new CX1<IgniteInternalFuture<Map<K, V>>, Map<K, V>>() {
@@ -1498,7 +1498,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
      * @param skipTx Skip tx.
      * @param subjId Subj Id.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable.
+     * @param deserializeBinary Deserialize binary.
      * @param skipVals Skip values.
      * @param canRemap Can remap flag.
      * @return Future for the get operation.
@@ -1509,7 +1509,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
         boolean skipTx,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         final boolean skipVals,
         boolean canRemap
     ) {
@@ -1518,7 +1518,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             skipTx,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             skipVals,
             canRemap).chain(
             new CX1<IgniteInternalFuture<Map<K, V>>, V>() {
@@ -1544,7 +1544,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
      * @param skipTx Skip tx.
      * @param subjId Subj Id.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable.
+     * @param deserializeBinary Deserialize binary.
      * @param skipVals Skip values.
      * @param canRemap Can remap flag.
      * @return Future for the get operation.
@@ -1556,7 +1556,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
         boolean skipTx,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         boolean skipVals,
         boolean canRemap
     ) {
@@ -1569,7 +1569,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             !skipTx,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             forcePrimary,
             skipVals ? null : expiryPolicy(opCtx != null ? opCtx.expiry() : null),
             skipVals,
@@ -1582,7 +1582,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
      * @param checkTx Check tx.
      * @param subjId Subj Id.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable.
+     * @param deserializeBinary Deserialize binary.
      * @param forcePrimary Froce primary.
      * @param expiry Expiry policy.
      * @param skipVals Skip values.
@@ -1595,7 +1595,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
         boolean checkTx,
         @Nullable final UUID subjId,
         final String taskName,
-        final boolean deserializePortable,
+        final boolean deserializeBinary,
         final boolean forcePrimary,
         @Nullable IgniteCacheExpiryPolicy expiry,
         final boolean skipVals,
@@ -1611,7 +1611,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             checkTx,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             expiry,
             skipVals,
             false,
@@ -1625,7 +1625,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
      * @param checkTx Check local transaction flag.
      * @param subjId Subject ID.
      * @param taskName Task name/
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param expiry Expiry policy.
      * @param skipVals Skip values flag.
      * @param keepCacheObjects Keep cache objects.
@@ -1638,7 +1638,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
         boolean checkTx,
         @Nullable final UUID subjId,
         final String taskName,
-        final boolean deserializePortable,
+        final boolean deserializeBinary,
         @Nullable IgniteCacheExpiryPolicy expiry,
         final boolean skipVals,
         final boolean keepCacheObjects,
@@ -1696,7 +1696,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
                                 null,
                                 taskName,
                                 expiry,
-                                !deserializePortable);
+                                !deserializeBinary);
 
                             if (res == null) {
                                 if (storeEnabled) {
@@ -1722,7 +1722,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
                                         res.get1(),
                                         skipVals,
                                         keepCacheObjects,
-                                        deserializePortable,
+                                        deserializeBinary,
                                         true);
                                 }
 
@@ -1797,7 +1797,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
                                                             cacheVal,
                                                             skipVals,
                                                             keepCacheObjects,
-                                                            deserializePortable,
+                                                            deserializeBinary,
                                                             false);
                                                     }
                                                 }
@@ -1896,7 +1896,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
             return asyncOp(tx, new AsyncOp<Map<K1, V1>>(keys) {
                 @Override public IgniteInternalFuture<Map<K1, V1>> op(IgniteTxLocalAdapter tx) {
-                    return tx.getAllAsync(ctx, keys, deserializePortable, skipVals, false, !readThrough);
+                    return tx.getAllAsync(ctx, keys, deserializeBinary, skipVals, false, !readThrough);
                 }
             }, ctx.operationContextPerCall());
         }
@@ -3815,7 +3815,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
         if (!ctx0.isSwapOrOffheapEnabled() && ctx0.kernalContext().discovery().size() == 1)
             return localIteratorHonorExpirePolicy(opCtx);
 
-        CacheQueryFuture<Map.Entry<K, V>> fut = ctx0.queries().createScanQuery(null, null, ctx.keepPortable())
+        CacheQueryFuture<Map.Entry<K, V>> fut = ctx0.queries().createScanQuery(null, null, ctx.keepBinary())
             .keepAll(false)
             .execute();
 
@@ -3842,12 +3842,12 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
     /**
      * @param key Key.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Value.
      * @throws IgniteCheckedException If failed.
      */
     @SuppressWarnings("IfMayBeConditional")
-    @Nullable public V promote(K key, boolean deserializePortable) throws IgniteCheckedException {
+    @Nullable public V promote(K key, boolean deserializeBinary) throws IgniteCheckedException {
         A.notNull(key, "key");
 
         if (keyCheck)
@@ -3877,7 +3877,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
         Object val0 = val != null ? val.value(ctx.cacheObjectContext(), true) : null;
 
-        return (V)ctx.unwrapPortableIfNeeded(val0, !deserializePortable);
+        return (V)ctx.unwrapBinaryIfNeeded(val0, !deserializeBinary);
     }
 
     /** {@inheritDoc} */
@@ -4513,21 +4513,21 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
     /**
      * @param key Key.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Cached value.
      * @throws IgniteCheckedException If failed.
      */
-    @Nullable public V get(K key, boolean deserializePortable)
+    @Nullable public V get(K key, boolean deserializeBinary)
         throws IgniteCheckedException {
-        return getAsync(key, deserializePortable).get();
+        return getAsync(key, deserializeBinary).get();
     }
 
     /**
      * @param key Key.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Read operation future.
      */
-    public final IgniteInternalFuture<V> getAsync(final K key, boolean deserializePortable) {
+    public final IgniteInternalFuture<V> getAsync(final K key, boolean deserializeBinary) {
         try {
             checkJta();
         }
@@ -4542,30 +4542,30 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             /*skip tx*/false,
             null,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             false,
             /*can remap*/true);
     }
 
     /**
      * @param keys Keys.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Map of cached values.
      * @throws IgniteCheckedException If read failed.
      */
-    public Map<K, V> getAll(Collection<? extends K> keys, boolean deserializePortable) throws IgniteCheckedException {
+    public Map<K, V> getAll(Collection<? extends K> keys, boolean deserializeBinary) throws IgniteCheckedException {
         checkJta();
 
-        return getAllAsync(keys, deserializePortable).get();
+        return getAllAsync(keys, deserializeBinary).get();
     }
 
     /**
      * @param keys Keys.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Read future.
      */
     public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys,
-        boolean deserializePortable) {
+        boolean deserializeBinary) {
         String taskName = ctx.kernalContext().job().currentTaskName();
 
         return getAllAsync(keys,
@@ -4573,7 +4573,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             /*skip tx*/false,
             /*subject id*/null,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             /*skip vals*/false,
             /*can remap*/true);
     }
@@ -4662,11 +4662,11 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
     /**
      * @param it Internal entry iterator.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Public API iterator.
      */
     protected Iterator<Cache.Entry<K, V>> iterator(final Iterator<GridCacheEntryEx> it,
-        final boolean deserializePortable) {
+        final boolean deserializeBinary) {
         return new Iterator<Cache.Entry<K, V>>() {
             {
                 advance();
@@ -4704,7 +4704,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
                     GridCacheEntryEx entry = it.next();
 
                     try {
-                        next = toCacheEntry(entry, deserializePortable);
+                        next = toCacheEntry(entry, deserializeBinary);
 
                         if (next == null)
                             continue;
@@ -4724,13 +4724,13 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
     /**
      * @param entry Internal entry.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Public API entry.
      * @throws IgniteCheckedException If failed.
      * @throws GridCacheEntryRemovedException If entry removed.
      */
     @Nullable private Cache.Entry<K, V> toCacheEntry(GridCacheEntryEx entry,
-        boolean deserializePortable)
+        boolean deserializeBinary)
         throws IgniteCheckedException, GridCacheEntryRemovedException
     {
         CacheObject val = entry.innerGet(
@@ -4746,7 +4746,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             null,
             null,
             null,
-            !deserializePortable);
+            !deserializeBinary);
 
         if (val == null)
             return null;
@@ -4756,9 +4756,9 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
         Object key0 = key.value(ctx.cacheObjectContext(), true);
         Object val0 = val.value(ctx.cacheObjectContext(), true);
 
-        if (deserializePortable) {
-            key0 = ctx.unwrapPortableIfNeeded(key0, true);
-            val0 = ctx.unwrapPortableIfNeeded(val0, true);
+        if (deserializeBinary) {
+            key0 = ctx.unwrapBinaryIfNeeded(key0, true);
+            val0 = ctx.unwrapBinaryIfNeeded(val0, true);
         }
 
         return new CacheEntryImpl<>((K)key0, (V)val0, entry.version());

http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index f78a606..05ff71a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1781,7 +1781,7 @@ public class GridCacheConcurrentMap {
 
         /** {@inheritDoc} */
         @Override public K next() {
-            return (K)it.ctx.cacheObjectContext().unwrapPortableIfNeeded(it.next().key(), keepBinary, true);
+            return (K)it.ctx.cacheObjectContext().unwrapBinaryIfNeeded(it.next().key(), keepBinary, true);
         }
 
         /** {@inheritDoc} */


Mime
View raw message