ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [10/51] [abbrv] incubator-ignite git commit: sprint-1 - marshaller renaming.
Date Sat, 07 Feb 2015 10:52:42 GMT
sprint-1 - marshaller renaming.


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

Branch: refs/heads/ignite-96
Commit: 5674cddedddf0f188f95fded9a2bf222e5779aee
Parents: 5fa6d5c
Author: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Authored: Thu Feb 5 19:57:57 2015 -0800
Committer: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Committed: Thu Feb 5 19:57:58 2015 -0800

----------------------------------------------------------------------
 examples/config/example-cache.xml               |    2 +-
 examples/config/example-compute.xml             |    2 +-
 examples/config/example-streamer.xml            |    2 +-
 examples/config/filesystem/example-ignitefs.xml |    2 +-
 .../MemcacheRestExampleNodeStartup.java         |    2 +-
 .../examples/misc/springbean/spring-bean.xml    |    2 +-
 .../optimized/OptimizedMarshallerAopTest.java   |    2 +-
 .../processors/rest/TestMemcacheClient.java     |    2 +-
 .../java/org/apache/ignite/IgniteCompute.java   |    3 +-
 .../CacheRendezvousAffinityFunction.java        |    2 +-
 .../GridClientOptimizedMarshaller.java          |   10 +-
 .../configuration/IgniteConfiguration.java      |   10 +-
 .../internal/GridEventConsumeHandler.java       |    4 +-
 .../internal/GridJobSiblingsResponse.java       |    2 +-
 .../org/apache/ignite/internal/GridTopic.java   |   16 +-
 .../apache/ignite/internal/IgniteKernal.java    |    8 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   12 +-
 .../apache/ignite/internal/jdbc/JdbcUtils.java  |    2 +-
 .../checkpoint/GridCheckpointManager.java       |    2 +-
 .../managers/communication/GridIoManager.java   |    2 +-
 .../deployment/GridDeploymentCommunication.java |    2 +-
 .../deployment/GridDeploymentLocalStore.java    |    2 +-
 .../GridDeploymentPerLoaderStore.java           |    2 +-
 .../GridDeploymentPerVersionStore.java          |    2 +-
 .../eventstorage/GridEventStorageManager.java   |    2 +-
 .../swapspace/GridSwapSpaceManager.java         |    2 +-
 .../affinity/GridAffinityMessage.java           |    2 +-
 .../processors/cache/CacheInvokeResult.java     |    2 +-
 .../processors/cache/GridCacheContext.java      |    2 +-
 .../processors/cache/GridCacheEntryInfo.java    |    2 +-
 .../processors/cache/GridCacheMessage.java      |   10 +-
 .../processors/cache/GridCacheReturn.java       |    2 +-
 .../cache/GridCacheSharedContext.java           |    2 +-
 .../IgniteExternalizableExpiryPolicy.java       |    2 +-
 .../cache/query/GridCacheLocalQueryFuture.java  |    2 +-
 .../cache/query/GridCacheQueryRequest.java      |    4 +-
 .../GridCacheContinuousQueryEntry.java          |    6 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |    4 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |    4 +-
 .../cache/transactions/IgniteTxEntry.java       |    2 +-
 .../version/GridCacheRawVersionedEntry.java     |    6 +-
 .../cache/version/GridCacheVersion.java         |    2 +-
 .../closure/GridClosureProcessor.java           |    2 +-
 .../continuous/GridContinuousProcessor.java     |    6 +-
 .../dataload/GridDataLoaderProcessor.java       |    2 +-
 .../processors/fs/GridGgfsAckMessage.java       |    4 +-
 .../fs/GridGgfsCommunicationMessage.java        |    4 +-
 .../processors/fs/GridGgfsDeleteMessage.java    |    4 +-
 .../processors/job/GridJobProcessor.java        |    2 +-
 .../internal/processors/job/GridJobWorker.java  |    2 +-
 .../offheap/GridOffHeapProcessor.java           |    2 +-
 .../tcp/GridMemcachedMessageWrapper.java        |    6 +-
 .../tcp/GridTcpMemcachedNioListener.java        |    2 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |    2 +-
 .../rest/protocols/tcp/GridTcpRestProtocol.java |    4 +-
 .../service/GridServiceProcessor.java           |    2 +-
 .../streamer/GridStreamerExecutionBatch.java    |    2 +-
 .../processors/task/GridTaskProcessor.java      |    2 +-
 .../processors/task/GridTaskWorker.java         |    2 +-
 .../java/org/apache/ignite/lang/IgniteUuid.java |    2 +-
 .../ignite/marshaller/AbstractMarshaller.java   |   65 ++
 .../marshaller/IgniteAbstractMarshaller.java    |   65 --
 .../ignite/marshaller/IgniteMarshaller.java     |  109 --
 .../marshaller/IgniteMarshallerExclusions.java  |  153 ---
 .../apache/ignite/marshaller/Marshaller.java    |  109 ++
 .../ignite/marshaller/MarshallerExclusions.java |  153 +++
 .../marshaller/jdk/IgniteJdkMarshaller.java     |  117 --
 .../IgniteJdkMarshallerDummySerializable.java   |   30 -
 .../IgniteJdkMarshallerInputStreamWrapper.java  |   81 --
 .../IgniteJdkMarshallerObjectInputStream.java   |   61 -
 .../IgniteJdkMarshallerObjectOutputStream.java  |   45 -
 .../IgniteJdkMarshallerOutputStreamWrapper.java |   59 -
 .../ignite/marshaller/jdk/JdkMarshaller.java    |  117 ++
 .../jdk/JdkMarshallerDummySerializable.java     |   30 +
 .../jdk/JdkMarshallerInputStreamWrapper.java    |   81 ++
 .../jdk/JdkMarshallerObjectInputStream.java     |   61 +
 .../jdk/JdkMarshallerObjectOutputStream.java    |   45 +
 .../jdk/JdkMarshallerOutputStreamWrapper.java   |   59 +
 .../IgniteOptimizedClassDescriptor.java         | 1040 ------------------
 .../optimized/IgniteOptimizedClassResolver.java |  477 --------
 .../optimized/IgniteOptimizedFieldType.java     |   50 -
 .../optimized/IgniteOptimizedMarshallable.java  |   65 --
 .../optimized/IgniteOptimizedMarshaller.java    |  393 -------
 .../IgniteOptimizedMarshallerUtils.java         |  458 --------
 .../IgniteOptimizedObjectInputStream.java       | 1016 -----------------
 .../IgniteOptimizedObjectOutputStream.java      |  839 --------------
 .../IgniteOptimizedObjectStreamRegistry.java    |  224 ----
 .../optimized/OptimizedClassDescriptor.java     | 1040 ++++++++++++++++++
 .../optimized/OptimizedClassResolver.java       |  477 ++++++++
 .../optimized/OptimizedFieldType.java           |   50 +
 .../optimized/OptimizedMarshallable.java        |   65 ++
 .../optimized/OptimizedMarshaller.java          |  393 +++++++
 .../optimized/OptimizedMarshallerUtils.java     |  458 ++++++++
 .../optimized/OptimizedObjectInputStream.java   | 1016 +++++++++++++++++
 .../optimized/OptimizedObjectOutputStream.java  |  839 ++++++++++++++
 .../OptimizedObjectStreamRegistry.java          |  224 ++++
 .../sharedfs/SharedFsCheckpointSpi.java         |    2 +-
 .../sharedfs/SharedFsTimeoutTask.java           |    4 +-
 .../spi/checkpoint/sharedfs/SharedFsUtils.java  |    4 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |    2 +-
 .../TcpDiscoveryMulticastIpFinder.java          |    2 +-
 modules/core/src/test/config/example-cache.xml  |    2 +-
 modules/core/src/test/config/ggfs-loopback.xml  |    2 +-
 modules/core/src/test/config/ggfs-shmem.xml     |    2 +-
 .../src/test/config/io-manager-benchmark.xml    |    2 +-
 modules/core/src/test/config/jobs-load-base.xml |    2 +-
 .../core/src/test/config/load/dsi-load-base.xml |    2 +-
 .../src/test/config/spring-start-nodes-attr.xml |    2 +-
 .../core/src/test/config/spring-start-nodes.xml |    2 +-
 .../java/org/apache/ignite/GridTestIoUtils.java |    2 +-
 .../IgniteExternalizableAbstractTest.java       |    8 +-
 .../ignite/ignitefs/GridGgfsPathSelfTest.java   |    2 +-
 .../GridFailoverTaskWithPredicateSelfTest.java  |    2 +-
 .../GridJobMasterLeaveAwareSelfTest.java        |    2 +-
 .../internal/GridJobStealingSelfTest.java       |    2 +-
 .../internal/GridLifecycleAwareSelfTest.java    |    2 +-
 ...ectionLocalJobMultipleArgumentsSelfTest.java |    2 +-
 .../GridTaskExecutionContextSelfTest.java       |    2 +-
 .../GridTopicExternalizableSelfTest.java        |   16 +-
 .../IgniteComputeEmptyClusterGroupTest.java     |    2 +-
 .../managers/GridManagerStopSelfTest.java       |    2 +-
 .../communication/GridIoManagerSelfTest.java    |    2 +-
 .../GridDeploymentManagerStopSelfTest.java      |    2 +-
 .../cache/GridCacheAbstractSelfTest.java        |    2 +-
 .../cache/GridCacheAffinityRoutingSelfTest.java |    2 +-
 .../cache/GridCacheDeploymentSelfTest.java      |    2 +-
 .../cache/GridCacheEntryMemorySizeSelfTest.java |    2 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |    2 +-
 .../processors/cache/GridCacheMvccSelfTest.java |    2 +-
 .../cache/GridCacheOffHeapSelfTest.java         |    2 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |    2 +-
 .../GridCacheReferenceCleanupSelfTest.java      |    2 +-
 .../cache/GridCacheVersionSelfTest.java         |    2 +-
 .../cache/IgniteCacheAbstractTest.java          |    2 +-
 ...cheAtomicReferenceMultiNodeAbstractTest.java |    2 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |    2 +-
 ...CacheQueueRotativeMultiNodeAbstractTest.java |    2 +-
 .../GridCacheSetAbstractSelfTest.java           |    2 +-
 .../GridCacheAbstractJobExecutionTest.java      |    2 +-
 .../GridCachePreloadLifecycleAbstractTest.java  |    2 +-
 ...heAbstractTransformWriteThroughSelfTest.java |    2 +-
 .../near/GridCacheNearEvictionSelfTest.java     |    2 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |    2 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |    2 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |    2 +-
 .../closure/GridClosureProcessorSelfTest.java   |    2 +-
 .../continuous/GridEventConsumeSelfTest.java    |    2 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |    6 +-
 .../GridDataLoaderProcessorSelfTest.java        |    2 +-
 .../processors/fs/GridGgfsFileInfoSelfTest.java |    2 +-
 .../streamer/GridStreamerEvictionSelfTest.java  |    2 +-
 .../streamer/GridStreamerSelfTest.java          |    2 +-
 .../util/future/GridFinishedFutureSelfTest.java |    2 +-
 .../marshaller/GridMarshallerAbstractTest.java  |    6 +-
 .../GridMarshallerPerformanceTest.java          |    2 +-
 .../marshaller/GridMarshallerResourceBean.java  |    4 +-
 .../jdk/GridJdkMarshallerSelfTest.java          |    4 +-
 .../GridOptimizedMarshallerEnumSelfTest.java    |    2 +-
 .../GridOptimizedMarshallerSelfTest.java        |   12 +-
 .../optimized/GridOptimizedMarshallerTest.java  |   58 +-
 .../GridOptimizedObjectStreamSelfTest.java      |   26 +-
 .../ignite/messaging/GridMessagingSelfTest.java |    2 +-
 .../GridSessionCheckpointAbstractSelfTest.java  |    4 +-
 .../spi/GridTcpSpiForwardingSelfTest.java       |    2 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |    2 +-
 .../GridAbstractDiscoverySelfTest.java          |    2 +-
 ...GridTcpDiscoveryMarshallerCheckSelfTest.java |    4 +-
 .../testframework/junits/GridAbstractTest.java  |    8 +-
 .../ignite/testframework/junits/IgniteMock.java |    6 +-
 .../junits/IgniteTestResources.java             |    8 +-
 .../core/src/test/webapp/META-INF/gg-config.xml |    2 +-
 .../child/GridHadoopExternalProcessStarter.java |    2 +-
 .../GridHadoopExternalCommunication.java        |    4 +-
 .../GridHadoopMarshallerFilter.java             |    4 +-
 ...GridHadoopExternalCommunicationSelfTest.java |    2 +-
 .../processors/query/h2/IgniteH2Indexing.java   |    4 +-
 .../query/h2/opt/GridLuceneIndex.java           |    4 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |    2 +-
 .../cache/GridCacheAbstractQuerySelfTest.java   |    2 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |    2 +-
 .../GridCacheQueryMultiThreadedSelfTest.java    |    2 +-
 ...idCacheReduceQueryMultithreadedSelfTest.java |    2 +-
 .../processors/cache/GridCacheSwapSelfTest.java |    2 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |    2 +-
 .../query/h2/sql/GridQueryParsingTest.java      |    2 +-
 .../test/resources/spring-ping-pong-partner.xml |    2 +-
 .../GridSpringBeanSerializationSelfTest.java    |    2 +-
 modules/yardstick/config/ignite-base-config.xml |    2 +-
 .../yardstick/config/ignite-store-config.xml    |    2 +-
 189 files changed, 5555 insertions(+), 5556 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/examples/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml
