# 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/78736f3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/78736f3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/78736f3c Branch: refs/heads/master Commit: 78736f3c418666b4c50f2f094912b6be0bea5ce4 Parents: ff14819 Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 4 21:50:21 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 4 21:50:26 2014 +0300 ---------------------------------------------------------------------- .../spi/checkpoint/s3/GridS3CheckpointSpi.java | 2 +- .../processors/rest/GridTestMemcacheClient.java | 2 +- .../configuration/IgniteConfiguration.java | 2 +- .../marshaller/GridAbstractMarshaller.java | 57 ++++++++ .../ignite/marshaller/GridMarshaller.java | 130 +++++++++++++++++ .../marshaller/GridMarshallerExclusions.java | 145 +++++++++++++++++++ .../org/apache/ignite/marshaller/package.html | 15 ++ .../resources/IgniteMarshallerResource.java | 3 +- .../GridCacheRendezvousAffinityFunction.java | 2 +- .../store/jdbc/GridCacheJdbcBlobStore.java | 2 +- .../grid/kernal/GridEventConsumeHandler.java | 2 +- .../org/gridgain/grid/kernal/GridGainEx.java | 2 +- .../grid/kernal/GridJobSiblingsResponse.java | 2 +- .../org/gridgain/grid/kernal/GridKernal.java | 2 +- .../checkpoint/GridCheckpointManager.java | 2 +- .../managers/communication/GridIoManager.java | 2 +- .../deployment/GridDeploymentCommunication.java | 2 +- .../eventstorage/GridEventStorageManager.java | 2 +- .../managers/indexing/GridIndexingManager.java | 2 +- .../swapspace/GridSwapSpaceManager.java | 2 +- .../processors/cache/GridCacheContext.java | 2 +- .../processors/cache/GridCacheEntryInfo.java | 2 +- .../processors/cache/GridCacheMessage.java | 2 +- .../cache/GridCacheSharedContext.java | 2 +- .../cache/query/GridCacheLocalQueryFuture.java | 2 +- .../cache/query/GridCacheQueryRequest.java | 2 +- .../GridCacheContinuousQueryEntry.java | 2 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 2 +- .../closure/GridClosureProcessor.java | 2 +- .../continuous/GridContinuousProcessor.java | 2 +- .../dataload/GridDataLoaderProcessor.java | 2 +- .../processors/dr/GridRawVersionedEntry.java | 2 +- .../processors/dr/GridVersionedEntry.java | 2 +- .../processors/ggfs/GridGgfsAckMessage.java | 2 +- .../ggfs/GridGgfsCommunicationMessage.java | 2 +- .../processors/ggfs/GridGgfsDeleteMessage.java | 2 +- .../kernal/processors/job/GridJobProcessor.java | 2 +- .../kernal/processors/job/GridJobWorker.java | 2 +- .../offheap/GridOffHeapProcessor.java | 2 +- .../resource/GridResourceCustomInjector.java | 2 +- .../resource/GridResourceProcessor.java | 2 +- .../tcp/GridMemcachedMessageWrapper.java | 2 +- .../tcp/GridTcpMemcachedNioListener.java | 2 +- .../rest/protocols/tcp/GridTcpRestParser.java | 2 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 2 +- .../service/GridServiceProcessor.java | 2 +- .../processors/task/GridTaskProcessor.java | 2 +- .../kernal/processors/task/GridTaskWorker.java | 2 +- .../grid/marshaller/GridAbstractMarshaller.java | 57 -------- .../grid/marshaller/GridMarshaller.java | 130 ----------------- .../marshaller/GridMarshallerExclusions.java | 145 ------------------- .../grid/marshaller/jdk/GridJdkMarshaller.java | 2 +- .../GridJdkMarshallerObjectOutputStream.java | 2 +- .../optimized/GridOptimizedClassDescriptor.java | 2 +- .../optimized/GridOptimizedMarshaller.java | 2 +- .../org/gridgain/grid/marshaller/package.html | 15 -- .../sharedfs/GridSharedFsCheckpointSpi.java | 2 +- .../sharedfs/GridSharedFsTimeoutTask.java | 2 +- .../checkpoint/sharedfs/GridSharedFsUtils.java | 2 +- .../tcp/GridTcpCommunicationSpi.java | 2 +- .../spi/discovery/tcp/GridTcpDiscoverySpi.java | 2 +- .../tcp/GridTcpDiscoverySpiAdapter.java | 2 +- .../GridTcpDiscoveryMulticastIpFinder.java | 2 +- .../spi/indexing/GridIndexingEntityAdapter.java | 3 +- .../swapspace/file/GridFileSwapSpaceSpi.java | 2 +- .../org/gridgain/jdbc/util/GridJdbcUtils.java | 2 +- .../grid/GridExternalizableAbstractTest.java | 2 +- .../java/org/gridgain/grid/GridTestIoUtils.java | 2 +- .../grid/ggfs/GridGgfsPathSelfTest.java | 2 +- .../kernal/GridJobMasterLeaveAwareSelfTest.java | 2 +- .../kernal/GridTopicExternalizableSelfTest.java | 2 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 2 +- .../processors/cache/GridCacheMvccSelfTest.java | 2 +- .../dataload/GridDataLoaderImplSelfTest.java | 2 +- .../ggfs/GridGgfsFileInfoSelfTest.java | 2 +- .../marshaller/GridMarshallerAbstractTest.java | 1 + .../marshaller/GridMarshallerResourceBean.java | 1 + .../jdk/GridJdkMarshallerSelfTest.java | 1 + .../GridOptimizedMarshallerSelfTest.java | 1 + .../optimized/GridOptimizedMarshallerTest.java | 1 + .../GridOptimizedObjectStreamSelfTest.java | 2 +- .../GridSessionCheckpointAbstractSelfTest.java | 2 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 2 +- .../GridAbstractDiscoverySelfTest.java | 2 +- .../util/future/GridFinishedFutureSelfTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 2 +- .../testframework/junits/GridTestResources.java | 2 +- .../GridHadoopExternalCommunication.java | 2 +- .../GridHadoopMarshallerFilter.java | 2 +- ...GridHadoopExternalCommunicationSelfTest.java | 2 +- .../hibernate/GridCacheHibernateBlobStore.java | 2 +- .../grid/spi/indexing/h2/GridH2IndexingSpi.java | 2 +- .../GridIndexingSpiAbstractSelfTest.java | 2 +- .../grid/kernal/GridFactorySelfTest.java | 2 +- .../GridSpringBeanSerializationSelfTest.java | 2 +- .../GridResourceFieldInjectionSelfTest.java | 2 +- .../GridResourceMethodInjectionSelfTest.java | 2 +- 99 files changed, 438 insertions(+), 435 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java b/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java index d0fcf23..2a7cf00 100644 --- a/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java +++ b/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java @@ -14,9 +14,9 @@ import com.amazonaws.auth.*; import com.amazonaws.services.s3.*; import com.amazonaws.services.s3.model.*; import org.apache.ignite.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.checkpoint.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 4f7ac77..08d13a7 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 @@ -11,8 +11,8 @@ package org.gridgain.grid.kernal.processors.rest; import org.apache.ignite.*; import org.apache.ignite.logger.java.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 a6574f3..18075c7 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 @@ -14,6 +14,7 @@ import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.managed.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.plugin.*; import org.gridgain.client.ssl.*; import org.gridgain.grid.*; @@ -24,7 +25,6 @@ import org.gridgain.grid.dr.hub.sender.*; import org.gridgain.grid.ggfs.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.managers.eventstorage.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.portables.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java new file mode 100644 index 0000000..40fd1ad --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java @@ -0,0 +1,57 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.marshaller; + +import org.gridgain.grid.*; +import org.gridgain.grid.util.*; +import org.gridgain.grid.util.typedef.internal.*; +import org.gridgain.grid.util.io.*; +import org.jetbrains.annotations.*; + +/** + * Base class for marshallers. Provides default implementations of methods + * that work with byte array or {@link GridByteArrayList}. These implementations + * use {@link GridByteArrayInputStream} or {@link GridByteArrayOutputStream} + * to marshal and unmarshal objects. + */ +public abstract class GridAbstractMarshaller implements GridMarshaller { + /** Default initial buffer size for the {@link GridByteArrayOutputStream}. */ + public static final int DFLT_BUFFER_SIZE = 512; + + /** {@inheritDoc} */ + @Override public byte[] marshal(@Nullable Object obj) throws GridException { + GridByteArrayOutputStream out = null; + + try { + out = new GridByteArrayOutputStream(DFLT_BUFFER_SIZE); + + marshal(obj, out); + + return out.toByteArray(); + } + finally { + U.close(out, null); + } + } + + /** {@inheritDoc} */ + @Override public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException { + GridByteArrayInputStream in = null; + + try { + in = new GridByteArrayInputStream(arr, 0, arr.length); + + return unmarshal(in, clsLdr); + } + finally { + U.close(in, null); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 new file mode 100644 index 0000000..703eb51 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java @@ -0,0 +1,130 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.marshaller; + +import org.gridgain.grid.*; +import org.gridgain.grid.marshaller.jdk.*; +import org.gridgain.grid.marshaller.optimized.*; +import org.jetbrains.annotations.*; + +import java.io.*; + +/** + * {@code GridMarshaller} allows to marshal or unmarshal objects in grid. It provides + * serialization/deserialization mechanism for all instances that are sent across networks + * or are otherwise serialized. + * <p> + * Gridgain provides the following {@code GridMarshaller} implementations: + * <ul> + * <li>{@link GridOptimizedMarshaller} - default</li> + * <li>{@link GridJdkMarshaller}</li> + * </ul> + * <p> + * Below are examples of marshaller configuration, usage, and injection into tasks, jobs, + * and SPI's. + * <h2 class="header">Java Example</h2> + * {@code GridMarshaller} can be explicitely configured in code. + * <pre name="code" class="java"> + * GridJdkMarshaller marshaller = new GridJdkMarshaller(); + * + * GridConfiguration cfg = new GridConfiguration(); + * + * // Override marshaller. + * cfg.setMarshaller(marshaller); + * + * // Starts grid. + * G.start(cfg); + * </pre> + * <h2 class="header">Spring Example</h2> + * GridMarshaller 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; + * + * public Serializable execute() { + * // Use marshaller to serialize/deserialize any object. + * ... + * } + * } + * </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> + */ +public interface GridMarshaller { + /** + * Marshals object to the output stream. This method should not close + * given output stream. + * + * @param obj Object to marshal. + * @param out Output stream to marshal into. + * @throws GridException If marshalling failed. + */ + public void marshal(@Nullable Object obj, OutputStream out) throws GridException; + + /** + * Marshals object to byte array. + * + * @param obj Object to marshal. + * @return Byte array. + * @throws GridException If marshalling failed. + */ + public byte[] marshal(@Nullable Object obj) throws GridException; + + /** + * Unmarshals object from the output stream using given class loader. + * This method should not close given input stream. + * + * @param <T> Type of unmarshalled object. + * @param in Input stream. + * @param clsLdr Class loader to use. + * @return Unmarshalled object. + * @throws GridException If unmarshalling failed. + */ + public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException; + + /** + * Unmarshals object from byte array using given class loader. + * + * @param <T> Type of unmarshalled object. + * @param arr Byte array. + * @param clsLdr Class loader to use. + * @return Unmarshalled object. + * @throws GridException If unmarshalling failed. + */ + public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException; +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java new file mode 100644 index 0000000..d9d7792 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java @@ -0,0 +1,145 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.marshaller; + +import org.apache.ignite.*; +import org.apache.ignite.compute.*; +import org.gridgain.grid.kernal.*; +import org.gridgain.grid.kernal.executor.*; +import org.gridgain.grid.util.*; +import org.gridgain.grid.util.typedef.internal.*; + +import javax.management.*; +import java.util.*; +import java.util.concurrent.*; + +/** + * Controls what classes should be excluded from marshalling by default. + */ +public final class GridMarshallerExclusions { + /** + * Classes that must be included in serialization. All marshallers must + * included these classes. + * <p> + * Note that this list supercedes {@link #EXCL_CLASSES}. + */ + private static final Class<?>[] INCL_CLASSES = new Class[] { + // GridGain classes. + GridLoggerProxy.class, + GridExecutorService.class + }; + + /** */ + private static final Map<Class<?>, Boolean> cache = new GridBoundedConcurrentLinkedHashMap<>( + 512, 512, 0.75f, 16); + + /** + * Excluded grid classes from serialization. All marshallers must omit + * these classes. Fields of these types should be serialized as {@code null}. + * <p> + * Note that {@link #INCL_CLASSES} supercedes this list. + */ + private static final Class<?>[] EXCL_CLASSES; + + /** + * + */ + static { + Class springCtxCls = null; + + try { + springCtxCls = Class.forName("org.springframework.context.ApplicationContext"); + } + catch (Exception ignored) { + // No-op. + } + + List<Class<?>> excl = new ArrayList<>(); + + // Non-GridGain classes. + excl.add(MBeanServer.class); + excl.add(ExecutorService.class); + excl.add(ClassLoader.class); + excl.add(Thread.class); + + if (springCtxCls != null) + excl.add(springCtxCls); + + // GridGain classes. + excl.add(IgniteLogger.class); + excl.add(ComputeTaskSession.class); + excl.add(ComputeLoadBalancer.class); + excl.add(ComputeJobContext.class); + excl.add(GridMarshaller.class); + excl.add(GridComponent.class); + excl.add(ComputeTaskContinuousMapper.class); + + EXCL_CLASSES = U.toArray(excl, new Class[excl.size()]); + } + + /** + * Ensures singleton. + */ + private GridMarshallerExclusions() { + // No-op. + } + + /** + * Checks given class against predefined set of excluded types. + * + * @param cls Class to check. + * @return {@code true} if class should be excluded, {@code false} otherwise. + */ + @SuppressWarnings("ForLoopReplaceableByForEach") + private static boolean isExcluded0(Class<?> cls) { + assert cls != null; + + final Class<?>[] inc = INCL_CLASSES; + + // NOTE: don't use foreach for performance reasons. + for (int i = 0; i < inc.length; i++) + if (inc[i].isAssignableFrom(cls)) + return false; + + final Class<?>[] exc = EXCL_CLASSES; + + // NOTE: don't use foreach for performance reasons. + for (int i = 0; i < exc.length; i++) + if (exc[i].isAssignableFrom(cls)) + return true; + + return false; + } + + /** + * Checks whether or not given class should be excluded from marshalling. + * + * @param cls Class to check. + * @return {@code true} if class should be excluded, {@code false} otherwise. + */ + public static boolean isExcluded(Class<?> cls) { + Boolean res = cache.get(cls); + + if (res == null) { + res = isExcluded0(cls); + + cache.put(cls, res); + } + + return res; + } + + /** + * Intended for test purposes only. + */ + public static void clearCache() { + cache.clear(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/apache/ignite/marshaller/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/package.html b/modules/core/src/main/java/org/apache/ignite/marshaller/package.html new file mode 100644 index 0000000..0129583 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/package.html @@ -0,0 +1,15 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> +<!-- + @html.file.header + _________ _____ __________________ _____ + __ ____/___________(_)______ /__ ____/______ ____(_)_______ + _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ +--> +<html> +<body> + <!-- Package description. --> + Contains various supported marshallers. +</body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java index 5fc46a5..0ad0732 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java @@ -9,13 +9,12 @@ package org.apache.ignite.resources; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import java.lang.annotation.*; /** - * Annotates a field or a setter method for injection of {@link GridMarshaller} resource. Grid marshaller + * Annotates a field or a setter method for injection of {@link org.apache.ignite.marshaller.GridMarshaller} resource. Grid marshaller * is provided to grid via {@link org.apache.ignite.configuration.IgniteConfiguration}. * <p> * Marshaller can be injected into instances of following classes: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java index 4ed0998..a7f195f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java @@ -11,11 +11,11 @@ package org.gridgain.grid.cache.affinity.rendezvous; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java index 4e5512d..d9df3e7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java @@ -10,11 +10,11 @@ package org.gridgain.grid.cache.store.jdbc; import org.apache.ignite.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.store.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java index 5590a0b..c1f27de 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java @@ -12,12 +12,12 @@ package org.gridgain.grid.kernal; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.continuous.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 d9db364..1fe7cbd 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 @@ -14,6 +14,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.logger.*; import org.apache.ignite.logger.java.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.mbean.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; @@ -22,7 +23,6 @@ import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.processors.interop.*; import org.gridgain.grid.kernal.processors.resource.*; import org.gridgain.grid.kernal.processors.spring.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.segmentation.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java index 772e82d..e91f3f4 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java @@ -10,8 +10,8 @@ package org.gridgain.grid.kernal; import org.apache.ignite.compute.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java index cbc9d18..965c526 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java @@ -14,6 +14,7 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.mbean.*; import org.apache.ignite.plugin.*; import org.gridgain.grid.*; @@ -57,7 +58,6 @@ import org.gridgain.grid.kernal.processors.session.*; import org.gridgain.grid.kernal.processors.streamer.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.portables.*; import org.gridgain.grid.product.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java index 97a9bd7..406273e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java @@ -13,11 +13,11 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.*; import org.gridgain.grid.kernal.managers.communication.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.checkpoint.*; import org.gridgain.grid.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java index a52a46b..7cb14ec 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java @@ -12,13 +12,13 @@ package org.gridgain.grid.kernal.managers.communication; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.communication.*; import org.gridgain.grid.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java index e868343..c7f6a14 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java @@ -13,11 +13,11 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.eventstorage.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java index ad05dea..585fbd7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java @@ -12,12 +12,12 @@ package org.gridgain.grid.kernal.managers.eventstorage; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.deployment.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.security.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.eventstorage.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java index 418e8b6..99cd118 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java @@ -10,13 +10,13 @@ package org.gridgain.grid.kernal.managers.indexing; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.portables.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.indexing.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java index 3791958..2e7085c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java @@ -11,10 +11,10 @@ package org.gridgain.grid.kernal.managers.swapspace; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.swapspace.*; import org.gridgain.grid.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java index a7ed532..85d1107 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java @@ -13,6 +13,7 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.cloner.*; @@ -35,7 +36,6 @@ import org.gridgain.grid.kernal.processors.closure.*; import org.gridgain.grid.kernal.processors.offheap.*; import org.gridgain.grid.kernal.processors.portable.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.portables.*; import org.gridgain.grid.security.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java index 614252a..66aaf5b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java @@ -9,9 +9,9 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java index 52e5947..c7bef12 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java @@ -10,11 +10,11 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.deployment.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java index 808c117..fd03aaa 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java @@ -13,6 +13,7 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; @@ -21,7 +22,6 @@ import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.managers.discovery.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.typedef.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java index aa7f739..c584996 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java @@ -10,10 +10,10 @@ package org.gridgain.grid.kernal.processors.cache.query; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java index 5c54108..1c5d7ba 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java @@ -10,11 +10,11 @@ package org.gridgain.grid.kernal.processors.cache.query; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java index 964afe7..33d8e82 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java @@ -10,11 +10,11 @@ package org.gridgain.grid.kernal.processors.cache.query.continuous; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 ff150df..434a290 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 @@ -12,12 +12,12 @@ package org.gridgain.grid.kernal.processors.cache.query.jdbc; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.query.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 1d148d2..eaf57e1 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 @@ -12,13 +12,13 @@ package org.gridgain.grid.kernal.processors.cache.query.jdbc; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.query.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.spi.indexing.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java index 6c24f5d..cd83114 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java @@ -12,13 +12,13 @@ package org.gridgain.grid.kernal.processors.closure; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java index 6166f72..d6ab870 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java @@ -12,6 +12,7 @@ package org.gridgain.grid.kernal.processors.continuous; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; @@ -19,7 +20,6 @@ import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.kernal.processors.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.thread.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.future.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java index d09608d..0a8d9c2 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java @@ -12,12 +12,12 @@ package org.gridgain.grid.kernal.processors.dataload; import org.apache.ignite.*; import org.apache.ignite.dataload.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.processors.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.thread.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java index f0cf251..83a1824 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java @@ -9,9 +9,9 @@ package org.gridgain.grid.kernal.processors.dr; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java index 7dd47ae..8a04583 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java @@ -9,9 +9,9 @@ package org.gridgain.grid.kernal.processors.dr; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.marshaller.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java index 78f2562..ff92b80 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java @@ -10,9 +10,9 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.direct.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java index 15f2754..0c9ad31 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.ggfs; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.direct.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java index 9cbe3a0..7813fe5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java @@ -10,9 +10,9 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java index bc40b52..b5589e1 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java @@ -13,6 +13,7 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.collision.*; @@ -21,7 +22,6 @@ import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.kernal.processors.*; import org.gridgain.grid.kernal.processors.jobmetrics.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.product.*; import org.gridgain.grid.spi.collision.*; import org.gridgain.grid.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java index 8fef3ac..b18294e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java @@ -14,13 +14,13 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.worker.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java index 9459b7a..cd5a31c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java @@ -10,10 +10,10 @@ package org.gridgain.grid.kernal.processors.offheap; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.offheap.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java index c814579..9ac4f99 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java @@ -12,11 +12,11 @@ package org.gridgain.grid.kernal.processors.resource; import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.managed.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.deployment.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java index 1c2bc95..8463fe7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java @@ -13,12 +13,12 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.managed.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.processors.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java index d366ffa..1bcf300 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.rest.protocols.tcp; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 6c5ddc7..6f14c58 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 @@ -11,12 +11,12 @@ package org.gridgain.grid.kernal.processors.rest.protocols.tcp; import org.apache.ignite.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.rest.*; import org.gridgain.grid.kernal.processors.rest.handlers.cache.*; import org.gridgain.grid.kernal.processors.rest.request.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 5203825..a45179c 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 @@ -8,10 +8,10 @@ */ package org.gridgain.grid.kernal.processors.rest.protocols.tcp; +import org.apache.ignite.marshaller.*; import org.gridgain.client.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.rest.client.message.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.nio.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 633c90a..ee574af 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 @@ -10,6 +10,7 @@ package org.gridgain.grid.kernal.processors.rest.protocols.tcp; import org.apache.ignite.configuration.*; +import org.apache.ignite.marshaller.*; import org.gridgain.client.marshaller.*; import org.gridgain.client.marshaller.jdk.*; import org.gridgain.client.marshaller.optimized.*; @@ -19,7 +20,6 @@ import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.rest.*; import org.gridgain.grid.kernal.processors.rest.client.message.*; import org.gridgain.grid.kernal.processors.rest.protocols.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.util.direct.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 ca112ac..c2a580f 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 @@ -14,6 +14,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.managed.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.GridCacheContinuousQueryEntry; @@ -23,7 +24,6 @@ import org.gridgain.grid.kernal.processors.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.query.continuous.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.thread.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.future.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 f07bf46..f6c1e0f 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 @@ -13,6 +13,7 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; @@ -20,7 +21,6 @@ import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.kernal.processors.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.security.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 9d7c705..b76f6c1 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 @@ -14,6 +14,7 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.ggfs.*; @@ -21,7 +22,6 @@ import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.processors.job.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.worker.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/GridAbstractMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridAbstractMarshaller.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/GridAbstractMarshaller.java deleted file mode 100644 index 5bea1f6..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridAbstractMarshaller.java +++ /dev/null @@ -1,57 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.marshaller; - -import org.gridgain.grid.*; -import org.gridgain.grid.util.*; -import org.gridgain.grid.util.typedef.internal.*; -import org.gridgain.grid.util.io.*; -import org.jetbrains.annotations.*; - -/** - * Base class for marshallers. Provides default implementations of methods - * that work with byte array or {@link GridByteArrayList}. These implementations - * use {@link GridByteArrayInputStream} or {@link GridByteArrayOutputStream} - * to marshal and unmarshal objects. - */ -public abstract class GridAbstractMarshaller implements GridMarshaller { - /** Default initial buffer size for the {@link GridByteArrayOutputStream}. */ - public static final int DFLT_BUFFER_SIZE = 512; - - /** {@inheritDoc} */ - @Override public byte[] marshal(@Nullable Object obj) throws GridException { - GridByteArrayOutputStream out = null; - - try { - out = new GridByteArrayOutputStream(DFLT_BUFFER_SIZE); - - marshal(obj, out); - - return out.toByteArray(); - } - finally { - U.close(out, null); - } - } - - /** {@inheritDoc} */ - @Override public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException { - GridByteArrayInputStream in = null; - - try { - in = new GridByteArrayInputStream(arr, 0, arr.length); - - return unmarshal(in, clsLdr); - } - finally { - U.close(in, null); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshaller.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshaller.java deleted file mode 100644 index e8e6f2b..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshaller.java +++ /dev/null @@ -1,130 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.marshaller; - -import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.jdk.*; -import org.gridgain.grid.marshaller.optimized.*; -import org.jetbrains.annotations.*; - -import java.io.*; - -/** - * {@code GridMarshaller} allows to marshal or unmarshal objects in grid. It provides - * serialization/deserialization mechanism for all instances that are sent across networks - * or are otherwise serialized. - * <p> - * Gridgain provides the following {@code GridMarshaller} implementations: - * <ul> - * <li>{@link GridOptimizedMarshaller} - default</li> - * <li>{@link GridJdkMarshaller}</li> - * </ul> - * <p> - * Below are examples of marshaller configuration, usage, and injection into tasks, jobs, - * and SPI's. - * <h2 class="header">Java Example</h2> - * {@code GridMarshaller} can be explicitely configured in code. - * <pre name="code" class="java"> - * GridJdkMarshaller marshaller = new GridJdkMarshaller(); - * - * GridConfiguration cfg = new GridConfiguration(); - * - * // Override marshaller. - * cfg.setMarshaller(marshaller); - * - * // Starts grid. - * G.start(cfg); - * </pre> - * <h2 class="header">Spring Example</h2> - * GridMarshaller 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; - * - * public Serializable execute() { - * // Use marshaller to serialize/deserialize any object. - * ... - * } - * } - * </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> - */ -public interface GridMarshaller { - /** - * Marshals object to the output stream. This method should not close - * given output stream. - * - * @param obj Object to marshal. - * @param out Output stream to marshal into. - * @throws GridException If marshalling failed. - */ - public void marshal(@Nullable Object obj, OutputStream out) throws GridException; - - /** - * Marshals object to byte array. - * - * @param obj Object to marshal. - * @return Byte array. - * @throws GridException If marshalling failed. - */ - public byte[] marshal(@Nullable Object obj) throws GridException; - - /** - * Unmarshals object from the output stream using given class loader. - * This method should not close given input stream. - * - * @param <T> Type of unmarshalled object. - * @param in Input stream. - * @param clsLdr Class loader to use. - * @return Unmarshalled object. - * @throws GridException If unmarshalling failed. - */ - public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException; - - /** - * Unmarshals object from byte array using given class loader. - * - * @param <T> Type of unmarshalled object. - * @param arr Byte array. - * @param clsLdr Class loader to use. - * @return Unmarshalled object. - * @throws GridException If unmarshalling failed. - */ - public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException; -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java deleted file mode 100644 index 76b81bc..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java +++ /dev/null @@ -1,145 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.marshaller; - -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.gridgain.grid.kernal.*; -import org.gridgain.grid.kernal.executor.*; -import org.gridgain.grid.util.*; -import org.gridgain.grid.util.typedef.internal.*; - -import javax.management.*; -import java.util.*; -import java.util.concurrent.*; - -/** - * Controls what classes should be excluded from marshalling by default. - */ -public final class GridMarshallerExclusions { - /** - * Classes that must be included in serialization. All marshallers must - * included these classes. - * <p> - * Note that this list supercedes {@link #EXCL_CLASSES}. - */ - private static final Class<?>[] INCL_CLASSES = new Class[] { - // GridGain classes. - GridLoggerProxy.class, - GridExecutorService.class - }; - - /** */ - private static final Map<Class<?>, Boolean> cache = new GridBoundedConcurrentLinkedHashMap<>( - 512, 512, 0.75f, 16); - - /** - * Excluded grid classes from serialization. All marshallers must omit - * these classes. Fields of these types should be serialized as {@code null}. - * <p> - * Note that {@link #INCL_CLASSES} supercedes this list. - */ - private static final Class<?>[] EXCL_CLASSES; - - /** - * - */ - static { - Class springCtxCls = null; - - try { - springCtxCls = Class.forName("org.springframework.context.ApplicationContext"); - } - catch (Exception ignored) { - // No-op. - } - - List<Class<?>> excl = new ArrayList<>(); - - // Non-GridGain classes. - excl.add(MBeanServer.class); - excl.add(ExecutorService.class); - excl.add(ClassLoader.class); - excl.add(Thread.class); - - if (springCtxCls != null) - excl.add(springCtxCls); - - // GridGain classes. - excl.add(IgniteLogger.class); - excl.add(ComputeTaskSession.class); - excl.add(ComputeLoadBalancer.class); - excl.add(ComputeJobContext.class); - excl.add(GridMarshaller.class); - excl.add(GridComponent.class); - excl.add(ComputeTaskContinuousMapper.class); - - EXCL_CLASSES = U.toArray(excl, new Class[excl.size()]); - } - - /** - * Ensures singleton. - */ - private GridMarshallerExclusions() { - // No-op. - } - - /** - * Checks given class against predefined set of excluded types. - * - * @param cls Class to check. - * @return {@code true} if class should be excluded, {@code false} otherwise. - */ - @SuppressWarnings("ForLoopReplaceableByForEach") - private static boolean isExcluded0(Class<?> cls) { - assert cls != null; - - final Class<?>[] inc = INCL_CLASSES; - - // NOTE: don't use foreach for performance reasons. - for (int i = 0; i < inc.length; i++) - if (inc[i].isAssignableFrom(cls)) - return false; - - final Class<?>[] exc = EXCL_CLASSES; - - // NOTE: don't use foreach for performance reasons. - for (int i = 0; i < exc.length; i++) - if (exc[i].isAssignableFrom(cls)) - return true; - - return false; - } - - /** - * Checks whether or not given class should be excluded from marshalling. - * - * @param cls Class to check. - * @return {@code true} if class should be excluded, {@code false} otherwise. - */ - public static boolean isExcluded(Class<?> cls) { - Boolean res = cache.get(cls); - - if (res == null) { - res = isExcluded0(cls); - - cache.put(cls, res); - } - - return res; - } - - /** - * Intended for test purposes only. - */ - public static void clearCache() { - cache.clear(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java index e4d12fc..b8826a5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java +++ b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java @@ -9,8 +9,8 @@ package org.gridgain.grid.marshaller.jdk; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java index beeca05..e820977 100644 --- a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java +++ b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java @@ -9,7 +9,7 @@ package org.gridgain.grid.marshaller.jdk; -import org.gridgain.grid.marshaller.*; +import org.apache.ignite.marshaller.*; import org.jetbrains.annotations.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java index 18ec95f..af15ab8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java +++ b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java @@ -10,7 +10,7 @@ package org.gridgain.grid.marshaller.optimized; import org.apache.ignite.lang.*; -import org.gridgain.grid.marshaller.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; import sun.misc.*;
![http://www.gridgain.com/images/spring-small.png"](http://www.gridgain.com/images/spring-small.png"){kind=link}