ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [27/36] incubator-ignite git commit: #ignite-315: move zip function to VisorUtils
Date Thu, 26 Feb 2015 03:54:41 GMT
#ignite-315: move zip function to VisorUtils


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

Branch: refs/heads/ignite-preload-debug
Commit: 9a69903e5b390ab52745fb8853edaaff9dbee440
Parents: 12ee896
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Wed Feb 25 17:56:01 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Wed Feb 25 17:56:01 2015 +0300

----------------------------------------------------------------------
 .../processors/rest/TestBinaryClient.java       |   6 +-
 .../processors/rest/TestMemcacheClient.java     |  44 +-
 .../protocols/tcp/TcpRestParserSelfTest.java    |  14 +-
 .../CacheRendezvousAffinityFunction.java        |   2 +-
 .../IgfsByteDelimiterRecordResolver.java        |   4 +-
 .../ignite/internal/ClusterMetricsSnapshot.java | 204 +++---
 .../internal/GridEventConsumeHandler.java       |   8 +-
 .../internal/GridMessageListenHandler.java      |   8 +-
 .../router/impl/GridTcpRouterNioParser.java     |  10 +-
 .../internal/direct/DirectByteBufferStream.java |   4 +-
 .../igfs/common/IgfsControlResponse.java        |   6 +-
 .../internal/igfs/common/IgfsMarshaller.java    |  16 +-
 .../affinity/GridAffinityMessage.java           |   4 +-
 .../processors/cache/GridCacheEntryInfo.java    |  12 +-
 .../processors/cache/GridCacheUtils.java        |   8 +-
 .../continuous/CacheContinuousQueryEntry.java   |  12 +-
 .../continuous/CacheContinuousQueryHandler.java |   4 +-
 .../cache/transactions/IgniteTxEntry.java       |  20 +-
 .../version/GridCacheRawVersionedEntry.java     |   8 +-
 .../processors/clock/GridClockMessage.java      |  24 +-
 .../continuous/GridContinuousProcessor.java     |   4 +-
 .../processors/igfs/IgfsDataManager.java        |   4 +-
 .../internal/processors/igfs/IgfsServer.java    |   4 +-
 .../processors/rest/GridRestResponse.java       |   4 +-
 .../message/GridClientAbstractMessage.java      |   4 +-
 .../message/GridClientHandshakeRequest.java     |   4 +-
 .../protocols/tcp/GridMemcachedMessage.java     |   4 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |  44 +-
 .../ignite/internal/util/GridByteArrayList.java |  14 +-
 .../ignite/internal/util/IgniteByteUtils.java   | 705 -------------------
 .../ignite/internal/util/IgniteUtils.java       | 646 ++++++++++++++++-
 .../nio/GridConnectionBytesVerifyFilter.java    |   2 +-
 .../util/nio/GridTcpCommunicationClient.java    |   2 +-
 .../internal/visor/util/VisorTaskUtils.java     |  43 +-
 .../ignite/lang/IgniteProductVersion.java       |   6 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  12 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   2 +-
 .../tcp/internal/TcpDiscoveryNode.java          |   4 +-
 .../TcpDiscoveryMulticastIpFinder.java          |   6 +-
 .../messages/TcpDiscoveryAuthFailedMessage.java |   4 +-
 .../messages/TcpDiscoveryHeartbeatMessage.java  |  14 +-
 .../igfs/IgfsDataManagerSelfTest.java           |   3 +-
 .../internal/util/IgniteUtilsSelfTest.java      |  20 +-
 .../internal/util/nio/GridNioSelfTest.java      |   6 +-
 .../internal/util/nio/GridRoundTripTest.java    |   4 +-
 .../offheap/GridOffHeapMapAbstractSelfTest.java |   3 +-
 .../ignite/lang/GridByteArrayListSelfTest.java  |   6 +-
 .../communication/GridTestMessage.java          |   5 +-
 .../file/GridFileSwapSpaceSpiSelfTest.java      |   5 +-
 .../internal/igfs/hadoop/IgfsHadoopIpcIo.java   |  10 +-
 .../shuffle/GridHadoopShuffleMessage.java       |   4 +-
 .../hadoop/v2/GridHadoopSplitWrapper.java       |   6 +-
 .../http/jetty/GridJettyRestHandler.java        |   2 +-
 53 files changed, 996 insertions(+), 1028 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
