http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java index 8213d7e..5fedbd9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java @@ -175,7 +175,7 @@ public enum GridTopic { /** * */ - private static class T1 implements Externalizable, GridOptimizedMarshallable { + private static class T1 implements Externalizable, IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; @@ -247,7 +247,7 @@ public enum GridTopic { /** * */ - private static class T2 implements Externalizable, GridOptimizedMarshallable { + private static class T2 implements Externalizable, IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; @@ -326,7 +326,7 @@ public enum GridTopic { /** * */ - private static class T3 implements Externalizable, GridOptimizedMarshallable { + private static class T3 implements Externalizable, IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; @@ -398,7 +398,7 @@ public enum GridTopic { /** * */ - private static class T4 implements Externalizable, GridOptimizedMarshallable { + private static class T4 implements Externalizable, IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; @@ -484,7 +484,7 @@ public enum GridTopic { /** * */ - private static class T5 implements Externalizable, GridOptimizedMarshallable { + private static class T5 implements Externalizable, IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; @@ -570,7 +570,7 @@ public enum GridTopic { /** * */ - private static class T6 implements Externalizable, GridOptimizedMarshallable { + private static class T6 implements Externalizable, IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; @@ -649,7 +649,7 @@ public enum GridTopic { /** * */ - private static class T7 implements Externalizable, GridOptimizedMarshallable { + private static class T7 implements Externalizable, IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; @@ -743,7 +743,7 @@ public enum GridTopic { /** * */ - private static class T8 implements Externalizable, GridOptimizedMarshallable { + private static class T8 implements Externalizable, IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java index e176e45..4286058 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java @@ -515,7 +515,7 @@ class GridDeploymentLocalStore extends GridDeploymentStoreAdapter { ctx.resource().onUndeployed(dep); // Clear optimized marshaller's cache. If another marshaller is used, this is no-op. - GridOptimizedMarshaller.onUndeploy(ldr); + IgniteOptimizedMarshaller.onUndeploy(ldr); clearSerializationCaches(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java index 86ec14e..2d7cc8a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java @@ -494,7 +494,7 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter { ctx.stream().onUndeployed(leftNodeId, ldr); // Clear optimized marshaller's cache. If another marshaller is used, this is no-op. - GridOptimizedMarshaller.onUndeploy(ldr); + IgniteOptimizedMarshaller.onUndeploy(ldr); clearSerializationCaches(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java index 7aa7096..25eb4ab 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java @@ -1254,7 +1254,7 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter { ctx.stream().onUndeployed(leftNodeId, ldr); // Clear optimized marshaller's cache. If another marshaller is used, this is no-op. - GridOptimizedMarshaller.onUndeploy(ldr); + IgniteOptimizedMarshaller.onUndeploy(ldr); clearSerializationCaches(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java index 4b7df4f..778a780 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java @@ -21,7 +21,7 @@ import java.util.*; /** * Object wrapper containing serialized byte array of original object and deployment information. */ -class GridAffinityMessage implements Externalizable, GridOptimizedMarshallable { +class GridAffinityMessage implements Externalizable, IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java index b2fa13a..e9c476a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java @@ -19,7 +19,7 @@ import java.io.*; /** * Return value for cases where both, value and success flag need to be returned. */ -public class GridCacheReturn<V> implements Externalizable, GridOptimizedMarshallable { +public class GridCacheReturn<V> implements Externalizable, IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java index 45941d4..6aa3003 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java @@ -30,7 +30,7 @@ import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*; * {@link #equals(Object)} method, as transaction entries should use referential * equality. */ -public class GridCacheTxEntry<K, V> implements GridPeerDeployAware, Externalizable, GridOptimizedMarshallable { +public class GridCacheTxEntry<K, V> implements GridPeerDeployAware, Externalizable, IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java index 1ed7f93..7f04ace 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java @@ -20,7 +20,7 @@ import java.util.*; /** * Grid unique version. */ -public class GridCacheVersion implements Comparable<GridCacheVersion>, Externalizable, GridOptimizedMarshallable { +public class GridCacheVersion implements Comparable<GridCacheVersion>, Externalizable, IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java index 8682c55..e8c0013 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java @@ -60,7 +60,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b /** * Job for JDBC adapter. */ - private static class JdbcDriverMetadataJob extends ComputeJobAdapter implements GridOptimizedMarshallable { + private static class JdbcDriverMetadataJob extends ComputeJobAdapter implements IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java index c8e59f4..5f65f1d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java @@ -121,7 +121,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { /** * Job for JDBC adapter. */ - private static class JdbcDriverJob extends ComputeJobAdapter implements GridOptimizedMarshallable { + private static class JdbcDriverJob extends ComputeJobAdapter implements IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java index 3004e85..fb626ec 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java @@ -22,7 +22,7 @@ import java.util.*; /** * Streamer execution batch which should be processed on one node. */ -public class GridStreamerExecutionBatch implements Externalizable, GridOptimizedMarshallable { +public class GridStreamerExecutionBatch implements Externalizable, IgniteOptimizedMarshallable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/example-cache.xml b/modules/core/src/test/config/example-cache.xml index 0ae4a11..43d1ce3 100644 --- a/modules/core/src/test/config/example-cache.xml +++ b/modules/core/src/test/config/example-cache.xml @@ -38,7 +38,7 @@ <property name="peerClassLoadingEnabled" value="true"/> <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller"> + <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> <!-- 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/f586cfc2/modules/core/src/test/config/ggfs-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-loopback.xml b/modules/core/src/test/config/ggfs-loopback.xml index d7f2480..88e8843 100644 --- a/modules/core/src/test/config/ggfs-loopback.xml +++ b/modules/core/src/test/config/ggfs-loopback.xml @@ -58,7 +58,7 @@ Configure optimized marshaller. --> <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller"> + <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> <!-- 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/f586cfc2/modules/core/src/test/config/ggfs-no-endpoint.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-no-endpoint.xml b/modules/core/src/test/config/ggfs-no-endpoint.xml index 5b4b861..25c4381 100644 --- a/modules/core/src/test/config/ggfs-no-endpoint.xml +++ b/modules/core/src/test/config/ggfs-no-endpoint.xml @@ -59,7 +59,7 @@ Configure optimized marshaller. --> <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller"> + <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> <!-- 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/f586cfc2/modules/core/src/test/config/ggfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml index 3602b4f..698759f 100644 --- a/modules/core/src/test/config/ggfs-shmem.xml +++ b/modules/core/src/test/config/ggfs-shmem.xml @@ -58,7 +58,7 @@ Configure optimized marshaller. --> <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller"> + <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> <!-- 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/f586cfc2/modules/core/src/test/config/io-manager-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/io-manager-benchmark.xml b/modules/core/src/test/config/io-manager-benchmark.xml index 87223bf..ec7b019 100644 --- a/modules/core/src/test/config/io-manager-benchmark.xml +++ b/modules/core/src/test/config/io-manager-benchmark.xml @@ -28,7 +28,7 @@ </property> <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller"> + <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> <property name="requireSerializable" value="true"/> <property name="classNames"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/jobs-load-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/jobs-load-base.xml b/modules/core/src/test/config/jobs-load-base.xml index 870b0e6..a5b83c7 100644 --- a/modules/core/src/test/config/jobs-load-base.xml +++ b/modules/core/src/test/config/jobs-load-base.xml @@ -13,7 +13,7 @@ <property name="localHost" value="127.0.0.1"/> <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller"> + <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> <property name="classNames"> <list> <value>org.gridgain.loadtests.job.GridJobExecutionLoadTestJob</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/load/dsi-load-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/dsi-load-base.xml b/modules/core/src/test/config/load/dsi-load-base.xml index 5cf4c20..4ac4001 100644 --- a/modules/core/src/test/config/load/dsi-load-base.xml +++ b/modules/core/src/test/config/load/dsi-load-base.xml @@ -27,7 +27,7 @@ <property name="localHost" value="127.0.0.1"/> <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller"> + <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> <property name="classNames"> <list> <value>org.gridgain.loadtests.dsi.GridDsiSession</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/spring-start-nodes-attr.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-start-nodes-attr.xml b/modules/core/src/test/config/spring-start-nodes-attr.xml index d02d6f8..02170c9 100644 --- a/modules/core/src/test/config/spring-start-nodes-attr.xml +++ b/modules/core/src/test/config/spring-start-nodes-attr.xml @@ -31,7 +31,7 @@ <property name="restEnabled" value="false"/> <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller"> + <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> <property name="requireSerializable" value="false"/> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/spring-start-nodes.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-start-nodes.xml b/modules/core/src/test/config/spring-start-nodes.xml index ed9377c..34d1b92 100644 --- a/modules/core/src/test/config/spring-start-nodes.xml +++ b/modules/core/src/test/config/spring-start-nodes.xml @@ -25,7 +25,7 @@ <property name="restEnabled" value="false"/> <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller"> + <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> <property name="requireSerializable" value="false"/> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/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 4bf911e..46813d4 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 @@ -10,7 +10,6 @@ package org.apache.ignite.marshaller.optimized; import junit.framework.*; -import org.apache.ignite.marshaller.optimized.*; /** * @@ -20,7 +19,7 @@ public class GridOptimizedMarshallerEnumSelfTest extends TestCase { * @throws Exception If failed. */ public void testEnumSerialisation() throws Exception { - GridOptimizedMarshaller marsh = new GridOptimizedMarshaller(); + IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); byte[] bytes = marsh.marshal(TestEnum.Bond); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/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 aa018b4..2733c45 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 @@ -2,7 +2,6 @@ package org.apache.ignite.marshaller.optimized; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; -import org.apache.ignite.marshaller.optimized.*; import org.gridgain.grid.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.*; @@ -19,7 +18,7 @@ import java.util.concurrent.*; public class GridOptimizedMarshallerSelfTest extends GridMarshallerAbstractTest { /** {@inheritDoc} */ @Override protected GridMarshaller createMarshaller() { - GridOptimizedMarshaller m = new GridOptimizedMarshaller(); + IgniteOptimizedMarshaller m = new IgniteOptimizedMarshaller(); m.setRequireSerializable(false); m.setClassNames(F.asList(GoodMarshallable.class.getName(), NoMarshallable.class.getName())); @@ -339,8 +338,8 @@ public class GridOptimizedMarshallerSelfTest extends GridMarshallerAbstractTest /** * */ - public static class GoodMarshallable implements GridOptimizedMarshallable, Serializable { - /** Class ID required by {@link GridOptimizedMarshallable}. */ + public static class GoodMarshallable implements IgniteOptimizedMarshallable, Serializable { + /** Class ID required by {@link IgniteOptimizedMarshallable}. */ @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"}) private static Object GG_CLASS_ID; @@ -416,8 +415,8 @@ public class GridOptimizedMarshallerSelfTest extends GridMarshallerAbstractTest /** * */ - private static class BadMarshallable extends TestObject implements GridOptimizedMarshallable { - /** Class ID required by {@link GridOptimizedMarshallable}. */ + private static class BadMarshallable extends TestObject implements IgniteOptimizedMarshallable { + /** Class ID required by {@link IgniteOptimizedMarshallable}. */ @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"}) private static Object GG_CLASS_ID; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/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 d394039..e907146 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 @@ -28,7 +28,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws GridException If marshalling failed. */ public void testNonSerializable() throws GridException { - GridOptimizedMarshaller marsh = new GridOptimizedMarshaller(); + IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); marsh.setRequireSerializable(false); @@ -43,7 +43,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws GridException If marshalling failed. */ public void testNonSerializable1() throws GridException { - GridOptimizedMarshaller marsh = new GridOptimizedMarshaller(); + IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); marsh.setRequireSerializable(false); @@ -64,7 +64,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws GridException If marshalling failed. */ public void testNonSerializable2() throws GridException { - GridOptimizedMarshaller marsh = new GridOptimizedMarshaller(); + IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); marsh.setRequireSerializable(false); @@ -97,7 +97,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws GridException If marshalling failed. */ public void testNonSerializable3() throws GridException { - GridOptimizedMarshaller marsh = new GridOptimizedMarshaller(); + IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); marsh.setRequireSerializable(false); @@ -114,7 +114,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws GridException If marshalling failed. */ public void testNonSerializable4() throws GridException { - GridOptimizedMarshaller marsh = new GridOptimizedMarshaller(); + IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); marsh.setRequireSerializable(false); @@ -133,7 +133,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws GridException If marshalling failed. */ public void testNonSerializable5() throws GridException { - GridMarshaller marsh = new GridOptimizedMarshaller(); + GridMarshaller marsh = new IgniteOptimizedMarshaller(); byte[] bytes = marsh.marshal(true); @@ -148,7 +148,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws GridException If marshalling failed. */ public void testSerializable() throws GridException { - GridMarshaller marsh = new GridOptimizedMarshaller(); + GridMarshaller marsh = new IgniteOptimizedMarshaller(); SomeSerializable outObj = marsh.unmarshal(marsh.marshal(new SomeSerializable(null)), null); @@ -159,7 +159,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws GridException If failed. */ public void testSerializableAfterChangingValue() throws GridException { - GridMarshaller marsh = new GridOptimizedMarshaller(); + GridMarshaller marsh = new IgniteOptimizedMarshaller(); SomeSimpleSerializable newObj = new SomeSimpleSerializable(); @@ -180,7 +180,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws GridException If marshalling failed. */ public void testExternalizable() throws GridException { - GridMarshaller marsh = new GridOptimizedMarshaller(); + GridMarshaller marsh = new IgniteOptimizedMarshaller(); ExternalizableA outObj = marsh.unmarshal(marsh.marshal(new ExternalizableA(null, true)), null); ExternalizableA outObj1 = marsh.unmarshal(marsh.marshal(new ExternalizableA(null, false)), null); @@ -190,10 +190,10 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { } /** - * Tests {@link GridOptimizedMarshaller#setRequireSerializable(boolean)}. + * Tests {@link IgniteOptimizedMarshaller#setRequireSerializable(boolean)}. */ public void testRequireSerializable() { - GridOptimizedMarshaller marsh = new GridOptimizedMarshaller(); + IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); marsh.setRequireSerializable(true); @@ -208,7 +208,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { } /** - * Tests {@link GridOptimizedMarshaller#setClassNames(List)}. + * Tests {@link IgniteOptimizedMarshaller#setClassNames(List)}. * * @throws GridException If marshalling failed. */ @@ -217,17 +217,17 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { // Clear caches. ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear(); - GridOptimizedClassResolver.userClasses(null, null); + IgniteOptimizedClassResolver.userClasses(null, null); - GridMarshaller marsh = new GridOptimizedMarshaller(); + GridMarshaller marsh = new IgniteOptimizedMarshaller(); int size1 = marsh.marshal(obj).length; // Clear caches. ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear(); - GridOptimizedClassResolver.userClasses(null, null); + IgniteOptimizedClassResolver.userClasses(null, null); - GridOptimizedMarshaller marshPreregistered = new GridOptimizedMarshaller(); + IgniteOptimizedMarshaller marshPreregistered = new IgniteOptimizedMarshaller(); marshPreregistered.setClassNames(Arrays.asList(SomeSerializable.class.getName())); @@ -237,7 +237,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { } /** - * Tests {@link GridOptimizedMarshaller#setClassNames(List)}. + * Tests {@link IgniteOptimizedMarshaller#setClassNames(List)}. * * @throws GridException If marshalling failed. * @throws IOException If an I/O error occurs. @@ -247,17 +247,17 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { // Clear caches. ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear(); - GridOptimizedClassResolver.userClasses(null, null); + IgniteOptimizedClassResolver.userClasses(null, null); - GridMarshaller marsh = new GridOptimizedMarshaller(); + GridMarshaller marsh = new IgniteOptimizedMarshaller(); int size1 = marsh.marshal(obj).length; // Clear caches. ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear(); - GridOptimizedClassResolver.userClasses(null, null); + IgniteOptimizedClassResolver.userClasses(null, null); - GridOptimizedMarshaller marshPreregistered = new GridOptimizedMarshaller(); + IgniteOptimizedMarshaller marshPreregistered = new IgniteOptimizedMarshaller(); File namesFile = File.createTempFile("gg-", null); @@ -276,7 +276,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws GridException If marshalling failed. */ public void testProxy() throws GridException { - GridOptimizedMarshaller marsh = new GridOptimizedMarshaller(); + IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); marsh.setRequireSerializable(false); @@ -317,7 +317,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { ignite.compute().execute(taskClsName, 2); - ConcurrentMap<Class<?>, GridOptimizedClassDescriptor> cache = + ConcurrentMap<Class<?>, IgniteOptimizedClassDescriptor> cache = U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE"); assertTrue(cache.containsKey(jobCls)); @@ -349,7 +349,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void checkPerformance(int cnt, int tries) throws Exception { - GridMarshaller marsh = new GridOptimizedMarshaller(); + GridMarshaller marsh = new IgniteOptimizedMarshaller(); for (int j = 0; j < tries; j++) { System.gc(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/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 63253fe..3aae159 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 @@ -10,7 +10,6 @@ package org.apache.ignite.marshaller.optimized; import org.apache.ignite.marshaller.*; -import org.apache.ignite.marshaller.optimized.*; import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -209,7 +208,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest { */ public void testRequireSerializable() throws Exception { try { - new GridOptimizedMarshaller(true, null, null, 0).marshal(new Object()); + new IgniteOptimizedMarshaller(true, null, null, 0).marshal(new Object()); assert false : "Exception not thrown."; } @@ -235,7 +234,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest { Arrays.fill(obj.longArr, 100L); Arrays.fill(obj.doubleArr, 100.0d); - final GridOptimizedMarshaller marsh = new GridOptimizedMarshaller(false, null, null, 5); + final IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(false, null, null, 5); try { multithreaded(new Callable<Object>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java index b68ed28..0673e5d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java @@ -26,7 +26,7 @@ public class GridExternalizableAbstractTest extends GridCommonAbstractTest { List<GridMarshaller> marshallers = new ArrayList<>(); marshallers.add(new IgniteJdkMarshaller()); - marshallers.add(new GridOptimizedMarshaller()); + marshallers.add(new IgniteOptimizedMarshaller()); return marshallers; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java index 3c3ac4e..2e8f2a6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.*; */ public class GridGgfsPathSelfTest extends GridCommonAbstractTest { /** Marshaller to test {@link Externalizable} interface. */ - private final GridMarshaller marshaller = new GridOptimizedMarshaller(); + private final GridMarshaller marshaller = new IgniteOptimizedMarshaller(); /** * Test public methods of ggfs path. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java index b45bb03..8d79468 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java @@ -62,7 +62,7 @@ public class GridFailoverTaskWithPredicateSelfTest extends GridCommonAbstractTes } }); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java index 412dc6e..1deefea 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java @@ -85,7 +85,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); cfg.setCommunicationSpi(new CommunicationSpi()); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); GridCacheConfiguration ccfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java index 46b8f5f..9def3f6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java @@ -283,7 +283,7 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest { cfg.setCollisionSpi(colSpi); cfg.setFailoverSpi(failSpi); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java index 8e0c7e4..dacdecc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java @@ -93,7 +93,7 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe /** */ - private static class TestMarshaller extends GridOptimizedMarshaller implements LifecycleAware { + private static class TestMarshaller extends IgniteOptimizedMarshaller implements LifecycleAware { /** */ private final TestLifecycleAware lifecycleAware = new TestLifecycleAware(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java index 0018cfc..572d50f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java @@ -49,7 +49,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); GridCacheConfiguration cache = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java index 9912065..ee2fafa 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java @@ -36,7 +36,7 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java index 96ced99..6919647 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java @@ -116,7 +116,7 @@ public class GridManagerStopSelfTest extends GridCommonAbstractTest { injectLogger(spi); ctx.config().setCommunicationSpi(spi); - ctx.config().setMarshaller(new GridOptimizedMarshaller()); + ctx.config().setMarshaller(new IgniteOptimizedMarshaller()); GridIoManager mgr = new GridIoManager(ctx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java index bb835c9..3d42c55 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java @@ -206,7 +206,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(gridName)); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java index bcd5f55..6f3a35e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java @@ -88,7 +88,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(); } - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java index ac236d9..b2368b9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java @@ -85,7 +85,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { cfg.setRestEnabled(false); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java index 6b52ee4..fe05d81 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java @@ -74,7 +74,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { NEAR_ENTRY_OVERHEAD = U.<Integer>staticField(GridNearCacheEntry.class, "NEAR_SIZE_OVERHEAD"); REPLICATED_ENTRY_OVERHEAD = DHT_ENTRY_OVERHEAD; - GridMarshaller marsh = new GridOptimizedMarshaller(); + GridMarshaller marsh = new IgniteOptimizedMarshaller(); 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/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java index c812c64..e61b594 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java @@ -83,7 +83,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { cacheCfg.setPortableEnabled(portableEnabled()); cfg.setCacheConfiguration(cacheCfg); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java index 7ec0aed..97e4981 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java @@ -77,7 +77,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheCfg); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); cfg.setDeploymentMode(SHARED); cfg.setPeerClassLoadingLocalClassPathExclude(GridCacheOffHeapSelfTest.class.getName(), CacheValue.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java index 50bb236..f71dc41 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java @@ -62,7 +62,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheCfg); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java index 2b3b073..b97a534 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java @@ -52,7 +52,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra cfg.setDiscoverySpi(disco); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java index 57567c3..d417e13 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java @@ -75,7 +75,7 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb c.setDeploymentMode(GridDeploymentMode.SHARED); c.setNetworkTimeout(10000); c.setRestEnabled(false); - c.setMarshaller(new GridOptimizedMarshaller(false)); + c.setMarshaller(new IgniteOptimizedMarshaller(false)); // c.setPeerClassLoadingLocalClassPathExclude(GridCachePreloadLifecycleAbstractTest.class.getName(), // MyValue.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java index 6201ca8..8a7fde2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java @@ -63,7 +63,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest { c.setDiscoverySpi(disco); - c.setMarshaller(new GridOptimizedMarshaller(false)); + c.setMarshaller(new IgniteOptimizedMarshaller(false)); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java index b83d848..0bf7d44 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java @@ -48,7 +48,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index c8675e0..8814648 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -80,7 +80,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo cfg.setDiscoverySpi(disco); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java index de1d1a2..633afc0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java @@ -52,7 +52,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom cfg.setCacheConfiguration(); cfg.setDiscoverySpi(discovery()); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java index 46ba6da..334900c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java @@ -51,7 +51,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); GridTcpDiscoverySpi discoSpi = new GridTcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java index c1b4449..b533e0d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java @@ -66,7 +66,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { if (include) cfg.setUserAttributes(F.asMap("include", true)); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java index db44d7c..0f79da7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java @@ -136,8 +136,8 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest { GridMarshaller marsh = g0.configuration().getMarshaller(); - if (marsh instanceof GridOptimizedMarshaller) - assertTrue(((GridOptimizedMarshaller)marsh).isRequireSerializable()); + if (marsh instanceof IgniteOptimizedMarshaller) + assertTrue(((IgniteOptimizedMarshaller)marsh).isRequireSerializable()); else fail("Expected GridOptimizedMarshaller, but found: " + marsh.getClass().getName()); @@ -186,8 +186,8 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest { GridMarshaller marsh = g0.configuration().getMarshaller(); - if (marsh instanceof GridOptimizedMarshaller) - assertTrue(((GridOptimizedMarshaller)marsh).isRequireSerializable()); + if (marsh instanceof IgniteOptimizedMarshaller) + assertTrue(((IgniteOptimizedMarshaller)marsh).isRequireSerializable()); else fail("Expected GridOptimizedMarshaller, but found: " + marsh.getClass().getName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java index ec55cca..a807f4f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java @@ -74,7 +74,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { cfg.setIncludeProperties(); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); if (useCache) { GridCacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java index 619082a..da1519c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.*; */ public class GridGgfsFileInfoSelfTest extends GridGgfsCommonAbstractTest { /** Marshaller to test {@link Externalizable} interface. */ - private final GridMarshaller marshaller = new GridOptimizedMarshaller(); + private final GridMarshaller marshaller = new IgniteOptimizedMarshaller(); /** * Test node info serialization. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java index 6397cde..9a3c859 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java @@ -54,7 +54,7 @@ public class GridStreamerEvictionSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java index 3da4159..51986a9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java @@ -73,7 +73,7 @@ public class GridStreamerSelfTest extends GridCommonAbstractTest { if (p2pEnabled) cfg.setDeploymentMode(SHARED); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java index 5d3ea8f..147935f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java @@ -102,7 +102,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest namedCache.setAtomicityMode(TRANSACTIONAL); namedCache.setQueryIndexEnabled(true); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); cfg.setStreamerConfiguration(streamerConfiguration()); cfg.setCacheConfiguration(new GridCacheConfiguration(), namedCache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java index f458745..3c8ffaa 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java @@ -92,7 +92,7 @@ public class GridMarshallerPerformanceTest extends GridCommonAbstractTest { public void testGridMarshaller() throws Exception { final GridTuple<byte[]> tuple = new GridTuple<>(); - final GridOptimizedMarshaller marsh = new GridOptimizedMarshaller(); + final IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(); marsh.setClassNames(Arrays.asList(TestObject.class.getName())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java index 2a63c73..dfab0af 100644 --- a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java @@ -156,7 +156,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - ((GridOptimizedMarshaller)cfg.getMarshaller()).setRequireSerializable(false); + ((IgniteOptimizedMarshaller)cfg.getMarshaller()).setRequireSerializable(false); GridTcpDiscoverySpi discoSpi = new GridTcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java index d7aa2b9..4375eea 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java @@ -91,7 +91,7 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(spi); cfg.setLocalHost("127.0.0.1"); cfg.setRestEnabled(false); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); GridTcpCommunicationSpi commSpi = new GridTcpCommunicationSpi() { @Override protected GridCommunicationClient createTcpClient(ClusterNode node) throws GridException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java index 9fafe0d..15c41c0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java @@ -46,7 +46,7 @@ public class GridTcpDiscoveryMarshallerCheckSelfTest extends GridCommonAbstractT if (flag) cfg.setMarshaller(new IgniteJdkMarshaller()); else - cfg.setMarshaller(sameMarsh ? new IgniteJdkMarshaller() : new GridOptimizedMarshaller()); + cfg.setMarshaller(sameMarsh ? new IgniteJdkMarshaller() : new IgniteOptimizedMarshaller()); // Flip flag. flag = !flag; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java index d9b7de8..42f9dda 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java @@ -58,7 +58,7 @@ public class GridFinishedFutureSelfTest extends GridCommonAbstractTest { private void testExternalizable(@Nullable Object t, @Nullable Throwable ex, boolean syncNotify) throws Exception { GridKernalContext ctx = ((GridKernal)grid()).context(); - GridMarshaller m = new GridOptimizedMarshaller(); + GridMarshaller m = new IgniteOptimizedMarshaller(); ClassLoader clsLdr = getClass().getClassLoader(); IgniteFuture<Object> orig = t == null ? new GridFinishedFuture<>(ctx, ex) : http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java index 95c9883..d9d1513 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java @@ -1166,7 +1166,7 @@ public abstract class GridAbstractTest extends TestCase { // Remove resources cached in static, if any. GridClassLoaderCache.clear(); - GridOptimizedMarshaller.clearCache(); + IgniteOptimizedMarshaller.clearCache(); GridMarshallerExclusions.clearCache(); GridEnumCache.clear(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java index c0755a5..e997486 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java @@ -234,7 +234,7 @@ public class GridTestResources { String marshallerName = GridTestProperties.getProperty("marshaller.class"); if (marshallerName == null) - marshaller = new GridOptimizedMarshaller(); + marshaller = new IgniteOptimizedMarshaller(); else { try { Class<? extends GridMarshaller> cls = (Class<? extends GridMarshaller>)Class.forName(marshallerName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/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 918df61..1a9923c 100644 --- a/modules/core/src/test/webapp/META-INF/gg-config.xml +++ b/modules/core/src/test/webapp/META-INF/gg-config.xml @@ -45,7 +45,7 @@ Configure optimized marshaller. --> <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller"> + <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> <!-- 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/f586cfc2/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java index f7b0a86..df267a2 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java @@ -83,7 +83,7 @@ public class GridHadoopExternalProcessStarter { GridHadoopExternalCommunication comm = new GridHadoopExternalCommunication( args.nodeId, args.childProcId, - new GridOptimizedMarshaller(), + new IgniteOptimizedMarshaller(), log, msgExecSvc, "external" http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java index 79d40ca..1b18ae7 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java @@ -45,7 +45,7 @@ public class GridHadoopExternalCommunicationSelfTest extends GridCommonAbstractT private void checkSimpleMessageSending(boolean useShmem) throws Exception { UUID parentNodeId = UUID.randomUUID(); - GridMarshaller marsh = new GridOptimizedMarshaller(); + GridMarshaller marsh = new IgniteOptimizedMarshaller(); IgniteLogger log = log(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java index f1e33c0..2530ca4 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java @@ -68,7 +68,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs cfg.setIndexingSpi(indexing(null, true), indexing(SPI_NO_PRIMITIVES, false), indexing(SPI_COMPLEX_KEYS, false)); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(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/f586cfc2/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java index ddc2a35..94639bf 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java @@ -107,7 +107,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT // Otherwise noop swap space will be chosen on Windows. c.setSwapSpaceSpi(new GridFileSwapSpaceSpi()); - c.setMarshaller(new GridOptimizedMarshaller(false)); + c.setMarshaller(new IgniteOptimizedMarshaller(false)); GridCacheConfiguration[] ccs = new GridCacheConfiguration[2]; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index 11df811..1f87b7f 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -47,7 +47,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { c.setDiscoverySpi(disco); - c.setMarshaller(new GridOptimizedMarshaller(false)); + c.setMarshaller(new IgniteOptimizedMarshaller(false)); GridH2IndexingSpi indexing = new GridH2IndexingSpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java index 317f259..451dec2 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java @@ -75,7 +75,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest cfg.setDiscoverySpi(disco); cfg.setSwapSpaceSpi(new GridFileSwapSpaceSpi()); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java index 58f91df..b2355ee 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java @@ -54,7 +54,7 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract c.setIndexingSpi(indexing); - c.setMarshaller(new GridOptimizedMarshaller(false)); + c.setMarshaller(new IgniteOptimizedMarshaller(false)); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java index b7d6d83..25022bb 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java @@ -81,7 +81,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { cfg.setPeerClassLoadingLocalClassPathExclude(GridCacheSwapSelfTest.class.getName(), CacheValue.class.getName()); - cfg.setMarshaller(new GridOptimizedMarshaller(false)); + cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; }
