ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [10/17] incubator-ignite git commit: ignite-nio - Removing message clone
Date Sun, 15 Feb 2015 06:44:07 GMT
ignite-nio - Removing message clone


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

Branch: refs/heads/ignite-nio
Commit: 3a05bf1a6956cb8dab8b3e25ed24d25aac3dcea4
Parents: 953e243
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Sat Feb 14 22:18:36 2015 -0800
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Sat Feb 14 22:18:36 2015 -0800

----------------------------------------------------------------------
 .../CommunicationMessageCodeGenerator.java      | 172 ++++++++++---------
 .../ignite/internal/GridJobExecuteRequest.java  |   8 +-
 .../internal/direct/DirectByteBufferStream.java |  16 +-
 .../internal/direct/DirectMessageReader.java    |   8 +-
 .../internal/direct/DirectMessageWriter.java    |   8 +-
 .../communication/GridIoUserMessage.java        |   4 +-
 .../deployment/GridDeploymentInfoBean.java      |   4 +-
 .../deployment/GridDeploymentRequest.java       |   4 +-
 .../eventstorage/GridEventStorageMessage.java   |   4 +-
 .../cache/GridCacheEvictionResponse.java        |   4 +-
 .../distributed/GridCacheTtlUpdateRequest.java  |  16 +-
 .../distributed/GridDistributedBaseMessage.java |   8 +-
 .../distributed/GridDistributedLockRequest.java |   8 +-
 .../GridDistributedLockResponse.java            |   4 +-
 .../GridDistributedTxFinishRequest.java         |   8 +-
 .../GridDistributedTxPrepareRequest.java        |   8 +-
 .../GridDistributedUnlockRequest.java           |   4 +-
 .../distributed/dht/GridDhtLockRequest.java     |   4 +-
 .../distributed/dht/GridDhtLockResponse.java    |  12 +-
 .../distributed/dht/GridDhtTxFinishRequest.java |   8 +-
 .../dht/GridDhtTxPrepareRequest.java            |   4 +-
 .../dht/GridDhtTxPrepareResponse.java           |  12 +-
 .../distributed/dht/GridDhtUnlockRequest.java   |   4 +-
 .../GridDhtAtomicDeferredUpdateResponse.java    |   4 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |  32 ++--
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |   4 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |  20 +--
 .../atomic/GridNearAtomicUpdateResponse.java    |  12 +-
 .../dht/preloader/GridDhtForceKeysRequest.java  |   4 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |   4 +-
 .../GridDhtPartitionDemandMessage.java          |   4 +-
 .../GridDhtPartitionSupplyMessage.java          |   8 +-
 .../distributed/near/GridNearGetRequest.java    |   4 +-
 .../distributed/near/GridNearGetResponse.java   |   4 +-
 .../distributed/near/GridNearLockRequest.java   |   8 +-
 .../distributed/near/GridNearLockResponse.java  |  12 +-
 .../near/GridNearTxPrepareRequest.java          |   4 +-
 .../near/GridNearTxPrepareResponse.java         |  12 +-
 .../cache/query/GridCacheQueryResponse.java     |   8 +-
 .../clock/GridClockDeltaSnapshotMessage.java    |   4 +-
 .../dataload/GridDataLoadRequest.java           |   4 +-
 .../processors/igfs/IgfsBlocksMessage.java      |   4 +-
 .../igfs/IgfsFragmentizerRequest.java           |   4 +-
 .../streamer/GridStreamerExecutionRequest.java  |   4 +-
 .../communication/MessageAdapter.java           |  67 --------
 .../communication/MessageFieldType.java         |  86 ++++++++++
 .../extensions/communication/MessageReader.java |   6 +-
 .../extensions/communication/MessageWriter.java |   8 +-
 48 files changed, 342 insertions(+), 321 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