index b01139c..2774947 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
@@ -149,7 +149,7 @@ final class TestBinaryClient {
 
                             if (len == 0) {
                                 if (buf.size() == 4) {
-                                    len = IgniteByteUtils.bytesToInt(buf.toByteArray(), 0);
+                                    len = U.bytesToInt(buf.toByteArray(), 0);
 
                                     if (log.isInfoEnabled())
                                         log.info("Read length: " + len);
@@ -279,8 +279,8 @@ final class TestBinaryClient {
         slice.put((byte)0x90);
         slice.putInt(res.remaining() - 5);
         slice.putLong(msg.requestId());
-        slice.put(IgniteByteUtils.uuidToBytes(msg.clientId()));
-        slice.put(IgniteByteUtils.uuidToBytes(msg.destinationId()));
+        slice.put(U.uuidToBytes(msg.clientId()));
+        slice.put(U.uuidToBytes(msg.destinationId()));
 
         byte[] arr = new byte[res.remaining()];
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java
index a29c336..5f4ae8f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java
@@ -147,7 +147,7 @@ final class TestMemcacheClient {
                                 buf.write(b);
 
                                 if (i == 3) {
-                                    keyLength = IgniteByteUtils.bytesToShort(buf.toByteArray(), 0);
+                                    keyLength = U.bytesToShort(buf.toByteArray(), 0);
 
                                     buf.reset();
                                 }
@@ -158,7 +158,7 @@ final class TestMemcacheClient {
                                 buf.write(b);
 
                                 if (i == 7) {
-                                    success = IgniteByteUtils.bytesToShort(buf.toByteArray(), 0) == 0;
+                                    success = U.bytesToShort(buf.toByteArray(), 0) == 0;
 
                                     buf.reset();
                                 }
@@ -167,7 +167,7 @@ final class TestMemcacheClient {
                                 buf.write(b);
 
                                 if (i == 11) {
-                                    totalLength = IgniteByteUtils.bytesToInt(buf.toByteArray(), 0);
+                                    totalLength = U.bytesToInt(buf.toByteArray(), 0);
 
                                     buf.reset();
                                 }
@@ -176,7 +176,7 @@ final class TestMemcacheClient {
                                 buf.write(b);
 
                                 if (i == 15) {
-                                    opaque = IgniteByteUtils.bytesToInt(buf.toByteArray(), 0);
+                                    opaque = U.bytesToInt(buf.toByteArray(), 0);
 
                                     buf.reset();
                                 }
@@ -187,8 +187,8 @@ final class TestMemcacheClient {
                                 if (i == HDR_LEN + extrasLength - 1) {
                                     byte[] rawFlags = buf.toByteArray();
 
-                                    keyFlags = IgniteByteUtils.bytesToShort(rawFlags, 0);
-                                    valFlags = IgniteByteUtils.bytesToShort(rawFlags, 2);
+                                    keyFlags = U.bytesToShort(rawFlags, 0);
+                                    valFlags = U.bytesToShort(rawFlags, 2);
 
                                     buf.reset();
                                 }
@@ -414,12 +414,12 @@ final class TestMemcacheClient {
         packet[0] = (byte)0x80;
         packet[1] = cmd.operationCode();
 
-        IgniteByteUtils.shortToBytes((short) keyData.length(), packet, 2);
+        U.shortToBytes((short) keyData.length(), packet, 2);
 
         packet[4] = (byte)(extrasLength);
 
-        IgniteByteUtils.intToBytes(extrasLength + keyData.length() + valData.length(), packet, 8);
-        IgniteByteUtils.intToBytes(opaque, packet, 12);
+        U.intToBytes(extrasLength + keyData.length() + valData.length(), packet, 8);
+        U.intToBytes(opaque, packet, 12);
 
         if (extrasLength > 0) {
             if (extras != null) {
@@ -427,14 +427,14 @@ final class TestMemcacheClient {
 
                 for (Long extra : extras) {
                     if (extra != null)
-                        IgniteByteUtils.longToBytes(extra, packet, offset);
+                        U.longToBytes(extra, packet, offset);
 
                     offset += 8;
                 }
             }
             else {
-                IgniteByteUtils.shortToBytes(keyData.getFlags(), packet, HDR_LEN);
-                IgniteByteUtils.shortToBytes(valData.getFlags(), packet, HDR_LEN + 2);
+                U.shortToBytes(keyData.getFlags(), packet, HDR_LEN);
+                U.shortToBytes(valData.getFlags(), packet, HDR_LEN + 2);
             }
         }
 
@@ -644,17 +644,17 @@ final class TestMemcacheClient {
             flags |= BOOLEAN_FLAG;
         }
         else if (obj instanceof Integer) {
-            bytes = IgniteByteUtils.intToBytes((Integer) obj);
+            bytes = U.intToBytes((Integer) obj);
 
             flags |= INT_FLAG;
         }
         else if (obj instanceof Long) {
-            bytes = IgniteByteUtils.longToBytes((Long) obj);
+            bytes = U.longToBytes((Long) obj);
 
             flags |= LONG_FLAG;
         }
         else if (obj instanceof Date) {
-            bytes = IgniteByteUtils.longToBytes(((Date) obj).getTime());
+            bytes = U.longToBytes(((Date) obj).getTime());
 
             flags |= DATE_FLAG;
         }
@@ -664,12 +664,12 @@ final class TestMemcacheClient {
             flags |= BYTE_FLAG;
         }
         else if (obj instanceof Float) {
-            bytes = IgniteByteUtils.intToBytes(Float.floatToIntBits((Float) obj));
+            bytes = U.intToBytes(Float.floatToIntBits((Float) obj));
 
             flags |= FLOAT_FLAG;
         }
         else if (obj instanceof Double) {
-            bytes = IgniteByteUtils.longToBytes(Double.doubleToLongBits((Double) obj));
+            bytes = U.longToBytes(Double.doubleToLongBits((Double) obj));
 
             flags |= DOUBLE_FLAG;
         }
@@ -706,17 +706,17 @@ final class TestMemcacheClient {
             case BOOLEAN_FLAG:
                 return bytes[0] == '1';
             case INT_FLAG:
-                return IgniteByteUtils.bytesToInt(bytes, 0);
+                return U.bytesToInt(bytes, 0);
             case LONG_FLAG:
-                return IgniteByteUtils.bytesToLong(bytes, 0);
+                return U.bytesToLong(bytes, 0);
             case DATE_FLAG:
-                return new Date(IgniteByteUtils.bytesToLong(bytes, 0));
+                return new Date(U.bytesToLong(bytes, 0));
             case BYTE_FLAG:
                 return bytes[0];
             case FLOAT_FLAG:
-                return Float.intBitsToFloat(IgniteByteUtils.bytesToInt(bytes, 0));
+                return Float.intBitsToFloat(U.bytesToInt(bytes, 0));
             case DOUBLE_FLAG:
-                return Double.longBitsToDouble(IgniteByteUtils.bytesToLong(bytes, 0));
+                return Double.longBitsToDouble(U.bytesToLong(bytes, 0));
             case BYTE_ARR_FLAG:
                 return bytes;
             default:

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
index f6997b9..76c929e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
@@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.rest.protocols.tcp;
 import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.util.*;
 import org.apache.ignite.internal.util.nio.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.testframework.*;
 import org.apache.ignite.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
@@ -121,9 +121,9 @@ public class TcpRestParserSelfTest extends GridCommonAbstractTest {
                 ByteBuffer fake = ByteBuffer.allocate(21);
 
                 fake.put(IGNITE_REQ_FLAG);
-                fake.put(IgniteByteUtils.intToBytes(-5));
-                fake.put(IgniteByteUtils.longToBytes(0));
-                fake.put(IgniteByteUtils.longToBytes(0));
+                fake.put(U.intToBytes(-5));
+                fake.put(U.longToBytes(0));
+                fake.put(U.longToBytes(0));
 
                 fake.flip();
 
@@ -326,7 +326,7 @@ public class TcpRestParserSelfTest extends GridCommonAbstractTest {
             GridClientHandshakeRequest req = (GridClientHandshakeRequest)F.first(lst);
 
             assertNotNull(req);
-            assertEquals(IgniteByteUtils.bytesToShort(new byte[]{5, 0}, 0), req.version());
+            assertEquals(U.bytesToShort(new byte[]{5, 0}, 0), req.version());
         }
     }
 
@@ -371,8 +371,8 @@ public class TcpRestParserSelfTest extends GridCommonAbstractTest {
         slice.put(IGNITE_REQ_FLAG);
         slice.putInt(res.remaining() - 5);
         slice.putLong(msg.requestId());
-        slice.put(IgniteByteUtils.uuidToBytes(msg.clientId()));
-        slice.put(IgniteByteUtils.uuidToBytes(msg.destinationId()));
+        slice.put(U.uuidToBytes(msg.clientId()));
+        slice.put(U.uuidToBytes(msg.destinationId()));
 
         return res;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java
index de25a50..87d768f 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java
@@ -295,7 +295,7 @@ public class CacheRendezvousAffinityFunction implements CacheAffinityFunction, E
                 byte[] nodeHashBytes = marshaller.marshal(nodeHash);
 
                 out.write(nodeHashBytes, 0, nodeHashBytes.length); // Avoid IOException.
-                out.write(IgniteByteUtils.intToBytes(part), 0, 4); // Avoid IOException.
+                out.write(U.intToBytes(part), 0, 4); // Avoid IOException.
 
                 d.reset();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java
index 666f847..c1c15a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java
@@ -282,7 +282,7 @@ public class IgfsByteDelimiterRecordResolver implements IgfsRecordResolver, Exte
             out.writeInt(delims.length);
 
             for (byte[] delim : delims)
-                IgniteByteUtils.writeByteArray(out, delim);
+                U.writeByteArray(out, delim);
         }
         else
             out.writeBoolean(false);
@@ -296,7 +296,7 @@ public class IgfsByteDelimiterRecordResolver implements IgfsRecordResolver, Exte
             delims = new byte[len][];
 
             for (int i = 0; i < len; i++)
-                delims[i] = IgniteByteUtils.readByteArray(in);
+                delims[i] = U.readByteArray(in);
 
             maxDelimLen = maxDelimiterLength(delims);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
index db8487f..6e1e4c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
@@ -1236,57 +1236,57 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
     public static int serialize(byte[] data, int off, ClusterMetrics metrics) {
         int start = off;
 
-        off = IgniteByteUtils.intToBytes(metrics.getMaximumActiveJobs(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getCurrentActiveJobs(), data, off);
-        off = IgniteByteUtils.floatToBytes(metrics.getAverageActiveJobs(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getMaximumWaitingJobs(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getCurrentWaitingJobs(), data, off);
-        off = IgniteByteUtils.floatToBytes(metrics.getAverageWaitingJobs(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getMaximumRejectedJobs(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getCurrentRejectedJobs(), data, off);
-        off = IgniteByteUtils.floatToBytes(metrics.getAverageRejectedJobs(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getMaximumCancelledJobs(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getCurrentCancelledJobs(), data, off);
-        off = IgniteByteUtils.floatToBytes(metrics.getAverageCancelledJobs(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getTotalRejectedJobs(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getTotalCancelledJobs(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getTotalExecutedJobs(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getMaximumJobWaitTime(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getCurrentJobWaitTime(), data, off);
-        off = IgniteByteUtils.doubleToBytes(metrics.getAverageJobWaitTime(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getMaximumJobExecuteTime(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getCurrentJobExecuteTime(), data, off);
-        off = IgniteByteUtils.doubleToBytes(metrics.getAverageJobExecuteTime(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getTotalExecutedTasks(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getCurrentIdleTime(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getTotalIdleTime(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getTotalCpus(), data, off);
-        off = IgniteByteUtils.doubleToBytes(metrics.getCurrentCpuLoad(), data, off);
-        off = IgniteByteUtils.doubleToBytes(metrics.getAverageCpuLoad(), data, off);
-        off = IgniteByteUtils.doubleToBytes(metrics.getCurrentGcCpuLoad(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getHeapMemoryInitialized(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getHeapMemoryUsed(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getHeapMemoryCommitted(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getHeapMemoryMaximum(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getHeapMemoryTotal(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getNonHeapMemoryInitialized(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getNonHeapMemoryUsed(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getNonHeapMemoryCommitted(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getNonHeapMemoryMaximum(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getNonHeapMemoryTotal(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getStartTime(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getNodeStartTime(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getUpTime(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getCurrentThreadCount(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getMaximumThreadCount(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getTotalStartedThreadCount(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getCurrentDaemonThreadCount(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getLastDataVersion(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getSentMessagesCount(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getSentBytesCount(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getReceivedMessagesCount(), data, off);
-        off = IgniteByteUtils.longToBytes(metrics.getReceivedBytesCount(), data, off);
-        off = IgniteByteUtils.intToBytes(metrics.getOutboundMessagesQueueSize(), data, off);
+        off = U.intToBytes(metrics.getMaximumActiveJobs(), data, off);
+        off = U.intToBytes(metrics.getCurrentActiveJobs(), data, off);
+        off = U.floatToBytes(metrics.getAverageActiveJobs(), data, off);
+        off = U.intToBytes(metrics.getMaximumWaitingJobs(), data, off);
+        off = U.intToBytes(metrics.getCurrentWaitingJobs(), data, off);
+        off = U.floatToBytes(metrics.getAverageWaitingJobs(), data, off);
+        off = U.intToBytes(metrics.getMaximumRejectedJobs(), data, off);
+        off = U.intToBytes(metrics.getCurrentRejectedJobs(), data, off);
+        off = U.floatToBytes(metrics.getAverageRejectedJobs(), data, off);
+        off = U.intToBytes(metrics.getMaximumCancelledJobs(), data, off);
+        off = U.intToBytes(metrics.getCurrentCancelledJobs(), data, off);
+        off = U.floatToBytes(metrics.getAverageCancelledJobs(), data, off);
+        off = U.intToBytes(metrics.getTotalRejectedJobs(), data, off);
+        off = U.intToBytes(metrics.getTotalCancelledJobs(), data, off);
+        off = U.intToBytes(metrics.getTotalExecutedJobs(), data, off);
+        off = U.longToBytes(metrics.getMaximumJobWaitTime(), data, off);
+        off = U.longToBytes(metrics.getCurrentJobWaitTime(), data, off);
+        off = U.doubleToBytes(metrics.getAverageJobWaitTime(), data, off);
+        off = U.longToBytes(metrics.getMaximumJobExecuteTime(), data, off);
+        off = U.longToBytes(metrics.getCurrentJobExecuteTime(), data, off);
+        off = U.doubleToBytes(metrics.getAverageJobExecuteTime(), data, off);
+        off = U.intToBytes(metrics.getTotalExecutedTasks(), data, off);
+        off = U.longToBytes(metrics.getCurrentIdleTime(), data, off);
+        off = U.longToBytes(metrics.getTotalIdleTime(), data, off);
+        off = U.intToBytes(metrics.getTotalCpus(), data, off);
+        off = U.doubleToBytes(metrics.getCurrentCpuLoad(), data, off);
+        off = U.doubleToBytes(metrics.getAverageCpuLoad(), data, off);
+        off = U.doubleToBytes(metrics.getCurrentGcCpuLoad(), data, off);
+        off = U.longToBytes(metrics.getHeapMemoryInitialized(), data, off);
+        off = U.longToBytes(metrics.getHeapMemoryUsed(), data, off);
+        off = U.longToBytes(metrics.getHeapMemoryCommitted(), data, off);
+        off = U.longToBytes(metrics.getHeapMemoryMaximum(), data, off);
+        off = U.longToBytes(metrics.getHeapMemoryTotal(), data, off);
+        off = U.longToBytes(metrics.getNonHeapMemoryInitialized(), data, off);
+        off = U.longToBytes(metrics.getNonHeapMemoryUsed(), data, off);
+        off = U.longToBytes(metrics.getNonHeapMemoryCommitted(), data, off);
+        off = U.longToBytes(metrics.getNonHeapMemoryMaximum(), data, off);
+        off = U.longToBytes(metrics.getNonHeapMemoryTotal(), data, off);
+        off = U.longToBytes(metrics.getStartTime(), data, off);
+        off = U.longToBytes(metrics.getNodeStartTime(), data, off);
+        off = U.longToBytes(metrics.getUpTime(), data, off);
+        off = U.intToBytes(metrics.getCurrentThreadCount(), data, off);
+        off = U.intToBytes(metrics.getMaximumThreadCount(), data, off);
+        off = U.longToBytes(metrics.getTotalStartedThreadCount(), data, off);
+        off = U.intToBytes(metrics.getCurrentDaemonThreadCount(), data, off);
+        off = U.longToBytes(metrics.getLastDataVersion(), data, off);
+        off = U.intToBytes(metrics.getSentMessagesCount(), data, off);
+        off = U.longToBytes(metrics.getSentBytesCount(), data, off);
+        off = U.intToBytes(metrics.getReceivedMessagesCount(), data, off);
+        off = U.longToBytes(metrics.getReceivedBytesCount(), data, off);
+        off = U.intToBytes(metrics.getOutboundMessagesQueueSize(), data, off);
 
         assert off - start == METRICS_SIZE : "Invalid metrics size [expected=" + METRICS_SIZE + ", actual=" +
                 (off - start) + ']';
@@ -1308,207 +1308,207 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
 
         metrics.setLastUpdateTime(U.currentTimeMillis());
 
-        metrics.setMaximumActiveJobs(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setMaximumActiveJobs(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setCurrentActiveJobs(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setCurrentActiveJobs(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setAverageActiveJobs(IgniteByteUtils.bytesToFloat(data, off));
+        metrics.setAverageActiveJobs(U.bytesToFloat(data, off));
 
         off += 4;
 
-        metrics.setMaximumWaitingJobs(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setMaximumWaitingJobs(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setCurrentWaitingJobs(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setCurrentWaitingJobs(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setAverageWaitingJobs(IgniteByteUtils.bytesToFloat(data, off));
+        metrics.setAverageWaitingJobs(U.bytesToFloat(data, off));
 
         off += 4;
 
-        metrics.setMaximumRejectedJobs(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setMaximumRejectedJobs(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setCurrentRejectedJobs(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setCurrentRejectedJobs(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setAverageRejectedJobs(IgniteByteUtils.bytesToFloat(data, off));
+        metrics.setAverageRejectedJobs(U.bytesToFloat(data, off));
 
         off += 4;
 
-        metrics.setMaximumCancelledJobs(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setMaximumCancelledJobs(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setCurrentCancelledJobs(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setCurrentCancelledJobs(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setAverageCancelledJobs(IgniteByteUtils.bytesToFloat(data, off));
+        metrics.setAverageCancelledJobs(U.bytesToFloat(data, off));
 
         off += 4;
 
-        metrics.setTotalRejectedJobs(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setTotalRejectedJobs(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setTotalCancelledJobs(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setTotalCancelledJobs(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setTotalExecutedJobs(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setTotalExecutedJobs(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setMaximumJobWaitTime(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setMaximumJobWaitTime(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setCurrentJobWaitTime(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setCurrentJobWaitTime(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setAverageJobWaitTime(IgniteByteUtils.bytesToDouble(data, off));
+        metrics.setAverageJobWaitTime(U.bytesToDouble(data, off));
 
         off += 8;
 
-        metrics.setMaximumJobExecuteTime(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setMaximumJobExecuteTime(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setCurrentJobExecuteTime(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setCurrentJobExecuteTime(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setAverageJobExecuteTime(IgniteByteUtils.bytesToDouble(data, off));
+        metrics.setAverageJobExecuteTime(U.bytesToDouble(data, off));
 
         off += 8;
 
-        metrics.setTotalExecutedTasks(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setTotalExecutedTasks(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setCurrentIdleTime(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setCurrentIdleTime(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setTotalIdleTime(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setTotalIdleTime(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setAvailableProcessors(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setAvailableProcessors(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setCurrentCpuLoad(IgniteByteUtils.bytesToDouble(data, off));
+        metrics.setCurrentCpuLoad(U.bytesToDouble(data, off));
 
         off += 8;
 
-        metrics.setAverageCpuLoad(IgniteByteUtils.bytesToDouble(data, off));
+        metrics.setAverageCpuLoad(U.bytesToDouble(data, off));
 
         off += 8;
 
-        metrics.setCurrentGcCpuLoad(IgniteByteUtils.bytesToDouble(data, off));
+        metrics.setCurrentGcCpuLoad(U.bytesToDouble(data, off));
 
         off += 8;
 
-        metrics.setHeapMemoryInitialized(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setHeapMemoryInitialized(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setHeapMemoryUsed(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setHeapMemoryUsed(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setHeapMemoryCommitted(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setHeapMemoryCommitted(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setHeapMemoryMaximum(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setHeapMemoryMaximum(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setHeapMemoryTotal(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setHeapMemoryTotal(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setNonHeapMemoryInitialized(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setNonHeapMemoryInitialized(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setNonHeapMemoryUsed(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setNonHeapMemoryUsed(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setNonHeapMemoryCommitted(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setNonHeapMemoryCommitted(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setNonHeapMemoryMaximum(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setNonHeapMemoryMaximum(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setNonHeapMemoryTotal(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setNonHeapMemoryTotal(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setStartTime(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setStartTime(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setNodeStartTime(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setNodeStartTime(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setUpTime(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setUpTime(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setCurrentThreadCount(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setCurrentThreadCount(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setMaximumThreadCount(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setMaximumThreadCount(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setTotalStartedThreadCount(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setTotalStartedThreadCount(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setCurrentDaemonThreadCount(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setCurrentDaemonThreadCount(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setLastDataVersion(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setLastDataVersion(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setSentMessagesCount(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setSentMessagesCount(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setSentBytesCount(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setSentBytesCount(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setReceivedMessagesCount(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setReceivedMessagesCount(U.bytesToInt(data, off));
 
         off += 4;
 
-        metrics.setReceivedBytesCount(IgniteByteUtils.bytesToLong(data, off));
+        metrics.setReceivedBytesCount(U.bytesToLong(data, off));
 
         off += 8;
 
-        metrics.setOutboundMessagesQueueSize(IgniteByteUtils.bytesToInt(data, off));
+        metrics.setOutboundMessagesQueueSize(U.bytesToInt(data, off));
 
         off += 4;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
index 99f9f45..68d8c0b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
@@ -289,7 +289,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
         out.writeBoolean(b);
 
         if (b) {
-            IgniteByteUtils.writeByteArray(out, filterBytes);
+            U.writeByteArray(out, filterBytes);
             U.writeString(out, clsName);
             out.writeObject(depInfo);
         }
@@ -304,7 +304,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
         boolean b = in.readBoolean();
 
         if (b) {
-            filterBytes = IgniteByteUtils.readByteArray(in);
+            filterBytes = U.readByteArray(in);
             clsName = U.readString(in);
             depInfo = (GridDeploymentInfo)in.readObject();
         }
@@ -392,7 +392,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
             out.writeBoolean(b);
 
             if (b) {
-                IgniteByteUtils.writeByteArray(out, bytes);
+                U.writeByteArray(out, bytes);
                 U.writeString(out, cacheName);
                 out.writeObject(depInfo);
             }
@@ -405,7 +405,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
             boolean b = in.readBoolean();
 
             if (b) {
-                bytes = IgniteByteUtils.readByteArray(in);
+                bytes = U.readByteArray(in);
                 cacheName = U.readString(in);
                 depInfo = (GridDeploymentInfo)in.readObject();
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
index 75102ff..199d0ac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
@@ -167,8 +167,8 @@ public class GridMessageListenHandler implements GridContinuousHandler {
         out.writeBoolean(depEnabled);
 
         if (depEnabled) {
-            IgniteByteUtils.writeByteArray(out, topicBytes);
-            IgniteByteUtils.writeByteArray(out, predBytes);
+            U.writeByteArray(out, topicBytes);
+            U.writeByteArray(out, predBytes);
             U.writeString(out, clsName);
             out.writeObject(depInfo);
         }
@@ -183,8 +183,8 @@ public class GridMessageListenHandler implements GridContinuousHandler {
         depEnabled = in.readBoolean();
 
         if (depEnabled) {
-            topicBytes = IgniteByteUtils.readByteArray(in);
-            predBytes = IgniteByteUtils.readByteArray(in);
+            topicBytes = U.readByteArray(in);
+            predBytes = U.readByteArray(in);
             clsName = U.readString(in);
             depInfo = (GridDeploymentInfoBean)in.readObject();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java
index ac1ff8a..5111ffc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java
@@ -21,8 +21,8 @@ import org.apache.ignite.*;
 import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.processors.rest.protocols.tcp.*;
-import org.apache.ignite.internal.util.*;
 import org.apache.ignite.internal.util.nio.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 
 import java.io.*;
 import java.nio.*;
@@ -68,8 +68,8 @@ class GridTcpRouterNioParser extends GridTcpRestParser {
             res.put(IGNITE_REQ_FLAG);
             res.putInt(resp.body().length + 40);
             res.putLong(resp.requestId());
-            res.put(IgniteByteUtils.uuidToBytes(resp.clientId()));
-            res.put(IgniteByteUtils.uuidToBytes(resp.destinationId()));
+            res.put(U.uuidToBytes(resp.clientId()));
+            res.put(U.uuidToBytes(resp.destinationId()));
             res.put(resp.body());
 
             res.flip();
@@ -88,8 +88,8 @@ class GridTcpRouterNioParser extends GridTcpRestParser {
             slice.put(IGNITE_REQ_FLAG);
             slice.putInt(res.remaining() - 5);
             slice.putLong(clientMsg.requestId());
-            slice.put(IgniteByteUtils.uuidToBytes(clientMsg.clientId()));
-            slice.put(IgniteByteUtils.uuidToBytes(clientMsg.destinationId()));
+            slice.put(U.uuidToBytes(clientMsg.clientId()));
+            slice.put(U.uuidToBytes(clientMsg.destinationId()));
 
             return res;
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/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 4ad78f3..a594eb9 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
@@ -524,7 +524,7 @@ public class DirectByteBufferStream {
      * @param val Value
      */
     public void writeUuid(UUID val) {
-        writeByteArray(val != null ? IgniteByteUtils.uuidToBytes(val) : null);
+        writeByteArray(val != null ? U.uuidToBytes(val) : null);
     }
 
     /**
@@ -892,7 +892,7 @@ public class DirectByteBufferStream {
     public UUID readUuid() {
         byte[] arr = readByteArray();
 
-        return arr != null ? IgniteByteUtils.bytesToUuid(arr, 0) : null;
+        return arr != null ? U.bytesToUuid(arr, 0) : null;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java
index 83417ff..6da6f22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java
@@ -362,14 +362,14 @@ public class IgfsControlResponse extends IgfsMessage {
     public void writeExternal(ObjectOutput out) throws IOException {
         byte[] hdr = new byte[RES_HEADER_SIZE];
 
-        IgniteByteUtils.intToBytes(resType, hdr, 0);
+        U.intToBytes(resType, hdr, 0);
 
         int off = 4;
 
         hdr[off++] = err != null ? (byte)1 : (byte)0;
 
         if (resType == RES_TYPE_BYTE_ARRAY)
-            IgniteByteUtils.intToBytes(len, hdr, off);
+            U.intToBytes(len, hdr, off);
 
         out.write(hdr);
 
@@ -447,7 +447,7 @@ public class IgfsControlResponse extends IgfsMessage {
 
         in.readFully(hdr);
 
-        resType = IgniteByteUtils.bytesToInt(hdr, 0);
+        resType = U.bytesToInt(hdr, 0);
 
         boolean hasErr = hdr[4] != 0;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
index cf5a956..3db9bad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
@@ -47,9 +47,9 @@ public class IgfsMarshaller {
 
         byte[] hdr = new byte[HEADER_SIZE];
 
-        IgniteByteUtils.longToBytes(reqId, hdr, 0);
+        U.longToBytes(reqId, hdr, 0);
 
-        IgniteByteUtils.intToBytes(cmd.ordinal(), hdr, 8);
+        U.intToBytes(cmd.ordinal(), hdr, 8);
 
         return hdr;
     }
@@ -66,9 +66,9 @@ public class IgfsMarshaller {
 
         Arrays.fill(hdr, (byte)0);
 
-        IgniteByteUtils.longToBytes(reqId, hdr, 0);
+        U.longToBytes(reqId, hdr, 0);
 
-        IgniteByteUtils.intToBytes(cmd.ordinal(), hdr, 8);
+        U.intToBytes(cmd.ordinal(), hdr, 8);
 
         return hdr;
     }
@@ -152,10 +152,10 @@ public class IgfsMarshaller {
 
                     IgfsStreamControlRequest req = (IgfsStreamControlRequest)msg;
 
-                    IgniteByteUtils.longToBytes(req.streamId(), hdr, 12);
+                    U.longToBytes(req.streamId(), hdr, 12);
 
                     if (msg.command() == READ_BLOCK)
-                        IgniteByteUtils.intToBytes(req.length(), hdr, 20);
+                        U.intToBytes(req.length(), hdr, 20);
 
                     out.write(hdr);
 
@@ -269,10 +269,10 @@ public class IgfsMarshaller {
                 case WRITE_BLOCK: {
                     IgfsStreamControlRequest req = new IgfsStreamControlRequest();
 
-                    long streamId = IgniteByteUtils.bytesToLong(hdr, 12);
+                    long streamId = U.bytesToLong(hdr, 12);
 
                     req.streamId(streamId);
-                    req.length(IgniteByteUtils.bytesToInt(hdr, 20));
+                    req.length(U.bytesToInt(hdr, 20));
 
                     if (cmd == READ_BLOCK)
                         req.position(in.readLong());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java
index 3fbd23c..016a792 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java
@@ -136,7 +136,7 @@ class GridAffinityMessage implements Externalizable, OptimizedMarshallable {
 
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
-        IgniteByteUtils.writeByteArray(out, src);
+        U.writeByteArray(out, src);
 
         out.writeInt(depMode.ordinal());
 
@@ -148,7 +148,7 @@ class GridAffinityMessage implements Externalizable, OptimizedMarshallable {
 
     /** {@inheritDoc} */
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        src = IgniteByteUtils.readByteArray(in);
+        src = U.readByteArray(in);
 
         depMode = DeploymentMode.fromOrdinal(in.readInt());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
index c8e563b..b752f66 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
@@ -267,17 +267,17 @@ public class GridCacheEntryInfo<K, V> implements Externalizable {
         out.writeBoolean(valBytesSent);
 
         if (keyBytesSent)
-            IgniteByteUtils.writeByteArray(out, keyBytes);
+            U.writeByteArray(out, keyBytes);
         else
             out.writeObject(key);
 
         if (valBytesSent)
-            IgniteByteUtils.writeByteArray(out, valBytes);
+            U.writeByteArray(out, valBytes);
         else {
             if (val != null && val instanceof byte[]) {
                 out.writeBoolean(true);
 
-                IgniteByteUtils.writeByteArray(out, (byte[]) val);
+                U.writeByteArray(out, (byte[]) val);
             }
             else {
                 out.writeBoolean(false);
@@ -313,14 +313,14 @@ public class GridCacheEntryInfo<K, V> implements Externalizable {
         valBytesSent = in.readBoolean();
 
         if (keyBytesSent)
-            keyBytes = IgniteByteUtils.readByteArray(in);
+            keyBytes = U.readByteArray(in);
         else
             key = (K)in.readObject();
 
         if (valBytesSent)
-            valBytes = IgniteByteUtils.readByteArray(in);
+            valBytes = U.readByteArray(in);
         else
-            val = in.readBoolean() ? (V) IgniteByteUtils.readByteArray(in) : (V)in.readObject();
+            val = in.readBoolean() ? (V) U.readByteArray(in) : (V)in.readObject();
 
         ttl = in.readLong();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index f4d801d..7cd13df 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1332,10 +1332,10 @@ public class GridCacheUtils {
 
         byte[] bytes = new byte[28];
 
-        IgniteByteUtils.intToBytes(ver.topologyVersion(), bytes, 0);
-        IgniteByteUtils.longToBytes(ver.globalTime(), bytes, 4);
-        IgniteByteUtils.longToBytes(ver.order(), bytes, 12);
-        IgniteByteUtils.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 20);
+        U.intToBytes(ver.topologyVersion(), bytes, 0);
+        U.longToBytes(ver.globalTime(), bytes, 4);
+        U.longToBytes(ver.order(), bytes, 12);
+        U.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 20);
 
         return bytes;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
index 2ce417d..d98b254 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
@@ -176,12 +176,12 @@ class CacheContinuousQueryEntry<K, V> implements GridCacheDeployable, Externaliz
         out.writeBoolean(b);
 
         if (b) {
-            IgniteByteUtils.writeByteArray(out, keyBytes);
+            U.writeByteArray(out, keyBytes);
 
             if (newValBytes != null && !newValBytes.isNull()) {
                 out.writeBoolean(true);
                 out.writeBoolean(newValBytes.isPlain());
-                IgniteByteUtils.writeByteArray(out, newValBytes.get());
+                U.writeByteArray(out, newValBytes.get());
             }
             else
                 out.writeBoolean(false);
@@ -189,7 +189,7 @@ class CacheContinuousQueryEntry<K, V> implements GridCacheDeployable, Externaliz
             if (oldValBytes != null && !oldValBytes.isNull()) {
                 out.writeBoolean(true);
                 out.writeBoolean(oldValBytes.isPlain());
-                IgniteByteUtils.writeByteArray(out, oldValBytes.get());
+                U.writeByteArray(out, oldValBytes.get());
             }
             else
                 out.writeBoolean(false);
@@ -210,13 +210,13 @@ class CacheContinuousQueryEntry<K, V> implements GridCacheDeployable, Externaliz
         boolean b = in.readBoolean();
 
         if (b) {
-            keyBytes = IgniteByteUtils.readByteArray(in);
+            keyBytes = U.readByteArray(in);
 
             if (in.readBoolean())
-                newValBytes = in.readBoolean() ? plain(IgniteByteUtils.readByteArray(in)) : marshaled(IgniteByteUtils.readByteArray(in));
+                newValBytes = in.readBoolean() ? plain(U.readByteArray(in)) : marshaled(U.readByteArray(in));
 
             if (in.readBoolean())
-                oldValBytes = in.readBoolean() ? plain(IgniteByteUtils.readByteArray(in)) : marshaled(IgniteByteUtils.readByteArray(in));
+                oldValBytes = in.readBoolean() ? plain(U.readByteArray(in)) : marshaled(U.readByteArray(in));
 
             cacheName = U.readString(in);
             depInfo = (GridDeploymentInfo)in.readObject();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
index d5aa6b7..9502b3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@ -488,14 +488,14 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
 
         /** {@inheritDoc} */
         @Override public void writeExternal(ObjectOutput out) throws IOException {
-            IgniteByteUtils.writeByteArray(out, bytes);
+            U.writeByteArray(out, bytes);
             U.writeString(out, clsName);
             out.writeObject(depInfo);
         }
 
         /** {@inheritDoc} */
         @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-            bytes = IgniteByteUtils.readByteArray(in);
+            bytes = U.readByteArray(in);
             clsName = U.readString(in);
             depInfo = (GridDeploymentInfo)in.readObject();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index 5e4426f..eb184c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -838,9 +838,9 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable,
         out.writeBoolean(depEnabled);
 
         if (depEnabled) {
-            IgniteByteUtils.writeByteArray(out, keyBytes);
-            IgniteByteUtils.writeByteArray(out, transformClosBytes);
-            IgniteByteUtils.writeByteArray(out, filterBytes);
+            U.writeByteArray(out, keyBytes);
+            U.writeByteArray(out, transformClosBytes);
+            U.writeByteArray(out, filterBytes);
         }
         else {
             out.writeObject(key);
@@ -875,9 +875,9 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable,
         depEnabled = in.readBoolean();
 
         if (depEnabled) {
-            keyBytes = IgniteByteUtils.readByteArray(in);
-            transformClosBytes = IgniteByteUtils.readByteArray(in);
-            filterBytes = IgniteByteUtils.readByteArray(in);
+            keyBytes = U.readByteArray(in);
+            transformClosBytes = U.readByteArray(in);
+            filterBytes = U.readByteArray(in);
         }
         else {
             key = (K)in.readObject();
@@ -1092,12 +1092,12 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable,
 
             if (hasWriteVal) {
                 if (valBytesSent)
-                    IgniteByteUtils.writeByteArray(out, valBytes);
+                    U.writeByteArray(out, valBytes);
                 else {
                     if (val != null && val instanceof byte[]) {
                         out.writeBoolean(true);
 
-                        IgniteByteUtils.writeByteArray(out, (byte[]) val);
+                        U.writeByteArray(out, (byte[]) val);
                     }
                     else {
                         out.writeBoolean(false);
@@ -1122,9 +1122,9 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable,
 
             if (hasWriteVal) {
                 if (valBytesSent)
-                    valBytes = IgniteByteUtils.readByteArray(in);
+                    valBytes = U.readByteArray(in);
                 else
-                    val = in.readBoolean() ? (V) IgniteByteUtils.readByteArray(in) : (V)in.readObject();
+                    val = in.readBoolean() ? (V) U.readByteArray(in) : (V)in.readObject();
             }
 
             op = fromOrdinal(in.readInt());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
index a8fc95f..23585fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
@@ -189,8 +189,8 @@ public class GridCacheRawVersionedEntry<K, V> implements GridCacheVersionedEntry
     @Override public void writeExternal(ObjectOutput out) throws IOException {
         assert keyBytes != null;
 
-        IgniteByteUtils.writeByteArray(out, keyBytes);
-        IgniteByteUtils.writeByteArray(out, valBytes);
+        U.writeByteArray(out, keyBytes);
+        U.writeByteArray(out, valBytes);
 
         out.writeLong(ttl);
 
@@ -202,8 +202,8 @@ public class GridCacheRawVersionedEntry<K, V> implements GridCacheVersionedEntry
 
     /** {@inheritDoc} */
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        keyBytes = IgniteByteUtils.readByteArray(in);
-        valBytes = IgniteByteUtils.readByteArray(in);
+        keyBytes = U.readByteArray(in);
+        valBytes = U.readByteArray(in);
 
         ttl = in.readLong();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java
index d858b22..d93a5d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java
@@ -121,15 +121,15 @@ public class GridClockMessage {
 
         int off = 0;
 
-        off = IgniteByteUtils.longToBytes(origNodeId.getLeastSignificantBits(), buf, off);
-        off = IgniteByteUtils.longToBytes(origNodeId.getMostSignificantBits(), buf, off);
+        off = U.longToBytes(origNodeId.getLeastSignificantBits(), buf, off);
+        off = U.longToBytes(origNodeId.getMostSignificantBits(), buf, off);
 
-        off = IgniteByteUtils.longToBytes(targetNodeId.getLeastSignificantBits(), buf, off);
-        off = IgniteByteUtils.longToBytes(targetNodeId.getMostSignificantBits(), buf, off);
+        off = U.longToBytes(targetNodeId.getLeastSignificantBits(), buf, off);
+        off = U.longToBytes(targetNodeId.getMostSignificantBits(), buf, off);
 
-        off = IgniteByteUtils.longToBytes(origTs, buf, off);
+        off = U.longToBytes(origTs, buf, off);
 
-        off = IgniteByteUtils.longToBytes(replyTs, buf, off);
+        off = U.longToBytes(replyTs, buf, off);
 
         assert off == PACKET_SIZE;
 
@@ -149,18 +149,18 @@ public class GridClockMessage {
         if (len < PACKET_SIZE)
             throw new IgniteCheckedException("Failed to assemble time server packet (message is too short).");
 
-        long lsb = IgniteByteUtils.bytesToLong(buf, off);
-        long msb = IgniteByteUtils.bytesToLong(buf, off + 8);
+        long lsb = U.bytesToLong(buf, off);
+        long msb = U.bytesToLong(buf, off + 8);
 
         UUID origNodeId = new UUID(msb, lsb);
 
-        lsb = IgniteByteUtils.bytesToLong(buf, off + 16);
-        msb = IgniteByteUtils.bytesToLong(buf, off + 24);
+        lsb = U.bytesToLong(buf, off + 16);
+        msb = U.bytesToLong(buf, off + 24);
 
         UUID targetNodeId = new UUID(msb, lsb);
 
-        long origTs = IgniteByteUtils.bytesToLong(buf, off + 32);
-        long replyTs = IgniteByteUtils.bytesToLong(buf, off + 40);
+        long origTs = U.bytesToLong(buf, off + 32);
+        long replyTs = U.bytesToLong(buf, off + 40);
 
         return new GridClockMessage(origNodeId, targetNodeId, origTs, replyTs);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index 478ae09..eed273d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -1435,7 +1435,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
             out.writeBoolean(b);
 
             if (b) {
-                IgniteByteUtils.writeByteArray(out, prjPredBytes);
+                U.writeByteArray(out, prjPredBytes);
                 U.writeString(out, clsName);
                 out.writeObject(depInfo);
             }
@@ -1454,7 +1454,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
             boolean b = in.readBoolean();
 
             if (b) {
-                prjPredBytes = IgniteByteUtils.readByteArray(in);
+                prjPredBytes = U.readByteArray(in);
                 clsName = U.readString(in);
                 depInfo = (GridDeploymentInfo)in.readObject();
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
index 75738bd..d2f4f23 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
@@ -1637,13 +1637,13 @@ public class IgfsDataManager extends IgfsManager {
         /** {@inheritDoc} */
         @Override public void writeExternal(ObjectOutput out) throws IOException {
             out.writeInt(start);
-            IgniteByteUtils.writeByteArray(out, data);
+            U.writeByteArray(out, data);
         }
 
         /** {@inheritDoc} */
         @Override public void readExternal(ObjectInput in) throws IOException {
             start = in.readInt();
-            data = IgniteByteUtils.readByteArray(in);
+            data = U.readByteArray(in);
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java
index 4e5eb36..870ced0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java
@@ -239,9 +239,9 @@ public class IgfsServer {
                 while (!Thread.currentThread().isInterrupted()) {
                     dis.readFully(hdr);
 
-                    final long reqId = IgniteByteUtils.bytesToLong(hdr, 0);
+                    final long reqId = U.bytesToLong(hdr, 0);
 
-                    int ordinal = IgniteByteUtils.bytesToInt(hdr, 8);
+                    int ordinal = U.bytesToInt(hdr, 8);
 
                     if (first) { // First message must be HANDSHAKE.
                         if (reqId != 0 || ordinal != IgfsIpcCommand.HANDSHAKE.ordinal()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java
index e2e04e9..6dd497e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java
@@ -161,7 +161,7 @@ public class GridRestResponse implements Externalizable {
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(successStatus);
-        IgniteByteUtils.writeByteArray(out, sesTokBytes);
+        U.writeByteArray(out, sesTokBytes);
         U.writeString(out, sesTokStr);
         U.writeString(out, err);
         out.writeObject(obj);
@@ -170,7 +170,7 @@ public class GridRestResponse implements Externalizable {
     /** {@inheritDoc} */
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         successStatus = in.readInt();
-        sesTokBytes = IgniteByteUtils.readByteArray(in);
+        sesTokBytes = U.readByteArray(in);
         sesTokStr = U.readString(in);
         err = U.readString(in);
         obj = in.readObject();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java
index 30678e0..495b3cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java
@@ -88,12 +88,12 @@ public abstract class GridClientAbstractMessage implements GridClientMessage, Ex
 
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
-        IgniteByteUtils.writeByteArray(out, sesTok);
+        U.writeByteArray(out, sesTok);
     }
 
     /** {@inheritDoc} */
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        sesTok = IgniteByteUtils.readByteArray(in);
+        sesTok = U.readByteArray(in);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java
index 0079b10..60bee04 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java
@@ -54,7 +54,7 @@ public class GridClientHandshakeRequest extends GridClientAbstractMessage {
      * @return Protocol version.
      */
     public short version() {
-        return IgniteByteUtils.bytesToShort(arr, 0);
+        return U.bytesToShort(arr, 0);
     }
 
     /**
@@ -93,7 +93,7 @@ public class GridClientHandshakeRequest extends GridClientAbstractMessage {
     public byte[] rawBytes() {
         byte[] ret = new byte[PACKET_SIZE];
 
-        IgniteByteUtils.shortToBytes(PROTO_VER, ret, 0);
+        U.shortToBytes(PROTO_VER, ret, 0);
 
         ret[2] = (byte)(marshId << 6);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java
index f9095b0..226285b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java
@@ -156,12 +156,12 @@ public class GridMemcachedMessage implements GridClientMessage {
 
     /** {@inheritDoc} */
     @Override public long requestId() {
-        return IgniteByteUtils.bytesToInt(opaque, 0);
+        return U.bytesToInt(opaque, 0);
     }
 
     /** {@inheritDoc} */
     @Override public void requestId(long reqId) {
-        IgniteByteUtils.intToBytes((int) reqId, opaque, 0);
+        U.intToBytes((int) reqId, opaque, 0);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
index 91a22b3..90f144f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
@@ -171,8 +171,8 @@ public class GridTcpRestParser implements GridNioParser {
             buf.put(IGNITE_REQ_FLAG);
             buf.putInt(40 + body.length);
             buf.putLong(msg.requestId());
-            buf.put(IgniteByteUtils.uuidToBytes(msg.clientId()));
-            buf.put(IgniteByteUtils.uuidToBytes(msg.destinationId()));
+            buf.put(U.uuidToBytes(msg.clientId()));
+            buf.put(U.uuidToBytes(msg.destinationId()));
             buf.put(body);
 
             buf.flip();
@@ -189,8 +189,8 @@ public class GridTcpRestParser implements GridNioParser {
             slice.put(IGNITE_REQ_FLAG);
             slice.putInt(res.remaining() - 5);
             slice.putLong(msg.requestId());
-            slice.put(IgniteByteUtils.uuidToBytes(msg.clientId()));
-            slice.put(IgniteByteUtils.uuidToBytes(msg.destinationId()));
+            slice.put(U.uuidToBytes(msg.clientId()));
+            slice.put(U.uuidToBytes(msg.destinationId()));
 
             return res;
         }
@@ -227,7 +227,7 @@ public class GridTcpRestParser implements GridNioParser {
                 tmp.write(b);
 
                 if (i == 3) {
-                    req.keyLength(IgniteByteUtils.bytesToShort(tmp.toByteArray(), 0));
+                    req.keyLength(U.bytesToShort(tmp.toByteArray(), 0));
 
                     tmp.reset();
                 }
@@ -238,7 +238,7 @@ public class GridTcpRestParser implements GridNioParser {
                 tmp.write(b);
 
                 if (i == 11) {
-                    req.totalLength(IgniteByteUtils.bytesToInt(tmp.toByteArray(), 0));
+                    req.totalLength(U.bytesToInt(tmp.toByteArray(), 0));
 
                     tmp.reset();
                 }
@@ -370,7 +370,7 @@ public class GridTcpRestParser implements GridNioParser {
                 byte[] lenBytes = statefulRead(buf, tmp, 4);
 
                 if (lenBytes != null) {
-                    len = IgniteByteUtils.bytesToInt(lenBytes, 0);
+                    len = U.bytesToInt(lenBytes, 0);
 
                     if (len == 0)
                         return GridClientPingPacket.PING_MESSAGE;
@@ -609,8 +609,8 @@ public class GridTcpRestParser implements GridNioParser {
                     throw new IOException("Failed to parse incoming packet (flags required for command) [ses=" +
                         ses + ", opCode=" + Integer.toHexString(req.operationCode() & 0xFF) + ']');
 
-                keyFlags = IgniteByteUtils.bytesToShort(extras, 0);
-                valFlags = IgniteByteUtils.bytesToShort(extras, 2);
+                keyFlags = U.bytesToShort(extras, 0);
+                valFlags = U.bytesToShort(extras, 2);
             }
 
             if (req.key() != null) {
@@ -636,7 +636,7 @@ public class GridTcpRestParser implements GridNioParser {
                 throw new IOException("Failed to parse incoming packet (expiration value required for command) [ses=" +
                     ses + ", opCode=" + Integer.toHexString(req.operationCode() & 0xFF) + ']');
 
-            req.expiration(IgniteByteUtils.bytesToInt(extras, 4) & 0xFFFFFFFFL);
+            req.expiration(U.bytesToInt(extras, 4) & 0xFFFFFFFFL);
         }
 
         if (req.hasInitial()) {
@@ -644,7 +644,7 @@ public class GridTcpRestParser implements GridNioParser {
                 throw new IOException("Failed to parse incoming packet (initial value required for command) [ses=" +
                     ses + ", opCode=" + Integer.toHexString(req.operationCode() & 0xFF) + ']');
 
-            req.initial(IgniteByteUtils.bytesToLong(extras, 8));
+            req.initial(U.bytesToLong(extras, 8));
         }
 
         if (req.hasDelta()) {
@@ -652,7 +652,7 @@ public class GridTcpRestParser implements GridNioParser {
                 throw new IOException("Failed to parse incoming packet (delta value required for command) [ses=" +
                     ses + ", opCode=" + Integer.toHexString(req.operationCode() & 0xFF) + ']');
 
-            req.delta(IgniteByteUtils.bytesToLong(extras, 0));
+            req.delta(U.bytesToLong(extras, 0));
         }
 
         if (extras != null) {
@@ -700,17 +700,17 @@ public class GridTcpRestParser implements GridNioParser {
             case BOOLEAN_FLAG:
                 return bytes[0] == '1';
             case INT_FLAG:
-                return IgniteByteUtils.bytesToInt(bytes, 0);
+                return U.bytesToInt(bytes, 0);
             case LONG_FLAG:
-                return IgniteByteUtils.bytesToLong(bytes, 0);
+                return U.bytesToLong(bytes, 0);
             case DATE_FLAG:
-                return new Date(IgniteByteUtils.bytesToLong(bytes, 0));
+                return new Date(U.bytesToLong(bytes, 0));
             case BYTE_FLAG:
                 return bytes[0];
             case FLOAT_FLAG:
-                return Float.intBitsToFloat(IgniteByteUtils.bytesToInt(bytes, 0));
+                return Float.intBitsToFloat(U.bytesToInt(bytes, 0));
             case DOUBLE_FLAG:
-                return Double.longBitsToDouble(IgniteByteUtils.bytesToLong(bytes, 0));
+                return Double.longBitsToDouble(U.bytesToLong(bytes, 0));
             case BYTE_ARR_FLAG:
                 return bytes;
             default:
@@ -739,17 +739,17 @@ public class GridTcpRestParser implements GridNioParser {
             flags |= BOOLEAN_FLAG;
         }
         else if (obj instanceof Integer) {
-            data = IgniteByteUtils.intToBytes((Integer) obj);
+            data = U.intToBytes((Integer) obj);
 
             flags |= INT_FLAG;
         }
         else if (obj instanceof Long) {
-            data = IgniteByteUtils.longToBytes((Long) obj);
+            data = U.longToBytes((Long) obj);
 
             flags |= LONG_FLAG;
         }
         else if (obj instanceof Date) {
-            data = IgniteByteUtils.longToBytes(((Date) obj).getTime());
+            data = U.longToBytes(((Date) obj).getTime());
 
             flags |= DATE_FLAG;
         }
@@ -759,12 +759,12 @@ public class GridTcpRestParser implements GridNioParser {
             flags |= BYTE_FLAG;
         }
         else if (obj instanceof Float) {
-            data = IgniteByteUtils.intToBytes(Float.floatToIntBits((Float) obj));
+            data = U.intToBytes(Float.floatToIntBits((Float) obj));
 
             flags |= FLOAT_FLAG;
         }
         else if (obj instanceof Double) {
-            data = IgniteByteUtils.longToBytes(Double.doubleToLongBits((Double) obj));
+            data = U.longToBytes(Double.doubleToLongBits((Double) obj));
 
             flags |= DOUBLE_FLAG;
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a69903e/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
index 5c75806..de5dd47 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
@@ -218,7 +218,7 @@ public class GridByteArrayList implements Message, Externalizable {
     public void add(int i) {
         requestFreeSize(4);
 
-        IgniteByteUtils.intToBytes(i, data, size);
+        U.intToBytes(i, data, size);
 
         size += 4;
     }
@@ -231,7 +231,7 @@ public class GridByteArrayList implements Message, Externalizable {
     public void add(short i) {
         requestFreeSize(2);
 
-        IgniteByteUtils.shortToBytes(i, data, size);
+        U.shortToBytes(i, data, size);
 
         size += 2;
     }
@@ -246,7 +246,7 @@ public class GridByteArrayList implements Message, Externalizable {
         assert pos >= 0;
         assert pos + 2 <= size;
 
-        IgniteByteUtils.shortToBytes(i, data, pos);
+        U.shortToBytes(i, data, pos);
     }
 
     /**
@@ -259,7 +259,7 @@ public class GridByteArrayList implements Message, Externalizable {
         assert pos >= 0;
         assert pos + 4 <= size;
 
-        IgniteByteUtils.intToBytes(i, data, pos);
+        U.intToBytes(i, data, pos);
     }
 
     /**
@@ -270,7 +270,7 @@ public class GridByteArrayList implements Message, Externalizable {
     public void add(long l) {
         requestFreeSize(8);
 
-        IgniteByteUtils.longToBytes(l, data, size);
+        U.longToBytes(l, data, size);
 
         size += 8;
     }
@@ -285,7 +285,7 @@ public class GridByteArrayList implements Message, Externalizable {
         assert pos >= 0;
         assert pos + 8 <= size;
 
-        IgniteByteUtils.longToBytes(l, data, pos);
+        U.longToBytes(l, data, pos);
     }
 
     /**
@@ -336,7 +336,7 @@ public class GridByteArrayList implements Message, Externalizable {
     public int getInt(int i) {
         assert i + 4 <= size;
 
-        return IgniteByteUtils.bytesToInt(data, i);
+        return U.bytesToInt(data, i);
     }
 
     /**


Mime
View raw message