You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/05 00:24:30 UTC
[38/53] [abbrv] incubator-ignite git commit: # gg-9470-rename
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
index c2a580f..db1ae2f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
@@ -850,7 +850,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
* @return Copy of service.
*/
private GridService copyAndInject(GridService svc) {
- GridMarshaller m = ctx.config().getMarshaller();
+ IgniteMarshaller m = ctx.config().getMarshaller();
try {
byte[] bytes = m.marshal(svc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java
index f6c1e0f..d58717e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java
@@ -49,7 +49,7 @@ public class GridTaskProcessor extends GridProcessorAdapter {
new EnumMap<>(GridTaskThreadContextKey.class);
/** */
- private final GridMarshaller marsh;
+ private final IgniteMarshaller marsh;
/** */
private final ConcurrentMap<IgniteUuid, GridTaskWorker<?, ?>> tasks = GridConcurrentFactory.newMap();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
index b76f6c1..4d18c4b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
@@ -76,7 +76,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
private final IgniteLogger log;
/** */
- private final GridMarshaller marsh;
+ private final IgniteMarshaller marsh;
/** */
private final GridTaskSessionImpl ses;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
index aa0359d..3db8f2c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
@@ -116,7 +116,7 @@ public class GridSharedFsCheckpointSpi extends GridSpiAdapter implements GridChe
/** Grid marshaller. */
@IgniteMarshallerResource
- private GridMarshaller marsh;
+ private IgniteMarshaller marsh;
/** List of checkpoint directories where all files are stored. */
private Queue<String> dirPaths = new LinkedList<>();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
index 79f05a2..5d563ec 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
@@ -35,7 +35,7 @@ class GridSharedFsTimeoutTask extends GridSpiThread {
private IgniteLogger log;
/** Messages marshaller. */
- private GridMarshaller marshaller;
+ private IgniteMarshaller marshaller;
/** */
private final Object mux = new Object();
@@ -50,7 +50,7 @@ class GridSharedFsTimeoutTask extends GridSpiThread {
* @param marshaller Messages marshaller.
* @param log Messages logger.
*/
- GridSharedFsTimeoutTask(String gridName, GridMarshaller marshaller, IgniteLogger log) {
+ GridSharedFsTimeoutTask(String gridName, IgniteMarshaller marshaller, IgniteLogger log) {
super(gridName, "grid-sharedfs-timeout-worker", log);
assert marshaller != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
index 13689f3..c177b77 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
@@ -39,7 +39,7 @@ final class GridSharedFsUtils {
* to {@link GridSharedFsCheckpointData} object.
* @throws IOException Thrown if file read error occurred.
*/
- static GridSharedFsCheckpointData read(File file, GridMarshaller m, IgniteLogger log)
+ static GridSharedFsCheckpointData read(File file, IgniteMarshaller m, IgniteLogger log)
throws IOException, GridException {
assert file != null;
assert m != null;
@@ -66,7 +66,7 @@ final class GridSharedFsUtils {
* @throws GridException Thrown if data could not be marshalled.
* @throws IOException Thrown if file write operation failed.
*/
- static void write(File file, GridSharedFsCheckpointData data, GridMarshaller m, IgniteLogger log)
+ static void write(File file, GridSharedFsCheckpointData data, IgniteMarshaller m, IgniteLogger log)
throws IOException, GridException {
assert file != null;
assert m != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
index 9617000..12ea6c0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
@@ -339,7 +339,7 @@ public class GridTcpCommunicationSpi extends GridSpiAdapter
/** Marshaller. */
@IgniteMarshallerResource
- private GridMarshaller marsh;
+ private IgniteMarshaller marsh;
/** Local IP address. */
private String locAddr;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
index 4bffc5e..ef055fb 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
@@ -202,7 +202,7 @@ public class GridTcpDiscoverySpi extends GridTcpDiscoverySpiAdapter implements G
/** Grid marshaller. */
@IgniteMarshallerResource
- private GridMarshaller gridMarsh;
+ private IgniteMarshaller gridMarsh;
/** Nodes ring. */
@GridToStringExclude
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
index 0706447..89dfa0e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
@@ -128,7 +128,7 @@ abstract class GridTcpDiscoverySpiAdapter extends GridSpiAdapter implements Grid
protected volatile long gridStartTime;
/** Marshaller. */
- protected final GridMarshaller marsh = new IgniteJdkMarshaller();
+ protected final IgniteMarshaller marsh = new IgniteJdkMarshaller();
/** Statistics. */
protected final GridTcpDiscoveryStatistics stats = new GridTcpDiscoveryStatistics();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
index eaf813f..3f40cf9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
@@ -70,7 +70,7 @@ public class GridTcpDiscoveryMulticastIpFinder extends GridTcpDiscoveryVmIpFinde
private static final byte[] MSG_ADDR_REQ_DATA = U.GG_HEADER;
/** */
- private static final GridMarshaller marsh = new IgniteJdkMarshaller();
+ private static final IgniteMarshaller marsh = new IgniteJdkMarshaller();
/** Grid logger. */
@IgniteLoggerResource
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java
index d8eb600..ce64c20 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java
@@ -27,7 +27,7 @@ public class GridIndexingEntityAdapter<T> implements GridIndexingEntity<T> {
/**
* @param val Value.
- * @param bytes Value marshalled by {@link org.apache.ignite.marshaller.GridMarshaller}.
+ * @param bytes Value marshalled by {@link org.apache.ignite.marshaller.IgniteMarshaller}.
*/
public GridIndexingEntityAdapter(T val, @Nullable byte[] bytes) {
this.val = val;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
index 4dc2c6d..59be61a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
@@ -154,7 +154,7 @@ public class GridFileSwapSpaceSpi extends GridSpiAdapter implements GridSwapSpac
/** Marshaller. */
@IgniteMarshallerResource
- private GridMarshaller marsh;
+ private IgniteMarshaller marsh;
/** {@inheritDoc} */
@Override public String getBaseDirectory() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
index f3efc02..8f1e18b 100644
--- a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
+++ b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
@@ -25,7 +25,7 @@ import static java.sql.Types.*;
*/
public class GridJdbcUtils {
/** Marshaller. */
- private static final GridMarshaller MARSHALLER = new IgniteJdkMarshaller();
+ private static final IgniteMarshaller MARSHALLER = new IgniteJdkMarshaller();
/**
* Marshals task argument to byte array.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 2733c45..4fd524d 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
@@ -17,7 +17,7 @@ import java.util.concurrent.*;
@GridCommonTest(group = "Marshaller")
public class GridOptimizedMarshallerSelfTest extends GridMarshallerAbstractTest {
/** {@inheritDoc} */
- @Override protected GridMarshaller createMarshaller() {
+ @Override protected IgniteMarshaller createMarshaller() {
IgniteOptimizedMarshaller m = new IgniteOptimizedMarshaller();
m.setRequireSerializable(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 f2dac0d..d17c792 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
@@ -133,7 +133,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
* @throws GridException If marshalling failed.
*/
public void testNonSerializable5() throws GridException {
- GridMarshaller marsh = new IgniteOptimizedMarshaller();
+ IgniteMarshaller 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 IgniteOptimizedMarshaller();
+ IgniteMarshaller 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 IgniteOptimizedMarshaller();
+ IgniteMarshaller 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 IgniteOptimizedMarshaller();
+ IgniteMarshaller 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);
@@ -219,7 +219,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
((Map)U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
IgniteOptimizedClassResolver.userClasses(null, null);
- GridMarshaller marsh = new IgniteOptimizedMarshaller();
+ IgniteMarshaller marsh = new IgniteOptimizedMarshaller();
int size1 = marsh.marshal(obj).length;
@@ -249,7 +249,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
((Map)U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
IgniteOptimizedClassResolver.userClasses(null, null);
- GridMarshaller marsh = new IgniteOptimizedMarshaller();
+ IgniteMarshaller marsh = new IgniteOptimizedMarshaller();
int size1 = marsh.marshal(obj).length;
@@ -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 IgniteOptimizedMarshaller();
+ IgniteMarshaller marsh = new IgniteOptimizedMarshaller();
for (int j = 0; j < tries; j++) {
System.gc();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 60c6110..16c01f0 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
@@ -940,7 +940,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testExcludedClass() throws Exception {
- Class<?>[] exclClasses = U.staticField(GridMarshallerExclusions.class, "EXCL_CLASSES");
+ Class<?>[] exclClasses = U.staticField(IgniteMarshallerExclusions.class, "EXCL_CLASSES");
assertFalse(F.isEmpty(exclClasses));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 0673e5d..8f02e67 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
@@ -22,8 +22,8 @@ public class GridExternalizableAbstractTest extends GridCommonAbstractTest {
/**
* @return Marshallers.
*/
- protected List<GridMarshaller> getMarshallers() {
- List<GridMarshaller> marshallers = new ArrayList<>();
+ protected List<IgniteMarshaller> getMarshallers() {
+ List<IgniteMarshaller> marshallers = new ArrayList<>();
marshallers.add(new IgniteJdkMarshaller());
marshallers.add(new IgniteOptimizedMarshaller());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java b/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java
index b84989c..6aabb6f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java
@@ -115,7 +115,7 @@ public final class GridTestIoUtils {
* @throws Exception If failed.
*/
@SuppressWarnings("unchecked")
- public static <T> T externalize(Externalizable obj, GridMarshaller marshaller) throws Exception {
+ public static <T> T externalize(Externalizable obj, IgniteMarshaller marshaller) throws Exception {
assert marshaller != null;
byte[] buf = marshaller.marshal(obj);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 2e8f2a6..b7e97c6 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 IgniteOptimizedMarshaller();
+ private final IgniteMarshaller marshaller = new IgniteOptimizedMarshaller();
/**
* Test public methods of ggfs path.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 1deefea..31530ae 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
@@ -716,7 +716,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
private static class CommunicationSpi extends GridTcpCommunicationSpi {
/** Marshaller. */
@IgniteMarshallerResource
- private GridMarshaller marsh;
+ private IgniteMarshaller marsh;
/** Whether to block all outgoing messages. */
private volatile boolean block;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java
index eb5b96b..9094077 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java
@@ -39,7 +39,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
* @throws Exception If failed.
*/
public void testSerializationTopicCreatedByGridUuid() throws Exception {
- for (GridMarshaller marsh : getMarshallers()) {
+ for (IgniteMarshaller marsh : getMarshallers()) {
info("Test GridTopic externalization [marshaller=" + marsh + ']');
for (GridTopic topic : GridTopic.values()) {
@@ -54,7 +54,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
* @throws Exception If failed.
*/
public void testSerializationTopicCreatedByGridUuidAndUUID() throws Exception {
- for (GridMarshaller marsh : getMarshallers()) {
+ for (IgniteMarshaller marsh : getMarshallers()) {
info("Test GridTopic externalization [marshaller=" + marsh + ']');
for (GridTopic topic : GridTopic.values()) {
@@ -69,7 +69,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
* @throws Exception If failed.
*/
public void testSerializationTopicCreatedByGridUuidAndLong() throws Exception {
- for (GridMarshaller marsh : getMarshallers()) {
+ for (IgniteMarshaller marsh : getMarshallers()) {
info("Test GridTopic externalization [marshaller=" + marsh + ']');
for (GridTopic topic : GridTopic.values()) {
@@ -84,7 +84,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
* @throws Exception If failed.
*/
public void testSerializationTopicCreatedByStringAndUUIDAndLong() throws Exception {
- for (GridMarshaller marsh : getMarshallers()) {
+ for (IgniteMarshaller marsh : getMarshallers()) {
info("Test GridTopic externalization [marshaller=" + marsh + ']');
for (GridTopic topic : GridTopic.values()) {
@@ -99,7 +99,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
* @throws Exception If failed.
*/
public void testSerializationTopicCreatedByString() throws Exception {
- for (GridMarshaller marsh : getMarshallers()) {
+ for (IgniteMarshaller marsh : getMarshallers()) {
info("Test GridTopic externalization [marshaller=" + marsh + ']');
for (GridTopic topic : GridTopic.values()) {
@@ -114,7 +114,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
* @throws Exception If failed.
*/
public void testSerializationTopicCreatedByStringAndIntAndLong() throws Exception {
- for (GridMarshaller marsh : getMarshallers()) {
+ for (IgniteMarshaller marsh : getMarshallers()) {
info("Test GridTopic externalization [marshaller=" + marsh + ']');
for (GridTopic topic : GridTopic.values()) {
@@ -129,7 +129,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
* @throws Exception If failed.
*/
public void testSerializationTopicCreatedByStrinAndLong() throws Exception {
- for (GridMarshaller marsh : getMarshallers()) {
+ for (IgniteMarshaller marsh : getMarshallers()) {
info("Test GridTopic externalization [marshaller=" + marsh + ']');
for (GridTopic topic : GridTopic.values()) {
@@ -144,7 +144,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
* @throws Exception If failed.
*/
public void testSerializationTopicCreatedByStringAndUUIDAndIntAndLong() throws Exception {
- for (GridMarshaller marsh : getMarshallers()) {
+ for (IgniteMarshaller marsh : getMarshallers()) {
info("Test GridTopic externalization [marshaller=" + marsh + ']');
for (GridTopic topic : GridTopic.values()) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 fe05d81..651b0a8 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 IgniteOptimizedMarshaller();
+ IgniteMarshaller 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/78892777/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
index 823e66a..f8847db 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
@@ -92,7 +92,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
false
);
- GridMarshaller marshaller = getTestResources().getMarshaller();
+ IgniteMarshaller marshaller = getTestResources().getMarshaller();
GridCacheMvccCandidate<String> unmarshalled = marshaller.unmarshal(marshaller.marshal(cand), null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 0f79da7..f3fa2db 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
@@ -134,7 +134,7 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest {
Ignite g0 = grid(0);
- GridMarshaller marsh = g0.configuration().getMarshaller();
+ IgniteMarshaller marsh = g0.configuration().getMarshaller();
if (marsh instanceof IgniteOptimizedMarshaller)
assertTrue(((IgniteOptimizedMarshaller)marsh).isRequireSerializable());
@@ -184,7 +184,7 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest {
Ignite g0 = grid(0);
- GridMarshaller marsh = g0.configuration().getMarshaller();
+ IgniteMarshaller marsh = g0.configuration().getMarshaller();
if (marsh instanceof IgniteOptimizedMarshaller)
assertTrue(((IgniteOptimizedMarshaller)marsh).isRequireSerializable());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 da1519c..84cca65 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 IgniteOptimizedMarshaller();
+ private final IgniteMarshaller marshaller = new IgniteOptimizedMarshaller();
/**
* Test node info serialization.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 147935f..e6fb1b4 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
@@ -53,7 +53,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
private static final String CACHE_NAME = "namedCache";
/** */
- private static GridMarshaller marsh;
+ private static IgniteMarshaller marsh;
/** Closure job. */
protected IgniteInClosure<String> c1 = new IgniteInClosure<String>() {
@@ -135,7 +135,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
/**
* @return Grid marshaller.
*/
- protected abstract GridMarshaller createMarshaller();
+ protected abstract IgniteMarshaller createMarshaller();
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java
index b3ffa02..9f6b1e4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java
@@ -35,7 +35,7 @@ class GridMarshallerResourceBean implements Serializable {
private IgniteLogger log;
/** Marshaller. */
- private GridMarshaller marshaller;
+ private IgniteMarshaller marshaller;
/** Load balancer. */
private ComputeLoadBalancer balancer;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
index 9cd31aa..f6134a5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
@@ -21,7 +21,7 @@ import org.gridgain.testframework.junits.common.*;
@GridCommonTest(group = "Marshaller")
public class GridJdkMarshallerSelfTest extends GridMarshallerAbstractTest {
/** {@inheritDoc} */
- @Override protected GridMarshaller createMarshaller() {
+ @Override protected IgniteMarshaller createMarshaller() {
return new IgniteJdkMarshaller();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
index 8dac019..9417f77 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
@@ -51,7 +51,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb
serState = spi.loadCheckpoint(globalKey);
- GridMarshaller marshaller = getTestResources().getMarshaller();
+ IgniteMarshaller marshaller = getTestResources().getMarshaller();
assert marshaller != null;
@@ -77,7 +77,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb
* @throws Exception If check failed.
*/
private static void checkRunningState(String sesKey, String sesState, String globalKey, String globalState,
- GridMarshaller marsh, ClassLoader cl) throws Exception {
+ IgniteMarshaller marsh, ClassLoader cl) throws Exception {
assert marsh != null;
assert cl != null;
@@ -144,7 +144,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb
/** */
@IgniteMarshallerResource
- private GridMarshaller marshaller;
+ private IgniteMarshaller marshaller;
/** {@inheritDoc} */
@Override protected Collection<ComputeJobAdapter> split(int gridSize, Object arg) throws GridException {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
index d16942c..22be7ef 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
@@ -46,7 +46,7 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest {
private GridCommunicationSpi commSpi;
/** Marshaller used in test. */
- private GridMarshaller marsh = new IgniteJdkMarshaller();
+ private IgniteMarshaller marsh = new IgniteJdkMarshaller();
/**
*
@@ -234,7 +234,7 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest {
/** */
@IgniteMarshallerResource
- private GridMarshaller marsh;
+ private IgniteMarshaller marsh;
/**
* Creates test communication spi.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index 8f979a3..cc0483f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -140,7 +140,7 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
private static class CommunicationSpi extends GridTcpCommunicationSpi {
/** */
@IgniteMarshallerResource
- private GridMarshaller marsh;
+ private IgniteMarshaller marsh;
/** {@inheritDoc} */
@Override protected void notifyListener(UUID sndId, GridTcpCommunicationMessageAdapter msg,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
index af38e80..dde721c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
@@ -464,7 +464,7 @@ public abstract class GridAbstractDiscoverySelfTest<T extends GridSpi> extends G
*/
private void writeObject(ClusterNode node) throws Exception {
- GridMarshaller marshaller = getTestResources().getMarshaller();
+ IgniteMarshaller marshaller = getTestResources().getMarshaller();
OutputStream out = new NullOutputStream();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 42f9dda..ad46c0a 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 IgniteOptimizedMarshaller();
+ IgniteMarshaller 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/78892777/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 d9d1513..9e1660b 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
@@ -996,7 +996,7 @@ public abstract class GridAbstractTest extends TestCase {
* @return Path for specific marshaller.
*/
@SuppressWarnings({"IfMayBeConditional", "deprecation"})
- protected String getDefaultCheckpointPath(GridMarshaller marshaller) {
+ protected String getDefaultCheckpointPath(IgniteMarshaller marshaller) {
if (marshaller instanceof IgniteJdkMarshaller)
return GridSharedFsCheckpointSpi.DFLT_DIR_PATH + "/jdk/";
else
@@ -1167,7 +1167,7 @@ public abstract class GridAbstractTest extends TestCase {
// Remove resources cached in static, if any.
GridClassLoaderCache.clear();
IgniteOptimizedMarshaller.clearCache();
- GridMarshallerExclusions.clearCache();
+ IgniteMarshallerExclusions.clearCache();
GridEnumCache.clear();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 e997486..2b99542 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
@@ -44,7 +44,7 @@ public class GridTestResources {
private final UUID nodeId;
/** */
- private GridMarshaller marshaller;
+ private IgniteMarshaller marshaller;
/** */
private final MBeanServer jmx;
@@ -229,7 +229,7 @@ public class GridTestResources {
* @throws GridException If failed.
*/
@SuppressWarnings("unchecked")
- public synchronized GridMarshaller getMarshaller() throws GridException {
+ public synchronized IgniteMarshaller getMarshaller() throws GridException {
if (marshaller == null) {
String marshallerName = GridTestProperties.getProperty("marshaller.class");
@@ -237,7 +237,7 @@ public class GridTestResources {
marshaller = new IgniteOptimizedMarshaller();
else {
try {
- Class<? extends GridMarshaller> cls = (Class<? extends GridMarshaller>)Class.forName(marshallerName);
+ Class<? extends IgniteMarshaller> cls = (Class<? extends IgniteMarshaller>)Class.forName(marshallerName);
marshaller = cls.newInstance();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
index ae3a600..a9fa657 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
@@ -134,7 +134,7 @@ public class GridHadoopExternalCommunication {
private GridHadoopProcessDescriptor locProcDesc;
/** Marshaller. */
- private GridMarshaller marsh;
+ private IgniteMarshaller marsh;
/** Message notification executor service. */
private ExecutorService execSvc;
@@ -223,7 +223,7 @@ public class GridHadoopExternalCommunication {
public GridHadoopExternalCommunication(
UUID parentNodeId,
UUID procId,
- GridMarshaller marsh,
+ IgniteMarshaller marsh,
IgniteLogger log,
ExecutorService execSvc,
String gridName
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
index 3c0080e..76b29cd 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
@@ -19,12 +19,12 @@ import org.gridgain.grid.util.nio.*;
*/
public class GridHadoopMarshallerFilter extends GridNioFilterAdapter {
/** Marshaller. */
- private GridMarshaller marshaller;
+ private IgniteMarshaller marshaller;
/**
* @param marshaller Marshaller to use.
*/
- public GridHadoopMarshallerFilter(GridMarshaller marshaller) {
+ public GridHadoopMarshallerFilter(IgniteMarshaller marshaller) {
super("GridHadoopMarshallerFilter");
this.marshaller = marshaller;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 1b18ae7..6e2033e 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 IgniteOptimizedMarshaller();
+ IgniteMarshaller marsh = new IgniteOptimizedMarshaller();
IgniteLogger log = log();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
index dd2f2bd..6fede17 100644
--- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
+++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
@@ -181,7 +181,7 @@ public class GridCacheHibernateBlobStore<K, V> extends GridCacheStoreAdapter<K,
/** Marshaller. */
@IgniteMarshallerResource
- private GridMarshaller marsh;
+ private IgniteMarshaller marsh;
/** {@inheritDoc} */
@SuppressWarnings({"unchecked", "RedundantTypeArguments"})
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
index 411431f..68e8cbe 100644
--- a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
+++ b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
@@ -238,7 +238,7 @@ public class GridH2IndexingSpi extends GridSpiAdapter implements GridIndexingSpi
/** */
@IgniteMarshallerResource
- private GridMarshaller gridMarshaller;
+ private IgniteMarshaller igniteMarshaller;
/** */
private final CountDownLatch ctxInitLatch = new CountDownLatch(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
index 69e5fed..9ec7f59 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
@@ -552,12 +552,12 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
*/
private static class IdxMarshaller implements GridIndexingMarshaller {
/** */
- private final GridMarshaller marshaller;
+ private final IgniteMarshaller marshaller;
/**
* @param marshaller Marshaller.
*/
- private IdxMarshaller(GridMarshaller marshaller) {
+ private IdxMarshaller(IgniteMarshaller marshaller) {
this.marshaller = marshaller;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
index 0c42fe9..190b632 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
@@ -617,7 +617,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
/** Marshaller. */
@IgniteMarshallerResource
- private GridMarshaller marshaller;
+ private IgniteMarshaller marshaller;
/** Executor. */
@IgniteExecutorServiceResource
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
index b558d4c..f5a1072 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
@@ -27,7 +27,7 @@ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest
private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
/** Marshaller. */
- private static final GridMarshaller MARSHALLER = new IgniteOptimizedMarshaller();
+ private static final IgniteMarshaller MARSHALLER = new IgniteOptimizedMarshaller();
/** Attribute key. */
private static final String ATTR_KEY = "checkAttr";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
index d1c48c6..c10e88a 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
@@ -439,7 +439,7 @@ public class GridResourceFieldInjectionSelfTest extends GridCommonAbstractTest {
/** */
@IgniteMarshallerResource
- private GridMarshaller marshaller;
+ private IgniteMarshaller marshaller;
/** */
@IgniteSpringApplicationContextResource
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
index 9166f28..9c8a56d 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
@@ -219,7 +219,7 @@ public class GridResourceMethodInjectionSelfTest extends GridCommonAbstractTest
private String locHost;
/** */
- private GridMarshaller marshaller;
+ private IgniteMarshaller marshaller;
/** */
private ApplicationContext springCtx;
@@ -331,7 +331,7 @@ public class GridResourceMethodInjectionSelfTest extends GridCommonAbstractTest
* @param marshaller Marshaller.
*/
@IgniteMarshallerResource
- public void setMarshaller(GridMarshaller marshaller) {
+ public void setMarshaller(IgniteMarshaller marshaller) {
this.marshaller = marshaller;
}