index 04ee8ea..97ccc4d 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
@@ -57,50 +57,50 @@ public class CommunicationMessageCodeGenerator {
     private static final String BUF_VAR = "buf";
 
     /** */
-    private static final Map<Class<?>, MessageAdapter.Type> TYPES = U.newHashMap(30);
+    private static final Map<Class<?>, MessageFieldType> TYPES = U.newHashMap(30);
 
     static {
-        TYPES.put(byte.class, MessageAdapter.Type.BYTE);
-        TYPES.put(Byte.class, MessageAdapter.Type.BYTE);
-        TYPES.put(short.class, MessageAdapter.Type.SHORT);
-        TYPES.put(Short.class, MessageAdapter.Type.SHORT);
-        TYPES.put(int.class, MessageAdapter.Type.INT);
-        TYPES.put(Integer.class, MessageAdapter.Type.INT);
-        TYPES.put(long.class, MessageAdapter.Type.LONG);
-        TYPES.put(Long.class, MessageAdapter.Type.LONG);
-        TYPES.put(float.class, MessageAdapter.Type.FLOAT);
-        TYPES.put(Float.class, MessageAdapter.Type.FLOAT);
-        TYPES.put(double.class, MessageAdapter.Type.DOUBLE);
-        TYPES.put(Double.class, MessageAdapter.Type.DOUBLE);
-        TYPES.put(char.class, MessageAdapter.Type.CHAR);
-        TYPES.put(Character.class, MessageAdapter.Type.CHAR);
-        TYPES.put(boolean.class, MessageAdapter.Type.BOOLEAN);
-        TYPES.put(Boolean.class, MessageAdapter.Type.BOOLEAN);
-        TYPES.put(byte[].class, MessageAdapter.Type.BYTE_ARR);
-        TYPES.put(short[].class, MessageAdapter.Type.SHORT_ARR);
-        TYPES.put(int[].class, MessageAdapter.Type.INT_ARR);
-        TYPES.put(long[].class, MessageAdapter.Type.LONG_ARR);
-        TYPES.put(float[].class, MessageAdapter.Type.FLOAT_ARR);
-        TYPES.put(double[].class, MessageAdapter.Type.DOUBLE_ARR);
-        TYPES.put(char[].class, MessageAdapter.Type.CHAR_ARR);
-        TYPES.put(boolean[].class, MessageAdapter.Type.BOOLEAN_ARR);
-        TYPES.put(String.class, MessageAdapter.Type.STRING);
-        TYPES.put(BitSet.class, MessageAdapter.Type.BIT_SET);
-        TYPES.put(UUID.class, MessageAdapter.Type.UUID);
-        TYPES.put(IgniteUuid.class, MessageAdapter.Type.IGNITE_UUID);
+        TYPES.put(byte.class, MessageFieldType.BYTE);
+        TYPES.put(Byte.class, MessageFieldType.BYTE);
+        TYPES.put(short.class, MessageFieldType.SHORT);
+        TYPES.put(Short.class, MessageFieldType.SHORT);
+        TYPES.put(int.class, MessageFieldType.INT);
+        TYPES.put(Integer.class, MessageFieldType.INT);
+        TYPES.put(long.class, MessageFieldType.LONG);
+        TYPES.put(Long.class, MessageFieldType.LONG);
+        TYPES.put(float.class, MessageFieldType.FLOAT);
+        TYPES.put(Float.class, MessageFieldType.FLOAT);
+        TYPES.put(double.class, MessageFieldType.DOUBLE);
+        TYPES.put(Double.class, MessageFieldType.DOUBLE);
+        TYPES.put(char.class, MessageFieldType.CHAR);
+        TYPES.put(Character.class, MessageFieldType.CHAR);
+        TYPES.put(boolean.class, MessageFieldType.BOOLEAN);
+        TYPES.put(Boolean.class, MessageFieldType.BOOLEAN);
+        TYPES.put(byte[].class, MessageFieldType.BYTE_ARR);
+        TYPES.put(short[].class, MessageFieldType.SHORT_ARR);
+        TYPES.put(int[].class, MessageFieldType.INT_ARR);
+        TYPES.put(long[].class, MessageFieldType.LONG_ARR);
+        TYPES.put(float[].class, MessageFieldType.FLOAT_ARR);
+        TYPES.put(double[].class, MessageFieldType.DOUBLE_ARR);
+        TYPES.put(char[].class, MessageFieldType.CHAR_ARR);
+        TYPES.put(boolean[].class, MessageFieldType.BOOLEAN_ARR);
+        TYPES.put(String.class, MessageFieldType.STRING);
+        TYPES.put(BitSet.class, MessageFieldType.BIT_SET);
+        TYPES.put(UUID.class, MessageFieldType.UUID);
+        TYPES.put(IgniteUuid.class, MessageFieldType.IGNITE_UUID);
     }
 
     /**
      * @param cls Class.
      * @return Type enum value.
      */
-    private static MessageAdapter.Type typeEnum(Class<?> cls) {
-        MessageAdapter.Type type = TYPES.get(cls);
+    private static MessageFieldType typeEnum(Class<?> cls) {
+        MessageFieldType type = TYPES.get(cls);
 
         if (type == null) {
             assert MessageAdapter.class.isAssignableFrom(cls) : cls;
 
-            type = MessageAdapter.Type.MSG;
+            type = MessageFieldType.MSG;
         }
 
         return type;
@@ -531,67 +531,68 @@ public class CommunicationMessageCodeGenerator {
         String field = raw ? "null" : '"' + name + '"';
 
         if (type == byte.class)
-            returnFalseIfFailed(write, "writer.writeByte", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.BYTE");
         else if (type == short.class)
-            returnFalseIfFailed(write, "writer.writeShort", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.SHORT");
         else if (type == int.class)
-            returnFalseIfFailed(write, "writer.writeInt", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.INT");
         else if (type == long.class)
-            returnFalseIfFailed(write, "writer.writeLong", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.LONG");
         else if (type == float.class)
-            returnFalseIfFailed(write, "writer.writeFloat", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.FLOAT");
         else if (type == double.class)
-            returnFalseIfFailed(write, "writer.writeDouble", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.DOUBLE");
         else if (type == char.class)
-            returnFalseIfFailed(write, "writer.writeChar", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.CHAR");
         else if (type == boolean.class)
-            returnFalseIfFailed(write, "writer.writeBoolean", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.BOOLEAN");
         else if (type == byte[].class)
-            returnFalseIfFailed(write, "writer.writeByteArray", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.BYTE_ARR");
         else if (type == short[].class)
-            returnFalseIfFailed(write, "writer.writeShortArray", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.SHORT_ARR");
         else if (type == int[].class)
-            returnFalseIfFailed(write, "writer.writeIntArray", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.INT_ARR");
         else if (type == long[].class)
-            returnFalseIfFailed(write, "writer.writeLongArray", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.LONG_ARR");
         else if (type == float[].class)
-            returnFalseIfFailed(write, "writer.writeFloatArray", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.FLOAT_ARR");
         else if (type == double[].class)
-            returnFalseIfFailed(write, "writer.writeDoubleArray", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.DOUBLE_ARR");
         else if (type == char[].class)
-            returnFalseIfFailed(write, "writer.writeCharArray", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.CHAR_ARR");
         else if (type == boolean[].class)
-            returnFalseIfFailed(write, "writer.writeBooleanArray", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.BOOLEAN_ARR");
         else if (type == String.class)
-            returnFalseIfFailed(write, "writer.writeString", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.STRING");
         else if (type == BitSet.class)
-            returnFalseIfFailed(write, "writer.writeBitSet", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.BIT_SET");
         else if (type == UUID.class)
-            returnFalseIfFailed(write, "writer.writeUuid", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.UUID");
         else if (type == IgniteUuid.class)
-            returnFalseIfFailed(write, "writer.writeIgniteUuid", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.IGNITE_UUID");
         else if (type.isEnum()) {
             String arg = name + " != null ? (byte)" + name + ".ordinal() : -1";
 
-            returnFalseIfFailed(write, "writer.writeByte", field, arg);
+            returnFalseIfFailed(write, "writer.writeField", field, arg, "MessageFieldType.BYTE");
         }
         else if (BASE_CLS.isAssignableFrom(type))
-            returnFalseIfFailed(write, "writer.writeMessage", field, name);
+            returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.MSG");
         else if (type.isArray()) {
-            returnFalseIfFailed(write, "writer.writeObjectArray", field, name,
-                "Type." + typeEnum(type.getComponentType()));
+            returnFalseIfFailed(write, "writer.writeArrayField", field, name,
+                "MessageFieldType." + typeEnum(type.getComponentType()));
         }
         else if (Collection.class.isAssignableFrom(type) && !Set.class.isAssignableFrom(type)) {
             assert colItemType != null;
 
-            returnFalseIfFailed(write, "writer.writeCollection", field, name, "Type." + typeEnum(colItemType));
+            returnFalseIfFailed(write, "writer.writeCollectionField", field, name,
+                "MessageFieldType." + typeEnum(colItemType));
         }
         else if (Map.class.isAssignableFrom(type)) {
             assert mapKeyType != null;
             assert mapValType != null;
 
-            returnFalseIfFailed(write, "writer.writeMap", field, name, "Type." + typeEnum(mapKeyType),
-                "Type." + typeEnum(mapValType));
+            returnFalseIfFailed(write, "writer.writeMapField", field, name, "MessageFieldType." + typeEnum(mapKeyType),
+                "MessageFieldType." + typeEnum(mapValType));
         }
         else
             throw new IllegalStateException("Unsupported type: " + type);
@@ -611,68 +612,69 @@ public class CommunicationMessageCodeGenerator {
         String field = '"' + name + '"';
 
         if (type == byte.class)
-            returnFalseIfReadFailed(name, "reader.readByte", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.BYTE");
         else if (type == short.class)
-            returnFalseIfReadFailed(name, "reader.readShort", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.SHORT");
         else if (type == int.class)
-            returnFalseIfReadFailed(name, "reader.readInt", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.INT");
         else if (type == long.class)
-            returnFalseIfReadFailed(name, "reader.readLong", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.LONG");
         else if (type == float.class)
-            returnFalseIfReadFailed(name, "reader.readFloat", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.FLOAT");
         else if (type == double.class)
-            returnFalseIfReadFailed(name, "reader.readDouble", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.DOUBLE");
         else if (type == char.class)
-            returnFalseIfReadFailed(name, "reader.readChar", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.CHAR");
         else if (type == boolean.class)
-            returnFalseIfReadFailed(name, "reader.readBoolean", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.BOOLEAN");
         else if (type == byte[].class)
-            returnFalseIfReadFailed(name, "reader.readByteArray", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.BYTE_ARR");
         else if (type == short[].class)
-            returnFalseIfReadFailed(name, "reader.readShortArray", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.SHORT_ARR");
         else if (type == int[].class)
-            returnFalseIfReadFailed(name, "reader.readIntArray", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.INT_ARR");
         else if (type == long[].class)
-            returnFalseIfReadFailed(name, "reader.readLongArray", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.LONG_ARR");
         else if (type == float[].class)
-            returnFalseIfReadFailed(name, "reader.readFloatArray", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.FLOAT_ARR");
         else if (type == double[].class)
-            returnFalseIfReadFailed(name, "reader.readDoubleArray", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.DOUBLE_ARR");
         else if (type == char[].class)
-            returnFalseIfReadFailed(name, "reader.readCharArray", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.CHAR_ARR");
         else if (type == boolean[].class)
-            returnFalseIfReadFailed(name, "reader.readBooleanArray", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.BOOLEAN_ARR");
         else if (type == String.class)
-            returnFalseIfReadFailed(name, "reader.readString", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.STRING");
         else if (type == BitSet.class)
-            returnFalseIfReadFailed(name, "reader.readBitSet", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.BIT_SET");
         else if (type == UUID.class)
-            returnFalseIfReadFailed(name, "reader.readUuid", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.UUID");
         else if (type == IgniteUuid.class)
-            returnFalseIfReadFailed(name, "reader.readIgniteUuid", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.IGNITE_UUID");
         else if (type.isEnum()) {
             String loc = name + "Ord";
 
             read.add(builder().a("byte ").a(loc).a(";").toString());
             read.add(EMPTY);
 
-            returnFalseIfReadFailed(loc, "reader.readByte", field);
+            returnFalseIfReadFailed(loc, "reader.readField", field, "MessageFieldType.BYTE");
 
             read.add(EMPTY);
             read.add(builder().a(name).a(" = ").a(type.getSimpleName()).a(".fromOrdinal(").a(loc).a(");").toString());
         }
         else if (BASE_CLS.isAssignableFrom(type))
-            returnFalseIfReadFailed(name, "reader.readMessage", field);
+            returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.MSG");
         else if (type.isArray()) {
             Class<?> compType = type.getComponentType();
 
-            returnFalseIfReadFailed(name, "reader.readObjectArray", field, "Type." + typeEnum(compType),
+            returnFalseIfReadFailed(name, "reader.readArrayField", field, "MessageFieldType." + typeEnum(compType),
                 compType.getSimpleName() + ".class");
         }
         else if (Collection.class.isAssignableFrom(type) && !Set.class.isAssignableFrom(type)) {
             assert colItemType != null;
 
-            returnFalseIfReadFailed(name, "reader.readCollection", field, "Type." + typeEnum(colItemType));
+            returnFalseIfReadFailed(name, "reader.readCollectionField", field,
+                "MessageFieldType." + typeEnum(colItemType));
         }
         else if (Map.class.isAssignableFrom(type)) {
             assert mapKeyType != null;
@@ -680,8 +682,8 @@ public class CommunicationMessageCodeGenerator {
 
             boolean linked = type.equals(LinkedHashMap.class);
 
-            returnFalseIfReadFailed(name, "reader.readMap", field, "Type." + typeEnum(mapKeyType),
-                "Type." + typeEnum(mapValType), linked ? "true" : "false");
+            returnFalseIfReadFailed(name, "reader.readMapField", field, "MessageFieldType." + typeEnum(mapKeyType),
+                "MessageFieldType." + typeEnum(mapValType), linked ? "true" : "false");
         }
         else
             throw new IllegalStateException("Unsupported type: " + type);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
index 4a961a2..eef9f78 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
@@ -478,7 +478,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes
                 writer.incrementState();
 
             case 9:
-                if (!writer.writeMap("ldrParticipants", ldrParticipants, Type.UUID, Type.IGNITE_UUID))
+                if (!writer.writeMap("ldrParticipants", ldrParticipants, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID))
                     return false;
 
                 writer.incrementState();
@@ -538,7 +538,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes
                 writer.incrementState();
 
             case 19:
-                if (!writer.writeCollection("top", top, Type.UUID))
+                if (!writer.writeCollection("top", top, MessageFieldType.UUID))
                     return false;
 
                 writer.incrementState();
@@ -636,7 +636,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes
                 readState++;
 
             case 9:
-                ldrParticipants = reader.readMap("ldrParticipants", Type.UUID, Type.IGNITE_UUID, false);
+                ldrParticipants = reader.readMap("ldrParticipants", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false);
 
                 if (!reader.isLastRead())
                     return false;
@@ -716,7 +716,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes
                 readState++;
 
             case 19:
-                top = reader.readCollection("top", Type.UUID);
+                top = reader.readCollection("top", MessageFieldType.UUID);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
index 901958f..78fe0f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
@@ -553,7 +553,7 @@ public class DirectByteBufferStream {
      * @param itemType Component type.
      * @param writer Writer.
      */
-    public <T> void writeObjectArray(T[] arr, MessageAdapter.Type itemType, MessageWriter writer) {
+    public <T> void writeObjectArray(T[] arr, MessageFieldType itemType, MessageWriter writer) {
         if (arr != null) {
             if (it == null) {
                 writeInt(arr.length);
@@ -587,7 +587,7 @@ public class DirectByteBufferStream {
      * @param itemType Item type.
      * @param writer Writer.
      */
-    public <T> void writeCollection(Collection<T> col, MessageAdapter.Type itemType, MessageWriter writer) {
+    public <T> void writeCollection(Collection<T> col, MessageFieldType itemType, MessageWriter writer) {
         if (col != null) {
             if (it == null) {
                 writeInt(col.size());
@@ -623,7 +623,7 @@ public class DirectByteBufferStream {
      * @param writer Writer.
      */
     @SuppressWarnings("unchecked")
-    public <K, V> void writeMap(Map<K, V> map, MessageAdapter.Type keyType, MessageAdapter.Type valType,
+    public <K, V> void writeMap(Map<K, V> map, MessageFieldType keyType, MessageFieldType valType,
         MessageWriter writer) {
         if (map != null) {
             if (it == null) {
@@ -935,7 +935,7 @@ public class DirectByteBufferStream {
      * @return Array.
      */
     @SuppressWarnings("unchecked")
-    public <T> T[] readObjectArray(MessageAdapter.Type itemType, Class<T> itemCls) {
+    public <T> T[] readObjectArray(MessageFieldType itemType, Class<T> itemCls) {
         if (readSize == -1) {
             int size = readInt();
 
@@ -977,7 +977,7 @@ public class DirectByteBufferStream {
      * @return Collection.
      */
     @SuppressWarnings("unchecked")
-    public <C extends Collection<?>> C readCollection(MessageAdapter.Type itemType) {
+    public <C extends Collection<?>> C readCollection(MessageFieldType itemType) {
         if (readSize == -1) {
             int size = readInt();
 
@@ -1021,7 +1021,7 @@ public class DirectByteBufferStream {
      * @return Map.
      */
     @SuppressWarnings("unchecked")
-    public <M extends Map<?, ?>> M readMap(MessageAdapter.Type keyType, MessageAdapter.Type valType, boolean linked) {
+    public <M extends Map<?, ?>> M readMap(MessageFieldType keyType, MessageFieldType valType, boolean linked) {
         if (readSize == -1) {
             int size = readInt();
 
@@ -1220,7 +1220,7 @@ public class DirectByteBufferStream {
      * @param val Value.
      * @param writer Writer.
      */
-    private void write(MessageAdapter.Type type, Object val, MessageWriter writer) {
+    private void write(MessageFieldType type, Object val, MessageWriter writer) {
         switch (type) {
             case BYTE:
                 writeByte((Byte)val);
@@ -1345,7 +1345,7 @@ public class DirectByteBufferStream {
      * @param type Type.
      * @return Value.
      */
-    private Object read(MessageAdapter.Type type) {
+    private Object read(MessageFieldType type) {
         switch (type) {
             case BYTE:
                 return readByte();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
index f52a4c8..0e6ef5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
@@ -236,7 +236,7 @@ public class DirectMessageReader implements MessageReader {
     }
 
     /** {@inheritDoc} */
-    @Override public <T> T[] readObjectArray(String name, MessageAdapter.Type itemType, Class<T> itemCls) {
+    @Override public <T> T[] readObjectArray(String name, MessageFieldType itemType, Class<T> itemCls) {
         T[] msg = stream.readObjectArray(itemType, itemCls);
 
         lastRead = stream.lastFinished();
@@ -245,7 +245,7 @@ public class DirectMessageReader implements MessageReader {
     }
 
     /** {@inheritDoc} */
-    @Override public <C extends Collection<?>> C readCollection(String name, MessageAdapter.Type itemType) {
+    @Override public <C extends Collection<?>> C readCollection(String name, MessageFieldType itemType) {
         C col = stream.readCollection(itemType);
 
         lastRead = stream.lastFinished();
@@ -254,8 +254,8 @@ public class DirectMessageReader implements MessageReader {
     }
 
     /** {@inheritDoc} */
-    @Override public <M extends Map<?, ?>> M readMap(String name, MessageAdapter.Type keyType,
-        MessageAdapter.Type valType, boolean linked) {
+    @Override public <M extends Map<?, ?>> M readMap(String name, MessageFieldType keyType,
+        MessageFieldType valType, boolean linked) {
         M map = stream.readMap(keyType, valType, linked);
 
         lastRead = stream.lastFinished();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
index 0438bb2..ced0889 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
@@ -187,22 +187,22 @@ public class DirectMessageWriter implements MessageWriter {
     }
 
     /** {@inheritDoc} */
-    @Override public <T> boolean writeObjectArray(String name, T[] arr, MessageAdapter.Type itemType) {
+    @Override public <T> boolean writeObjectArray(String name, T[] arr, MessageFieldType itemType) {
         stream.writeObjectArray(arr, itemType, this);
 
         return stream.lastFinished();
     }
 
     /** {@inheritDoc} */
-    @Override public <T> boolean writeCollection(String name, Collection<T> col, MessageAdapter.Type itemType) {
+    @Override public <T> boolean writeCollection(String name, Collection<T> col, MessageFieldType itemType) {
         stream.writeCollection(col, itemType, this);
 
         return stream.lastFinished();
     }
 
     /** {@inheritDoc} */
-    @Override public <K, V> boolean writeMap(String name, Map<K, V> map, MessageAdapter.Type keyType,
-        MessageAdapter.Type valType) {
+    @Override public <K, V> boolean writeMap(String name, Map<K, V> map, MessageFieldType keyType,
+        MessageFieldType valType) {
         stream.writeMap(map, keyType, valType, this);
 
         return stream.lastFinished();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
index 059f836..786f11a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
@@ -239,7 +239,7 @@ public class GridIoUserMessage extends MessageAdapter {
                 writer.incrementState();
 
             case 4:
-                if (!writer.writeMap("ldrParties", ldrParties, Type.UUID, Type.IGNITE_UUID))
+                if (!writer.writeMap("ldrParties", ldrParties, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID))
                     return false;
 
                 writer.incrementState();
@@ -303,7 +303,7 @@ public class GridIoUserMessage extends MessageAdapter {
                 readState++;
 
             case 4:
-                ldrParties = reader.readMap("ldrParties", Type.UUID, Type.IGNITE_UUID, false);
+                ldrParties = reader.readMap("ldrParties", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
index 16ccaab..59968a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
@@ -168,7 +168,7 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy
                 writer.incrementState();
 
             case 3:
-                if (!writer.writeMap("participants", participants, Type.UUID, Type.IGNITE_UUID))
+                if (!writer.writeMap("participants", participants, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID))
                     return false;
 
                 writer.incrementState();
@@ -218,7 +218,7 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy
                 readState++;
 
             case 3:
-                participants = reader.readMap("participants", Type.UUID, Type.IGNITE_UUID, false);
+                participants = reader.readMap("participants", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
index 0d2dc9a..7f6a7ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
@@ -180,7 +180,7 @@ public class GridDeploymentRequest extends MessageAdapter {
                 writer.incrementState();
 
             case 2:
-                if (!writer.writeCollection("nodeIds", nodeIds, Type.UUID))
+                if (!writer.writeCollection("nodeIds", nodeIds, MessageFieldType.UUID))
                     return false;
 
                 writer.incrementState();
@@ -224,7 +224,7 @@ public class GridDeploymentRequest extends MessageAdapter {
                 readState++;
 
             case 2:
-                nodeIds = reader.readCollection("nodeIds", Type.UUID);
+                nodeIds = reader.readCollection("nodeIds", MessageFieldType.UUID);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
index 9c51332..0762849 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
@@ -309,7 +309,7 @@ public class GridEventStorageMessage extends MessageAdapter {
                 writer.incrementState();
 
             case 6:
-                if (!writer.writeMap("ldrParties", ldrParties, Type.UUID, Type.IGNITE_UUID))
+                if (!writer.writeMap("ldrParties", ldrParties, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID))
                     return false;
 
                 writer.incrementState();
@@ -389,7 +389,7 @@ public class GridEventStorageMessage extends MessageAdapter {
                 readState++;
 
             case 6:
-                ldrParties = reader.readMap("ldrParties", Type.UUID, Type.IGNITE_UUID, false);
+                ldrParties = reader.readMap("ldrParties", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
index 1e8fe58..b1f9902 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
@@ -156,7 +156,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> {
                 writer.incrementState();
 
             case 5:
-                if (!writer.writeCollection("rejectedKeyBytes", rejectedKeyBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("rejectedKeyBytes", rejectedKeyBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -191,7 +191,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> {
                 readState++;
 
             case 5:
-                rejectedKeyBytes = reader.readCollection("rejectedKeyBytes", Type.BYTE_ARR);
+                rejectedKeyBytes = reader.readCollection("rejectedKeyBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
index b0aa291..19da7fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
@@ -202,19 +202,19 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
 
         switch (writer.state()) {
             case 3:
-                if (!writer.writeCollection("keysBytes", keysBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("keysBytes", keysBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
 
             case 4:
-                if (!writer.writeCollection("nearKeysBytes", nearKeysBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("nearKeysBytes", nearKeysBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
 
             case 5:
-                if (!writer.writeCollection("nearVers", nearVers, Type.MSG))
+                if (!writer.writeCollection("nearVers", nearVers, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -232,7 +232,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
                 writer.incrementState();
 
             case 8:
-                if (!writer.writeCollection("vers", vers, Type.MSG))
+                if (!writer.writeCollection("vers", vers, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -251,7 +251,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
 
         switch (readState) {
             case 3:
-                keysBytes = reader.readCollection("keysBytes", Type.BYTE_ARR);
+                keysBytes = reader.readCollection("keysBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;
@@ -259,7 +259,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
                 readState++;
 
             case 4:
-                nearKeysBytes = reader.readCollection("nearKeysBytes", Type.BYTE_ARR);
+                nearKeysBytes = reader.readCollection("nearKeysBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;
@@ -267,7 +267,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
                 readState++;
 
             case 5:
-                nearVers = reader.readCollection("nearVers", Type.MSG);
+                nearVers = reader.readCollection("nearVers", MessageFieldType.MSG);
 
                 if (!reader.isLastRead())
                     return false;
@@ -291,7 +291,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> {
                 readState++;
 
             case 8:
-                vers = reader.readCollection("vers", Type.MSG);
+                vers = reader.readCollection("vers", MessageFieldType.MSG);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
index a7d5819..f58c520 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
@@ -267,13 +267,13 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
                 writer.incrementState();
 
             case 5:
-                if (!writer.writeCollection("committedVers", committedVers, Type.MSG))
+                if (!writer.writeCollection("committedVers", committedVers, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
 
             case 6:
-                if (!writer.writeCollection("rolledbackVers", rolledbackVers, Type.MSG))
+                if (!writer.writeCollection("rolledbackVers", rolledbackVers, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -314,7 +314,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
                 readState++;
 
             case 5:
-                committedVers = reader.readCollection("committedVers", Type.MSG);
+                committedVers = reader.readCollection("committedVers", MessageFieldType.MSG);
 
                 if (!reader.isLastRead())
                     return false;
@@ -322,7 +322,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
                 readState++;
 
             case 6:
-                rolledbackVers = reader.readCollection("rolledbackVers", Type.MSG);
+                rolledbackVers = reader.readCollection("rolledbackVers", MessageFieldType.MSG);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index e144279..ed20375 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -441,7 +441,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
 
         switch (writer.state()) {
             case 8:
-                if (!writer.writeObjectArray("drVersByIdx", drVersByIdx, Type.MSG))
+                if (!writer.writeObjectArray("drVersByIdx", drVersByIdx, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -483,7 +483,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 writer.incrementState();
 
             case 15:
-                if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -550,7 +550,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
 
         switch (readState) {
             case 8:
-                drVersByIdx = reader.readObjectArray("drVersByIdx", Type.MSG, GridCacheVersion.class);
+                drVersByIdx = reader.readObjectArray("drVersByIdx", MessageFieldType.MSG, GridCacheVersion.class);
 
                 if (!reader.isLastRead())
                     return false;
@@ -610,7 +610,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 readState++;
 
             case 15:
-                keyBytes = reader.readCollection("keyBytes", Type.BYTE_ARR);
+                keyBytes = reader.readCollection("keyBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
index ee993eb..f02d826 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
@@ -304,7 +304,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
                 writer.incrementState();
 
             case 10:
-                if (!writer.writeCollection("valBytes", valBytes, Type.MSG))
+                if (!writer.writeCollection("valBytes", valBytes, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -339,7 +339,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
                 readState++;
 
             case 10:
-                valBytes = reader.readCollection("valBytes", Type.MSG);
+                valBytes = reader.readCollection("valBytes", MessageFieldType.MSG);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index 30ad331..9896e18 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -395,7 +395,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 writer.incrementState();
 
             case 14:
-                if (!writer.writeCollection("recoveryWritesBytes", recoveryWritesBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("recoveryWritesBytes", recoveryWritesBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -431,7 +431,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 writer.incrementState();
 
             case 20:
-                if (!writer.writeCollection("writeEntriesBytes", writeEntriesBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("writeEntriesBytes", writeEntriesBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -498,7 +498,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 readState++;
 
             case 14:
-                recoveryWritesBytes = reader.readCollection("recoveryWritesBytes", Type.BYTE_ARR);
+                recoveryWritesBytes = reader.readCollection("recoveryWritesBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;
@@ -546,7 +546,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 readState++;
 
             case 20:
-                writeEntriesBytes = reader.readCollection("writeEntriesBytes", Type.BYTE_ARR);
+                writeEntriesBytes = reader.readCollection("writeEntriesBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index 41a55ba..d685b48 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -459,7 +459,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 writer.incrementState();
 
             case 15:
-                if (!writer.writeCollection("readsBytes", readsBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("readsBytes", readsBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -495,7 +495,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 writer.incrementState();
 
             case 21:
-                if (!writer.writeCollection("writesBytes", writesBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("writesBytes", writesBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -578,7 +578,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 readState++;
 
             case 15:
-                readsBytes = reader.readCollection("readsBytes", Type.BYTE_ARR);
+                readsBytes = reader.readCollection("readsBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;
@@ -626,7 +626,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 readState++;
 
             case 21:
-                writesBytes = reader.readCollection("writesBytes", Type.BYTE_ARR);
+                writesBytes = reader.readCollection("writesBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
index 694c30c..8526a9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
@@ -130,7 +130,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa
 
         switch (writer.state()) {
             case 8:
-                if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -149,7 +149,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa
 
         switch (readState) {
             case 8:
-                keyBytes = reader.readCollection("keyBytes", Type.BYTE_ARR);
+                keyBytes = reader.readCollection("keyBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 342d4b7..5455a7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -374,7 +374,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
                 writer.incrementState();
 
             case 27:
-                if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -447,7 +447,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
                 readState++;
 
             case 27:
-                nearKeyBytes = reader.readCollection("nearKeyBytes", Type.BYTE_ARR);
+                nearKeyBytes = reader.readCollection("nearKeyBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
index 409dbb6..038bdda 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
@@ -214,7 +214,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V>
 
         switch (writer.state()) {
             case 11:
-                if (!writer.writeCollection("invalidParts", invalidParts, Type.INT))
+                if (!writer.writeCollection("invalidParts", invalidParts, MessageFieldType.INT))
                     return false;
 
                 writer.incrementState();
@@ -226,13 +226,13 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V>
                 writer.incrementState();
 
             case 13:
-                if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
 
             case 14:
-                if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -251,7 +251,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V>
 
         switch (readState) {
             case 11:
-                invalidParts = reader.readCollection("invalidParts", Type.INT);
+                invalidParts = reader.readCollection("invalidParts", MessageFieldType.INT);
 
                 if (!reader.isLastRead())
                     return false;
@@ -267,7 +267,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V>
                 readState++;
 
             case 13:
-                nearEvictedBytes = reader.readCollection("nearEvictedBytes", Type.BYTE_ARR);
+                nearEvictedBytes = reader.readCollection("nearEvictedBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;
@@ -275,7 +275,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V>
                 readState++;
 
             case 14:
-                preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", Type.BYTE_ARR);
+                preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index 28d60ac..e67535a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -387,7 +387,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
                 writer.incrementState();
 
             case 25:
-                if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -399,7 +399,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
                 writer.incrementState();
 
             case 27:
-                if (!writer.writeCollection("pendingVers", pendingVers, Type.MSG))
+                if (!writer.writeCollection("pendingVers", pendingVers, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -490,7 +490,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
                 readState++;
 
             case 25:
-                nearWritesBytes = reader.readCollection("nearWritesBytes", Type.BYTE_ARR);
+                nearWritesBytes = reader.readCollection("nearWritesBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;
@@ -506,7 +506,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
                 readState++;
 
             case 27:
-                pendingVers = reader.readCollection("pendingVers", Type.MSG);
+                pendingVers = reader.readCollection("pendingVers", MessageFieldType.MSG);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 0439a23..bcf2e7d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -357,7 +357,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
                 writer.incrementState();
 
             case 27:
-                if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -452,7 +452,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
                 readState++;
 
             case 27:
-                nearWritesBytes = reader.readCollection("nearWritesBytes", Type.BYTE_ARR);
+                nearWritesBytes = reader.readCollection("nearWritesBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index ca92980..e3a3a0d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@ -226,7 +226,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp
                 writer.incrementState();
 
             case 11:
-                if (!writer.writeCollection("invalidParts", invalidParts, Type.INT))
+                if (!writer.writeCollection("invalidParts", invalidParts, MessageFieldType.INT))
                     return false;
 
                 writer.incrementState();
@@ -238,13 +238,13 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp
                 writer.incrementState();
 
             case 13:
-                if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
 
             case 14:
-                if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -271,7 +271,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp
                 readState++;
 
             case 11:
-                invalidParts = reader.readCollection("invalidParts", Type.INT);
+                invalidParts = reader.readCollection("invalidParts", MessageFieldType.INT);
 
                 if (!reader.isLastRead())
                     return false;
@@ -287,7 +287,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp
                 readState++;
 
             case 13:
-                nearEvictedBytes = reader.readCollection("nearEvictedBytes", Type.BYTE_ARR);
+                nearEvictedBytes = reader.readCollection("nearEvictedBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;
@@ -295,7 +295,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp
                 readState++;
 
             case 14:
-                preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", Type.BYTE_ARR);
+                preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
index a9d035f..5c8efbe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
@@ -119,7 +119,7 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K,
 
         switch (writer.state()) {
             case 9:
-                if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -138,7 +138,7 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K,
 
         switch (readState) {
             case 9:
-                nearKeyBytes = reader.readCollection("nearKeyBytes", Type.BYTE_ARR);
+                nearKeyBytes = reader.readCollection("nearKeyBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
index f8e60c0..77d858b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
@@ -88,7 +88,7 @@ public class GridDhtAtomicDeferredUpdateResponse<K, V> extends GridCacheMessage<
 
         switch (writer.state()) {
             case 3:
-                if (!writer.writeCollection("futVers", futVers, Type.MSG))
+                if (!writer.writeCollection("futVers", futVers, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -107,7 +107,7 @@ public class GridDhtAtomicDeferredUpdateResponse<K, V> extends GridCacheMessage<
 
         switch (readState) {
             case 3:
-                futVers = reader.readCollection("futVers", Type.MSG);
+                futVers = reader.readCollection("futVers", MessageFieldType.MSG);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index 7e4413a..2f33351 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -702,13 +702,13 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 writer.incrementState();
 
             case 4:
-                if (!writer.writeCollection("drVers", drVers, Type.MSG))
+                if (!writer.writeCollection("drVers", drVers, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
 
             case 5:
-                if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -726,19 +726,19 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 writer.incrementState();
 
             case 8:
-                if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, Type.BYTE_ARR))
+                if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
 
             case 9:
-                if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
 
             case 10:
-                if (!writer.writeCollection("nearEntryProcessorsBytes", nearEntryProcessorsBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("nearEntryProcessorsBytes", nearEntryProcessorsBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -750,7 +750,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 writer.incrementState();
 
             case 12:
-                if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -762,7 +762,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 writer.incrementState();
 
             case 14:
-                if (!writer.writeCollection("nearValBytes", nearValBytes, Type.MSG))
+                if (!writer.writeCollection("nearValBytes", nearValBytes, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -804,7 +804,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 writer.incrementState();
 
             case 21:
-                if (!writer.writeCollection("valBytes", valBytes, Type.MSG))
+                if (!writer.writeCollection("valBytes", valBytes, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -837,7 +837,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 readState++;
 
             case 4:
-                drVers = reader.readCollection("drVers", Type.MSG);
+                drVers = reader.readCollection("drVers", MessageFieldType.MSG);
 
                 if (!reader.isLastRead())
                     return false;
@@ -845,7 +845,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 readState++;
 
             case 5:
-                entryProcessorsBytes = reader.readCollection("entryProcessorsBytes", Type.BYTE_ARR);
+                entryProcessorsBytes = reader.readCollection("entryProcessorsBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;
@@ -869,7 +869,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 readState++;
 
             case 8:
-                invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", Type.BYTE_ARR, byte[].class);
+                invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageFieldType.BYTE_ARR, byte[].class);
 
                 if (!reader.isLastRead())
                     return false;
@@ -877,7 +877,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 readState++;
 
             case 9:
-                keyBytes = reader.readCollection("keyBytes", Type.BYTE_ARR);
+                keyBytes = reader.readCollection("keyBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;
@@ -885,7 +885,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 readState++;
 
             case 10:
-                nearEntryProcessorsBytes = reader.readCollection("nearEntryProcessorsBytes", Type.BYTE_ARR);
+                nearEntryProcessorsBytes = reader.readCollection("nearEntryProcessorsBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;
@@ -901,7 +901,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 readState++;
 
             case 12:
-                nearKeyBytes = reader.readCollection("nearKeyBytes", Type.BYTE_ARR);
+                nearKeyBytes = reader.readCollection("nearKeyBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;
@@ -917,7 +917,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 readState++;
 
             case 14:
-                nearValBytes = reader.readCollection("nearValBytes", Type.MSG);
+                nearValBytes = reader.readCollection("nearValBytes", MessageFieldType.MSG);
 
                 if (!reader.isLastRead())
                     return false;
@@ -977,7 +977,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 readState++;
 
             case 21:
-                valBytes = reader.readCollection("valBytes", Type.MSG);
+                valBytes = reader.readCollection("valBytes", MessageFieldType.MSG);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index c732be5..0bf33ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -211,7 +211,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im
                 writer.incrementState();
 
             case 6:
-                if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -254,7 +254,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im
                 readState++;
 
             case 6:
-                nearEvictedBytes = reader.readCollection("nearEvictedBytes", Type.BYTE_ARR);
+                nearEvictedBytes = reader.readCollection("nearEvictedBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
index c206264..50c1e5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
@@ -570,7 +570,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 writer.incrementState();
 
             case 5:
-                if (!writer.writeCollection("drVers", drVers, Type.MSG))
+                if (!writer.writeCollection("drVers", drVers, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -588,7 +588,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 writer.incrementState();
 
             case 8:
-                if (!writer.writeObjectArray("filterBytes", filterBytes, Type.BYTE_ARR))
+                if (!writer.writeObjectArray("filterBytes", filterBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -612,13 +612,13 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 writer.incrementState();
 
             case 12:
-                if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, Type.BYTE_ARR))
+                if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
 
             case 13:
-                if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR))
+                if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR))
                     return false;
 
                 writer.incrementState();
@@ -666,7 +666,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 writer.incrementState();
 
             case 21:
-                if (!writer.writeCollection("valBytes", valBytes, Type.MSG))
+                if (!writer.writeCollection("valBytes", valBytes, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -701,7 +701,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 readState++;
 
             case 5:
-                drVers = reader.readCollection("drVers", Type.MSG);
+                drVers = reader.readCollection("drVers", MessageFieldType.MSG);
 
                 if (!reader.isLastRead())
                     return false;
@@ -725,7 +725,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 readState++;
 
             case 8:
-                filterBytes = reader.readObjectArray("filterBytes", Type.BYTE_ARR, byte[].class);
+                filterBytes = reader.readObjectArray("filterBytes", MessageFieldType.BYTE_ARR, byte[].class);
 
                 if (!reader.isLastRead())
                     return false;
@@ -757,7 +757,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 readState++;
 
             case 12:
-                invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", Type.BYTE_ARR, byte[].class);
+                invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageFieldType.BYTE_ARR, byte[].class);
 
                 if (!reader.isLastRead())
                     return false;
@@ -765,7 +765,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 readState++;
 
             case 13:
-                keyBytes = reader.readCollection("keyBytes", Type.BYTE_ARR);
+                keyBytes = reader.readCollection("keyBytes", MessageFieldType.BYTE_ARR);
 
                 if (!reader.isLastRead())
                     return false;
@@ -837,7 +837,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 readState++;
 
             case 21:
-                valBytes = reader.readCollection("valBytes", Type.MSG);
+                valBytes = reader.readCollection("valBytes", MessageFieldType.MSG);
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a05bf1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index 468861b..7912a07 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -457,7 +457,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 writer.incrementState();
 
             case 7:
-                if (!writer.writeCollection("nearSkipIdxs", nearSkipIdxs, Type.INT))
+                if (!writer.writeCollection("nearSkipIdxs", nearSkipIdxs, MessageFieldType.INT))
                     return false;
 
                 writer.incrementState();
@@ -469,13 +469,13 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 writer.incrementState();
 
             case 9:
-                if (!writer.writeCollection("nearValBytes", nearValBytes, Type.MSG))
+                if (!writer.writeCollection("nearValBytes", nearValBytes, MessageFieldType.MSG))
                     return false;
 
                 writer.incrementState();
 
             case 10:
-                if (!writer.writeCollection("nearValsIdxs", nearValsIdxs, Type.INT))
+                if (!writer.writeCollection("nearValsIdxs", nearValsIdxs, MessageFieldType.INT))
                     return false;
 
                 writer.incrementState();
@@ -544,7 +544,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 readState++;
 
             case 7:
-                nearSkipIdxs = reader.readCollection("nearSkipIdxs", Type.INT);
+                nearSkipIdxs = reader.readCollection("nearSkipIdxs", MessageFieldType.INT);
 
                 if (!reader.isLastRead())
                     return false;
@@ -560,7 +560,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 readState++;
 
             case 9:
-                nearValBytes = reader.readCollection("nearValBytes", Type.MSG);
+                nearValBytes = reader.readCollection("nearValBytes", MessageFieldType.MSG);
 
                 if (!reader.isLastRead())
                     return false;
@@ -568,7 +568,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 readState++;
 
             case 10:
-                nearValsIdxs = reader.readCollection("nearValsIdxs", Type.INT);
+                nearValsIdxs = reader.readCollection("nearValsIdxs", MessageFieldType.INT);
 
                 if (!reader.isLastRead())
                     return false;


Mime
View raw message