# gg-9470-rename
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cecd94bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cecd94bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cecd94bd Branch: refs/heads/master Commit: cecd94bdf2e82a40c2387517474ed2998328f91e Parents: 22b17d7 Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 4 22:32:15 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 4 22:32:15 2014 +0300 ---------------------------------------------------------------------- .../processors/rest/GridTestMemcacheClient.java | 2 +- .../configuration/IgniteConfiguration.java | 2 +- .../ignite/marshaller/GridMarshaller.java | 2 +- .../marshaller/jdk/GridJdkMarshaller.java | 134 ------------------- .../jdk/GridJdkMarshallerDummySerializable.java | 22 --- .../GridJdkMarshallerInputStreamWrapper.java | 73 ---------- .../jdk/GridJdkMarshallerObjectInputStream.java | 53 -------- .../GridJdkMarshallerObjectOutputStream.java | 37 ----- .../GridJdkMarshallerOutputStreamWrapper.java | 51 ------- .../marshaller/jdk/IgniteJdkMarshaller.java | 134 +++++++++++++++++++ .../IgniteJdkMarshallerDummySerializable.java | 22 +++ .../IgniteJdkMarshallerInputStreamWrapper.java | 73 ++++++++++ .../IgniteJdkMarshallerObjectInputStream.java | 53 ++++++++ .../IgniteJdkMarshallerObjectOutputStream.java | 37 +++++ .../IgniteJdkMarshallerOutputStreamWrapper.java | 51 +++++++ .../optimized/GridOptimizedMarshaller.java | 2 +- .../org/gridgain/grid/kernal/GridGainEx.java | 4 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 2 +- .../tcp/GridTcpMemcachedNioListener.java | 2 +- .../rest/protocols/tcp/GridTcpRestParser.java | 2 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 2 +- .../tcp/GridTcpDiscoverySpiAdapter.java | 2 +- .../GridTcpDiscoveryMulticastIpFinder.java | 2 +- .../org/gridgain/jdbc/util/GridJdbcUtils.java | 2 +- .../grid/GridExternalizableAbstractTest.java | 2 +- .../communication/GridIoManagerSelfTest.java | 2 +- .../GridDeploymentManagerStopSelfTest.java | 2 +- .../cache/GridCacheP2PUndeploySelfTest.java | 2 +- .../marshaller/GridMarshallerResourceBean.java | 2 +- .../jdk/GridJdkMarshallerSelfTest.java | 2 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 2 +- ...GridTcpDiscoveryMarshallerCheckSelfTest.java | 4 +- .../testframework/junits/GridAbstractTest.java | 2 +- 34 files changed, 394 insertions(+), 394 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java index 994603d..bf02c2b 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java @@ -61,7 +61,7 @@ final class GridTestMemcacheClient { private final IgniteLogger log = new IgniteJavaLogger(); /** JDK marshaller. */ - private final GridMarshaller jdkMarshaller = new GridJdkMarshaller(); + private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller(); /** Socket. */ private final Socket sock; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 2254ffb..b733597 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -1455,7 +1455,7 @@ public class IgniteConfiguration { /** * Should return an instance of marshaller to use in grid. If not provided, * {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller} will be used on Java HotSpot VM, and - * {@link org.apache.ignite.marshaller.jdk.GridJdkMarshaller} will be used on other VMs. + * {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller} will be used on other VMs. * * @return Marshaller to use in grid. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java index d0b8826..df3d0d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java @@ -22,7 +22,7 @@ import java.io.*; * Gridgain provides the following {@code GridMarshaller} implementations: * <ul> * <li>{@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller} - default</li> - * <li>{@link org.apache.ignite.marshaller.jdk.GridJdkMarshaller}</li> + * <li>{@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller}</li> * </ul> * <p> * Below are examples of marshaller configuration, usage, and injection into tasks, jobs, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java deleted file mode 100644 index d0c3246..0000000 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java +++ /dev/null @@ -1,134 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.apache.ignite.marshaller.jdk; - -import org.apache.ignite.marshaller.*; -import org.gridgain.grid.*; -import org.gridgain.grid.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.io.*; - -/** - * Implementation of {@link GridMarshaller} based on JDK serialization mechanism. - * <p> - * <h1 class="header">Configuration</h1> - * <h2 class="header">Mandatory</h2> - * This marshaller has no mandatory configuration parameters. - * <h2 class="header">Java Example</h2> - * {@code GridJdkMarshaller} needs to be explicitly configured to override default {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller}. - * <pre name="code" class="java"> - * GridJdkMarshaller marshaller = new GridJdkMarshaller(); - * - * GridConfiguration cfg = new GridConfiguration(); - * - * // Override default marshaller. - * cfg.setMarshaller(marshaller); - * - * // Starts grid. - * G.start(cfg); - * </pre> - * <h2 class="header">Spring Example</h2> - * GridJdkMarshaller can be configured from Spring XML configuration file: - * <pre name="code" class="xml"> - * <bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"> - * ... - * <property name="marshaller"> - * <bean class="org.gridgain.grid.marshaller.jdk.GridJdkMarshaller"/> - * </property> - * ... - * </bean> - * </pre> - * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> - * <br> - * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> - * <h2 class="header">Injection Example</h2> - * GridMarshaller can be injected in users task, job or SPI as following: - * <pre name="code" class="java"> - * public class MyGridJob implements GridComputeJob { - * ... - * @GridMarshallerResource - * private GridMarshaller marshaller; - * ... - * } - * </pre> - * or - * <pre name="code" class="java"> - * public class MyGridJob implements GridComputeJob { - * ... - * private GridMarshaller marshaller; - * ... - * @GridMarshallerResource - * public void setMarshaller(GridMarshaller marshaller) { - * this.marshaller = marshaller; - * } - * ... - * } - * </pre> - * <br> - * - */ -public class GridJdkMarshaller extends GridAbstractMarshaller { - /** {@inheritDoc} */ - @Override public void marshal(@Nullable Object obj, OutputStream out) throws GridException { - assert out != null; - - ObjectOutputStream objOut = null; - - try { - objOut = new GridJdkMarshallerObjectOutputStream(new GridJdkMarshallerOutputStreamWrapper(out)); - - // Make sure that we serialize only task, without class loader. - objOut.writeObject(obj); - - objOut.flush(); - } - catch (IOException e) { - throw new GridException("Failed to serialize object: " + obj, e); - } - finally{ - U.closeQuiet(objOut); - } - } - - /** {@inheritDoc} */ - @SuppressWarnings({"unchecked"}) - @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException { - assert in != null; - - if (clsLdr == null) - clsLdr = getClass().getClassLoader(); - - ObjectInputStream objIn = null; - - try { - objIn = new GridJdkMarshallerObjectInputStream(new GridJdkMarshallerInputStreamWrapper(in), clsLdr); - - return (T)objIn.readObject(); - } - catch (IOException e) { - throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e); - } - catch (ClassNotFoundException e) { - throw new GridException("Failed to find class with given class loader for unmarshalling " + - "(make sure same versions of all classes are available on all nodes or enable peer-class-loading): " + - clsLdr, e); - } - finally{ - U.closeQuiet(objIn); - } - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(GridJdkMarshaller.class, this); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerDummySerializable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerDummySerializable.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerDummySerializable.java deleted file mode 100644 index 6487717..0000000 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerDummySerializable.java +++ /dev/null @@ -1,22 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.apache.ignite.marshaller.jdk; - -import java.io.*; - -/** - * Serializable object used for {@link Object} replacement. - */ -class GridJdkMarshallerDummySerializable implements Serializable { - /** */ - private static final long serialVersionUID = 0L; - - // No-op. -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java deleted file mode 100644 index fb08f40..0000000 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java +++ /dev/null @@ -1,73 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.apache.ignite.marshaller.jdk; - -import java.io.*; - -/** - * Wrapper for {@link InputStream}. - */ -class GridJdkMarshallerInputStreamWrapper extends InputStream { - /** */ - private InputStream in; - - /** - * Creates wrapper. - * - * @param in Wrapped input stream - */ - GridJdkMarshallerInputStreamWrapper(InputStream in) { - assert in != null; - - this.in = in; - } - - /** {@inheritDoc} */ - @Override public int read() throws IOException { - return in.read(); - } - - /** {@inheritDoc} */ - @Override public int read(byte[] b) throws IOException { - return in.read(b); - } - - /** {@inheritDoc} */ - @Override public int read(byte[] b, int off, int len) throws IOException { - return in.read(b, off, len); - } - - /** {@inheritDoc} */ - @Override public long skip(long n) throws IOException { - return in.skip(n); - } - - /** {@inheritDoc} */ - @Override public int available() throws IOException { - return in.available(); - } - - /** {@inheritDoc} */ - @SuppressWarnings({"NonSynchronizedMethodOverridesSynchronizedMethod"}) - @Override public void mark(int readLimit) { - in.mark(readLimit); - } - - /** {@inheritDoc} */ - @SuppressWarnings({"NonSynchronizedMethodOverridesSynchronizedMethod"}) - @Override public void reset() throws IOException { - in.reset(); - } - - /** {@inheritDoc} */ - @Override public boolean markSupported() { - return in.markSupported(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectInputStream.java deleted file mode 100644 index 5a64a75..0000000 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectInputStream.java +++ /dev/null @@ -1,53 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.apache.ignite.marshaller.jdk; - -import java.io.*; - -/** - * This class defines custom JDK object input stream. - */ -class GridJdkMarshallerObjectInputStream extends ObjectInputStream { - /** */ - private final ClassLoader clsLdr; - - /** - * @param in Parent input stream. - * @param clsLdr Custom class loader. - * @throws IOException If initialization failed. - */ - GridJdkMarshallerObjectInputStream(InputStream in, ClassLoader clsLdr) throws IOException { - super(in); - - assert clsLdr != null; - - this.clsLdr = clsLdr; - - enableResolveObject(true); - } - - /** {@inheritDoc} */ - @Override protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { - // NOTE: DO NOT CHANGE TO 'clsLoader.loadClass()' - // Must have 'Class.forName()' instead of clsLoader.loadClass() - // due to weird ClassNotFoundExceptions for arrays of classes - // in certain cases. - return Class.forName(desc.getName(), true, clsLdr); - } - - /** {@inheritDoc} */ - @Override protected Object resolveObject(Object o) throws IOException { - if (o != null && o.getClass().equals(GridJdkMarshallerDummySerializable.class)) - return new Object(); - - return super.resolveObject(o); - } -} - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java deleted file mode 100644 index 51cfdd6..0000000 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java +++ /dev/null @@ -1,37 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.apache.ignite.marshaller.jdk; - -import org.apache.ignite.marshaller.*; -import org.jetbrains.annotations.*; - -import java.io.*; - -/** - * This class defines own object output stream. - */ -class GridJdkMarshallerObjectOutputStream extends ObjectOutputStream { - /** - * @param out Output stream. - * @throws IOException Thrown in case of any I/O errors. - */ - GridJdkMarshallerObjectOutputStream(OutputStream out) throws IOException { - super(out); - - enableReplaceObject(true); - } - - /** {@inheritDoc} */ - @Nullable @Override protected Object replaceObject(Object o) throws IOException { - return o == null || GridMarshallerExclusions.isExcluded(o.getClass()) ? null : - o.getClass().equals(Object.class) ? new GridJdkMarshallerDummySerializable() : super.replaceObject(o); - } -} - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java deleted file mode 100644 index b5e9e06..0000000 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java +++ /dev/null @@ -1,51 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.apache.ignite.marshaller.jdk; - -import java.io.*; - -/** - * Wrapper for {@link OutputStream}. - */ -class GridJdkMarshallerOutputStreamWrapper extends OutputStream { - /** */ - private OutputStream out; - - /** - * Creates wrapper. - * - * @param out Wrapped output stream - */ - GridJdkMarshallerOutputStreamWrapper(OutputStream out) { - assert out != null; - - this.out = out; - } - - /** {@inheritDoc} */ - @Override public void write(int b) throws IOException { - out.write(b); - } - - /** {@inheritDoc} */ - @Override public void write(byte[] b) throws IOException { - out.write(b); - } - - /** {@inheritDoc} */ - @Override public void write(byte[] b, int off, int len) throws IOException { - out.write(b, off, len); - } - - /** {@inheritDoc} */ - @Override public void flush() throws IOException { - out.flush(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java new file mode 100644 index 0000000..3ed5b6c --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java @@ -0,0 +1,134 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.marshaller.jdk; + +import org.apache.ignite.marshaller.*; +import org.gridgain.grid.*; +import org.gridgain.grid.util.typedef.internal.*; +import org.jetbrains.annotations.*; + +import java.io.*; + +/** + * Implementation of {@link GridMarshaller} based on JDK serialization mechanism. + * <p> + * <h1 class="header">Configuration</h1> + * <h2 class="header">Mandatory</h2> + * This marshaller has no mandatory configuration parameters. + * <h2 class="header">Java Example</h2> + * {@code GridJdkMarshaller} needs to be explicitly configured to override default {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller}. + * <pre name="code" class="java"> + * GridJdkMarshaller marshaller = new GridJdkMarshaller(); + * + * GridConfiguration cfg = new GridConfiguration(); + * + * // Override default marshaller. + * cfg.setMarshaller(marshaller); + * + * // Starts grid. + * G.start(cfg); + * </pre> + * <h2 class="header">Spring Example</h2> + * GridJdkMarshaller can be configured from Spring XML configuration file: + * <pre name="code" class="xml"> + * <bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"> + * ... + * <property name="marshaller"> + * <bean class="org.gridgain.grid.marshaller.jdk.GridJdkMarshaller"/> + * </property> + * ... + * </bean> + * </pre> + * <p> + * <img src="http://www.gridgain.com/images/spring-small.png";> + * <br> + * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> + * <h2 class="header">Injection Example</h2> + * GridMarshaller can be injected in users task, job or SPI as following: + * <pre name="code" class="java"> + * public class MyGridJob implements GridComputeJob { + * ... + * @GridMarshallerResource + * private GridMarshaller marshaller; + * ... + * } + * </pre> + * or + * <pre name="code" class="java"> + * public class MyGridJob implements GridComputeJob { + * ... + * private GridMarshaller marshaller; + * ... + * @GridMarshallerResource + * public void setMarshaller(GridMarshaller marshaller) { + * this.marshaller = marshaller; + * } + * ... + * } + * </pre> + * <br> + * + */ +public class IgniteJdkMarshaller extends GridAbstractMarshaller { + /** {@inheritDoc} */ + @Override public void marshal(@Nullable Object obj, OutputStream out) throws GridException { + assert out != null; + + ObjectOutputStream objOut = null; + + try { + objOut = new IgniteJdkMarshallerObjectOutputStream(new IgniteJdkMarshallerOutputStreamWrapper(out)); + + // Make sure that we serialize only task, without class loader. + objOut.writeObject(obj); + + objOut.flush(); + } + catch (IOException e) { + throw new GridException("Failed to serialize object: " + obj, e); + } + finally{ + U.closeQuiet(objOut); + } + } + + /** {@inheritDoc} */ + @SuppressWarnings({"unchecked"}) + @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException { + assert in != null; + + if (clsLdr == null) + clsLdr = getClass().getClassLoader(); + + ObjectInputStream objIn = null; + + try { + objIn = new IgniteJdkMarshallerObjectInputStream(new IgniteJdkMarshallerInputStreamWrapper(in), clsLdr); + + return (T)objIn.readObject(); + } + catch (IOException e) { + throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e); + } + catch (ClassNotFoundException e) { + throw new GridException("Failed to find class with given class loader for unmarshalling " + + "(make sure same versions of all classes are available on all nodes or enable peer-class-loading): " + + clsLdr, e); + } + finally{ + U.closeQuiet(objIn); + } + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgniteJdkMarshaller.class, this); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerDummySerializable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerDummySerializable.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerDummySerializable.java new file mode 100644 index 0000000..23c2c67 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerDummySerializable.java @@ -0,0 +1,22 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.marshaller.jdk; + +import java.io.*; + +/** + * Serializable object used for {@link Object} replacement. + */ +class IgniteJdkMarshallerDummySerializable implements Serializable { + /** */ + private static final long serialVersionUID = 0L; + + // No-op. +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerInputStreamWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerInputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerInputStreamWrapper.java new file mode 100644 index 0000000..698ed74 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerInputStreamWrapper.java @@ -0,0 +1,73 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.marshaller.jdk; + +import java.io.*; + +/** + * Wrapper for {@link InputStream}. + */ +class IgniteJdkMarshallerInputStreamWrapper extends InputStream { + /** */ + private InputStream in; + + /** + * Creates wrapper. + * + * @param in Wrapped input stream + */ + IgniteJdkMarshallerInputStreamWrapper(InputStream in) { + assert in != null; + + this.in = in; + } + + /** {@inheritDoc} */ + @Override public int read() throws IOException { + return in.read(); + } + + /** {@inheritDoc} */ + @Override public int read(byte[] b) throws IOException { + return in.read(b); + } + + /** {@inheritDoc} */ + @Override public int read(byte[] b, int off, int len) throws IOException { + return in.read(b, off, len); + } + + /** {@inheritDoc} */ + @Override public long skip(long n) throws IOException { + return in.skip(n); + } + + /** {@inheritDoc} */ + @Override public int available() throws IOException { + return in.available(); + } + + /** {@inheritDoc} */ + @SuppressWarnings({"NonSynchronizedMethodOverridesSynchronizedMethod"}) + @Override public void mark(int readLimit) { + in.mark(readLimit); + } + + /** {@inheritDoc} */ + @SuppressWarnings({"NonSynchronizedMethodOverridesSynchronizedMethod"}) + @Override public void reset() throws IOException { + in.reset(); + } + + /** {@inheritDoc} */ + @Override public boolean markSupported() { + return in.markSupported(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectInputStream.java new file mode 100644 index 0000000..1022c4d --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectInputStream.java @@ -0,0 +1,53 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.marshaller.jdk; + +import java.io.*; + +/** + * This class defines custom JDK object input stream. + */ +class IgniteJdkMarshallerObjectInputStream extends ObjectInputStream { + /** */ + private final ClassLoader clsLdr; + + /** + * @param in Parent input stream. + * @param clsLdr Custom class loader. + * @throws IOException If initialization failed. + */ + IgniteJdkMarshallerObjectInputStream(InputStream in, ClassLoader clsLdr) throws IOException { + super(in); + + assert clsLdr != null; + + this.clsLdr = clsLdr; + + enableResolveObject(true); + } + + /** {@inheritDoc} */ + @Override protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { + // NOTE: DO NOT CHANGE TO 'clsLoader.loadClass()' + // Must have 'Class.forName()' instead of clsLoader.loadClass() + // due to weird ClassNotFoundExceptions for arrays of classes + // in certain cases. + return Class.forName(desc.getName(), true, clsLdr); + } + + /** {@inheritDoc} */ + @Override protected Object resolveObject(Object o) throws IOException { + if (o != null && o.getClass().equals(IgniteJdkMarshallerDummySerializable.class)) + return new Object(); + + return super.resolveObject(o); + } +} + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java new file mode 100644 index 0000000..7243893 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java @@ -0,0 +1,37 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.marshaller.jdk; + +import org.apache.ignite.marshaller.*; +import org.jetbrains.annotations.*; + +import java.io.*; + +/** + * This class defines own object output stream. + */ +class IgniteJdkMarshallerObjectOutputStream extends ObjectOutputStream { + /** + * @param out Output stream. + * @throws IOException Thrown in case of any I/O errors. + */ + IgniteJdkMarshallerObjectOutputStream(OutputStream out) throws IOException { + super(out); + + enableReplaceObject(true); + } + + /** {@inheritDoc} */ + @Nullable @Override protected Object replaceObject(Object o) throws IOException { + return o == null || GridMarshallerExclusions.isExcluded(o.getClass()) ? null : + o.getClass().equals(Object.class) ? new IgniteJdkMarshallerDummySerializable() : super.replaceObject(o); + } +} + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerOutputStreamWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerOutputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerOutputStreamWrapper.java new file mode 100644 index 0000000..0610747 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerOutputStreamWrapper.java @@ -0,0 +1,51 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.marshaller.jdk; + +import java.io.*; + +/** + * Wrapper for {@link OutputStream}. + */ +class IgniteJdkMarshallerOutputStreamWrapper extends OutputStream { + /** */ + private OutputStream out; + + /** + * Creates wrapper. + * + * @param out Wrapped output stream + */ + IgniteJdkMarshallerOutputStreamWrapper(OutputStream out) { + assert out != null; + + this.out = out; + } + + /** {@inheritDoc} */ + @Override public void write(int b) throws IOException { + out.write(b); + } + + /** {@inheritDoc} */ + @Override public void write(byte[] b) throws IOException { + out.write(b); + } + + /** {@inheritDoc} */ + @Override public void write(byte[] b, int off, int len) throws IOException { + out.write(b, off, len); + } + + /** {@inheritDoc} */ + @Override public void flush() throws IOException { + out.flush(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java index 3a94bb3..17b3a07 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java @@ -22,7 +22,7 @@ import java.net.*; import java.util.*; /** - * Optimized implementation of {@link GridMarshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.GridJdkMarshaller}, + * Optimized implementation of {@link GridMarshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller}, * which is based on standard {@link ObjectOutputStream}, this marshaller does not * enforce that all serialized objects implement {@link Serializable} interface. It is also * about 20 times faster as it removes lots of serialization overhead that exists in http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java index 8888f9b..fcfc385 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java @@ -1596,7 +1596,7 @@ public class GridGainEx { "object serialization performance will be significantly slower.", "To enable fast marshalling upgrade to recent 1.6 or 1.7 HotSpot VM release."); - marsh = new GridJdkMarshaller(); + marsh = new IgniteJdkMarshaller(); } else if (!GridOptimizedMarshaller.available()) { U.warn(log, "GridOptimizedMarshaller is not supported on this JVM " + @@ -1606,7 +1606,7 @@ public class GridGainEx { "object serialization performance will be significantly slower.", "To enable fast marshalling upgrade to recent 1.6 or 1.7 HotSpot VM release."); - marsh = new GridJdkMarshaller(); + marsh = new IgniteJdkMarshaller(); } else marsh = new GridOptimizedMarshaller(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/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 4ffed4a..8682c55 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 @@ -35,7 +35,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b private static final long serialVersionUID = 0L; /** Marshaller. */ - private static final GridMarshaller MARSHALLER = new GridJdkMarshaller(); + private static final GridMarshaller MARSHALLER = new IgniteJdkMarshaller(); /** {@inheritDoc} */ @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/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 03fa113..c8e59f4 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 @@ -44,7 +44,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { private static final long serialVersionUID = 0L; /** Marshaller. */ - private static final GridMarshaller MARSHALLER = new GridJdkMarshaller(); + private static final GridMarshaller MARSHALLER = new IgniteJdkMarshaller(); /** How long to store future (10 minutes). */ private static final int RMV_DELAY = 10 * 60; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java index b3c8b22..abcc72e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java @@ -42,7 +42,7 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter<Gr private final GridRestProtocolHandler hnd; /** JDK marshaller. */ - private final GridMarshaller jdkMarshaller = new GridJdkMarshaller(); + private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller(); /** Context. */ private final GridKernalContext ctx; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java index 71ed4f3..26d62c2 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java @@ -34,7 +34,7 @@ public class GridTcpRestParser implements GridNioParser { private static final Charset UTF_8 = Charset.forName("UTF-8"); /** JDK marshaller. */ - private final GridMarshaller jdkMarshaller = new GridJdkMarshaller(); + private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller(); /** {@inheritDoc} */ @Nullable @Override public GridClientMessage decode(GridNioSession ses, ByteBuffer buf) throws IOException, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java index 28dce35..42c1de9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java @@ -44,7 +44,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { private GridNioServer<GridClientMessage> srv; /** JDK marshaller. */ - private final GridMarshaller jdkMarshaller = new GridJdkMarshaller(); + private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller(); /** NIO server listener. */ private GridTcpRestNioListener lsnr; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/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 f1f8761..0706447 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 GridJdkMarshaller(); + protected final GridMarshaller marsh = new IgniteJdkMarshaller(); /** Statistics. */ protected final GridTcpDiscoveryStatistics stats = new GridTcpDiscoveryStatistics(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/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 792bdfc..eaf813f 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 GridJdkMarshaller(); + private static final GridMarshaller marsh = new IgniteJdkMarshaller(); /** Grid logger. */ @IgniteLoggerResource http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/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 faedd51..f3efc02 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 GridJdkMarshaller(); + private static final GridMarshaller MARSHALLER = new IgniteJdkMarshaller(); /** * Marshals task argument to byte array. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/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 cc94418..b68ed28 100644 --- a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java @@ -25,7 +25,7 @@ public class GridExternalizableAbstractTest extends GridCommonAbstractTest { protected List<GridMarshaller> getMarshallers() { List<GridMarshaller> marshallers = new ArrayList<>(); - marshallers.add(new GridJdkMarshaller()); + marshallers.add(new IgniteJdkMarshaller()); marshallers.add(new GridOptimizedMarshaller()); return marshallers; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java index 1178e14..b5b6dbe 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java @@ -50,7 +50,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { ctx.config().setCommunicationSpi(new GridTcpCommunicationSpi()); - ctx.config().setMarshaller(new GridJdkMarshaller()); + ctx.config().setMarshaller(new IgniteJdkMarshaller()); // Turn off peer class loading to simplify mocking. ctx.config().setPeerClassLoadingEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java index 7a0ce0f..d076ad6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java @@ -32,7 +32,7 @@ public class GridDeploymentManagerStopSelfTest extends GridCommonAbstractTest { GridTestKernalContext ctx = newContext(); - ctx.config().setMarshaller(new GridJdkMarshaller()); + ctx.config().setMarshaller(new IgniteJdkMarshaller()); ctx.config().setDeploymentSpi(spi); GridResourceProcessor resProc = new GridResourceProcessor(ctx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java index 5757f86..66c46b7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java @@ -66,7 +66,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(spi); - cfg.setMarshaller(new GridJdkMarshaller()); + cfg.setMarshaller(new IgniteJdkMarshaller()); cfg.setSwapSpaceSpi(new GridFileSwapSpaceSpi()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/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 0f35995..b3ffa02 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 @@ -60,7 +60,7 @@ class GridMarshallerResourceBean implements Serializable { */ GridMarshallerResourceBean() { log = new IgniteJavaLogger(); - marshaller = new GridJdkMarshaller(); + marshaller = new IgniteJdkMarshaller(); mbeanSrv = ManagementFactory.getPlatformMBeanServer(); ses = new GridTestTaskSession(); execSvc = new GridThreadPoolExecutor(1, 1, 0, new LinkedBlockingQueue<Runnable>()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/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 5920ff7..9cd31aa 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 @@ -22,6 +22,6 @@ import org.gridgain.testframework.junits.common.*; public class GridJdkMarshallerSelfTest extends GridMarshallerAbstractTest { /** {@inheritDoc} */ @Override protected GridMarshaller createMarshaller() { - return new GridJdkMarshaller(); + return new IgniteJdkMarshaller(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/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 fe21efe..d16942c 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 GridJdkMarshaller(); + private GridMarshaller marsh = new IgniteJdkMarshaller(); /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/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 04c368e..9fafe0d 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 @@ -44,9 +44,9 @@ public class GridTcpDiscoveryMarshallerCheckSelfTest extends GridCommonAbstractT cfg.setLocalHost("127.0.0.1"); if (flag) - cfg.setMarshaller(new GridJdkMarshaller()); + cfg.setMarshaller(new IgniteJdkMarshaller()); else - cfg.setMarshaller(sameMarsh ? new GridJdkMarshaller() : new GridOptimizedMarshaller()); + cfg.setMarshaller(sameMarsh ? new IgniteJdkMarshaller() : new GridOptimizedMarshaller()); // Flip flag. flag = !flag; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/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 b41809e..95c9883 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 @@ -997,7 +997,7 @@ public abstract class GridAbstractTest extends TestCase { */ @SuppressWarnings({"IfMayBeConditional", "deprecation"}) protected String getDefaultCheckpointPath(GridMarshaller marshaller) { - if (marshaller instanceof GridJdkMarshaller) + if (marshaller instanceof IgniteJdkMarshaller) return GridSharedFsCheckpointSpi.DFLT_DIR_PATH + "/jdk/"; else return GridSharedFsCheckpointSpi.DFLT_DIR_PATH + '/' + marshaller.getClass().getSimpleName() + '/';
![http://www.gridgain.com/images/spring-small.png"](http://www.gridgain.com/images/spring-small.png"){kind=link}