diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/PreJoinCacheConfig.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/PreJoinCacheConfig.java index 3ad34de7ca00a..4ec552699a606 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/PreJoinCacheConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/PreJoinCacheConfig.java @@ -22,7 +22,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.spi.tenantcontrol.TenantControl; @@ -41,7 +40,7 @@ * @param the value type * @since 3.9 */ -public class PreJoinCacheConfig extends CacheConfig implements Versioned, IdentifiedDataSerializable { +public class PreJoinCacheConfig extends CacheConfig implements IdentifiedDataSerializable { public PreJoinCacheConfig() { super(); } @@ -49,7 +48,8 @@ public PreJoinCacheConfig() { /** * Constructor that copies given {@code cacheConfig}'s properties to a new {@link PreJoinCacheConfig}. It is assumed that * the given {@code cacheConfig}'s key-value types have already been resolved to loaded classes. - * @param cacheConfig the original {@link CacheConfig} to copy into a new {@link PreJoinCacheConfig} + * + * @param cacheConfig the original {@link CacheConfig} to copy into a new {@link PreJoinCacheConfig} */ public PreJoinCacheConfig(CacheConfig cacheConfig) { this(cacheConfig, true); diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/merge/entry/DefaultCacheEntryView.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/merge/entry/DefaultCacheEntryView.java index 01985f9086aa9..a8aece378a44a 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/merge/entry/DefaultCacheEntryView.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/merge/entry/DefaultCacheEntryView.java @@ -22,7 +22,6 @@ import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import java.io.IOException; @@ -30,7 +29,7 @@ * Default heap based implementation of {@link com.hazelcast.cache.CacheEntryView}. */ public class DefaultCacheEntryView - implements CacheEntryView, IdentifiedDataSerializable, Versioned { + implements CacheEntryView, IdentifiedDataSerializable { private Data key; private Data value; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecord.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecord.java index 660b46dc81c5e..d164b7bcf68ee 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecord.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecord.java @@ -18,7 +18,6 @@ import com.hazelcast.internal.eviction.Evictable; import com.hazelcast.internal.eviction.Expirable; -import com.hazelcast.nio.serialization.impl.Versioned; /** *

@@ -28,7 +27,7 @@ * * @param the type of the value stored by this {@link CacheRecord} */ -public interface CacheRecord extends Expirable, Evictable, Versioned { +public interface CacheRecord extends Expirable, Evictable { /** * Represents invalid (not set) time for creation time, expiration time, access time, etc... @@ -75,12 +74,14 @@ public interface CacheRecord extends Expirable, Evictable, Versioned { /** * Sets the expiry policy for this record. + * * @param expiryPolicy */ void setExpiryPolicy(E expiryPolicy); /** * Gets the expiryPolicy associated with this record. + * * @return */ E getExpiryPolicy(); diff --git a/hazelcast/src/main/java/com/hazelcast/cardinality/impl/hyperloglog/HyperLogLog.java b/hazelcast/src/main/java/com/hazelcast/cardinality/impl/hyperloglog/HyperLogLog.java index 2893d05d64bfa..13d576f9f1d2e 100644 --- a/hazelcast/src/main/java/com/hazelcast/cardinality/impl/hyperloglog/HyperLogLog.java +++ b/hazelcast/src/main/java/com/hazelcast/cardinality/impl/hyperloglog/HyperLogLog.java @@ -17,21 +17,19 @@ package com.hazelcast.cardinality.impl.hyperloglog; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; /** * HyperLogLog is a redundant and highly available distributed data-structure used for cardinality estimation * purposes on unique items in significantly sized data cultures. HyperLogLog uses P^2 byte registers for storage * and computation. - * + *

* HyperLogLog is an implementation of the two famous papers *

    - *
  • http://algo.inria.fr/flajolet/Publications/FlFuGaMe07.pdf
    • - *
  • http://static.googleusercontent.com/media/research.google.com/en//pubs/archive/40671.pdf
    • + *
  • http://algo.inria.fr/flajolet/Publications/FlFuGaMe07.pdf
    • + *
  • http://static.googleusercontent.com/media/research.google.com/en//pubs/archive/40671.pdf
    • *
- * */ -public interface HyperLogLog extends IdentifiedDataSerializable, Versioned { +public interface HyperLogLog extends IdentifiedDataSerializable { /** * Computes a new estimate for the current status of the registers. diff --git a/hazelcast/src/main/java/com/hazelcast/cardinality/impl/hyperloglog/impl/HyperLogLogImpl.java b/hazelcast/src/main/java/com/hazelcast/cardinality/impl/hyperloglog/impl/HyperLogLogImpl.java index 760fa130fe0ab..bb94f2118f543 100644 --- a/hazelcast/src/main/java/com/hazelcast/cardinality/impl/hyperloglog/impl/HyperLogLogImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/cardinality/impl/hyperloglog/impl/HyperLogLogImpl.java @@ -20,14 +20,13 @@ import com.hazelcast.cardinality.impl.hyperloglog.HyperLogLog; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.impl.Versioned; import java.io.IOException; import static com.hazelcast.cardinality.impl.hyperloglog.impl.HyperLogLogEncoding.SPARSE; public class HyperLogLogImpl - implements HyperLogLog, Versioned { + implements HyperLogLog { private static final int LOWER_P_BOUND = 4; private static final int UPPER_P_BOUND = 16; diff --git a/hazelcast/src/main/java/com/hazelcast/cardinality/impl/hyperloglog/impl/SparseHyperLogLogEncoder.java b/hazelcast/src/main/java/com/hazelcast/cardinality/impl/hyperloglog/impl/SparseHyperLogLogEncoder.java index 36f4d8a925adc..72a94e4b0a616 100644 --- a/hazelcast/src/main/java/com/hazelcast/cardinality/impl/hyperloglog/impl/SparseHyperLogLogEncoder.java +++ b/hazelcast/src/main/java/com/hazelcast/cardinality/impl/hyperloglog/impl/SparseHyperLogLogEncoder.java @@ -20,7 +20,6 @@ import com.hazelcast.nio.Bits; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.impl.Versioned; import java.io.IOException; import java.util.Arrays; @@ -32,7 +31,7 @@ */ @SuppressWarnings("checkstyle:magicnumber") public class SparseHyperLogLogEncoder - implements HyperLogLogEncoder, Versioned { + implements HyperLogLogEncoder { private static final int P_PRIME = 25; private static final int P_PRIME_MASK = 0x1ffffff; @@ -230,7 +229,7 @@ private void mergeAndResetTmp() { /** * Variable length difference encoding for sorted integer lists. - * + *

* Single byte, (7 bits) used to store the value if less or equal to 127, * or more bytes for larger numbers, having the MSB bit set to 1 to signify * the next_flag. Also, numbers are stored as a diff from the previous one diff --git a/hazelcast/src/main/java/com/hazelcast/concurrent/lock/LockStoreImpl.java b/hazelcast/src/main/java/com/hazelcast/concurrent/lock/LockStoreImpl.java index d44b4e283d79c..1dbbe59f1e017 100644 --- a/hazelcast/src/main/java/com/hazelcast/concurrent/lock/LockStoreImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/concurrent/lock/LockStoreImpl.java @@ -21,7 +21,6 @@ import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.ObjectNamespace; import com.hazelcast.spi.WaitNotifyKey; import com.hazelcast.util.ConcurrencyUtil; @@ -43,7 +42,7 @@ import static com.hazelcast.concurrent.lock.ObjectNamespaceSerializationHelper.writeNamespaceCompatibly; import static com.hazelcast.util.SetUtil.createHashSet; -public final class LockStoreImpl implements IdentifiedDataSerializable, LockStore, Versioned { +public final class LockStoreImpl implements IdentifiedDataSerializable, LockStore { private final transient ConstructorFunction lockConstructor = new ConstructorFunction() { diff --git a/hazelcast/src/main/java/com/hazelcast/concurrent/lock/operations/AbstractLockOperation.java b/hazelcast/src/main/java/com/hazelcast/concurrent/lock/operations/AbstractLockOperation.java index 600060fff7973..ef81aca720c86 100644 --- a/hazelcast/src/main/java/com/hazelcast/concurrent/lock/operations/AbstractLockOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/concurrent/lock/operations/AbstractLockOperation.java @@ -23,7 +23,6 @@ import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.LockInterceptorService; import com.hazelcast.spi.NamedOperation; import com.hazelcast.spi.ObjectNamespace; @@ -40,7 +39,7 @@ public abstract class AbstractLockOperation extends Operation implements PartitionAwareOperation, IdentifiedDataSerializable, NamedOperation, - ServiceNamespaceAware, Versioned { + ServiceNamespaceAware { public static final int ANY_THREAD = 0; diff --git a/hazelcast/src/main/java/com/hazelcast/concurrent/lock/operations/LockReplicationOperation.java b/hazelcast/src/main/java/com/hazelcast/concurrent/lock/operations/LockReplicationOperation.java index 7695ec2166c23..adade8bd73d5d 100644 --- a/hazelcast/src/main/java/com/hazelcast/concurrent/lock/operations/LockReplicationOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/concurrent/lock/operations/LockReplicationOperation.java @@ -23,7 +23,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.ObjectNamespace; import com.hazelcast.spi.Operation; import com.hazelcast.spi.ServiceNamespace; @@ -33,7 +32,7 @@ import java.util.LinkedList; public class LockReplicationOperation extends Operation - implements IdentifiedDataSerializable, Versioned { + implements IdentifiedDataSerializable { private final Collection locks = new LinkedList(); @@ -45,7 +44,7 @@ public LockReplicationOperation(LockStoreContainer container, int partitionId, i } public LockReplicationOperation(LockStoreContainer container, int partitionId, int replicaIndex, - Collection namespaces) { + Collection namespaces) { setPartitionId(partitionId).setReplicaIndex(replicaIndex); diff --git a/hazelcast/src/main/java/com/hazelcast/config/CardinalityEstimatorConfig.java b/hazelcast/src/main/java/com/hazelcast/config/CardinalityEstimatorConfig.java index 29d728101c9f2..f38509696b0ba 100644 --- a/hazelcast/src/main/java/com/hazelcast/config/CardinalityEstimatorConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/config/CardinalityEstimatorConfig.java @@ -19,7 +19,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.merge.HyperLogLogMergePolicy; import java.io.IOException; @@ -33,7 +32,7 @@ /** * Configuration options for the {@link com.hazelcast.cardinality.CardinalityEstimator} */ -public class CardinalityEstimatorConfig implements IdentifiedDataSerializable, Versioned, NamedConfig { +public class CardinalityEstimatorConfig implements IdentifiedDataSerializable, NamedConfig { /** * The number of sync backups per estimator diff --git a/hazelcast/src/main/java/com/hazelcast/config/CollectionConfig.java b/hazelcast/src/main/java/com/hazelcast/config/CollectionConfig.java index 86c2013a48125..adc99ba29f64e 100644 --- a/hazelcast/src/main/java/com/hazelcast/config/CollectionConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/config/CollectionConfig.java @@ -19,7 +19,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.merge.SplitBrainMergeTypeProvider; import com.hazelcast.spi.merge.SplitBrainMergeTypes; @@ -39,7 +38,7 @@ * @param Type of Collection such as List, Set */ public abstract class CollectionConfig - implements SplitBrainMergeTypeProvider, IdentifiedDataSerializable, Versioned, NamedConfig { + implements SplitBrainMergeTypeProvider, IdentifiedDataSerializable, NamedConfig { /** * Default maximum size for the Configuration. diff --git a/hazelcast/src/main/java/com/hazelcast/config/CountDownLatchConfig.java b/hazelcast/src/main/java/com/hazelcast/config/CountDownLatchConfig.java index 94bdfe5c9c86b..373e787841d34 100644 --- a/hazelcast/src/main/java/com/hazelcast/config/CountDownLatchConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/config/CountDownLatchConfig.java @@ -19,7 +19,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import java.io.IOException; @@ -31,7 +30,7 @@ * * @since 3.10 */ -public class CountDownLatchConfig implements IdentifiedDataSerializable, Versioned, NamedConfig { +public class CountDownLatchConfig implements IdentifiedDataSerializable, NamedConfig { private transient CountDownLatchConfigReadOnly readOnly; diff --git a/hazelcast/src/main/java/com/hazelcast/config/DurableExecutorConfig.java b/hazelcast/src/main/java/com/hazelcast/config/DurableExecutorConfig.java index e46c728d1cd2b..031a434cf54c7 100644 --- a/hazelcast/src/main/java/com/hazelcast/config/DurableExecutorConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/config/DurableExecutorConfig.java @@ -20,7 +20,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import java.io.IOException; @@ -30,7 +29,7 @@ /** * Contains the configuration for an {@link DurableExecutorService}. */ -public class DurableExecutorConfig implements IdentifiedDataSerializable, Versioned, NamedConfig { +public class DurableExecutorConfig implements IdentifiedDataSerializable, NamedConfig { /** * The number of executor threads per Member for the Executor based on this configuration. diff --git a/hazelcast/src/main/java/com/hazelcast/config/ExecutorConfig.java b/hazelcast/src/main/java/com/hazelcast/config/ExecutorConfig.java index b874789574a41..626a62afcf4ef 100644 --- a/hazelcast/src/main/java/com/hazelcast/config/ExecutorConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/config/ExecutorConfig.java @@ -19,14 +19,13 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import java.io.IOException; /** * Contains the configuration for an {@link com.hazelcast.core.IExecutorService}. */ -public class ExecutorConfig implements IdentifiedDataSerializable, Versioned, NamedConfig { +public class ExecutorConfig implements IdentifiedDataSerializable, NamedConfig { /** * The number of executor threads per Member for the Executor based on this configuration. diff --git a/hazelcast/src/main/java/com/hazelcast/config/MapConfig.java b/hazelcast/src/main/java/com/hazelcast/config/MapConfig.java index 555267a1e9e98..3387146386538 100644 --- a/hazelcast/src/main/java/com/hazelcast/config/MapConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/config/MapConfig.java @@ -16,13 +16,11 @@ package com.hazelcast.config; -import com.hazelcast.internal.cluster.Versions; import com.hazelcast.map.eviction.MapEvictionPolicy; import com.hazelcast.map.merge.PutIfAbsentMapMergePolicy; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.merge.SplitBrainMergePolicy; import com.hazelcast.spi.merge.SplitBrainMergeTypeProvider; import com.hazelcast.spi.merge.SplitBrainMergeTypes; @@ -43,7 +41,7 @@ /** * Contains the configuration for an {@link com.hazelcast.core.IMap}. */ -public class MapConfig implements SplitBrainMergeTypeProvider, IdentifiedDataSerializable, Versioned, NamedConfig { +public class MapConfig implements SplitBrainMergeTypeProvider, IdentifiedDataSerializable, NamedConfig { /** * The minimum number of backups @@ -199,12 +197,12 @@ public MapConfig(MapConfig config) { this.statisticsEnabled = config.statisticsEnabled; this.mergePolicyConfig = config.mergePolicyConfig; this.wanReplicationRef = config.wanReplicationRef != null ? new WanReplicationRef(config.wanReplicationRef) : null; - this.entryListenerConfigs = new ArrayList(config.getEntryListenerConfigs()); + this.entryListenerConfigs = new ArrayList<>(config.getEntryListenerConfigs()); this.partitionLostListenerConfigs = - new ArrayList(config.getPartitionLostListenerConfigs()); - this.mapIndexConfigs = new ArrayList(config.getMapIndexConfigs()); - this.mapAttributeConfigs = new ArrayList(config.getMapAttributeConfigs()); - this.queryCacheConfigs = new ArrayList(config.getQueryCacheConfigs()); + new ArrayList<>(config.getPartitionLostListenerConfigs()); + this.mapIndexConfigs = new ArrayList<>(config.getMapIndexConfigs()); + this.mapAttributeConfigs = new ArrayList<>(config.getMapAttributeConfigs()); + this.queryCacheConfigs = new ArrayList<>(config.getQueryCacheConfigs()); this.partitioningStrategyConfig = config.partitioningStrategyConfig != null ? new PartitioningStrategyConfig(config.getPartitioningStrategyConfig()) : null; this.quorumName = config.quorumName; @@ -650,7 +648,7 @@ public MapConfig addEntryListenerConfig(EntryListenerConfig listenerConfig) { public List getEntryListenerConfigs() { if (entryListenerConfigs == null) { - entryListenerConfigs = new ArrayList(); + entryListenerConfigs = new ArrayList<>(); } return entryListenerConfigs; } @@ -667,7 +665,7 @@ public MapConfig addMapPartitionLostListenerConfig(MapPartitionLostListenerConfi public List getPartitionLostListenerConfigs() { if (partitionLostListenerConfigs == null) { - partitionLostListenerConfigs = new ArrayList(); + partitionLostListenerConfigs = new ArrayList<>(); } return partitionLostListenerConfigs; @@ -686,7 +684,7 @@ public MapConfig addMapIndexConfig(MapIndexConfig mapIndexConfig) { public List getMapIndexConfigs() { if (mapIndexConfigs == null) { - mapIndexConfigs = new ArrayList(); + mapIndexConfigs = new ArrayList<>(); } return mapIndexConfigs; } @@ -703,7 +701,7 @@ public MapConfig addMapAttributeConfig(MapAttributeConfig mapAttributeConfig) { public List getMapAttributeConfigs() { if (mapAttributeConfigs == null) { - mapAttributeConfigs = new ArrayList(); + mapAttributeConfigs = new ArrayList<>(); } return mapAttributeConfigs; } @@ -759,7 +757,7 @@ public MapConfig addQueryCacheConfig(QueryCacheConfig queryCacheConfig) { */ public List getQueryCacheConfigs() { if (queryCacheConfigs == null) { - queryCacheConfigs = new ArrayList(); + queryCacheConfigs = new ArrayList<>(); } return queryCacheConfigs; } @@ -1094,10 +1092,7 @@ public void writeData(ObjectDataOutput out) throws IOException { out.writeObject(partitioningStrategyConfig); out.writeUTF(quorumName); out.writeObject(hotRestartConfig); - // RU_COMPAT_3_11 - if (out.getVersion().isGreaterOrEqual(Versions.V3_12)) { - out.writeShort(metadataPolicy.getId()); - } + out.writeShort(metadataPolicy.getId()); } @Override @@ -1126,9 +1121,6 @@ public void readData(ObjectDataInput in) throws IOException { partitioningStrategyConfig = in.readObject(); quorumName = in.readUTF(); hotRestartConfig = in.readObject(); - // RU_COMPAT_3_11 - if (in.getVersion().isGreaterOrEqual(Versions.V3_12)) { - metadataPolicy = MetadataPolicy.getById(in.readShort()); - } + metadataPolicy = MetadataPolicy.getById(in.readShort()); } } diff --git a/hazelcast/src/main/java/com/hazelcast/config/MultiMapConfig.java b/hazelcast/src/main/java/com/hazelcast/config/MultiMapConfig.java index 69ca834a5b6c3..54991c10484dc 100644 --- a/hazelcast/src/main/java/com/hazelcast/config/MultiMapConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/config/MultiMapConfig.java @@ -19,7 +19,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.merge.SplitBrainMergeTypeProvider; import com.hazelcast.spi.merge.SplitBrainMergeTypes; import com.hazelcast.util.StringUtil; @@ -36,7 +35,7 @@ * Configuration for MultiMap. */ @SuppressWarnings("checkstyle:methodcount") -public class MultiMapConfig implements SplitBrainMergeTypeProvider, IdentifiedDataSerializable, Versioned, NamedConfig { +public class MultiMapConfig implements SplitBrainMergeTypeProvider, IdentifiedDataSerializable, NamedConfig { /** * The default number of synchronous backups for this MultiMap. diff --git a/hazelcast/src/main/java/com/hazelcast/config/QueueConfig.java b/hazelcast/src/main/java/com/hazelcast/config/QueueConfig.java index def11f16e7a1b..25eed494fa6bd 100644 --- a/hazelcast/src/main/java/com/hazelcast/config/QueueConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/config/QueueConfig.java @@ -19,7 +19,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.merge.SplitBrainMergeTypeProvider; import com.hazelcast.spi.merge.SplitBrainMergeTypes; @@ -37,7 +36,7 @@ * Contains the configuration for an {@link com.hazelcast.core.IQueue}. */ @SuppressWarnings("checkstyle:methodcount") -public class QueueConfig implements SplitBrainMergeTypeProvider, IdentifiedDataSerializable, Versioned , NamedConfig { +public class QueueConfig implements SplitBrainMergeTypeProvider, IdentifiedDataSerializable, NamedConfig { /** * Default value for the maximum size of the Queue. diff --git a/hazelcast/src/main/java/com/hazelcast/config/ReplicatedMapConfig.java b/hazelcast/src/main/java/com/hazelcast/config/ReplicatedMapConfig.java index 45907290d5203..892a9695fc409 100644 --- a/hazelcast/src/main/java/com/hazelcast/config/ReplicatedMapConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/config/ReplicatedMapConfig.java @@ -19,7 +19,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.merge.PutIfAbsentMergePolicy; import com.hazelcast.spi.merge.SplitBrainMergeTypeProvider; import com.hazelcast.spi.merge.SplitBrainMergeTypes; @@ -37,7 +36,7 @@ * Contains the configuration for an {@link com.hazelcast.core.ReplicatedMap} */ @SuppressWarnings("checkstyle:methodcount") -public class ReplicatedMapConfig implements SplitBrainMergeTypeProvider, IdentifiedDataSerializable, Versioned, NamedConfig { +public class ReplicatedMapConfig implements SplitBrainMergeTypeProvider, IdentifiedDataSerializable, NamedConfig { /** * Default value of concurrency level diff --git a/hazelcast/src/main/java/com/hazelcast/config/RingbufferConfig.java b/hazelcast/src/main/java/com/hazelcast/config/RingbufferConfig.java index b2b2018087335..839a52e152ee0 100644 --- a/hazelcast/src/main/java/com/hazelcast/config/RingbufferConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/config/RingbufferConfig.java @@ -19,7 +19,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.merge.SplitBrainMergeTypeProvider; import com.hazelcast.spi.merge.SplitBrainMergeTypes; @@ -41,7 +40,7 @@ * content will be fully stored on a single member in the cluster and its * backup in another member in the cluster. */ -public class RingbufferConfig implements SplitBrainMergeTypeProvider, IdentifiedDataSerializable, Versioned, NamedConfig { +public class RingbufferConfig implements SplitBrainMergeTypeProvider, IdentifiedDataSerializable, NamedConfig { /** * Default value of capacity of the RingBuffer. diff --git a/hazelcast/src/main/java/com/hazelcast/config/ScheduledExecutorConfig.java b/hazelcast/src/main/java/com/hazelcast/config/ScheduledExecutorConfig.java index 6f32dcfa2eb40..d8251220e0f2f 100644 --- a/hazelcast/src/main/java/com/hazelcast/config/ScheduledExecutorConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/config/ScheduledExecutorConfig.java @@ -19,7 +19,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.merge.SplitBrainMergeTypeProvider; import com.hazelcast.spi.merge.SplitBrainMergeTypes; @@ -33,7 +32,7 @@ * Configuration options for the {@link com.hazelcast.scheduledexecutor.IScheduledExecutorService}. */ public class ScheduledExecutorConfig implements SplitBrainMergeTypeProvider, IdentifiedDataSerializable, - Versioned, NamedConfig { + NamedConfig { /** * The number of executor threads per Member for the Executor based on this configuration. diff --git a/hazelcast/src/main/java/com/hazelcast/config/SemaphoreConfig.java b/hazelcast/src/main/java/com/hazelcast/config/SemaphoreConfig.java index 985021c129ee2..cb75a4a201834 100644 --- a/hazelcast/src/main/java/com/hazelcast/config/SemaphoreConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/config/SemaphoreConfig.java @@ -19,7 +19,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import java.io.IOException; @@ -31,7 +30,7 @@ /** * Contains the configuration for an {@link com.hazelcast.core.ISemaphore}. */ -public class SemaphoreConfig implements IdentifiedDataSerializable, Versioned, NamedConfig { +public class SemaphoreConfig implements IdentifiedDataSerializable, NamedConfig { /** * Default synchronous backup count. diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/raftop/metadata/RaftServicePreJoinOp.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/raftop/metadata/RaftServicePreJoinOp.java index 88196bb63927a..0b1dba32609d3 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/raftop/metadata/RaftServicePreJoinOp.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/raftop/metadata/RaftServicePreJoinOp.java @@ -24,7 +24,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.Operation; import java.io.IOException; @@ -36,7 +35,7 @@ * Please note that this operation is not a {@link RaftOp}, * so it is not handled via the Raft layer. */ -public class RaftServicePreJoinOp extends Operation implements IdentifiedDataSerializable, Versioned { +public class RaftServicePreJoinOp extends Operation implements IdentifiedDataSerializable { private boolean discoveryCompleted; diff --git a/hazelcast/src/main/java/com/hazelcast/instance/AbstractMember.java b/hazelcast/src/main/java/com/hazelcast/instance/AbstractMember.java index eabd0e95e0f2c..5a46e0e31041c 100644 --- a/hazelcast/src/main/java/com/hazelcast/instance/AbstractMember.java +++ b/hazelcast/src/main/java/com/hazelcast/instance/AbstractMember.java @@ -23,7 +23,6 @@ import com.hazelcast.nio.IOUtil; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.annotation.PrivateApi; import com.hazelcast.version.MemberVersion; @@ -43,7 +42,7 @@ import static com.hazelcast.util.Preconditions.checkNotNull; @PrivateApi -public abstract class AbstractMember implements Member, Versioned { +public abstract class AbstractMember implements Member { protected final Map attributes = new ConcurrentHashMap(); protected Address address; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/management/operation/ScriptExecutorOperation.java b/hazelcast/src/main/java/com/hazelcast/internal/management/operation/ScriptExecutorOperation.java index cb2ee748e2735..0deb92b89d0e5 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/management/operation/ScriptExecutorOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/management/operation/ScriptExecutorOperation.java @@ -22,7 +22,6 @@ import com.hazelcast.internal.management.ScriptEngineManagerContext; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.impl.Versioned; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; @@ -30,12 +29,10 @@ import java.io.IOException; import java.security.AccessControlException; -import static com.hazelcast.internal.cluster.Versions.V3_10; - /** * Operation to execute script on the node. */ -public class ScriptExecutorOperation extends AbstractManagementOperation implements Versioned { +public class ScriptExecutorOperation extends AbstractManagementOperation { private String engineName; private String script; @@ -81,18 +78,12 @@ public Object getResponse() { protected void writeInternal(ObjectDataOutput out) throws IOException { out.writeUTF(engineName); out.writeUTF(script); - if (out.getVersion().isUnknownOrLessThan(V3_10)) { - out.writeInt(0); - } } @Override protected void readInternal(ObjectDataInput in) throws IOException { engineName = in.readUTF(); script = in.readUTF(); - if (in.getVersion().isUnknownOrLessThan(V3_10)) { - in.readInt(); - } } @Override diff --git a/hazelcast/src/main/java/com/hazelcast/internal/management/request/GetCacheEntryRequest.java b/hazelcast/src/main/java/com/hazelcast/internal/management/request/GetCacheEntryRequest.java index 9ab219a3bf0a8..a41bf663ee226 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/management/request/GetCacheEntryRequest.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/management/request/GetCacheEntryRequest.java @@ -29,7 +29,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import javax.cache.expiry.ExpiryPolicy; import javax.cache.processor.EntryProcessor; @@ -128,7 +127,7 @@ public void readData(ObjectDataInput in) throws IOException { } } - public static class CacheBrowserEntryView implements CacheEntryView, IdentifiedDataSerializable, Versioned { + public static class CacheBrowserEntryView implements CacheEntryView, IdentifiedDataSerializable { private Object value; private long expirationTime; private long creationTime; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/usercodedeployment/impl/ClassData.java b/hazelcast/src/main/java/com/hazelcast/internal/usercodedeployment/impl/ClassData.java index 18170e32379e9..57d5cc0f88b05 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/usercodedeployment/impl/ClassData.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/usercodedeployment/impl/ClassData.java @@ -19,7 +19,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import java.io.IOException; import java.util.Collections; @@ -28,12 +27,12 @@ /** * Carries byte code of a class along with its inner classes. - * - * + *

+ *

* It's wrapped inside own object as it allows to add additional metadata and maintain compatibility * with Hazelcast Rolling Upgrade. */ -public class ClassData implements IdentifiedDataSerializable, Versioned { +public class ClassData implements IdentifiedDataSerializable { private Map innerClassDefinitions = Collections.emptyMap(); diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/SimpleEntryView.java b/hazelcast/src/main/java/com/hazelcast/map/impl/SimpleEntryView.java index 005c98f501525..9c9e73f418daf 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/SimpleEntryView.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/SimpleEntryView.java @@ -21,12 +21,9 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import java.io.IOException; -import static com.hazelcast.internal.cluster.Versions.V3_11; - /** * SimpleEntryView is an implementation of {@link com.hazelcast.core.EntryView} and also it is writable. * @@ -35,7 +32,7 @@ */ @SuppressWarnings("checkstyle:methodcount") public class SimpleEntryView - implements EntryView, IdentifiedDataSerializable, Versioned { + implements EntryView, IdentifiedDataSerializable { private K key; private V value; @@ -257,10 +254,7 @@ public void writeData(ObjectDataOutput out) throws IOException { // writes the deprecated evictionCriteriaNumber to the data output (client protocol compatibility) out.writeLong(0); out.writeLong(ttl); - // RU_COMPAT_3_10 - if (out.getVersion().isGreaterOrEqual(V3_11)) { - out.writeLong(maxIdle); - } + out.writeLong(maxIdle); } @Override @@ -278,13 +272,7 @@ public void readData(ObjectDataInput in) throws IOException { // reads the deprecated evictionCriteriaNumber from the data input (client protocol compatibility) in.readLong(); ttl = in.readLong(); - // RU_COMPAT_3_10 - // DO NOT REMOVE UNTIL WAN PROTOCOL HAS BEEN IMPLEMENTED - // THE SOURCE CLUSTER SERIALIZES THE com.hazelcast.map.impl.wan.WanMapEntryView - // THE TARGET CLUSTER SHOULD DESERIALIZE THIS CLASS - if (in.getVersion().isGreaterOrEqual(V3_11)) { - maxIdle = in.readLong(); - } + maxIdle = in.readLong(); } @Override diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/KeyBasedMapOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/KeyBasedMapOperation.java index dda5e3b50bceb..9f65f45053398 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/KeyBasedMapOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/KeyBasedMapOperation.java @@ -19,7 +19,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.Data; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.PartitionAwareOperation; import java.io.IOException; @@ -28,7 +27,7 @@ import static com.hazelcast.map.impl.recordstore.RecordStore.DEFAULT_TTL; public abstract class KeyBasedMapOperation extends MapOperation - implements PartitionAwareOperation, Versioned { + implements PartitionAwareOperation { protected Data dataKey; protected long threadId; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapReplicationOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapReplicationOperation.java index 4310c61c114e1..79724e4c88198 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapReplicationOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapReplicationOperation.java @@ -28,7 +28,6 @@ import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.Operation; import com.hazelcast.spi.ServiceNamespace; import com.hazelcast.spi.serialization.SerializationService; @@ -43,7 +42,7 @@ */ public class MapReplicationOperation extends Operation - implements IdentifiedDataSerializable, Versioned { + implements IdentifiedDataSerializable { // keep these fields `protected`, extended in another context. protected final MapReplicationStateHolder mapReplicationStateHolder = new MapReplicationStateHolder(this); diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapReplicationStateHolder.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapReplicationStateHolder.java index e289fe4fc7e1f..ffda211b4f755 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapReplicationStateHolder.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapReplicationStateHolder.java @@ -27,7 +27,6 @@ import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.query.impl.Index; import com.hazelcast.query.impl.IndexInfo; import com.hazelcast.query.impl.Indexes; @@ -59,7 +58,7 @@ * Holder for raw IMap key-value pairs and their metadata. */ // keep this `protected`, extended in another context. -public class MapReplicationStateHolder implements IdentifiedDataSerializable, Versioned { +public class MapReplicationStateHolder implements IdentifiedDataSerializable { // holds recordStore-references of this partitions' maps protected transient Map> storesByMapName; @@ -151,7 +150,7 @@ void applyState() { MapContainer mapContainer = recordStore.getMapContainer(); PartitionContainer partitionContainer = recordStore.getMapContainer().getMapServiceContext() - .getPartitionContainer(operation.getPartitionId()); + .getPartitionContainer(operation.getPartitionId()); for (Map.Entry indexDefinition : mapContainer.getIndexDefinitions().entrySet()) { Indexes indexes = mapContainer.getIndexes(partitionContainer.getPartitionId()); indexes.addOrGetIndex(indexDefinition.getKey(), indexDefinition.getValue()); @@ -159,7 +158,7 @@ void applyState() { final Indexes indexes = mapContainer.getIndexes(partitionContainer.getPartitionId()); final SerializationService serializationService = mapContainer.getMapServiceContext().getNodeEngine() - .getSerializationService(); + .getSerializationService(); final boolean indexesMustBePopulated = indexesMustBePopulated(indexes, operation); if (indexesMustBePopulated) { // defensively clear possible stale leftovers in non-global indexes from the previous failed promotion attempt diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PostJoinMapOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PostJoinMapOperation.java index 7452935fb80a0..84e39988bb92d 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PostJoinMapOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PostJoinMapOperation.java @@ -34,7 +34,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.Operation; import com.hazelcast.spi.impl.operationservice.TargetAware; @@ -48,7 +47,7 @@ import static com.hazelcast.util.MapUtil.createHashMap; -public class PostJoinMapOperation extends Operation implements IdentifiedDataSerializable, Versioned, TargetAware { +public class PostJoinMapOperation extends Operation implements IdentifiedDataSerializable, TargetAware { private List interceptorInfoList = new LinkedList<>(); private List infoList; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/record/RecordInfo.java b/hazelcast/src/main/java/com/hazelcast/map/impl/record/RecordInfo.java index 31bf09e1c650d..f890fa73ed891 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/record/RecordInfo.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/record/RecordInfo.java @@ -20,7 +20,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import java.io.IOException; @@ -30,7 +29,7 @@ * Record info. */ public class RecordInfo - implements IdentifiedDataSerializable, Versioned { + implements IdentifiedDataSerializable { protected long version; protected long ttl; protected long maxIdle; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveBackupOperation.java index a2c3f6f31dc9a..ca5344d535c87 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveBackupOperation.java @@ -23,26 +23,20 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.Data; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.BackupOperation; import java.io.IOException; import java.util.Collection; -import java.util.Iterator; -import static com.hazelcast.internal.cluster.Versions.V3_12; +public class RemoveBackupOperation extends AbstractKeyBasedMultiMapOperation implements BackupOperation { -public class RemoveBackupOperation extends AbstractKeyBasedMultiMapOperation implements BackupOperation, Versioned { - - private long recordId; private Data value; public RemoveBackupOperation() { } - public RemoveBackupOperation(String name, Data dataKey, long recordId, Data value) { + public RemoveBackupOperation(String name, Data dataKey, Data value) { super(name, dataKey); - this.recordId = recordId; this.value = value; } @@ -56,20 +50,8 @@ public void run() throws Exception { } Collection coll = multiMapValue.getCollection(false); - // RU_COMPAT_3_11 - if (value != null) { - MultiMapRecord record = new MultiMapRecord(isBinary() ? value : toObject(value)); - response = coll.remove(record); - } else { - Iterator iterator = coll.iterator(); - while (iterator.hasNext()) { - if (iterator.next().getRecordId() == recordId) { - iterator.remove(); - response = true; - break; - } - } - } + MultiMapRecord record = new MultiMapRecord(isBinary() ? value : toObject(value)); + response = coll.remove(record); if (coll.isEmpty()) { container.delete(dataKey); @@ -79,21 +61,13 @@ public void run() throws Exception { @Override protected void writeInternal(ObjectDataOutput out) throws IOException { super.writeInternal(out); - out.writeLong(recordId); - // RU_COMPAT_3_11 - if (out.getVersion().isGreaterOrEqual(V3_12)) { - out.writeData(value); - } + out.writeData(value); } @Override protected void readInternal(ObjectDataInput in) throws IOException { super.readInternal(in); - recordId = in.readLong(); - // RU_COMPAT_3_11 - if (in.getVersion().isGreaterOrEqual(V3_12)) { - value = in.readData(); - } + value = in.readData(); } @Override diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveOperation.java index 429e0acf82082..74fdd5fbb5d79 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveOperation.java @@ -29,14 +29,10 @@ import java.io.IOException; import java.util.Collection; -import java.util.Iterator; - -import static com.hazelcast.internal.cluster.Versions.V3_12; public class RemoveOperation extends AbstractBackupAwareMultiMapOperation implements MutatingOperation { private Data value; - private long recordId; public RemoveOperation() { } @@ -57,21 +53,7 @@ public void run() throws Exception { Collection coll = multiMapValue.getCollection(false); MultiMapRecord record = new MultiMapRecord(isBinary() ? value : toObject(value)); - // RU_COMPAT_3_11 - if (getNodeEngine().getClusterService().getClusterVersion().isGreaterOrEqual(V3_12)) { - response = coll.remove(record); - } else { - Iterator iterator = coll.iterator(); - while (iterator.hasNext()) { - MultiMapRecord r = iterator.next(); - if (r.equals(record)) { - iterator.remove(); - recordId = r.getRecordId(); - response = true; - break; - } - } - } + response = coll.remove(record); if (coll.isEmpty()) { container.delete(dataKey); @@ -93,7 +75,7 @@ public boolean shouldBackup() { @Override public Operation getBackupOperation() { - return new RemoveBackupOperation(name, dataKey, recordId, value); + return new RemoveBackupOperation(name, dataKey, value); } @Override diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPrepareBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPrepareBackupOperation.java index 53f059a0171a4..7444ed532d88b 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPrepareBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPrepareBackupOperation.java @@ -22,7 +22,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.Data; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.BackupOperation; import com.hazelcast.transaction.TransactionException; @@ -30,7 +29,7 @@ import static com.hazelcast.multimap.impl.txn.TxnPrepareOperation.LOCK_EXTENSION_TIME_IN_MILLIS; -public class TxnPrepareBackupOperation extends AbstractKeyBasedMultiMapOperation implements BackupOperation, Versioned { +public class TxnPrepareBackupOperation extends AbstractKeyBasedMultiMapOperation implements BackupOperation { private String caller; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPrepareOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPrepareOperation.java index eeb8a3c8dedc2..a2caf29c0990c 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPrepareOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPrepareOperation.java @@ -20,13 +20,12 @@ import com.hazelcast.multimap.impl.MultiMapDataSerializerHook; import com.hazelcast.multimap.impl.operations.AbstractBackupAwareMultiMapOperation; import com.hazelcast.nio.serialization.Data; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.Operation; import com.hazelcast.transaction.TransactionException; import java.util.concurrent.TimeUnit; -public class TxnPrepareOperation extends AbstractBackupAwareMultiMapOperation implements Versioned { +public class TxnPrepareOperation extends AbstractBackupAwareMultiMapOperation { static final long LOCK_EXTENSION_TIME_IN_MILLIS = TimeUnit.SECONDS.toMillis(10); diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/ReplicatedMapEntryView.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/ReplicatedMapEntryView.java index 56fcac474d9f6..038ada05f5868 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/ReplicatedMapEntryView.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/ReplicatedMapEntryView.java @@ -21,16 +21,13 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.replicatedmap.impl.operation.ReplicatedMapDataSerializerHook; import com.hazelcast.spi.serialization.SerializationService; import java.io.IOException; -import static com.hazelcast.internal.cluster.Versions.V3_11; - public class ReplicatedMapEntryView - implements EntryView, IdentifiedDataSerializable, Versioned { + implements EntryView, IdentifiedDataSerializable { private static final int NOT_AVAILABLE = -1; @@ -164,10 +161,7 @@ public void writeData(ObjectDataOutput out) throws IOException { out.writeLong(lastAccessTime); out.writeLong(lastUpdateTime); out.writeLong(ttl); - //RU_COMPAT_3_10 - if (out.getVersion().isGreaterOrEqual(V3_11)) { - out.writeLong(maxIdle); - } + out.writeLong(maxIdle); } @Override @@ -179,10 +173,7 @@ public void readData(ObjectDataInput in) throws IOException { lastAccessTime = in.readLong(); lastUpdateTime = in.readLong(); ttl = in.readLong(); - //RU_COMPAT_3_10 - if (in.getVersion().isGreaterOrEqual(V3_11)) { - maxIdle = in.readLong(); - } + maxIdle = in.readLong(); } @Override diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/ReadResultSetImpl.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/ReadResultSetImpl.java index fe249648d18de..b43d6329f3b46 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/ReadResultSetImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/ReadResultSetImpl.java @@ -23,7 +23,6 @@ import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.projection.Projection; import com.hazelcast.ringbuffer.ReadResultSet; import com.hazelcast.spi.impl.SerializationServiceSupport; @@ -52,7 +51,7 @@ * is {@code null} or returns the same type as the parameter */ public class ReadResultSetImpl extends AbstractList - implements IdentifiedDataSerializable, HazelcastInstanceAware, ReadResultSet, Versioned { + implements IdentifiedDataSerializable, HazelcastInstanceAware, ReadResultSet { protected transient SerializationService serializationService; private transient int minSize; diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferContainer.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferContainer.java index 59850e30d56f1..afce24dc92bfc 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferContainer.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferContainer.java @@ -24,7 +24,6 @@ import com.hazelcast.nio.serialization.Data; import com.hazelcast.nio.serialization.HazelcastSerializationException; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.ringbuffer.StaleSequenceException; import com.hazelcast.spi.NodeEngine; import com.hazelcast.spi.Notifier; @@ -51,7 +50,7 @@ * @param the type of items in the ringbuffer */ @SuppressWarnings("checkstyle:methodcount") -public class RingbufferContainer implements IdentifiedDataSerializable, Notifier, Versioned { +public class RingbufferContainer implements IdentifiedDataSerializable, Notifier { private static final long TTL_DISABLED = 0; diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/ReadManyOperation.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/ReadManyOperation.java index 21dda568f4f81..73cf631130eec 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/ReadManyOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/ReadManyOperation.java @@ -19,7 +19,6 @@ import com.hazelcast.core.IFunction; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; import com.hazelcast.ringbuffer.impl.RingbufferContainer; import com.hazelcast.spi.BlockingOperation; @@ -31,7 +30,7 @@ import static com.hazelcast.ringbuffer.impl.RingbufferDataSerializerHook.READ_MANY_OPERATION; public class ReadManyOperation extends AbstractRingBufferOperation - implements BlockingOperation, ReadonlyOperation, Versioned { + implements BlockingOperation, ReadonlyOperation { transient long sequence; private int minSize; diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/ReplicationOperation.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/ReplicationOperation.java index f069572d158bc..50ff686341eae 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/ReplicationOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/ReplicationOperation.java @@ -26,7 +26,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.ringbuffer.impl.RingbufferContainer; import com.hazelcast.ringbuffer.impl.RingbufferService; import com.hazelcast.spi.ObjectNamespace; @@ -41,7 +40,7 @@ import static com.hazelcast.ringbuffer.impl.RingbufferService.SERVICE_NAME; import static com.hazelcast.util.MapUtil.createHashMap; -public class ReplicationOperation extends Operation implements IdentifiedDataSerializable, Versioned { +public class ReplicationOperation extends Operation implements IdentifiedDataSerializable { private Map migrationData; diff --git a/hazelcast/src/main/java/com/hazelcast/scheduledexecutor/impl/ScheduledTaskStatisticsImpl.java b/hazelcast/src/main/java/com/hazelcast/scheduledexecutor/impl/ScheduledTaskStatisticsImpl.java index 2b622e7b2c9a6..f9db08a5215ad 100644 --- a/hazelcast/src/main/java/com/hazelcast/scheduledexecutor/impl/ScheduledTaskStatisticsImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/scheduledexecutor/impl/ScheduledTaskStatisticsImpl.java @@ -18,14 +18,13 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.scheduledexecutor.ScheduledTaskStatistics; import java.io.IOException; import java.util.concurrent.TimeUnit; public class ScheduledTaskStatisticsImpl - implements ScheduledTaskStatistics, TaskLifecycleListener, Versioned { + implements ScheduledTaskStatistics, TaskLifecycleListener { private static final TimeUnit MEASUREMENT_UNIT = TimeUnit.NANOSECONDS; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/operations/AbstractRegistrationOperation.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/operations/AbstractRegistrationOperation.java index fc6b8e43d1caf..65569495163f6 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/operations/AbstractRegistrationOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/operations/AbstractRegistrationOperation.java @@ -21,7 +21,6 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.ExceptionAction; import com.hazelcast.spi.Operation; import com.hazelcast.spi.impl.AllowedDuringPassiveState; @@ -31,10 +30,8 @@ import static java.lang.String.format; -// RU_COMPAT_39: Do not remove Versioned interface! -// Version info is needed on 3.9 members while deserializing the operation. abstract class AbstractRegistrationOperation extends Operation - implements AllowedDuringPassiveState, IdentifiedDataSerializable, Versioned { + implements AllowedDuringPassiveState, IdentifiedDataSerializable { private int memberListVersion = -1; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/MapMergingEntryImpl.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/MapMergingEntryImpl.java index 412064a11b3ce..8e88dc8368ccb 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/MapMergingEntryImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/MapMergingEntryImpl.java @@ -21,15 +21,12 @@ import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.nio.serialization.impl.Versioned; import com.hazelcast.spi.merge.SplitBrainMergeTypes.MapMergeTypes; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.spi.serialization.SerializationServiceAware; import java.io.IOException; -import static com.hazelcast.internal.cluster.Versions.V3_11; - /** * Implementation of {@link MapMergeTypes}. * @@ -37,7 +34,7 @@ */ @SuppressWarnings({"WeakerAccess", "checkstyle:methodcount"}) public class MapMergingEntryImpl - implements MapMergeTypes, SerializationServiceAware, IdentifiedDataSerializable, Versioned { + implements MapMergeTypes, SerializationServiceAware, IdentifiedDataSerializable { private Data value; private Data key; @@ -210,15 +207,11 @@ public void writeData(ObjectDataOutput out) throws IOException { out.writeLong(lastUpdateTime); out.writeLong(version); out.writeLong(ttl); - // RU_COMPAT_3_10 // WAN events received from source cluster also carry null maxIdle - // even when cluster version is 3.11 - if (out.getVersion().isGreaterOrEqual(V3_11)) { - boolean hasMaxIdle = maxIdle != null; - out.writeBoolean(hasMaxIdle); - if (hasMaxIdle) { - out.writeLong(maxIdle); - } + boolean hasMaxIdle = maxIdle != null; + out.writeBoolean(hasMaxIdle); + if (hasMaxIdle) { + out.writeLong(maxIdle); } } @@ -235,14 +228,10 @@ public void readData(ObjectDataInput in) throws IOException { lastUpdateTime = in.readLong(); version = in.readLong(); ttl = in.readLong(); - //RU_COMPAT_3_10 // WAN events received from source cluster also carry null maxIdle - // even when cluster version is 3.11 - if (in.getVersion().isGreaterOrEqual(V3_11)) { - boolean hasMaxIdle = in.readBoolean(); - if (hasMaxIdle) { - maxIdle = in.readLong(); - } + boolean hasMaxIdle = in.readBoolean(); + if (hasMaxIdle) { + maxIdle = in.readLong(); } }