index b3f3c1a..8b5f017 100644
--- a/examples/config/example-cache.xml
+++ b/examples/config/example-cache.xml
@@ -39,7 +39,7 @@
         <property name="peerClassLoadingEnabled" value="true"/>
 
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/examples/config/example-compute.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-compute.xml b/examples/config/example-compute.xml
index c0c88db..1dd7752 100644
--- a/examples/config/example-compute.xml
+++ b/examples/config/example-compute.xml
@@ -33,7 +33,7 @@
         <property name="peerClassLoadingEnabled" value="true"/>
 
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/examples/config/example-streamer.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-streamer.xml b/examples/config/example-streamer.xml
index b2b8aec..00108e4 100644
--- a/examples/config/example-streamer.xml
+++ b/examples/config/example-streamer.xml
@@ -47,7 +47,7 @@
     -->
     <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/examples/config/filesystem/example-ignitefs.xml
----------------------------------------------------------------------
diff --git a/examples/config/filesystem/example-ignitefs.xml b/examples/config/filesystem/example-ignitefs.xml
index b6fab71..3f56341 100644
--- a/examples/config/filesystem/example-ignitefs.xml
+++ b/examples/config/filesystem/example-ignitefs.xml
@@ -57,7 +57,7 @@
         <property name="peerClassLoadingEnabled" value="true"/>
 
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
index b9bd586..fdd369b 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
@@ -61,7 +61,7 @@ public class MemcacheRestExampleNodeStartup {
         cfg.setDeploymentMode(SHARED);
         cfg.setPeerClassLoadingEnabled(true);
 
-        IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller();
+        OptimizedMarshaller marsh = new OptimizedMarshaller();
 
         marsh.setRequireSerializable(false);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
index 23b4375..9c6eef1 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
@@ -36,7 +36,7 @@
                 <property name="peerClassLoadingEnabled" value="true"/>
 
                 <property name="marshaller">
-                    <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
+                    <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
                         <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                         <property name="requireSerializable" value="false"/>
                     </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java b/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
index b46adb7..0ae80de 100644
--- a/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
@@ -58,7 +58,7 @@ public class OptimizedMarshallerAopTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         IgniteConfiguration cfg = new IgniteConfiguration();
 
-        cfg.setMarshaller(new IgniteOptimizedMarshaller());
+        cfg.setMarshaller(new OptimizedMarshaller());
 
         G.start(cfg);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/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 89c59ca..98d2d23 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
@@ -68,7 +68,7 @@ final class TestMemcacheClient {
     private final IgniteLogger log = new JavaLogger();
 
     /** JDK marshaller. */
-    private final IgniteMarshaller jdkMarshaller = new IgniteJdkMarshaller();
+    private final Marshaller jdkMarshaller = new JdkMarshaller();
 
     /** Socket. */
     private final Socket sock;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
index ecb542a..fff2d1b 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
@@ -20,7 +20,6 @@ package org.apache.ignite;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.failover.*;
 import org.apache.ignite.spi.loadbalancing.*;
@@ -55,7 +54,7 @@ import java.util.concurrent.*;
  * not have any alive nodes), then {@link org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException} will be thrown out of result future.
  * <h1 class="header">Serializable</h1>
  * Also note that {@link Runnable} and {@link Callable} implementations must support serialization as required
- * by the configured marshaller. For example, {@link IgniteOptimizedMarshaller} requires {@link Serializable}
+ * by the configured marshaller. For example, {@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller} requires {@link Serializable}
  * objects by default, but can be configured not to. Generally speaking objects that implement {@link Serializable}
  * or {@link Externalizable} will perform better. For {@link Runnable} and {@link Callable} interfaces
  * GridGain provides analogous {@link IgniteRunnable} and {@link IgniteCallable} classes which are

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/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 2858611..087e792 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
@@ -92,7 +92,7 @@ public class CacheRendezvousAffinityFunction implements CacheAffinityFunction, E
     private CacheAffinityNodeHashResolver hashIdRslvr = new CacheAffinityNodeAddressHashResolver();
 
     /** Marshaller. */
-    private IgniteMarshaller marshaller = new IgniteOptimizedMarshaller(false);
+    private Marshaller marshaller = new OptimizedMarshaller(false);
 
     /**
      * Empty constructor with all defaults.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/client/marshaller/optimized/GridClientOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/client/marshaller/optimized/GridClientOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/client/marshaller/optimized/GridClientOptimizedMarshaller.java
index e2c86b6..6c4bacd 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/marshaller/optimized/GridClientOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/marshaller/optimized/GridClientOptimizedMarshaller.java
@@ -27,7 +27,7 @@ import java.nio.*;
 import java.util.*;
 
 /**
- * Wrapper, that adapts {@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} to
+ * Wrapper, that adapts {@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller} to
  * {@link GridClientMarshaller} interface.
  */
 public class GridClientOptimizedMarshaller implements GridClientMarshaller {
@@ -35,13 +35,13 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller {
     public static final byte ID = 1;
 
     /** Optimized marshaller. */
-    private final IgniteOptimizedMarshaller opMarsh;
+    private final OptimizedMarshaller opMarsh;
 
     /**
      * Default constructor.
      */
     public GridClientOptimizedMarshaller() {
-        opMarsh = new IgniteOptimizedMarshaller();
+        opMarsh = new OptimizedMarshaller();
     }
 
     /**
@@ -55,12 +55,12 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller {
      * @param poolSize Object streams pool size.
      * @throws IOException If an I/O error occurs while writing stream header.
      * @throws IgniteException If this marshaller is not supported on the current JVM.
-     * @see org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller
+     * @see org.apache.ignite.marshaller.optimized.OptimizedMarshaller
      */
     public GridClientOptimizedMarshaller(boolean requireSer, List<String> clsNames, String clsNamesPath, int poolSize)
         throws IOException {
         try {
-            opMarsh = new IgniteOptimizedMarshaller(requireSer, clsNames, clsNamesPath, poolSize);
+            opMarsh = new OptimizedMarshaller(requireSer, clsNames, clsNamesPath, poolSize);
         }
         catch (IgniteCheckedException e) {
             throw new IOException(e);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 8818a81..cf16316 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -272,7 +272,7 @@ public class IgniteConfiguration {
     private UUID nodeId;
 
     /** Marshaller. */
-    private IgniteMarshaller marsh;
+    private Marshaller marsh;
 
     /** Marshal local jobs. */
     private boolean marshLocJobs = DFLT_MARSHAL_LOCAL_JOBS;
@@ -1433,12 +1433,12 @@ public class IgniteConfiguration {
 
     /**
      * Should return an instance of marshaller to use in grid. If not provided,
-     * {@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} will be used on Java HotSpot VM, and
-     * {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller} will be used on other VMs.
+     * {@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller} will be used on Java HotSpot VM, and
+     * {@link org.apache.ignite.marshaller.jdk.JdkMarshaller} will be used on other VMs.
      *
      * @return Marshaller to use in grid.
      */
-    public IgniteMarshaller getMarshaller() {
+    public Marshaller getMarshaller() {
         return marsh;
     }
 
@@ -1448,7 +1448,7 @@ public class IgniteConfiguration {
      * @param marsh Marshaller to use within grid.
      * @see IgniteConfiguration#getMarshaller()
      */
-    public void setMarshaller(IgniteMarshaller marsh) {
+    public void setMarshaller(Marshaller marsh) {
         this.marsh = marsh;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/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 539f4a5..8783b44 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
@@ -352,7 +352,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
          * @param marsh Marshaller.
          * @throws IgniteCheckedException In case of error.
          */
-        void p2pMarshal(IgniteMarshaller marsh) throws IgniteCheckedException {
+        void p2pMarshal(Marshaller marsh) throws IgniteCheckedException {
             assert marsh != null;
 
             bytes = marsh.marshal(evt);
@@ -363,7 +363,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
          * @param ldr Class loader.
          * @throws IgniteCheckedException In case of error.
          */
-        void p2pUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
+        void p2pUnmarshal(Marshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
             assert marsh != null;
 
             assert evt == null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
index 2deb6fc..4d52bd5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
@@ -69,7 +69,7 @@ public class GridJobSiblingsResponse extends GridTcpCommunicationMessageAdapter
      * @param marsh Marshaller.
      * @throws IgniteCheckedException In case of error.
      */
-    public void unmarshalSiblings(IgniteMarshaller marsh) throws IgniteCheckedException {
+    public void unmarshalSiblings(Marshaller marsh) throws IgniteCheckedException {
         assert marsh != null;
 
         if (siblingsBytes != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
index c3c70fd..7aa717f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
@@ -186,7 +186,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T1 implements Externalizable, IgniteOptimizedMarshallable {
+    private static class T1 implements Externalizable, OptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -258,7 +258,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T2 implements Externalizable, IgniteOptimizedMarshallable {
+    private static class T2 implements Externalizable, OptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -337,7 +337,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T3 implements Externalizable, IgniteOptimizedMarshallable {
+    private static class T3 implements Externalizable, OptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -409,7 +409,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T4 implements Externalizable, IgniteOptimizedMarshallable {
+    private static class T4 implements Externalizable, OptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -495,7 +495,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T5 implements Externalizable, IgniteOptimizedMarshallable {
+    private static class T5 implements Externalizable, OptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -581,7 +581,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T6 implements Externalizable, IgniteOptimizedMarshallable {
+    private static class T6 implements Externalizable, OptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -660,7 +660,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T7 implements Externalizable, IgniteOptimizedMarshallable {
+    private static class T7 implements Externalizable, OptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -754,7 +754,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T8 implements Externalizable, IgniteOptimizedMarshallable {
+    private static class T8 implements Externalizable, OptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 0da974f..24b9086 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1201,9 +1201,9 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
         if (cfg.getIncludeEventTypes() != null && cfg.getIncludeEventTypes().length != 0)
             perf.add("Disable grid events (remove 'includeEventTypes' from configuration)");
 
-        if (IgniteOptimizedMarshaller.available() && !(cfg.getMarshaller() instanceof IgniteOptimizedMarshaller))
+        if (OptimizedMarshaller.available() && !(cfg.getMarshaller() instanceof OptimizedMarshaller))
             perf.add("Enable optimized marshaller (set 'marshaller' to " +
-                IgniteOptimizedMarshaller.class.getSimpleName() + ')');
+                OptimizedMarshaller.class.getSimpleName() + ')');
     }
 
     /**
@@ -2000,8 +2000,8 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
             notifyLifecycleBeansEx(LifecycleEventType.AFTER_GRID_STOP);
 
             // Clean internal class/classloader caches to avoid stopped contexts held in memory.
-            IgniteOptimizedMarshaller.clearCache();
-            IgniteMarshallerExclusions.clearCache();
+            OptimizedMarshaller.clearCache();
+            MarshallerExclusions.clearCache();
             GridEnumCache.clear();
 
             gw.writeLock();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index c5c1c25..4b29d6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1503,7 +1503,7 @@ public class IgnitionEx {
 
             MBeanServer mbSrv = cfg.getMBeanServer();
 
-            IgniteMarshaller marsh = cfg.getMarshaller();
+            Marshaller marsh = cfg.getMarshaller();
 
             String[] p2pExclude = cfg.getPeerClassLoadingLocalClassPathExclude();
 
@@ -1641,9 +1641,9 @@ public class IgnitionEx {
                         "object serialization performance will be significantly slower.",
                         "To enable fast marshalling upgrade to recent 1.6 or 1.7 HotSpot VM release.");
 
-                    marsh = new IgniteJdkMarshaller();
+                    marsh = new JdkMarshaller();
                 }
-                else if (!IgniteOptimizedMarshaller.available()) {
+                else if (!OptimizedMarshaller.available()) {
                     U.warn(log, "GridOptimizedMarshaller is not supported on this JVM " +
                         "(only recent 1.6 and 1.7 versions HotSpot VMs are supported). " +
                         "To enable fast marshalling upgrade to recent 1.6 or 1.7 HotSpot VM release. " +
@@ -1651,12 +1651,12 @@ public class IgnitionEx {
                         "object serialization performance will be significantly slower.",
                         "To enable fast marshalling upgrade to recent 1.6 or 1.7 HotSpot VM release.");
 
-                    marsh = new IgniteJdkMarshaller();
+                    marsh = new JdkMarshaller();
                 }
                 else
-                    marsh = new IgniteOptimizedMarshaller();
+                    marsh = new OptimizedMarshaller();
             }
-            else if (marsh instanceof IgniteOptimizedMarshaller && !U.isHotSpot()) {
+            else if (marsh instanceof OptimizedMarshaller && !U.isHotSpot()) {
                 U.warn(log, "Using GridOptimizedMarshaller on untested JVM (only Java HotSpot VMs were tested) - " +
                     "object serialization behavior could yield unexpected results.",
                     "Using GridOptimizedMarshaller on untested JVM.");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java
index f18c03d..19575b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java
@@ -33,7 +33,7 @@ import static java.sql.Types.*;
  */
 class JdbcUtils {
     /** Marshaller. */
-    private static final IgniteMarshaller MARSHALLER = new IgniteJdkMarshaller();
+    private static final Marshaller MARSHALLER = new JdkMarshaller();
 
     /**
      * Marshals task argument to byte array.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
index 1a7672e..291930b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
@@ -62,7 +62,7 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> {
         MAX_CLOSED_SESS, MAX_CLOSED_SESS, 0.75f, 256, PER_SEGMENT_Q);
 
     /** Grid marshaller. */
-    private final IgniteMarshaller marsh;
+    private final Marshaller marsh;
 
     /**
      * @param ctx Grid kernal context.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index f33c09c..d8e588d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -103,7 +103,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
     private CommunicationListener<Serializable> commLsnr;
 
     /** Grid marshaller. */
-    private final IgniteMarshaller marsh;
+    private final Marshaller marsh;
 
     /** Busy lock. */
     private final GridSpinReadWriteLock busyLock = new GridSpinReadWriteLock();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java
index 8871a61..aa1b288 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java
@@ -60,7 +60,7 @@ class GridDeploymentCommunication {
     private final GridBusyLock busyLock = new GridBusyLock();
 
     /** */
-    private final IgniteMarshaller marsh;
+    private final Marshaller marsh;
 
     /**
      * Creates new instance of deployment communication.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
index 56cf729..195621c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
@@ -524,7 +524,7 @@ class GridDeploymentLocalStore extends GridDeploymentStoreAdapter {
                 ctx.resource().onUndeployed(dep);
 
                 // Clear optimized marshaller's cache. If another marshaller is used, this is no-op.
-                IgniteOptimizedMarshaller.onUndeploy(ldr);
+                OptimizedMarshaller.onUndeploy(ldr);
 
                 clearSerializationCaches();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
index e802dce..a031e4f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
@@ -500,7 +500,7 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter {
                 ctx.stream().onUndeployed(ldr);
 
                 // Clear optimized marshaller's cache. If another marshaller is used, this is no-op.
-                IgniteOptimizedMarshaller.onUndeploy(ldr);
+                OptimizedMarshaller.onUndeploy(ldr);
 
                 clearSerializationCaches();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
index 19338b7..b4d308a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -1263,7 +1263,7 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter {
                 ctx.stream().onUndeployed(ldr);
 
                 // Clear optimized marshaller's cache. If another marshaller is used, this is no-op.
-                IgniteOptimizedMarshaller.onUndeploy(ldr);
+                OptimizedMarshaller.onUndeploy(ldr);
 
                 clearSerializationCaches();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
index 850040d..1efc361 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
@@ -65,7 +65,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
     private final int len;
 
     /** Marshaller. */
-    private final IgniteMarshaller marsh;
+    private final Marshaller marsh;
 
     /** Request listener. */
     private RequestListener msgLsnr;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java
index 09b3c43..f00b33f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java
@@ -39,7 +39,7 @@ import static org.apache.ignite.events.EventType.*;
  */
 public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
     /** */
-    private IgniteMarshaller marsh;
+    private Marshaller marsh;
 
     /**
      * @param ctx Grid kernal context.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/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 ebb8717..2bb8b69 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
@@ -29,7 +29,7 @@ import java.util.*;
 /**
  * Object wrapper containing serialized byte array of original object and deployment information.
  */
-class GridAffinityMessage implements Externalizable, IgniteOptimizedMarshallable {
+class GridAffinityMessage implements Externalizable, OptimizedMarshallable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
index 19d5440..3eb0f5a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
@@ -27,7 +27,7 @@ import java.io.*;
 /**
  * Implementation of {@link EntryProcessorResult}.
  */
-public class CacheInvokeResult<T> implements EntryProcessorResult<T>, Externalizable, IgniteOptimizedMarshallable {
+public class CacheInvokeResult<T> implements EntryProcessorResult<T>, Externalizable, OptimizedMarshallable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 9563327..6b3b084 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -698,7 +698,7 @@ public class GridCacheContext<K, V> implements Externalizable {
     /**
      * @return Marshaller.
      */
-    public IgniteMarshaller marshaller() {
+    public Marshaller marshaller() {
         return ctx.config().getMarshaller();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/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 995990f..aee85ce 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
@@ -243,7 +243,7 @@ public class GridCacheEntryInfo<K, V> implements Externalizable {
      * @throws IgniteCheckedException If unmarshalling failed.
      */
     public void unmarshal(GridCacheContext<K, V> ctx, ClassLoader clsLdr) throws IgniteCheckedException {
-        IgniteMarshaller mrsh = ctx.marshaller();
+        Marshaller mrsh = ctx.marshaller();
 
         if (key == null)
             key = mrsh.unmarshal(keyBytes, clsLdr);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
index 8737b0a..75860b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
@@ -425,7 +425,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
 
         Object[] args = new Object[byteCol.length];
 
-        IgniteMarshaller marsh = ctx.marshaller();
+        Marshaller marsh = ctx.marshaller();
 
         for (int i = 0; i < byteCol.length; i++)
             args[i] = byteCol[i] == null ? null : marsh.unmarshal(byteCol[i], ldr);
@@ -478,7 +478,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
 
         IgnitePredicate<CacheEntry<K, V>>[] filter = new IgnitePredicate[byteCol.length];
 
-        IgniteMarshaller marsh = ctx.marshaller();
+        Marshaller marsh = ctx.marshaller();
 
         for (int i = 0; i < byteCol.length; i++)
             filter[i] = byteCol[i] == null ? null :
@@ -531,7 +531,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
 
         List<T> col = new ArrayList<>(byteCol.size());
 
-        IgniteMarshaller marsh = ctx.marshaller();
+        Marshaller marsh = ctx.marshaller();
 
         for (GridCacheValueBytes item : byteCol) {
             assert item == null || item.get() != null;
@@ -584,7 +584,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
 
         List<T> col = new ArrayList<>(byteCol.size());
 
-        IgniteMarshaller marsh = ctx.marshaller();
+        Marshaller marsh = ctx.marshaller();
 
         for (byte[] bytes : byteCol)
             col.add(bytes == null ? null : marsh.<T>unmarshal(bytes, ldr));
@@ -635,7 +635,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
 
         LinkedHashMap<K1, Boolean> map = U.newLinkedHashMap(byteMap.size());
 
-        IgniteMarshaller marsh = ctx.marshaller();
+        Marshaller marsh = ctx.marshaller();
 
         for (Map.Entry<byte[], Boolean> e : byteMap.entrySet())
             map.put(marsh.<K1>unmarshal(e.getKey(), ldr), e.getValue());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
index 61b97cd..943428c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
@@ -29,7 +29,7 @@ import java.util.*;
 /**
  * Return value for cases where both, value and success flag need to be returned.
  */
-public class GridCacheReturn<V> implements Externalizable, IgniteOptimizedMarshallable {
+public class GridCacheReturn<V> implements Externalizable, OptimizedMarshallable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 4ea44b1..a3e0b24 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -280,7 +280,7 @@ public class GridCacheSharedContext<K, V> {
     /**
      * @return Marshaller.
      */
-    public IgniteMarshaller marshaller() {
+    public Marshaller marshaller() {
         return kernalCtx.config().getMarshaller();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/IgniteExternalizableExpiryPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/IgniteExternalizableExpiryPolicy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/IgniteExternalizableExpiryPolicy.java
index 977342f..afaac97 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/IgniteExternalizableExpiryPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/IgniteExternalizableExpiryPolicy.java
@@ -28,7 +28,7 @@ import java.util.concurrent.*;
 /**
  * Externalizable wrapper for {@link ExpiryPolicy}.
  */
-public class IgniteExternalizableExpiryPolicy implements ExpiryPolicy, Externalizable, IgniteOptimizedMarshallable {
+public class IgniteExternalizableExpiryPolicy implements ExpiryPolicy, Externalizable, OptimizedMarshallable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java
index 6ff5ccd..4984dd0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java
@@ -115,7 +115,7 @@ public class GridCacheLocalQueryFuture<K, V, R> extends GridCacheQueryFutureAdap
             IgnitePredicate<CacheEntry<Object, Object>> prjPred = qry.query().projectionFilter() == null ?
                 F.<CacheEntry<Object, Object>>alwaysTrue() : qry.query().projectionFilter();
 
-            IgniteMarshaller marsh = cctx.marshaller();
+            Marshaller marsh = cctx.marshaller();
 
             IgniteReducer<Object, Object> rdc = qry.reducer() != null ?
                 marsh.<IgniteReducer<Object, Object>>unmarshal(marsh.marshal(qry.reducer()), null) : null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
index 37266d8..b6799b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
@@ -283,7 +283,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
     @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException {
         super.finishUnmarshal(ctx, ldr);
 
-        IgniteMarshaller mrsh = ctx.marshaller();
+        Marshaller mrsh = ctx.marshaller();
 
         if (keyValFilterBytes != null)
             keyValFilter = mrsh.unmarshal(keyValFilterBytes, ldr);
@@ -306,7 +306,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
      * @throws IgniteCheckedException In case of error.
      */
     void beforeLocalExecution(GridCacheContext<K, V> ctx) throws IgniteCheckedException {
-        IgniteMarshaller marsh = ctx.marshaller();
+        Marshaller marsh = ctx.marshaller();
 
         rdc = rdc != null ? marsh.<IgniteReducer<Object, Object>>unmarshal(marsh.marshal(rdc), null) : null;
         trans = trans != null ? marsh.<IgniteClosure<Object, Object>>unmarshal(marsh.marshal(trans), null) : null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
index f249a74..6ea0ebf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
@@ -176,7 +176,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr
      * @param ldr Class loader.
      * @throws IgniteCheckedException In case of error.
      */
-    void initValue(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
+    void initValue(Marshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
         assert marsh != null;
 
         if (newVal == null && newValBytes != null && !newValBytes.isNull())
@@ -201,7 +201,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr
      * @param marsh Marshaller.
      * @throws IgniteCheckedException In case of error.
      */
-    void p2pMarshal(IgniteMarshaller marsh) throws IgniteCheckedException {
+    void p2pMarshal(Marshaller marsh) throws IgniteCheckedException {
         assert marsh != null;
 
         assert key != null;
@@ -222,7 +222,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr
      * @param ldr Class loader.
      * @throws IgniteCheckedException In case of error.
      */
-    void p2pUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
+    void p2pUnmarshal(Marshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
         assert marsh != null;
 
         assert key == null : "Key should be null: " + key;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
index fe32eb9..d85a9d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
@@ -42,7 +42,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b
     private static final long serialVersionUID = 0L;
 
     /** Marshaller. */
-    private static final IgniteMarshaller MARSHALLER = new IgniteJdkMarshaller();
+    private static final Marshaller MARSHALLER = new JdkMarshaller();
 
     /** {@inheritDoc} */
     @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
@@ -67,7 +67,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b
     /**
      * Job for JDBC adapter.
      */
-    private static class JdbcDriverMetadataJob extends ComputeJobAdapter implements IgniteOptimizedMarshallable {
+    private static class JdbcDriverMetadataJob extends ComputeJobAdapter implements OptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index 767977c..a8c0031 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -51,7 +51,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
     private static final long serialVersionUID = 0L;
 
     /** Marshaller. */
-    private static final IgniteMarshaller MARSHALLER = new IgniteJdkMarshaller();
+    private static final Marshaller MARSHALLER = new JdkMarshaller();
 
     /** How long to store future (10 minutes). */
     private static final int RMV_DELAY = 10 * 60;
@@ -138,7 +138,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
     /**
      * Job for JDBC adapter.
      */
-    private static class JdbcDriverJob extends ComputeJobAdapter implements IgniteOptimizedMarshallable {
+    private static class JdbcDriverJob extends ComputeJobAdapter implements OptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/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 a6e39ce..ce5f44c 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
@@ -43,7 +43,7 @@ import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
  * {@link #equals(Object)} method, as transaction entries should use referential
  * equality.
  */
-public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, IgniteOptimizedMarshallable {
+public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, OptimizedMarshallable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/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 e448d69..f0a344a 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
@@ -152,7 +152,7 @@ public class GridCacheRawVersionedEntry<K, V> implements GridCacheVersionedEntry
      * @param marsh Marshaller.
      * @throws IgniteCheckedException If failed.
      */
-    public void unmarshal(IgniteMarshaller marsh) throws IgniteCheckedException {
+    public void unmarshal(Marshaller marsh) throws IgniteCheckedException {
         unmarshalKey(marsh);
 
         if (valBytes != null && val == null)
@@ -166,7 +166,7 @@ public class GridCacheRawVersionedEntry<K, V> implements GridCacheVersionedEntry
      * @param marsh Marshaller.
      * @throws IgniteCheckedException If failed.
      */
-    public void unmarshalKey(IgniteMarshaller marsh) throws IgniteCheckedException {
+    public void unmarshalKey(Marshaller marsh) throws IgniteCheckedException {
         if (key == null)
             key = marsh.unmarshal(keyBytes, null);
     }
@@ -177,7 +177,7 @@ public class GridCacheRawVersionedEntry<K, V> implements GridCacheVersionedEntry
      * @param marsh Marshaller.
      * @throws IgniteCheckedException If failed.
      */
-    public void marshal(IgniteMarshaller marsh) throws IgniteCheckedException {
+    public void marshal(Marshaller marsh) throws IgniteCheckedException {
         if (keyBytes == null)
             keyBytes = marsh.marshal(key);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
index bb78a02..891af09 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
@@ -28,7 +28,7 @@ import java.util.*;
 /**
  * Grid unique version.
  */
-public class GridCacheVersion implements Comparable<GridCacheVersion>, Externalizable, IgniteOptimizedMarshallable {
+public class GridCacheVersion implements Comparable<GridCacheVersion>, Externalizable, OptimizedMarshallable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
index c6fda07..eb3aecc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
@@ -1073,7 +1073,7 @@ public class GridClosureProcessor extends GridProcessorAdapter {
 
             if (ctx.localNodeId().equals(node.id())) {
                 if (hadLocNode) {
-                    IgniteMarshaller marsh = ctx.config().getMarshaller();
+                    Marshaller marsh = ctx.config().getMarshaller();
 
                     job = marsh.unmarshal(marsh.marshal(job), null);
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/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 5cdb3c5..1fd9571 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
@@ -99,7 +99,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
     private long ackTimeout;
 
     /** Marshaller. */
-    private IgniteMarshaller marsh;
+    private Marshaller marsh;
 
     /**
      * @param ctx Kernal context.
@@ -1414,7 +1414,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
          * @param marsh Marshaller.
          * @throws IgniteCheckedException In case of error.
          */
-        void p2pMarshal(IgniteMarshaller marsh) throws IgniteCheckedException {
+        void p2pMarshal(Marshaller marsh) throws IgniteCheckedException {
             assert marsh != null;
 
             prjPredBytes = marsh.marshal(prjPred);
@@ -1425,7 +1425,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
          * @param ldr Class loader.
          * @throws IgniteCheckedException In case of error.
          */
-        void p2pUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
+        void p2pUnmarshal(Marshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
             assert marsh != null;
 
             assert prjPred == null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessor.java
index f41132c..acac20d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessor.java
@@ -53,7 +53,7 @@ public class GridDataLoaderProcessor<K, V> extends GridProcessorAdapter {
     private final DelayQueue<IgniteDataLoaderImpl<K, V>> flushQ = new DelayQueue<>();
 
     /** Marshaller. */
-    private final IgniteMarshaller marsh;
+    private final Marshaller marsh;
 
     /**
      * @param ctx Kernal context.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsAckMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsAckMessage.java
index 2cacbe9..949fa7b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsAckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsAckMessage.java
@@ -87,7 +87,7 @@ public class GridGgfsAckMessage extends GridGgfsCommunicationMessage {
     }
 
     /** {@inheritDoc} */
-    @Override public void prepareMarshal(IgniteMarshaller marsh) throws IgniteCheckedException {
+    @Override public void prepareMarshal(Marshaller marsh) throws IgniteCheckedException {
         super.prepareMarshal(marsh);
 
         if (err != null)
@@ -95,7 +95,7 @@ public class GridGgfsAckMessage extends GridGgfsCommunicationMessage {
     }
 
     /** {@inheritDoc} */
-    @Override public void finishUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
+    @Override public void finishUnmarshal(Marshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
         super.finishUnmarshal(marsh, ldr);
 
         if (errBytes != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsCommunicationMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsCommunicationMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsCommunicationMessage.java
index 13eea62..1e5d4df 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsCommunicationMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsCommunicationMessage.java
@@ -39,7 +39,7 @@ public abstract class GridGgfsCommunicationMessage extends GridTcpCommunicationM
      * @param marsh Marshaller.
      * @throws IgniteCheckedException In case of error.
      */
-    public void prepareMarshal(IgniteMarshaller marsh) throws IgniteCheckedException {
+    public void prepareMarshal(Marshaller marsh) throws IgniteCheckedException {
         // No-op.
     }
 
@@ -48,7 +48,7 @@ public abstract class GridGgfsCommunicationMessage extends GridTcpCommunicationM
      * @param ldr Class loader.
      * @throws IgniteCheckedException In case of error.
      */
-    public void finishUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
+    public void finishUnmarshal(Marshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
         // No-op.
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDeleteMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDeleteMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDeleteMessage.java
index 30fc954..2d788cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDeleteMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDeleteMessage.java
@@ -91,7 +91,7 @@ public class GridGgfsDeleteMessage extends GridGgfsCommunicationMessage {
     }
 
     /** {@inheritDoc} */
-    @Override public void prepareMarshal(IgniteMarshaller marsh) throws IgniteCheckedException {
+    @Override public void prepareMarshal(Marshaller marsh) throws IgniteCheckedException {
         super.prepareMarshal(marsh);
 
         if (err != null)
@@ -99,7 +99,7 @@ public class GridGgfsDeleteMessage extends GridGgfsCommunicationMessage {
     }
 
     /** {@inheritDoc} */
-    @Override public void finishUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
+    @Override public void finishUnmarshal(Marshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
         super.finishUnmarshal(marsh, ldr);
 
         if (errBytes != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
index 7a5d6eb..9208eda 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
@@ -57,7 +57,7 @@ public class GridJobProcessor extends GridProcessorAdapter {
     private static final int FINISHED_JOBS_COUNT = Integer.getInteger(IGNITE_JOBS_HISTORY_SIZE, 10240);
 
     /** */
-    private final IgniteMarshaller marsh;
+    private final Marshaller marsh;
 
     /** */
     private final boolean jobAlwaysActivate;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
index 89ca6de..6cdc71f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
@@ -86,7 +86,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject {
     private final IgniteLogger log;
 
     /** */
-    private final IgniteMarshaller marsh;
+    private final Marshaller marsh;
 
     /** */
     private final GridJobSessionImpl ses;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
index 5e0e559..6e6a974 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
@@ -39,7 +39,7 @@ public class GridOffHeapProcessor extends GridProcessorAdapter {
         new ConcurrentHashMap8<>();
 
     /** */
-    private final IgniteMarshaller marsh;
+    private final Marshaller marsh;
 
     /**
      * @param ctx Kernal context.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
index 215c43e..a58d5ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
@@ -57,7 +57,7 @@ public class GridMemcachedMessageWrapper extends GridTcpCommunicationMessageAdap
      * @param jdkMarshaller JDK marshaller.
      * @throws IgniteCheckedException If failed to marshal.
      */
-    public GridMemcachedMessageWrapper(GridMemcachedMessage msg, IgniteMarshaller jdkMarshaller) throws IgniteCheckedException {
+    public GridMemcachedMessageWrapper(GridMemcachedMessage msg, Marshaller jdkMarshaller) throws IgniteCheckedException {
         bytes = encodeMemcache(msg, jdkMarshaller);
     }
 
@@ -119,7 +119,7 @@ public class GridMemcachedMessageWrapper extends GridTcpCommunicationMessageAdap
      * @return Serialized message.
      * @throws IgniteCheckedException If serialization failed.
      */
-    private byte[] encodeMemcache(GridMemcachedMessage msg, IgniteMarshaller jdkMarshaller) throws IgniteCheckedException {
+    private byte[] encodeMemcache(GridMemcachedMessage msg, Marshaller jdkMarshaller) throws IgniteCheckedException {
         GridByteArrayList res = new GridByteArrayList(HDR_LEN - 1);
 
         int keyLen = 0;
@@ -203,7 +203,7 @@ public class GridMemcachedMessageWrapper extends GridTcpCommunicationMessageAdap
      * @return Serialization flags.
      * @throws IgniteCheckedException If JDK serialization failed.
      */
-    private int encodeObj(Object obj, ByteArrayOutputStream out, IgniteMarshaller jdkMarshaller) throws IgniteCheckedException {
+    private int encodeObj(Object obj, ByteArrayOutputStream out, Marshaller jdkMarshaller) throws IgniteCheckedException {
         int flags = 0;
 
         byte[] data = null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
index c12bceb..070546e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
@@ -48,7 +48,7 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter<Gr
     private final GridRestProtocolHandler hnd;
 
     /** JDK marshaller. */
-    private final IgniteMarshaller jdkMarshaller = new IgniteJdkMarshaller();
+    private final Marshaller jdkMarshaller = new JdkMarshaller();
 
     /** Context. */
     private final GridKernalContext ctx;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/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 d6f5804..0e6fb19 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
@@ -43,7 +43,7 @@ public class GridTcpRestParser implements GridNioParser {
     private static final Charset UTF_8 = Charset.forName("UTF-8");
 
     /** JDK marshaller. */
-    private final IgniteMarshaller jdkMarshaller = new IgniteJdkMarshaller();
+    private final Marshaller jdkMarshaller = new JdkMarshaller();
 
     /** {@inheritDoc} */
     @Nullable @Override public GridClientMessage decode(GridNioSession ses, ByteBuffer buf) throws IOException,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
index 9656937..46c7ce9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
@@ -52,7 +52,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter {
     private GridNioServer<GridClientMessage> srv;
 
     /** JDK marshaller. */
-    private final IgniteMarshaller jdkMarshaller = new IgniteJdkMarshaller();
+    private final Marshaller jdkMarshaller = new JdkMarshaller();
 
     /** NIO server listener. */
     private GridTcpRestNioListener lsnr;
@@ -118,7 +118,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter {
     /**
      * @return JDK marshaller.
      */
-    IgniteMarshaller jdkMarshaller() {
+    Marshaller jdkMarshaller() {
         return jdkMarshaller;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 4b9a531..a6f76f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -860,7 +860,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
      * @return Copy of service.
      */
     private Service copyAndInject(Service svc) {
-        IgniteMarshaller m = ctx.config().getMarshaller();
+        Marshaller m = ctx.config().getMarshaller();
 
         try {
             byte[] bytes = m.marshal(svc);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionBatch.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionBatch.java
index dabec9b..770fcc2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionBatch.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionBatch.java
@@ -30,7 +30,7 @@ import java.util.*;
 /**
  * Streamer execution batch which should be processed on one node.
  */
-public class GridStreamerExecutionBatch implements Externalizable, IgniteOptimizedMarshallable {
+public class GridStreamerExecutionBatch implements Externalizable, OptimizedMarshallable {
     /** */
     private static final long serialVersionUID = 0L;
 


Mime
View raw message