Repository: incubator-ignite Updated Branches: refs/heads/ignite-141 423169168 -> 28167025d
# IGNITE-141 - Marshallers refactoring Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/28167025 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/28167025 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/28167025 Branch: refs/heads/ignite-141 Commit: 28167025d47841e0586f4506832408cb74f74c7f Parents: 4231691 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Mar 4 17:30:06 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed Mar 4 17:30:06 2015 -0800 ---------------------------------------------------------------------- .../hadoop/GridHadoopSortingExternalTest.java | 12 ++++++++++++ .../GridHadoopExternalTaskExecutionSelfTest.java | 11 +++++++++++ 2 files changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28167025/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSortingExternalTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSortingExternalTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSortingExternalTest.java index 23884ef..e2ba70a 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSortingExternalTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSortingExternalTest.java @@ -17,6 +17,9 @@ package org.apache.ignite.internal.processors.hadoop; +import org.apache.ignite.configuration.*; +import org.apache.ignite.marshaller.jdk.*; + /** * External test for sorting. */ @@ -29,4 +32,13 @@ public class GridHadoopSortingExternalTest extends GridHadoopSortingTest { return cfg; } + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + cfg.setMarshaller(new JdkMarshaller()); + + return cfg; + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28167025/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java index 52bfa98..5b8d486 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java @@ -24,10 +24,12 @@ import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.mapreduce.lib.output.*; import org.apache.ignite.*; +import org.apache.ignite.configuration.*; import org.apache.ignite.igfs.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.marshaller.jdk.*; import java.io.*; import java.util.*; @@ -62,6 +64,15 @@ public class GridHadoopExternalTaskExecutionSelfTest extends GridHadoopAbstractS return cfg; } + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + cfg.setMarshaller(new JdkMarshaller()); + + return cfg; + } + /** * @throws Exception If failed. */
