http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java index b1a7b18..9780080 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java @@ -40,7 +40,7 @@ public class GridDeploymentManagerStopSelfTest extends GridCommonAbstractTest { GridTestKernalContext ctx = newContext(); - ctx.config().setMarshaller(new IgniteJdkMarshaller()); + ctx.config().setMarshaller(new JdkMarshaller()); ctx.config().setDeploymentSpi(spi); GridResourceProcessor resProc = new GridResourceProcessor(ctx);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java index f0932af..359573f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java @@ -227,7 +227,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(gridName)); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java index 248fe74..6da1bce 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java @@ -95,7 +95,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(); } - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java index f8f64a4..c8a7283 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java @@ -93,7 +93,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { cfg.setRestEnabled(false); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java index a1fe573..dae5b51 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java @@ -82,7 +82,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { NEAR_ENTRY_OVERHEAD = U.<Integer>staticField(GridNearCacheEntry.class, "NEAR_SIZE_OVERHEAD"); REPLICATED_ENTRY_OVERHEAD = DHT_ENTRY_OVERHEAD; - IgniteMarshaller marsh = new IgniteOptimizedMarshaller(); + Marshaller marsh = new OptimizedMarshaller(); KEY_SIZE = marsh.marshal(1).length; ONE_KB_VAL_SIZE = marsh.marshal(new Value(new byte[1024])).length; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java index f70c8f0..c1a84c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java @@ -90,7 +90,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { cacheCfg.setPortableEnabled(portableEnabled()); cfg.setCacheConfiguration(cacheCfg); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java index a04d093..d2de20e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java @@ -100,7 +100,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { false ); - IgniteMarshaller marshaller = getTestResources().getMarshaller(); + Marshaller marshaller = getTestResources().getMarshaller(); GridCacheMvccCandidate<String> unmarshalled = marshaller.unmarshal(marshaller.marshal(cand), null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index d0e4dca..a6f8548 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -85,7 +85,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheCfg); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); cfg.setDeploymentMode(SHARED); cfg.setPeerClassLoadingLocalClassPathExclude(GridCacheOffHeapSelfTest.class.getName(), CacheValue.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java index 4dc0a71..8c1a827 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java @@ -73,7 +73,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(spi); - cfg.setMarshaller(new IgniteJdkMarshaller()); + cfg.setMarshaller(new JdkMarshaller()); cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java index b6e9a68..87a1e8e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java @@ -70,7 +70,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheCfg); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java index 45ad062..38d3afc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java @@ -80,7 +80,7 @@ public class GridCacheVersionSelfTest extends GridCommonAbstractTest { GridCacheVersion ver = version(1, 1); GridCacheVersionEx verEx = new GridCacheVersionEx(2, 2, 0, 0, ver); - IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(false); + OptimizedMarshaller marsh = new OptimizedMarshaller(false); byte[] verBytes = marsh.marshal(ver); byte[] verExBytes = marsh.marshal(verEx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java index b27cf5d..f704a75 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java @@ -95,7 +95,7 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(gridName)); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java index 703cc7d..dbdd194 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java @@ -40,7 +40,7 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Igni @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java index 6d88a96..d66b67d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java @@ -110,7 +110,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl cfg.setSystemExecutorServiceShutdown(true); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java index c099e69..06dd36a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java @@ -76,7 +76,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends Ignite @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java index 8ebff39..4fc3b1a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java @@ -52,7 +52,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java index 335ce12..1eeb431 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java @@ -60,7 +60,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra cfg.setDiscoverySpi(disco); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java index 4997ba1..69fab87 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java @@ -82,7 +82,7 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb c.setDeploymentMode(DeploymentMode.SHARED); c.setNetworkTimeout(10000); c.setRestEnabled(false); - c.setMarshaller(new IgniteOptimizedMarshaller(false)); + c.setMarshaller(new OptimizedMarshaller(false)); // c.setPeerClassLoadingLocalClassPathExclude(GridCachePreloadLifecycleAbstractTest.class.getName(), // MyValue.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java index 1391173..e0dfad4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java @@ -100,7 +100,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java index 7c5d965..3314dbb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java @@ -71,7 +71,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest { c.setDiscoverySpi(disco); - c.setMarshaller(new IgniteOptimizedMarshaller(false)); + c.setMarshaller(new OptimizedMarshaller(false)); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java index 0040e75..df305c1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java @@ -56,7 +56,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); TcpDiscoverySpi disco = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index 6a4fa18..09e2d2a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -95,7 +95,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo cfg.setDiscoverySpi(disco); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java index 729db68..40e1bd5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java @@ -60,7 +60,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom cfg.setCacheConfiguration(); cfg.setDiscoverySpi(discovery()); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java index d9de1f4..463b178 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java @@ -58,7 +58,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java index ca90c47..3006138 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java @@ -73,7 +73,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { if (include) cfg.setUserAttributes(F.asMap("include", true)); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java index 565d73b..788dea1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java @@ -128,10 +128,10 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest { Ignite g0 = grid(0); - IgniteMarshaller marsh = g0.configuration().getMarshaller(); + Marshaller marsh = g0.configuration().getMarshaller(); - if (marsh instanceof IgniteOptimizedMarshaller) - assertTrue(((IgniteOptimizedMarshaller)marsh).isRequireSerializable()); + if (marsh instanceof OptimizedMarshaller) + assertTrue(((OptimizedMarshaller)marsh).isRequireSerializable()); else fail("Expected GridOptimizedMarshaller, but found: " + marsh.getClass().getName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java index cd589b3..b601a2a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java @@ -90,7 +90,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { cfg.setIncludeProperties(); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); if (useCache) { CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsFileInfoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsFileInfoSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsFileInfoSelfTest.java index 79df9dd..bd3c249 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsFileInfoSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsFileInfoSelfTest.java @@ -32,7 +32,7 @@ import java.util.concurrent.*; */ public class GridGgfsFileInfoSelfTest extends GridGgfsCommonAbstractTest { /** Marshaller to test {@link Externalizable} interface. */ - private final IgniteMarshaller marshaller = new IgniteOptimizedMarshaller(); + private final Marshaller marshaller = new OptimizedMarshaller(); /** * Test node info serialization. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerEvictionSelfTest.java index d03a1f9..48b6259 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerEvictionSelfTest.java @@ -62,7 +62,7 @@ public class GridStreamerEvictionSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java index 9c50623..bc66b56 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java @@ -81,7 +81,7 @@ public class GridStreamerSelfTest extends GridCommonAbstractTest { if (p2pEnabled) cfg.setDeploymentMode(SHARED); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java index ea0b31b..5b077bb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java @@ -65,7 +65,7 @@ public class GridFinishedFutureSelfTest extends GridCommonAbstractTest { private void testExternalizable(@Nullable Object t, @Nullable Throwable ex, boolean syncNotify) throws Exception { GridKernalContext ctx = ((IgniteKernal)grid()).context(); - IgniteMarshaller m = new IgniteOptimizedMarshaller(); + Marshaller m = new OptimizedMarshaller(); ClassLoader clsLdr = getClass().getClassLoader(); IgniteInternalFuture<Object> orig = t == null ? new GridFinishedFuture<>(ctx, ex) : http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java index f111afc..f90eeab 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java @@ -57,7 +57,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest private static final String CACHE_NAME = "namedCache"; /** */ - private static IgniteMarshaller marsh; + private static Marshaller marsh; /** Closure job. */ protected IgniteInClosure<String> c1 = new IgniteInClosure<String>() { @@ -106,7 +106,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest namedCache.setAtomicityMode(TRANSACTIONAL); namedCache.setQueryIndexEnabled(true); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); cfg.setStreamerConfiguration(streamerConfiguration()); cfg.setCacheConfiguration(new CacheConfiguration(), namedCache); @@ -142,7 +142,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest /** * @return Grid marshaller. */ - protected abstract IgniteMarshaller createMarshaller(); + protected abstract Marshaller createMarshaller(); /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerPerformanceTest.java index 1fbce27..1e7c9a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerPerformanceTest.java @@ -100,7 +100,7 @@ public class GridMarshallerPerformanceTest extends GridCommonAbstractTest { public void testGridMarshaller() throws Exception { final GridTuple<byte[]> tuple = new GridTuple<>(); - final IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); + final OptimizedMarshaller marsh = new OptimizedMarshaller(); marsh.setClassNames(Arrays.asList(TestObject.class.getName())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerResourceBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerResourceBean.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerResourceBean.java index 87727e4..11ff42d 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerResourceBean.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerResourceBean.java @@ -41,7 +41,7 @@ class GridMarshallerResourceBean implements Serializable { private IgniteLogger log; /** Marshaller. */ - private IgniteMarshaller marshaller; + private Marshaller marshaller; /** Load balancer. */ private ComputeLoadBalancer balancer; @@ -66,7 +66,7 @@ class GridMarshallerResourceBean implements Serializable { */ GridMarshallerResourceBean() { log = new JavaLogger(); - marshaller = new IgniteJdkMarshaller(); + marshaller = new JdkMarshaller(); mbeanSrv = ManagementFactory.getPlatformMBeanServer(); ses = new GridTestTaskSession(); execSvc = new IgniteThreadPoolExecutor(1, 1, 0, new LinkedBlockingQueue<Runnable>()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerSelfTest.java index 4a6df9f..19e871c 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerSelfTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.testframework.junits.common.*; @GridCommonTest(group = "Marshaller") public class GridJdkMarshallerSelfTest extends GridMarshallerAbstractTest { /** {@inheritDoc} */ - @Override protected IgniteMarshaller createMarshaller() { - return new IgniteJdkMarshaller(); + @Override protected Marshaller createMarshaller() { + return new JdkMarshaller(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java index be20d6f..61ecb50 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java @@ -27,7 +27,7 @@ public class GridOptimizedMarshallerEnumSelfTest extends TestCase { * @throws Exception If failed. */ public void testEnumSerialisation() throws Exception { - IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); + OptimizedMarshaller marsh = new OptimizedMarshaller(); byte[] bytes = marsh.marshal(TestEnum.Bond); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java index 5834560..8189ae7 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java @@ -33,8 +33,8 @@ import java.util.concurrent.*; @GridCommonTest(group = "Marshaller") public class GridOptimizedMarshallerSelfTest extends GridMarshallerAbstractTest { /** {@inheritDoc} */ - @Override protected IgniteMarshaller createMarshaller() { - IgniteOptimizedMarshaller m = new IgniteOptimizedMarshaller(); + @Override protected Marshaller createMarshaller() { + OptimizedMarshaller m = new OptimizedMarshaller(); m.setRequireSerializable(false); m.setClassNames(F.asList(GoodMarshallable.class.getName(), NoMarshallable.class.getName())); @@ -354,8 +354,8 @@ public class GridOptimizedMarshallerSelfTest extends GridMarshallerAbstractTest /** * */ - public static class GoodMarshallable implements IgniteOptimizedMarshallable, Serializable { - /** Class ID required by {@link IgniteOptimizedMarshallable}. */ + public static class GoodMarshallable implements OptimizedMarshallable, Serializable { + /** Class ID required by {@link OptimizedMarshallable}. */ @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"}) private static Object GG_CLASS_ID; @@ -431,8 +431,8 @@ public class GridOptimizedMarshallerSelfTest extends GridMarshallerAbstractTest /** * */ - private static class BadMarshallable extends TestObject implements IgniteOptimizedMarshallable { - /** Class ID required by {@link IgniteOptimizedMarshallable}. */ + private static class BadMarshallable extends TestObject implements OptimizedMarshallable { + /** Class ID required by {@link OptimizedMarshallable}. */ @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"}) private static Object GG_CLASS_ID; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java index 6510cce..2ab44e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java @@ -43,7 +43,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If marshalling failed. */ public void testNonSerializable() throws IgniteCheckedException { - IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); + OptimizedMarshaller marsh = new OptimizedMarshaller(); marsh.setRequireSerializable(false); @@ -58,7 +58,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If marshalling failed. */ public void testNonSerializable1() throws IgniteCheckedException { - IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); + OptimizedMarshaller marsh = new OptimizedMarshaller(); marsh.setRequireSerializable(false); @@ -79,7 +79,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If marshalling failed. */ public void testNonSerializable2() throws IgniteCheckedException { - IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); + OptimizedMarshaller marsh = new OptimizedMarshaller(); marsh.setRequireSerializable(false); @@ -112,7 +112,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If marshalling failed. */ public void testNonSerializable3() throws IgniteCheckedException { - IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); + OptimizedMarshaller marsh = new OptimizedMarshaller(); marsh.setRequireSerializable(false); @@ -129,7 +129,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If marshalling failed. */ public void testNonSerializable4() throws IgniteCheckedException { - IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); + OptimizedMarshaller marsh = new OptimizedMarshaller(); marsh.setRequireSerializable(false); @@ -148,7 +148,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If marshalling failed. */ public void testNonSerializable5() throws IgniteCheckedException { - IgniteMarshaller marsh = new IgniteOptimizedMarshaller(); + Marshaller marsh = new OptimizedMarshaller(); byte[] bytes = marsh.marshal(true); @@ -163,7 +163,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If marshalling failed. */ public void testSerializable() throws IgniteCheckedException { - IgniteMarshaller marsh = new IgniteOptimizedMarshaller(); + Marshaller marsh = new OptimizedMarshaller(); SomeSerializable outObj = marsh.unmarshal(marsh.marshal(new SomeSerializable(null)), null); @@ -174,7 +174,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If failed. */ public void testSerializableAfterChangingValue() throws IgniteCheckedException { - IgniteMarshaller marsh = new IgniteOptimizedMarshaller(); + Marshaller marsh = new OptimizedMarshaller(); SomeSimpleSerializable newObj = new SomeSimpleSerializable(); @@ -195,7 +195,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If marshalling failed. */ public void testExternalizable() throws IgniteCheckedException { - IgniteMarshaller marsh = new IgniteOptimizedMarshaller(); + Marshaller marsh = new OptimizedMarshaller(); ExternalizableA outObj = marsh.unmarshal(marsh.marshal(new ExternalizableA(null, true)), null); ExternalizableA outObj1 = marsh.unmarshal(marsh.marshal(new ExternalizableA(null, false)), null); @@ -205,10 +205,10 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { } /** - * Tests {@link IgniteOptimizedMarshaller#setRequireSerializable(boolean)}. + * Tests {@link OptimizedMarshaller#setRequireSerializable(boolean)}. */ public void testRequireSerializable() { - IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); + OptimizedMarshaller marsh = new OptimizedMarshaller(); marsh.setRequireSerializable(true); @@ -223,7 +223,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { } /** - * Tests {@link IgniteOptimizedMarshaller#setClassNames(List)}. + * Tests {@link OptimizedMarshaller#setClassNames(List)}. * * @throws IgniteCheckedException If marshalling failed. */ @@ -231,18 +231,18 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { Object obj = new SomeSerializable(null); // Clear caches. - ((Map)U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear(); - IgniteOptimizedClassResolver.userClasses(null, null); + ((Map)U.staticField(OptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear(); + OptimizedClassResolver.userClasses(null, null); - IgniteMarshaller marsh = new IgniteOptimizedMarshaller(); + Marshaller marsh = new OptimizedMarshaller(); int size1 = marsh.marshal(obj).length; // Clear caches. - ((Map)U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear(); - IgniteOptimizedClassResolver.userClasses(null, null); + ((Map)U.staticField(OptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear(); + OptimizedClassResolver.userClasses(null, null); - IgniteOptimizedMarshaller marshPreregistered = new IgniteOptimizedMarshaller(); + OptimizedMarshaller marshPreregistered = new OptimizedMarshaller(); marshPreregistered.setClassNames(Arrays.asList(SomeSerializable.class.getName())); @@ -252,7 +252,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { } /** - * Tests {@link IgniteOptimizedMarshaller#setClassNames(List)}. + * Tests {@link OptimizedMarshaller#setClassNames(List)}. * * @throws IgniteCheckedException If marshalling failed. * @throws IOException If an I/O error occurs. @@ -261,18 +261,18 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { Object obj = new SomeSerializable(null); // Clear caches. - ((Map)U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear(); - IgniteOptimizedClassResolver.userClasses(null, null); + ((Map)U.staticField(OptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear(); + OptimizedClassResolver.userClasses(null, null); - IgniteMarshaller marsh = new IgniteOptimizedMarshaller(); + Marshaller marsh = new OptimizedMarshaller(); int size1 = marsh.marshal(obj).length; // Clear caches. - ((Map)U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear(); - IgniteOptimizedClassResolver.userClasses(null, null); + ((Map)U.staticField(OptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear(); + OptimizedClassResolver.userClasses(null, null); - IgniteOptimizedMarshaller marshPreregistered = new IgniteOptimizedMarshaller(); + OptimizedMarshaller marshPreregistered = new OptimizedMarshaller(); File namesFile = File.createTempFile("gg-", null); @@ -291,7 +291,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If marshalling failed. */ public void testProxy() throws IgniteCheckedException { - IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); + OptimizedMarshaller marsh = new OptimizedMarshaller(); marsh.setRequireSerializable(false); @@ -332,8 +332,8 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { ignite.compute().execute(taskClsName, 2); - ConcurrentMap<Class<?>, IgniteOptimizedClassDescriptor> cache = - U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE"); + ConcurrentMap<Class<?>, OptimizedClassDescriptor> cache = + U.staticField(OptimizedMarshallerUtils.class, "CLS_DESC_CACHE"); assertTrue(cache.containsKey(jobCls)); @@ -364,7 +364,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void checkPerformance(int cnt, int tries) throws Exception { - IgniteMarshaller marsh = new IgniteOptimizedMarshaller(); + Marshaller marsh = new OptimizedMarshaller(); for (int j = 0; j < tries; j++) { System.gc(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java index d629c6c..5112ab0 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java @@ -216,7 +216,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest { */ public void testRequireSerializable() throws Exception { try { - new IgniteOptimizedMarshaller(true, null, null, 0).marshal(new Object()); + new OptimizedMarshaller(true, null, null, 0).marshal(new Object()); assert false : "Exception not thrown."; } @@ -242,7 +242,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest { Arrays.fill(obj.longArr, 100L); Arrays.fill(obj.doubleArr, 100.0d); - final IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(false, null, null, 5); + final OptimizedMarshaller marsh = new OptimizedMarshaller(false, null, null, 5); try { multithreaded(new Callable<Object>() { @@ -697,7 +697,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testReadLine() throws Exception { - IgniteOptimizedObjectInputStream in = new IgniteOptimizedObjectInputStream(new GridUnsafeDataInput()); + OptimizedObjectInputStream in = new OptimizedObjectInputStream(new GridUnsafeDataInput()); byte[] bytes = "line1\nline2\r\nli\rne3\nline4".getBytes(); @@ -867,7 +867,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testReadToArray() throws Exception { - IgniteOptimizedObjectInputStream in = IgniteOptimizedObjectStreamRegistry.in(); + OptimizedObjectInputStream in = OptimizedObjectStreamRegistry.in(); try { byte[] arr = new byte[50]; @@ -906,7 +906,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest { assertEquals(i < 10 ? 40 + i : 0, buf[i]); } finally { - IgniteOptimizedObjectStreamRegistry.closeIn(in); + OptimizedObjectStreamRegistry.closeIn(in); } } @@ -948,7 +948,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testExcludedClass() throws Exception { - Class<?>[] exclClasses = U.staticField(IgniteMarshallerExclusions.class, "EXCL_CLASSES"); + Class<?>[] exclClasses = U.staticField(MarshallerExclusions.class, "EXCL_CLASSES"); assertFalse(F.isEmpty(exclClasses)); @@ -986,11 +986,11 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest { * @throws Exception In case of error. */ private <T> T marshalUnmarshal(@Nullable Object obj) throws Exception { - IgniteOptimizedObjectOutputStream out = null; - IgniteOptimizedObjectInputStream in = null; + OptimizedObjectOutputStream out = null; + OptimizedObjectInputStream in = null; try { - out = IgniteOptimizedObjectStreamRegistry.out(); + out = OptimizedObjectStreamRegistry.out(); out.requireSerializable(true); @@ -998,7 +998,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest { byte[] arr = out.out().array(); - in = IgniteOptimizedObjectStreamRegistry.in(); + in = OptimizedObjectStreamRegistry.in(); in.classLoader(getClass().getClassLoader()); @@ -1011,8 +1011,8 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest { return (T)obj0; } finally { - IgniteOptimizedObjectStreamRegistry.closeOut(out); - IgniteOptimizedObjectStreamRegistry.closeIn(in); + OptimizedObjectStreamRegistry.closeOut(out); + OptimizedObjectStreamRegistry.closeIn(in); } } @@ -1023,7 +1023,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest { * @param in Input stream. * @throws Exception If failed. */ - private void checkHandles(IgniteOptimizedObjectOutputStream out, IgniteOptimizedObjectInputStream in) + private void checkHandles(OptimizedObjectOutputStream out, OptimizedObjectInputStream in) throws Exception { Object[] outHandles = out.handledObjects(); Object[] inHandles = in.handledObjects(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java index 0a2cad8..e7d15c6 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java @@ -173,7 +173,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - ((IgniteOptimizedMarshaller)cfg.getMarshaller()).setRequireSerializable(false); + ((OptimizedMarshaller)cfg.getMarshaller()).setRequireSerializable(false); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java index 5728e5f..0d4938a 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java @@ -58,7 +58,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb serState = spi.loadCheckpoint(globalKey); - IgniteMarshaller marshaller = getTestResources().getMarshaller(); + Marshaller marshaller = getTestResources().getMarshaller(); assert marshaller != null; @@ -84,7 +84,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb * @throws Exception If check failed. */ private static void checkRunningState(String sesKey, String sesState, String globalKey, String globalState, - IgniteMarshaller marsh, ClassLoader cl) throws Exception { + Marshaller marsh, ClassLoader cl) throws Exception { assert marsh != null; assert cl != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java index 731ea40..d5355c8 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java @@ -98,7 +98,7 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(spi); cfg.setLocalHost("127.0.0.1"); cfg.setRestEnabled(false); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); TcpCommunicationSpi commSpi = new TcpCommunicationSpi() { @Override protected GridCommunicationClient createTcpClient(ClusterNode node) throws IgniteCheckedException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java index 3c9cdc6..f0ee2fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java @@ -53,7 +53,7 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest { private CommunicationSpi commSpi; /** Marshaller used in test. */ - private IgniteMarshaller marsh = new IgniteJdkMarshaller(); + private Marshaller marsh = new JdkMarshaller(); /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java index b44f38f..d73aaa5 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java @@ -472,7 +472,7 @@ public abstract class GridAbstractDiscoverySelfTest<T extends IgniteSpi> extends */ private void writeObject(ClusterNode node) throws Exception { - IgniteMarshaller marshaller = getTestResources().getMarshaller(); + Marshaller marshaller = getTestResources().getMarshaller(); OutputStream out = new NullOutputStream(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java index a9e6db4..6437548 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java @@ -52,9 +52,9 @@ public class GridTcpDiscoveryMarshallerCheckSelfTest extends GridCommonAbstractT cfg.setLocalHost("127.0.0.1"); if (flag) - cfg.setMarshaller(new IgniteJdkMarshaller()); + cfg.setMarshaller(new JdkMarshaller()); else - cfg.setMarshaller(sameMarsh ? new IgniteJdkMarshaller() : new IgniteOptimizedMarshaller()); + cfg.setMarshaller(sameMarsh ? new JdkMarshaller() : new OptimizedMarshaller()); // Flip flag. flag = !flag; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index d19832c..9b49809 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -1018,8 +1018,8 @@ public abstract class GridAbstractTest extends TestCase { * @return Path for specific marshaller. */ @SuppressWarnings({"IfMayBeConditional", "deprecation"}) - protected String getDefaultCheckpointPath(IgniteMarshaller marshaller) { - if (marshaller instanceof IgniteJdkMarshaller) + protected String getDefaultCheckpointPath(Marshaller marshaller) { + if (marshaller instanceof JdkMarshaller) return SharedFsCheckpointSpi.DFLT_DIR_PATH + "/jdk/"; else return SharedFsCheckpointSpi.DFLT_DIR_PATH + '/' + marshaller.getClass().getSimpleName() + '/'; @@ -1188,8 +1188,8 @@ public abstract class GridAbstractTest extends TestCase { // Remove resources cached in static, if any. GridClassLoaderCache.clear(); - IgniteOptimizedMarshaller.clearCache(); - IgniteMarshallerExclusions.clearCache(); + OptimizedMarshaller.clearCache(); + MarshallerExclusions.clearCache(); GridEnumCache.clear(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java index d1c2c73..13a06ca 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java @@ -14,7 +14,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.marshaller.IgniteMarshaller; +import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.internal.product.*; import org.apache.ignite.plugin.*; import org.apache.ignite.plugin.security.*; @@ -38,7 +38,7 @@ public class IgniteMock implements Ignite { private final UUID nodeId; /** */ - private IgniteMarshaller marshaller; + private Marshaller marshaller; /** */ private final MBeanServer jmx; @@ -57,7 +57,7 @@ public class IgniteMock implements Ignite { * @param home Ignite home. */ public IgniteMock( - String name, String locHost, UUID nodeId, IgniteMarshaller marshaller, MBeanServer jmx, String home) { + String name, String locHost, UUID nodeId, Marshaller marshaller, MBeanServer jmx, String home) { this.locHost = locHost; this.nodeId = nodeId; this.marshaller = marshaller; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java index 3a271b0..bf2a5a3 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java @@ -51,7 +51,7 @@ public class IgniteTestResources { private final UUID nodeId; /** */ - private IgniteMarshaller marshaller; + private Marshaller marshaller; /** */ private final MBeanServer jmx; @@ -232,15 +232,15 @@ public class IgniteTestResources { * @throws IgniteCheckedException If failed. */ @SuppressWarnings("unchecked") - public synchronized IgniteMarshaller getMarshaller() throws IgniteCheckedException { + public synchronized Marshaller getMarshaller() throws IgniteCheckedException { if (marshaller == null) { String marshallerName = GridTestProperties.getProperty("marshaller.class"); if (marshallerName == null) - marshaller = new IgniteOptimizedMarshaller(); + marshaller = new OptimizedMarshaller(); else { try { - Class<? extends IgniteMarshaller> cls = (Class<? extends IgniteMarshaller>)Class.forName(marshallerName); + Class<? extends Marshaller> cls = (Class<? extends Marshaller>)Class.forName(marshallerName); marshaller = cls.newInstance(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/webapp/META-INF/gg-config.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/webapp/META-INF/gg-config.xml b/modules/core/src/test/webapp/META-INF/gg-config.xml index 11a6f40..4b775e2 100644 --- a/modules/core/src/test/webapp/META-INF/gg-config.xml +++ b/modules/core/src/test/webapp/META-INF/gg-config.xml @@ -51,7 +51,7 @@ Configure optimized marshaller. --> <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> + <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"> <!-- For better performance set this property to true in case all marshalled classes implement java.io.Serializable. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java index 21e6599..7e9ef0f 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java @@ -90,7 +90,7 @@ public class GridHadoopExternalProcessStarter { GridHadoopExternalCommunication comm = new GridHadoopExternalCommunication( args.nodeId, args.childProcId, - new IgniteOptimizedMarshaller(), + new OptimizedMarshaller(), log, msgExecSvc, "external" http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java index 574bcb9..100749c 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java @@ -141,7 +141,7 @@ public class GridHadoopExternalCommunication { private GridHadoopProcessDescriptor locProcDesc; /** Marshaller. */ - private IgniteMarshaller marsh; + private Marshaller marsh; /** Message notification executor service. */ private ExecutorService execSvc; @@ -230,7 +230,7 @@ public class GridHadoopExternalCommunication { public GridHadoopExternalCommunication( UUID parentNodeId, UUID procId, - IgniteMarshaller marsh, + Marshaller marsh, IgniteLogger log, ExecutorService execSvc, String gridName http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java index 8445405..2a25357 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java @@ -27,12 +27,12 @@ import org.apache.ignite.marshaller.*; */ public class GridHadoopMarshallerFilter extends GridNioFilterAdapter { /** Marshaller. */ - private IgniteMarshaller marshaller; + private Marshaller marshaller; /** * @param marshaller Marshaller to use. */ - public GridHadoopMarshallerFilter(IgniteMarshaller marshaller) { + public GridHadoopMarshallerFilter(Marshaller marshaller) { super("GridHadoopMarshallerFilter"); this.marshaller = marshaller; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java index c951123..a725ddc 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java @@ -53,7 +53,7 @@ public class GridHadoopExternalCommunicationSelfTest extends GridCommonAbstractT private void checkSimpleMessageSending(boolean useShmem) throws Exception { UUID parentNodeId = UUID.randomUUID(); - IgniteMarshaller marsh = new IgniteOptimizedMarshaller(); + Marshaller marsh = new OptimizedMarshaller(); IgniteLogger log = log(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 07aa0d5..a8dcb62 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -137,7 +137,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { private UUID nodeId; /** */ - private IgniteMarshaller marshaller; + private Marshaller marshaller; /** */ private GridUnsafeMemory offheap; @@ -1111,7 +1111,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { log.debug("Starting cache query index..."); if (ctx == null) // This is allowed in some tests. - marshaller = new IgniteOptimizedMarshaller(); + marshaller = new OptimizedMarshaller(); else { this.ctx = ctx; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java index 45d336e..740061c 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java @@ -55,7 +55,7 @@ public class GridLuceneIndex implements Closeable { public static final String EXPIRATION_TIME_FIELD_NAME = "_gg_expires__"; /** */ - private final IgniteMarshaller marshaller; + private final Marshaller marshaller; /** */ private final String spaceName; @@ -91,7 +91,7 @@ public class GridLuceneIndex implements Closeable { * @param storeVal Store value in index. * @throws IgniteCheckedException If failed. */ - public GridLuceneIndex(IgniteMarshaller marshaller, @Nullable GridUnsafeMemory mem, + public GridLuceneIndex(Marshaller marshaller, @Nullable GridUnsafeMemory mem, @Nullable String spaceName, GridQueryTypeDescriptor type, boolean storeVal) throws IgniteCheckedException { this.marshaller = marshaller; this.spaceName = spaceName; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java index 56e5bfe..5a973bb 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java @@ -68,7 +68,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); if (hasCache) cfg.setCacheConfiguration(cache(null, null), cache(CACHE, null), cache(EMPTY_CACHE, null)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java index d0764a5..0fe2fe8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java @@ -115,7 +115,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT // Otherwise noop swap space will be chosen on Windows. c.setSwapSpaceSpi(new FileSwapSpaceSpi()); - c.setMarshaller(new IgniteOptimizedMarshaller(false)); + c.setMarshaller(new OptimizedMarshaller(false)); CacheConfiguration[] ccs = new CacheConfiguration[2]; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index 42d1bf7..6dacdc0 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -56,7 +56,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { c.setDiscoverySpi(disco); - c.setMarshaller(new IgniteOptimizedMarshaller(false)); + c.setMarshaller(new OptimizedMarshaller(false)); c.setCacheConfiguration(createCache("replicated", CacheMode.REPLICATED), createCache("partitioned", CacheMode.PARTITIONED)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java index 9bd96be..aefb354 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java @@ -82,7 +82,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest cfg.setDiscoverySpi(disco); cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java index 06b92b9..f062f52 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java @@ -55,7 +55,7 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.setMarshaller(new IgniteOptimizedMarshaller(false)); + c.setMarshaller(new OptimizedMarshaller(false)); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java index b766322..9f58faa 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java @@ -89,7 +89,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { cfg.setPeerClassLoadingLocalClassPathExclude(GridCacheSwapSelfTest.class.getName(), CacheValue.class.getName()); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index d53526b..8899bd5 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -52,7 +52,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); // DiscoverySpi TcpDiscoverySpi disco = new TcpDiscoverySpi();
