From c2a7f6247ad7e568364a810fc19aed71ac177d15 Mon Sep 17 00:00:00 2001 From: AKuznetsov Date: Fri, 13 Feb 2015 10:54:45 +0700 Subject: [PATCH] IGNITE-241 Fixed NonSerializableWithSerialVersionUIDField warning. --- .../apache/ignite/internal/managers/deployment/GridDeployment.java | 3 --- .../ignite/internal/managers/deployment/GridDeploymentManager.java | 3 --- .../internal/managers/deployment/GridDeploymentPerLoaderStore.java | 3 --- .../internal/managers/deployment/GridDeploymentPerVersionStore.java | 3 --- .../processors/cache/distributed/GridDistributedCacheEntry.java | 3 --- .../processors/cache/distributed/dht/GridDhtCacheEntry.java | 3 --- .../cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java | 3 --- .../cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java | 3 --- .../processors/cache/distributed/near/GridNearCacheEntry.java | 3 --- .../ignite/internal/processors/cache/local/GridLocalCacheEntry.java | 3 --- .../internal/processors/cache/query/GridCacheQueryManager.java | 3 --- .../internal/processors/cache/transactions/IgniteTxAdapter.java | 3 --- .../apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java | 3 --- .../src/main/java/org/apache/ignite/logger/java/JavaLogger.java | 3 --- .../ignite/testframework/junits/logger/GridTestLog4jLogger.java | 3 --- .../apache/ignite/internal/fs/hadoop/GridGgfsHadoopJclLogger.java | 3 --- .../src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java | 3 --- .../src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java | 6 +----- .../ignite/internal/processors/schedule/ScheduleFutureImpl.java | 3 --- .../main/java/org/apache/ignite/logger/slf4j/GridSlf4jLogger.java | 3 --- 20 files changed, 1 insertion(+), 62 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java index 4f6e39e..ad53ae9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java @@ -40,9 +40,6 @@ import java.util.concurrent.atomic.*; * Represents single class deployment. */ public class GridDeployment extends GridMetadataAwareAdapter implements GridDeploymentInfo { - /** */ - private static final long serialVersionUID = 0L; - /** Timestamp. */ private final long ts = U.currentTimeMillis(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java index 76fa1af..d8bce03 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java @@ -551,9 +551,6 @@ public class GridDeploymentManager extends GridManagerAdapter { * */ private static class LocalDeployment extends GridDeployment { - /** */ - private static final long serialVersionUID = 0L; - /** * @param depMode Mode. * @param clsLdr Loader. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java index a031e4f..7a98cbc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java @@ -395,9 +395,6 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter { * */ private class IsolatedDeployment extends GridDeployment { - /** */ - private static final long serialVersionUID = 0L; - /** Sender node ID. */ private final ClusterNode sndNode; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java index 0157f76..dc72248 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java @@ -1043,9 +1043,6 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter { * */ private class SharedDeployment extends GridDeployment { - /** */ - private static final long serialVersionUID = 0L; - /** Flag indicating whether this deployment was removed from cache. */ private boolean rmv; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java index 1e6c562..46a04a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java @@ -33,9 +33,6 @@ import static org.apache.ignite.events.EventType.*; */ @SuppressWarnings({"NonPrivateFieldAccessedInSynchronizedContext", "TooBroadScope"}) public class GridDistributedCacheEntry extends GridCacheMapEntry { - /** */ - private static final long serialVersionUID = 0L; - /** Remote candidates snapshot. */ private volatile List> rmts = Collections.emptyList(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java index b2fcc50..0c75a85 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java @@ -38,9 +38,6 @@ import java.util.*; */ @SuppressWarnings({"TooBroadScope", "NonPrivateFieldAccessedInSynchronizedContext"}) public class GridDhtCacheEntry extends GridDistributedCacheEntry { - /** */ - private static final long serialVersionUID = 0L; - /** Size overhead. */ private static final int DHT_SIZE_OVERHEAD = 16; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java index 78bb604..2fa9922 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java @@ -25,9 +25,6 @@ import org.apache.ignite.internal.util.typedef.internal.*; * DHT atomic cache entry. */ public class GridDhtAtomicCacheEntry extends GridDhtCacheEntry { - /** */ - private static final long serialVersionUID = 0L; - /** * @param ctx Cache context. * @param topVer Topology version at the time of creation (if negative, then latest topology is assumed). diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java index ceed6bd..b19a2da 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java @@ -25,9 +25,6 @@ import org.apache.ignite.internal.util.typedef.internal.*; * Cache entry for colocated cache. */ public class GridDhtColocatedCacheEntry extends GridDhtCacheEntry { - /** */ - private static final long serialVersionUID = 0L; - /** * @param ctx Cache context. * @param topVer Topology version at the time of creation (if negative, then latest topology is assumed). diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java index 85bd340..c6a919c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java @@ -41,9 +41,6 @@ import static org.apache.ignite.events.EventType.*; @SuppressWarnings({"NonPrivateFieldAccessedInSynchronizedContext", "TooBroadScope"}) public class GridNearCacheEntry extends GridDistributedCacheEntry { /** */ - private static final long serialVersionUID = 0L; - - /** */ private static final int NEAR_SIZE_OVERHEAD = 36; /** ID of primary node from which this entry was last read. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java index 7f992d3..09f9bbf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java @@ -29,9 +29,6 @@ import static org.apache.ignite.events.EventType.*; */ @SuppressWarnings({"NonPrivateFieldAccessedInSynchronizedContext", "TooBroadScope"}) public class GridLocalCacheEntry extends GridCacheMapEntry { - /** */ - private static final long serialVersionUID = 0L; - /** * @param ctx Cache registry. * @param key Cache key. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index 985dba9..1615631 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -2553,9 +2553,6 @@ public abstract class GridCacheQueryManager extends GridCacheManagerAdapte */ private class GridCacheScanSwapEntry implements Cache.Entry { /** */ - private static final long serialVersionUID = 1262515168518736214L; - - /** */ private final AbstractLazySwapEntry e; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java index ac508c8..48e5f2c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java @@ -1462,9 +1462,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter * Transaction shadow class to be used for deserialization. */ private static class TxShadow implements IgniteInternalTx { - /** */ - private static final long serialVersionUID = 0L; - /** Xid. */ private final IgniteUuid xid; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java index 3711547..5dadc48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java @@ -34,9 +34,6 @@ import java.util.concurrent.*; */ @SuppressWarnings( {"SynchronizeOnNonFinalField"}) public class GridMetadataAwareAdapter { - /** */ - private static final long serialVersionUID = 0L; - /** Attributes. */ @GridToStringInclude private GridLeanMap data; diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java index a9e3d0a..cdfe118 100644 --- a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java @@ -83,9 +83,6 @@ import static org.apache.ignite.IgniteSystemProperties.*; */ public class JavaLogger implements IgniteLogger, LoggerNodeIdAware { /** */ - private static final long serialVersionUID = 0L; - - /** */ public static final String DFLT_CONFIG_PATH = "config/java.util.logging.properties"; /** */ diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java index 098f713..31b3253 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java @@ -65,9 +65,6 @@ import static org.apache.ignite.IgniteSystemProperties.*; * injection. */ public class GridTestLog4jLogger implements IgniteLogger, LoggerNodeIdAware { - /** */ - private static final long serialVersionUID = 0L; - /** Appenders. */ private static Collection fileAppenders = new GridConcurrentHashSet<>(); diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopJclLogger.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopJclLogger.java index a7d0f56..3e0291f 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopJclLogger.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopJclLogger.java @@ -25,9 +25,6 @@ import org.jetbrains.annotations.*; * JCL logger wrapper for Hadoop. */ public class GridGgfsHadoopJclLogger implements IgniteLogger { - /** */ - private static final long serialVersionUID = 0L; - /** JCL implementation proxy. */ private Log impl; diff --git a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java index 87be646..90ff263 100644 --- a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java +++ b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java @@ -73,9 +73,6 @@ import org.jetbrains.annotations.*; * injection. */ public class IgniteJclLogger implements IgniteLogger { - /** */ - private static final long serialVersionUID = 0L; - /** JCL implementation proxy. */ private Log impl; diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java index 561acd4..e102974 100644 --- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java +++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java @@ -64,11 +64,7 @@ import static org.apache.ignite.IgniteSystemProperties.*; * logger in your task/job code. See {@link org.apache.ignite.resources.LoggerResource} annotation about logger * injection. */ -public class Log4JLogger implements IgniteLogger, LoggerNodeIdAware, - IgniteLog4jFileAware { - /** */ - private static final long serialVersionUID = 0L; - +public class Log4JLogger implements IgniteLogger, LoggerNodeIdAware, IgniteLog4jFileAware { /** Appenders. */ private static Collection fileAppenders = new GridConcurrentHashSet<>(); diff --git a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java index 67531b4..34284ac 100644 --- a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java +++ b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java @@ -808,9 +808,6 @@ class ScheduleFutureImpl implements SchedulerFuture, Externalizable { */ private static class ScheduleFutureSnapshot implements SchedulerFuture { /** */ - private static final long serialVersionUID = 0L; - - /** */ private ScheduleFutureImpl ref; /** */ diff --git a/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/GridSlf4jLogger.java b/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/GridSlf4jLogger.java index fa8576e..417108d 100644 --- a/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/GridSlf4jLogger.java +++ b/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/GridSlf4jLogger.java @@ -37,9 +37,6 @@ import org.slf4j.*; * injection. */ public class GridSlf4jLogger implements IgniteLogger { - /** */ - private static final long serialVersionUID = 0L; - /** SLF4J implementation proxy. */ private final Logger impl; -- 1.9.4.msysgit.0