diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheRecordStore.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheRecordStore.java index c377602d2cb7..8bbc583f35ab 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheRecordStore.java @@ -47,7 +47,7 @@ import com.hazelcast.internal.util.comparators.ValueComparatorUtil; import com.hazelcast.map.impl.MapEntries; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.impl.eventservice.EventRegistration; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheService.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheService.java index 3b24772fced2..030b8f011d7d 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheService.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheService.java @@ -39,7 +39,7 @@ import com.hazelcast.internal.util.SimpleCompletableFuture; import com.hazelcast.logging.ILogger; import com.hazelcast.nio.IOUtil; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventFilter; import com.hazelcast.spi.impl.eventservice.EventRegistration; import com.hazelcast.spi.impl.eventservice.EventService; @@ -801,7 +801,7 @@ public String addInvalidationListener(String cacheNameWithPrefix, CacheEventList * from mentioned source with sourceUuid. * * @param cacheNameWithPrefix the name of the cache that invalidation event is sent for - * @param key the {@link com.hazelcast.nio.serialization.Data} represents the invalidation event + * @param key the {@link Data} represents the invalidation event * @param sourceUuid an ID that represents the source for invalidation event */ @Override diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractClusterWideIterator.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractClusterWideIterator.java index 1f82d325cffc..40a2fc15aa45 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractClusterWideIterator.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractClusterWideIterator.java @@ -16,7 +16,7 @@ package com.hazelcast.cache.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import javax.cache.Cache; import java.util.Iterator; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEntryIterationResult.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEntryIterationResult.java index a354232e85a1..bfc7e820b696 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEntryIterationResult.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEntryIterationResult.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEntryProcessorEntry.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEntryProcessorEntry.java index 4c915b4eced3..fb5ce2b8bf4b 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEntryProcessorEntry.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEntryProcessorEntry.java @@ -17,7 +17,7 @@ package com.hazelcast.cache.impl; import com.hazelcast.cache.impl.record.CacheRecord; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationexecutor.impl.PartitionOperationThread; import javax.cache.configuration.Factory; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEntryViews.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEntryViews.java index e1d6d6ec3757..3344099c2519 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEntryViews.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEntryViews.java @@ -20,7 +20,7 @@ import com.hazelcast.cache.impl.merge.entry.DefaultCacheEntryView; import com.hazelcast.cache.impl.merge.entry.LazyCacheEntryView; import com.hazelcast.cache.impl.record.CacheRecord; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * A class providing static factory methods that create various entry view objects. diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventContext.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventContext.java index 1f25a3d6330f..d666618bc6d5 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventContext.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventContext.java @@ -17,7 +17,7 @@ package com.hazelcast.cache.impl; import com.hazelcast.cache.CacheEventType; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Wrapper class for parameters of {@link ICacheService#publishEvent(CacheEventContext)} diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventContextUtil.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventContextUtil.java index 0c18e3332f63..e14a8cc721ca 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventContextUtil.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventContextUtil.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.CacheEventType; import com.hazelcast.cache.impl.operation.MutableOperation; import com.hazelcast.cache.impl.record.CacheRecord; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Utility class to create {@link CacheEventContext} instances diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventData.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventData.java index d2a133c30199..648cfe118aa3 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventData.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventData.java @@ -17,7 +17,7 @@ package com.hazelcast.cache.impl; import com.hazelcast.cache.CacheEventType; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; /** diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventDataImpl.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventDataImpl.java index 80c67498b6fa..62b15e5047a7 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventDataImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventDataImpl.java @@ -20,7 +20,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.BinaryInterface; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventHandler.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventHandler.java index 23b90de6a452..ee9e3ebf89eb 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventHandler.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventHandler.java @@ -21,7 +21,7 @@ import com.hazelcast.internal.nearcache.impl.invalidation.Invalidator; import com.hazelcast.internal.nearcache.impl.invalidation.MetaDataGenerator; import com.hazelcast.internal.nearcache.impl.invalidation.NonStopInvalidator; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventRegistration; import com.hazelcast.spi.impl.eventservice.EventService; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventListenerAdaptor.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventListenerAdaptor.java index 60352a3b5650..d065500340ad 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventListenerAdaptor.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheEventListenerAdaptor.java @@ -21,7 +21,7 @@ import com.hazelcast.core.ManagedContext; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.eventservice.EventRegistration; import com.hazelcast.internal.services.ListenerWrapperEventFilter; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheKeyIterationResult.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheKeyIterationResult.java index 7ba94e93ca63..d10d62edde85 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheKeyIterationResult.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheKeyIterationResult.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheMergeRunnable.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheMergeRunnable.java index 6d2477036652..c4fad08d1beb 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheMergeRunnable.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheMergeRunnable.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.record.CacheRecord; import com.hazelcast.config.CacheConfig; import com.hazelcast.config.InMemoryFormat; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.merge.AbstractMergeRunnable; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheOperationProvider.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheOperationProvider.java index d5463cb72f12..75c75425e5e2 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheOperationProvider.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheOperationProvider.java @@ -16,7 +16,7 @@ package com.hazelcast.cache.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationFactory; import com.hazelcast.spi.merge.SplitBrainMergePolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxy.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxy.java index 4bad516e61a4..a055e1771150 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxy.java @@ -28,7 +28,7 @@ import com.hazelcast.internal.journal.EventJournalInitialSubscriberState; import com.hazelcast.internal.journal.EventJournalReader; import com.hazelcast.map.impl.MapEntries; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.ReadResultSet; import com.hazelcast.spi.impl.eventservice.EventFilter; import com.hazelcast.spi.impl.eventservice.EventRegistration; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxyLoadAllTask.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxyLoadAllTask.java index 2617ce3c453d..977626f2f78b 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxyLoadAllTask.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxyLoadAllTask.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.operation.CacheLoadAllOperation; import com.hazelcast.core.ManagedContext; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.operationservice.OperationFactory; import com.hazelcast.spi.impl.operationservice.OperationService; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxySupport.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxySupport.java index 2da17f150f67..471185a58c63 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxySupport.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxySupport.java @@ -30,7 +30,7 @@ import com.hazelcast.core.ManagedContext; import com.hazelcast.logging.ILogger; import com.hazelcast.nio.ClassLoaderUtil; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.AbstractDistributedObject; import com.hazelcast.spi.impl.eventservice.EventFilter; import com.hazelcast.spi.impl.executionservice.ExecutionService; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxyUtil.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxyUtil.java index 7165f2e645e3..8dac28df2ee2 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxyUtil.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxyUtil.java @@ -17,7 +17,7 @@ package com.hazelcast.cache.impl; import com.hazelcast.config.CacheConfig; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.util.ExceptionUtil; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheRecordStore.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheRecordStore.java index 85ece7f27c82..f3b9182fa8c9 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheRecordStore.java @@ -21,7 +21,7 @@ import com.hazelcast.cache.impl.record.CacheRecordHashMap; import com.hazelcast.config.EvictionConfig.MaxSizePolicy; import com.hazelcast.internal.eviction.EvictionChecker; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/ClusterWideIterator.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/ClusterWideIterator.java index aeedbec43861..537755f2df00 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/ClusterWideIterator.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/ClusterWideIterator.java @@ -16,7 +16,7 @@ package com.hazelcast.cache.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationService; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/DefaultOperationProvider.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/DefaultOperationProvider.java index dcc4ab5d18f6..c7d7b9972359 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/DefaultOperationProvider.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/DefaultOperationProvider.java @@ -37,7 +37,7 @@ import com.hazelcast.cache.impl.operation.CacheSetExpiryPolicyOperation; import com.hazelcast.cache.impl.operation.CacheSizeOperationFactory; import com.hazelcast.config.InMemoryFormat; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationFactory; import com.hazelcast.spi.merge.SplitBrainMergePolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/DeferredValue.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/DeferredValue.java index f0a7d24d2fa6..082c3df1d267 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/DeferredValue.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/DeferredValue.java @@ -16,7 +16,7 @@ package com.hazelcast.cache.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.util.AbstractSet; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/ICacheRecordStore.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/ICacheRecordStore.java index 84e6de7ed2b0..ea0e6f9f9276 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/ICacheRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/ICacheRecordStore.java @@ -21,7 +21,7 @@ import com.hazelcast.internal.eviction.ExpiredKey; import com.hazelcast.internal.nearcache.impl.invalidation.InvalidationQueue; import com.hazelcast.map.impl.MapEntries; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.merge.SplitBrainMergePolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/ICacheService.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/ICacheService.java index 8683dc3fd806..c0f7887c7262 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/ICacheService.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/ICacheService.java @@ -22,7 +22,7 @@ import com.hazelcast.config.CacheConfig; import com.hazelcast.config.InMemoryFormat; import com.hazelcast.internal.eviction.ExpirationManager; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.partition.FragmentedMigrationAwareService; import com.hazelcast.spi.impl.eventservice.EventFilter; import com.hazelcast.spi.impl.eventservice.EventPublishingService; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/event/CacheWanEventPublisher.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/event/CacheWanEventPublisher.java index 556757ffe666..9150194426fc 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/event/CacheWanEventPublisher.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/event/CacheWanEventPublisher.java @@ -17,7 +17,7 @@ package com.hazelcast.cache.impl.event; import com.hazelcast.cache.CacheEntryView; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; /** diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournal.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournal.java index 48603d995d82..ea80a3e9962f 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournal.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournal.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.CacheEventType; import com.hazelcast.config.EventJournalConfig; import com.hazelcast.internal.journal.EventJournal; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.ObjectNamespace; /** diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/DeserializingEventJournalCacheEvent.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/DeserializingEventJournalCacheEvent.java index e83377563735..151296007efa 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/DeserializingEventJournalCacheEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/DeserializingEventJournalCacheEvent.java @@ -22,7 +22,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.HazelcastInstanceAware; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.SerializationServiceSupport; import com.hazelcast.spi.serialization.SerializationService; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/InternalEventJournalCacheEvent.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/InternalEventJournalCacheEvent.java index aafad39fca14..9b58dffd3dec 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/InternalEventJournalCacheEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/InternalEventJournalCacheEvent.java @@ -20,7 +20,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/RingbufferCacheEventJournalImpl.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/RingbufferCacheEventJournalImpl.java index ce8c3fc9a5b6..790e3207f2c6 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/RingbufferCacheEventJournalImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/RingbufferCacheEventJournalImpl.java @@ -25,7 +25,7 @@ import com.hazelcast.config.RingbufferConfig; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.logging.ILogger; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataType; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; import com.hazelcast.ringbuffer.impl.RingbufferContainer; 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 58e78d5f9a3e..85efe7be2d1a 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 @@ -20,7 +20,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheBackupEntryProcessorOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheBackupEntryProcessorOperation.java index e2f6f03cd455..1f891465acf4 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheBackupEntryProcessorOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheBackupEntryProcessorOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cache.impl.record.CacheRecord; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.BackupOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheContainsKeyOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheContainsKeyOperation.java index cadc3a0a0b38..f16bf1e45dba 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheContainsKeyOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheContainsKeyOperation.java @@ -17,7 +17,7 @@ package com.hazelcast.cache.impl.operation; import com.hazelcast.cache.impl.CacheDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; /** diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheEntryProcessorOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheEntryProcessorOperation.java index 173e73c0be4d..0101156d6a28 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheEntryProcessorOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheEntryProcessorOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.cache.impl.record.CacheRecord; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import javax.cache.processor.EntryProcessor; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAllOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAllOperation.java index 17173d7113b1..fffef2ad7949 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAllOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.cache.impl.ICacheService; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; import javax.cache.expiry.ExpiryPolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAllOperationFactory.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAllOperationFactory.java index 46752921d2b3..1643a01de789 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAllOperationFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAllOperationFactory.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAndRemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAndRemoveOperation.java index 73b62aff421d..b226397aeec5 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAndRemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAndRemoveOperation.java @@ -17,7 +17,7 @@ package com.hazelcast.cache.impl.operation; import com.hazelcast.cache.impl.CacheDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; /** @@ -25,7 +25,7 @@ *

Operation to call the record store's functionality. Backup is also triggered by this operation * if a record is removed.

* - * @see com.hazelcast.cache.impl.ICacheRecordStore#getAndRemove(com.hazelcast.nio.serialization.Data, String, int) + * @see com.hazelcast.cache.impl.ICacheRecordStore#getAndRemove(Data, String, int) */ public class CacheGetAndRemoveOperation extends MutatingCacheOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAndReplaceOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAndReplaceOperation.java index 8f84bb801172..aaecfc29c34d 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAndReplaceOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetAndReplaceOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import javax.cache.expiry.ExpiryPolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetOperation.java index e33a1b8e6c01..bc449691b553 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheGetOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; import javax.cache.expiry.ExpiryPolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheLoadAllOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheLoadAllOperation.java index d5e83e8ee300..af46433ebfa1 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheLoadAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheLoadAllOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.cache.impl.record.CacheRecord; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheLoadAllOperationFactory.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheLoadAllOperationFactory.java index 9e867f8c9043..5f5177455a39 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheLoadAllOperationFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheLoadAllOperationFactory.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheMergeOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheMergeOperation.java index 722a50a4f33f..386579d26c03 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheMergeOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheMergeOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cache.impl.record.CacheRecord; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.merge.SplitBrainMergePolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheMergeOperationFactory.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheMergeOperationFactory.java index 22de1e5f445a..f34e725f1207 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheMergeOperationFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheMergeOperationFactory.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.impl.operations.PartitionAwareOperationFactory; import com.hazelcast.spi.merge.SplitBrainMergePolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheOperation.java index ee3ff6affe3f..736c680e0ebf 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheOperation.java @@ -25,7 +25,7 @@ import com.hazelcast.cache.impl.record.CacheRecord; import com.hazelcast.config.CacheConfig; import com.hazelcast.logging.ILogger; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.spi.impl.operationservice.ExceptionAction; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutAllBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutAllBackupOperation.java index eb3a90694d68..da9461d4e9a0 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutAllBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutAllBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cache.impl.record.CacheRecord; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutAllOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutAllOperation.java index cd553cb0efda..9aa67afa3bac 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutAllOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cache.impl.record.CacheRecord; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutBackupOperation.java index eb33c26c27a8..22479620462d 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cache.impl.record.CacheRecord; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutIfAbsentOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutIfAbsentOperation.java index 0fc2b00ff82a..3891a566341e 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutIfAbsentOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutIfAbsentOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import javax.cache.expiry.ExpiryPolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutOperation.java index 2fc2e62b62ae..94d1f4594138 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CachePutOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import javax.cache.expiry.ExpiryPolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveAllBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveAllBackupOperation.java index 07f0eecb4e09..6bfee6e23d81 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveAllBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveAllBackupOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.cache.impl.ICacheService; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveAllOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveAllOperation.java index f01086b79112..bccac30c07fd 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveAllOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.cache.impl.ICacheService; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveAllOperationFactory.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveAllOperationFactory.java index 6389e03f052e..fb69324d8d89 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveAllOperationFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveAllOperationFactory.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveBackupOperation.java index 5b64c3d38f44..d2eb8f8eac65 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveBackupOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveOperation.java index b0075f7de06a..f4ea7db5b5ad 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheRemoveOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheReplaceOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheReplaceOperation.java index ea863bbd45e4..c5d643038f58 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheReplaceOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheReplaceOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import javax.cache.expiry.ExpiryPolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheReplicationOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheReplicationOperation.java index 5cdf9c0ed4e0..da6fee49e4be 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheReplicationOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheReplicationOperation.java @@ -24,7 +24,7 @@ import com.hazelcast.config.CacheConfig; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheSetExpiryPolicyBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheSetExpiryPolicyBackupOperation.java index 53d8311780fb..9de77519efe8 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheSetExpiryPolicyBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheSetExpiryPolicyBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cache.impl.record.CacheRecord; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheSetExpiryPolicyOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheSetExpiryPolicyOperation.java index c759b5f40b72..a6d4df91807d 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheSetExpiryPolicyOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheSetExpiryPolicyOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cache.impl.record.CacheRecord; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/KeyBasedCacheOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/KeyBasedCacheOperation.java index 6eb37e573e34..bf1b4ac7efe9 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/KeyBasedCacheOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/KeyBasedCacheOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.record.CacheRecord; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/MutatingCacheOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/MutatingCacheOperation.java index 41e690eaab85..79058d5ed792 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/MutatingCacheOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/MutatingCacheOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheDataRecord.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheDataRecord.java index 65e997cf25f5..532a4fc9abc7 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheDataRecord.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheDataRecord.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecordFactory.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecordFactory.java index fd4249406cb9..ccd79bdc1fcf 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecordFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecordFactory.java @@ -17,7 +17,7 @@ package com.hazelcast.cache.impl.record; import com.hazelcast.config.InMemoryFormat; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; /** diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecordHashMap.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecordHashMap.java index 4a4bc243678b..5f7f3bdad6d9 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecordHashMap.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecordHashMap.java @@ -23,7 +23,7 @@ import com.hazelcast.internal.eviction.Evictable; import com.hazelcast.internal.eviction.EvictionCandidate; import com.hazelcast.internal.eviction.EvictionListener; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.SerializableByConvention; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.util.SampleableConcurrentHashMap; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecordMap.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecordMap.java index ff2341e327ee..49187b4843ce 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecordMap.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/record/CacheRecordMap.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CacheEntryIterationResult; import com.hazelcast.cache.impl.CacheKeyIterationResult; import com.hazelcast.internal.eviction.EvictableStore; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.Map; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/record/SampleableCacheRecordMap.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/record/SampleableCacheRecordMap.java index 4f89b7649d0a..0f94e340c171 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/record/SampleableCacheRecordMap.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/record/SampleableCacheRecordMap.java @@ -17,7 +17,7 @@ package com.hazelcast.cache.impl.record; import com.hazelcast.internal.eviction.impl.strategy.sampling.SampleableEvictableStore; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; public interface SampleableCacheRecordMap extends CacheRecordMap, SampleableEvictableStore { diff --git a/hazelcast/src/main/java/com/hazelcast/cardinality/impl/CardinalityEstimatorProxy.java b/hazelcast/src/main/java/com/hazelcast/cardinality/impl/CardinalityEstimatorProxy.java index 2571e6147504..bf403cbd9428 100644 --- a/hazelcast/src/main/java/com/hazelcast/cardinality/impl/CardinalityEstimatorProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/cardinality/impl/CardinalityEstimatorProxy.java @@ -19,7 +19,7 @@ import com.hazelcast.cardinality.CardinalityEstimator; import com.hazelcast.cardinality.impl.operations.AggregateOperation; import com.hazelcast.cardinality.impl.operations.EstimateOperation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.AbstractDistributedObject; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheHelper.java b/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheHelper.java index 84941777b51f..526afda8d944 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheHelper.java +++ b/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheHelper.java @@ -26,7 +26,7 @@ import com.hazelcast.config.CacheConfig; import com.hazelcast.cluster.Member; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.util.FutureUtil; diff --git a/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheProxy.java b/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheProxy.java index 5194f8970b8c..03e2d83f573e 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheProxy.java @@ -38,7 +38,7 @@ import com.hazelcast.core.ICompletableFuture; import com.hazelcast.internal.journal.EventJournalInitialSubscriberState; import com.hazelcast.internal.journal.EventJournalReader; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.ReadResultSet; import com.hazelcast.ringbuffer.impl.client.PortableReadResultSet; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheProxySupport.java b/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheProxySupport.java index cab63b71ab24..b4c47bd97a74 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheProxySupport.java +++ b/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheProxySupport.java @@ -55,7 +55,7 @@ import com.hazelcast.logging.ILogger; import com.hazelcast.nio.Address; import com.hazelcast.nio.IOUtil; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.util.FutureUtil; diff --git a/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheProxySupportUtil.java b/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheProxySupportUtil.java index e4fe86c5e79c..9bd48b12690d 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheProxySupportUtil.java +++ b/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientCacheProxySupportUtil.java @@ -35,7 +35,7 @@ import com.hazelcast.config.NativeMemoryConfig; import com.hazelcast.config.NearCacheConfig; import com.hazelcast.core.ExecutionCallback; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import javax.cache.CacheException; import javax.cache.integration.CompletionListener; diff --git a/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientClusterWideIterator.java b/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientClusterWideIterator.java index 177b89e8f2fb..8bef159d9031 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientClusterWideIterator.java +++ b/hazelcast/src/main/java/com/hazelcast/client/cache/impl/ClientClusterWideIterator.java @@ -25,7 +25,7 @@ import com.hazelcast.client.impl.spi.ClientContext; import com.hazelcast.client.impl.spi.impl.ClientInvocation; import com.hazelcast.client.impl.spi.impl.ClientInvocationFuture; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import javax.cache.Cache; import java.util.Iterator; diff --git a/hazelcast/src/main/java/com/hazelcast/client/cache/impl/NearCachedClientCacheProxy.java b/hazelcast/src/main/java/com/hazelcast/client/cache/impl/NearCachedClientCacheProxy.java index 3f57bab0536d..16f33f41d8e7 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/cache/impl/NearCachedClientCacheProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/cache/impl/NearCachedClientCacheProxy.java @@ -33,7 +33,7 @@ import com.hazelcast.internal.nearcache.NearCacheManager; import com.hazelcast.internal.nearcache.impl.invalidation.RepairingHandler; import com.hazelcast.internal.nearcache.impl.invalidation.RepairingTask; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.util.executor.CompletedFuture; diff --git a/hazelcast/src/main/java/com/hazelcast/client/cp/internal/datastructures/atomiclong/RaftAtomicLongProxy.java b/hazelcast/src/main/java/com/hazelcast/client/cp/internal/datastructures/atomiclong/RaftAtomicLongProxy.java index 33c4911c5996..d09172b4af23 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/cp/internal/datastructures/atomiclong/RaftAtomicLongProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/cp/internal/datastructures/atomiclong/RaftAtomicLongProxy.java @@ -36,7 +36,7 @@ import com.hazelcast.cp.CPGroupId; import com.hazelcast.cp.internal.RaftGroupId; import com.hazelcast.cp.internal.datastructures.atomiclong.RaftAtomicLongService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InternalCompletableFuture; import static com.hazelcast.cp.internal.datastructures.atomiclong.operation.AlterOp.AlterResultType.NEW_VALUE; diff --git a/hazelcast/src/main/java/com/hazelcast/client/cp/internal/datastructures/atomicref/RaftAtomicRefProxy.java b/hazelcast/src/main/java/com/hazelcast/client/cp/internal/datastructures/atomicref/RaftAtomicRefProxy.java index 308c0def8992..e4e503ac4610 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/cp/internal/datastructures/atomicref/RaftAtomicRefProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/cp/internal/datastructures/atomicref/RaftAtomicRefProxy.java @@ -35,7 +35,7 @@ import com.hazelcast.cp.internal.RaftGroupId; import com.hazelcast.cp.internal.datastructures.atomicref.RaftAtomicRefService; import com.hazelcast.cp.internal.datastructures.atomicref.operation.ApplyOp.ReturnValueType; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InternalCompletableFuture; import static com.hazelcast.cp.internal.datastructures.atomicref.operation.ApplyOp.ReturnValueType.NO_RETURN_VALUE; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/clientside/ClientDynamicClusterConfig.java b/hazelcast/src/main/java/com/hazelcast/client/impl/clientside/ClientDynamicClusterConfig.java index d18f2532f31b..8eada50433f7 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/clientside/ClientDynamicClusterConfig.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/clientside/ClientDynamicClusterConfig.java @@ -90,7 +90,7 @@ import com.hazelcast.config.WanReplicationConfig; import com.hazelcast.config.cp.CPSubsystemConfig; import com.hazelcast.core.ManagedContext; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.io.File; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/connection/nio/ClientConnectionManagerImpl.java b/hazelcast/src/main/java/com/hazelcast/client/impl/connection/nio/ClientConnectionManagerImpl.java index 4897d8ab2c8d..60154d9c4981 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/connection/nio/ClientConnectionManagerImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/connection/nio/ClientConnectionManagerImpl.java @@ -52,7 +52,7 @@ import com.hazelcast.nio.Connection; import com.hazelcast.nio.ConnectionListener; import com.hazelcast.nio.SocketInterceptor; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.Credentials; import com.hazelcast.security.PasswordCredentials; import com.hazelcast.security.TokenCredentials; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/atomicreference/AtomicReferenceApplyMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/atomicreference/AtomicReferenceApplyMessageTask.java index bcce18b42316..1cda017d0a2f 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/atomicreference/AtomicReferenceApplyMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/atomicreference/AtomicReferenceApplyMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.operations.ApplyOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.AtomicReferencePermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/atomicreference/AtomicReferenceGetAndSetMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/atomicreference/AtomicReferenceGetAndSetMessageTask.java index aabdcfc7b6b7..f724a05388e5 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/atomicreference/AtomicReferenceGetAndSetMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/atomicreference/AtomicReferenceGetAndSetMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.operations.GetAndSetOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.AtomicReferencePermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/atomicreference/AtomicReferenceGetMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/atomicreference/AtomicReferenceGetMessageTask.java index 7736c8cd4ace..e20995a4d526 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/atomicreference/AtomicReferenceGetMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/atomicreference/AtomicReferenceGetMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.operations.GetOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.AtomicReferencePermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheAddEntryListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheAddEntryListenerMessageTask.java index a972f97ff43d..d1475d9d7d6c 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheAddEntryListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheAddEntryListenerMessageTask.java @@ -29,7 +29,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.internal.serialization.impl.HeapData; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.CachePermission; import com.hazelcast.spi.impl.eventservice.EventRegistration; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheAddNearCacheInvalidationListenerTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheAddNearCacheInvalidationListenerTask.java index ca3ce5d8336c..e4511f8d1ce6 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheAddNearCacheInvalidationListenerTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheAddNearCacheInvalidationListenerTask.java @@ -26,7 +26,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.internal.nearcache.impl.invalidation.Invalidation; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.security.Permission; import java.util.List; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheCreateConfigMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheCreateConfigMessageTask.java index c3946fb06112..c033f55a15b4 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheCreateConfigMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheCreateConfigMessageTask.java @@ -27,7 +27,7 @@ import com.hazelcast.core.ICompletableFuture; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.merge.SplitBrainMergePolicyProvider; import java.security.Permission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheEntryProcessorMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheEntryProcessorMessageTask.java index 46e9ba74eb1b..f52b77ef3d14 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheEntryProcessorMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheEntryProcessorMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.client.impl.protocol.codec.CacheEntryProcessorCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.CachePermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheEventJournalReadTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheEventJournalReadTask.java index a9d15519b44c..d254f2975171 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheEventJournalReadTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheEventJournalReadTask.java @@ -23,7 +23,7 @@ import com.hazelcast.client.impl.protocol.codec.CacheEventJournalReadCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.CachePermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheGetAllMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheGetAllMessageTask.java index a10ca3d6e763..ec80bd6d64d4 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheGetAllMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheGetAllMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.map.impl.MapEntries; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.CachePermission; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheGetConfigMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheGetConfigMessageTask.java index abf9f17bdf1a..75800f01a156 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheGetConfigMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheGetConfigMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Address; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import java.security.Permission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheIterateEntriesMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheIterateEntriesMessageTask.java index a30ddbdad9fd..d1c078382f38 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheIterateEntriesMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheIterateEntriesMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.client.impl.protocol.codec.CacheIterateEntriesCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.CachePermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheIterateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheIterateMessageTask.java index aeca2f85dc6f..d03ec005f6a0 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheIterateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheIterateMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.client.impl.protocol.codec.CacheIterateCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import java.util.Collections; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheLoadAllMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheLoadAllMessageTask.java index 6c2d805fefdf..b0a4f9609754 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheLoadAllMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheLoadAllMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.client.impl.protocol.codec.CacheLoadAllCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.OperationFactory; import javax.cache.CacheException; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheRemoveAllKeysMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheRemoveAllKeysMessageTask.java index a41ffc6be109..b04e2bcca693 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheRemoveAllKeysMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheRemoveAllKeysMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.client.impl.protocol.codec.CacheRemoveAllKeysCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.CachePermission; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/Pre38CacheAddInvalidationListenerTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/Pre38CacheAddInvalidationListenerTask.java index 3fb53ac3eabf..280cf1c26b39 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/Pre38CacheAddInvalidationListenerTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/cache/Pre38CacheAddInvalidationListenerTask.java @@ -26,7 +26,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.internal.nearcache.impl.invalidation.Invalidation; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.security.Permission; import java.util.List; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionAwaitMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionAwaitMessageTask.java index 102f29334d7f..0936ba14982b 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionAwaitMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionAwaitMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.AwaitOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.LockPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionBeforeAwaitMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionBeforeAwaitMessageTask.java index e65081a3063b..bd3f58ea878d 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionBeforeAwaitMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionBeforeAwaitMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.BeforeAwaitOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.LockPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionSignalAllMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionSignalAllMessageTask.java index e87b63d6d4ac..f407ccc91072 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionSignalAllMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionSignalAllMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.SignalOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.LockPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionSignalMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionSignalMessageTask.java index f2db11f76ffa..30e5fe19b805 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionSignalMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/condition/ConditionSignalMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.SignalOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.LockPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/EvictionConfigHolder.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/EvictionConfigHolder.java index 3c4ad3bc49ed..a4f00774c3c9 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/EvictionConfigHolder.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/EvictionConfigHolder.java @@ -19,7 +19,7 @@ import com.hazelcast.config.EvictionConfig; import com.hazelcast.config.EvictionPolicy; import com.hazelcast.internal.eviction.EvictionPolicyComparator; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; /** diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/ListenerConfigHolder.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/ListenerConfigHolder.java index 8119d2394421..3d59a40f0399 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/ListenerConfigHolder.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/ListenerConfigHolder.java @@ -26,7 +26,7 @@ import com.hazelcast.core.EntryListener; import com.hazelcast.collection.ItemListener; import com.hazelcast.map.listener.MapPartitionLostListener; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.HazelcastSerializationException; import com.hazelcast.quorum.QuorumListener; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/MapStoreConfigHolder.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/MapStoreConfigHolder.java index 6a24415f2f9c..ba09a3aa017f 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/MapStoreConfigHolder.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/MapStoreConfigHolder.java @@ -18,7 +18,7 @@ import com.hazelcast.config.MapStoreConfig; import com.hazelcast.config.MapStoreConfig.InitialLoadMode; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.util.Properties; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/PredicateConfigHolder.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/PredicateConfigHolder.java index c1b316392693..b0ef33a49bee 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/PredicateConfigHolder.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/PredicateConfigHolder.java @@ -17,7 +17,7 @@ package com.hazelcast.client.impl.protocol.task.dynamicconfig; import com.hazelcast.config.PredicateConfig; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/QueueStoreConfigHolder.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/QueueStoreConfigHolder.java index 08c73aa8fb6d..c060a682d97d 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/QueueStoreConfigHolder.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/QueueStoreConfigHolder.java @@ -19,7 +19,7 @@ import com.hazelcast.config.QueueStoreConfig; import com.hazelcast.collection.QueueStore; import com.hazelcast.collection.QueueStoreFactory; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.util.Properties; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/RingbufferStoreConfigHolder.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/RingbufferStoreConfigHolder.java index 595000f573fd..a35f1aa012f1 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/RingbufferStoreConfigHolder.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/RingbufferStoreConfigHolder.java @@ -19,7 +19,7 @@ import com.hazelcast.config.RingbufferStoreConfig; import com.hazelcast.ringbuffer.RingbufferStore; import com.hazelcast.ringbuffer.RingbufferStoreFactory; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.util.Properties; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/ExecutorServiceSubmitToAddressMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/ExecutorServiceSubmitToAddressMessageTask.java index 879c7dd5318a..b8decf4b815b 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/ExecutorServiceSubmitToAddressMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/ExecutorServiceSubmitToAddressMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.executor.impl.operations.MemberCallableTaskOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.SecurityContext; import com.hazelcast.spi.impl.operationservice.InvocationBuilder; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/ExecutorServiceSubmitToPartitionMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/ExecutorServiceSubmitToPartitionMessageTask.java index 1c631e7e5cb8..273a36e914b6 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/ExecutorServiceSubmitToPartitionMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/ExecutorServiceSubmitToPartitionMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.executor.impl.operations.CallableTaskOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.SecurityContext; import com.hazelcast.spi.impl.operationservice.InvocationBuilder; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/durable/DurableExecutorRetrieveAndDisposeResultMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/durable/DurableExecutorRetrieveAndDisposeResultMessageTask.java index 70894b35b238..cedab0a3ceb8 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/durable/DurableExecutorRetrieveAndDisposeResultMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/durable/DurableExecutorRetrieveAndDisposeResultMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.durableexecutor.impl.operations.RetrieveAndDisposeResultOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import java.security.Permission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/durable/DurableExecutorRetrieveResultMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/durable/DurableExecutorRetrieveResultMessageTask.java index bbfca84a87a4..8ce8f9c7bf23 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/durable/DurableExecutorRetrieveResultMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/durable/DurableExecutorRetrieveResultMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.durableexecutor.impl.operations.RetrieveResultOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import java.security.Permission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/durable/DurableExecutorSubmitToPartitionMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/durable/DurableExecutorSubmitToPartitionMessageTask.java index 24bbd53d66d4..ab46b0db4331 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/durable/DurableExecutorSubmitToPartitionMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/executorservice/durable/DurableExecutorSubmitToPartitionMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.durableexecutor.impl.operations.TaskOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.SecurityContext; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListAddAllMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListAddAllMessageTask.java index 264bec7987c7..7a5188632e17 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListAddAllMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListAddAllMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.list.ListService; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.ListPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListAddAllWithIndexMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListAddAllWithIndexMessageTask.java index 5e8dba1199d9..b43f2993ac31 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListAddAllWithIndexMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListAddAllWithIndexMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.list.operations.ListAddAllOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.ListPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListAddListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListAddListenerMessageTask.java index 7246db08ad3e..2dd6e7cf0bb6 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListAddListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListAddListenerMessageTask.java @@ -28,7 +28,7 @@ import com.hazelcast.collection.ItemListener; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.ListPermission; import com.hazelcast.spi.impl.eventservice.EventRegistration; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListCompareAndRemoveAllMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListCompareAndRemoveAllMessageTask.java index 58376ce47da5..2d84421a216f 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListCompareAndRemoveAllMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListCompareAndRemoveAllMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.list.ListService; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.ListPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListCompareAndRetainAllMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListCompareAndRetainAllMessageTask.java index 041c679e1409..3df78d10caed 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListCompareAndRetainAllMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListCompareAndRetainAllMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.list.ListService; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.ListPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListContainsAllMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListContainsAllMessageTask.java index 327be5f5d89e..3bcef6baf0d6 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListContainsAllMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListContainsAllMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.list.ListService; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.ListPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListGetMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListGetMessageTask.java index a141ffdefee4..8f031e07f2fc 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListGetMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListGetMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.list.operations.ListGetOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.ListPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListRemoveWithIndexMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListRemoveWithIndexMessageTask.java index 965b37674447..54248153f847 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListRemoveWithIndexMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListRemoveWithIndexMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.list.operations.ListRemoveOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.ListPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListSetMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListSetMessageTask.java index 0d69da3462ab..6d5dd20ee09b 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListSetMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/list/ListSetMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.list.operations.ListSetOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.ListPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockForceUnlockMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockForceUnlockMessageTask.java index 34a6b69ccdcd..f3a83b107246 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockForceUnlockMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockForceUnlockMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.UnlockOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.LockPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockGetLockCountMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockGetLockCountMessageTask.java index b0d9f8286ee0..ffd7dedecd2e 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockGetLockCountMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockGetLockCountMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.GetLockCountOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.LockPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockGetRemainingLeaseTimeMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockGetRemainingLeaseTimeMessageTask.java index afe45e4ffdd7..2b0dde15a3d3 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockGetRemainingLeaseTimeMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockGetRemainingLeaseTimeMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.GetRemainingLeaseTimeOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.LockPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockIsLockedByCurrentThreadMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockIsLockedByCurrentThreadMessageTask.java index 10c1fb39f748..f10389c6d0b6 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockIsLockedByCurrentThreadMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockIsLockedByCurrentThreadMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.IsLockedOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.LockPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockIsLockedMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockIsLockedMessageTask.java index d26f592372ca..b5711ea1f9ae 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockIsLockedMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockIsLockedMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.IsLockedOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.LockPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockLockMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockLockMessageTask.java index 13d4cf4b08de..865642c07a76 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockLockMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockLockMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.LockOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.LockPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockTryLockMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockTryLockMessageTask.java index 9801ae9b41e5..b7d4b996502d 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockTryLockMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockTryLockMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.LockOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.LockPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockUnlockMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockUnlockMessageTask.java index 57dd413fe88b..adcba75fade5 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockUnlockMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/lock/LockUnlockMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.UnlockOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.LockPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/AbstractMapAddEntryListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/AbstractMapAddEntryListenerMessageTask.java index 1908aee81752..e0489c2558f0 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/AbstractMapAddEntryListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/AbstractMapAddEntryListenerMessageTask.java @@ -28,7 +28,7 @@ import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.MapServiceContext; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; import com.hazelcast.spi.impl.eventservice.EventFilter; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/DefaultMapProjectMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/DefaultMapProjectMessageTask.java index 768e4ef5eaa8..97d4fbab54a6 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/DefaultMapProjectMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/DefaultMapProjectMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.query.QueryResult; import com.hazelcast.map.impl.query.QueryResultUtils; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; import com.hazelcast.util.IterationType; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerMessageTask.java index aca29b3f26ef..31eea8ef685c 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.EntryEventFilter; import com.hazelcast.map.impl.EventListenerFilter; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventFilter; public class MapAddEntryListenerMessageTask diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerToKeyMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerToKeyMessageTask.java index fe7326b51ad5..e0090d3a4819 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerToKeyMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerToKeyMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.map.impl.EntryEventFilter; import com.hazelcast.map.impl.EventListenerFilter; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventFilter; public class MapAddEntryListenerToKeyMessageTask diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerToKeyWithPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerToKeyWithPredicateMessageTask.java index 371b7cd9f532..c84277dd51d5 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerToKeyWithPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerToKeyWithPredicateMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.EventListenerFilter; import com.hazelcast.map.impl.query.QueryEventFilter; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.spi.impl.eventservice.EventFilter; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerWithPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerWithPredicateMessageTask.java index 08d6a3aa85d8..d6972a85dc65 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerWithPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddEntryListenerWithPredicateMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.EventListenerFilter; import com.hazelcast.map.impl.query.QueryEventFilter; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.spi.impl.eventservice.EventFilter; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddNearCacheInvalidationListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddNearCacheInvalidationListenerMessageTask.java index 9d38fc75e12e..1b59ba7b3391 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddNearCacheInvalidationListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAddNearCacheInvalidationListenerMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.EventListenerFilter; import com.hazelcast.map.impl.nearcache.invalidation.UuidFilter; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventFilter; import java.util.List; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAggregateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAggregateMessageTask.java index cb2a375ec63d..5ab9211b8782 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAggregateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAggregateMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.client.impl.protocol.codec.MapAggregateCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAggregateWithPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAggregateWithPredicateMessageTask.java index b92d4a1ffe4e..aaeb06141f03 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAggregateWithPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapAggregateWithPredicateMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.client.impl.protocol.codec.MapAggregateWithPredicateCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEntriesWithPagingPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEntriesWithPagingPredicateMessageTask.java index fd754c1d2cda..61f05e882500 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEntriesWithPagingPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEntriesWithPagingPredicateMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.map.impl.query.QueryResultRow; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.util.IterationType; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEntriesWithPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEntriesWithPredicateMessageTask.java index 63d30d3e146d..906934f28944 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEntriesWithPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEntriesWithPredicateMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.map.impl.query.QueryResultRow; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.util.IterationType; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEntrySetMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEntrySetMessageTask.java index 442c9ccdfdd2..815bba9f6344 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEntrySetMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEntrySetMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.query.QueryResultRow; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; import com.hazelcast.security.permission.ActionConstants; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEventJournalReadTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEventJournalReadTask.java index a49d3cfecc74..163da97ab884 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEventJournalReadTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapEventJournalReadTask.java @@ -23,7 +23,7 @@ import com.hazelcast.map.impl.journal.MapEventJournalReadOperation; import com.hazelcast.map.journal.EventJournalMapEvent; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapExecuteOnAllKeysMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapExecuteOnAllKeysMessageTask.java index 05fc4d62e420..297a1e80bbe4 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapExecuteOnAllKeysMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapExecuteOnAllKeysMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.operation.MapOperationProvider; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapExecuteOnKeysMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapExecuteOnKeysMessageTask.java index 49802c9678a4..347118cb6db6 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapExecuteOnKeysMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapExecuteOnKeysMessageTask.java @@ -25,7 +25,7 @@ import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.operation.MultipleEntryOperationFactory; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapExecuteWithPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapExecuteWithPredicateMessageTask.java index 0dc5cba68797..9b94526970a1 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapExecuteWithPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapExecuteWithPredicateMessageTask.java @@ -28,7 +28,7 @@ import com.hazelcast.map.impl.MapServiceContext; import com.hazelcast.map.impl.operation.MapOperationProvider; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.PartitionPredicate; import com.hazelcast.query.Predicate; import com.hazelcast.security.permission.ActionConstants; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchEntriesMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchEntriesMessageTask.java index a2f2f7bc4be3..650ef5da0536 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchEntriesMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchEntriesMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.map.impl.iterator.MapEntriesWithCursor; import com.hazelcast.map.impl.operation.MapOperationProvider; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import java.security.Permission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchKeysMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchKeysMessageTask.java index 53e869d77c41..86c10e67523d 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchKeysMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchKeysMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.map.impl.iterator.MapKeysWithCursor; import com.hazelcast.map.impl.operation.MapOperationProvider; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import java.security.Permission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchWithQueryMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchWithQueryMessageTask.java index 3289916427d2..bd2d9680462d 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchWithQueryMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchWithQueryMessageTask.java @@ -26,7 +26,7 @@ import com.hazelcast.map.impl.query.QueryResultRow; import com.hazelcast.map.impl.query.ResultSegment; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.projection.Projection; import com.hazelcast.query.Predicate; import com.hazelcast.security.permission.ActionConstants; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapGetEntryViewMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapGetEntryViewMessageTask.java index 85d073f405be..e4d4e1ae1a17 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapGetEntryViewMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapGetEntryViewMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.operation.MapOperation; import com.hazelcast.map.impl.operation.MapOperationProvider; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapKeySetMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapKeySetMessageTask.java index c5d98aaf13d5..e4ebf447660a 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapKeySetMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapKeySetMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.query.QueryResultRow; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; import com.hazelcast.security.permission.ActionConstants; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapKeySetWithPagingPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapKeySetWithPagingPredicateMessageTask.java index b58f6b5b3b6e..b6d14cd40d04 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapKeySetWithPagingPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapKeySetWithPagingPredicateMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.map.impl.query.QueryResultRow; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.util.IterationType; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapKeySetWithPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapKeySetWithPredicateMessageTask.java index 5c692afc0a8a..9b64e44c2d6d 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapKeySetWithPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapKeySetWithPredicateMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.map.impl.query.QueryResultRow; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.util.IterationType; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapLoadGivenKeysMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapLoadGivenKeysMessageTask.java index 7df2d993b127..72b6d5412e20 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapLoadGivenKeysMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapLoadGivenKeysMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.operation.MapOperationProvider; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapProjectionMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapProjectionMessageTask.java index e693760cf9a7..1b4a7b4170a2 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapProjectionMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapProjectionMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.client.impl.protocol.codec.MapProjectWithPredicateCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.projection.Projection; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapProjectionWithPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapProjectionWithPredicateMessageTask.java index 8984ae827d6b..1fab797e3acb 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapProjectionWithPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapProjectionWithPredicateMessageTask.java @@ -20,7 +20,7 @@ import com.hazelcast.client.impl.protocol.codec.MapProjectWithPredicateCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.projection.Projection; import com.hazelcast.query.Predicate; import com.hazelcast.security.permission.ActionConstants; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapPublisherCreateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapPublisherCreateMessageTask.java index 35715e72f4fa..a404e3e3055e 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapPublisherCreateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapPublisherCreateMessageTask.java @@ -31,7 +31,7 @@ import com.hazelcast.map.impl.querycache.subscriber.operation.PublisherCreateOperation; import com.hazelcast.nio.Address; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.spi.impl.operationservice.InvocationBuilder; import com.hazelcast.spi.impl.operationservice.impl.OperationServiceImpl; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapPublisherCreateWithValueMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapPublisherCreateWithValueMessageTask.java index 5c026ffd9033..c87f4271eed5 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapPublisherCreateWithValueMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapPublisherCreateWithValueMessageTask.java @@ -31,7 +31,7 @@ import com.hazelcast.map.impl.querycache.subscriber.operation.PublisherCreateOperation; import com.hazelcast.nio.Address; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.spi.impl.operationservice.InvocationBuilder; import com.hazelcast.spi.impl.operationservice.impl.OperationServiceImpl; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapPutAllMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapPutAllMessageTask.java index ff2a24254e2b..024916d2e9bb 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapPutAllMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapPutAllMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.operation.MapOperationProvider; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapRemoveAllMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapRemoveAllMessageTask.java index a745972344c7..e1a81961c4c0 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapRemoveAllMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapRemoveAllMessageTask.java @@ -28,7 +28,7 @@ import com.hazelcast.map.impl.MapServiceContext; import com.hazelcast.map.impl.operation.MapOperationProvider; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.PartitionPredicate; import com.hazelcast.query.Predicate; import com.hazelcast.security.permission.ActionConstants; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapValuesMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapValuesMessageTask.java index 6771ed8f19fd..c1899626d61a 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapValuesMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapValuesMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.query.QueryResultRow; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; import com.hazelcast.security.permission.ActionConstants; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapValuesWithPagingPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapValuesWithPagingPredicateMessageTask.java index 4b205f6de928..faa22d23fdcc 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapValuesWithPagingPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapValuesWithPagingPredicateMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.map.impl.query.QueryResultRow; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.util.IterationType; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapValuesWithPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapValuesWithPredicateMessageTask.java index a6097e0c87af..13554291c79a 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapValuesWithPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapValuesWithPredicateMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.query.QueryResultRow; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.util.IterationType; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/Pre38MapAddNearCacheEntryListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/Pre38MapAddNearCacheEntryListenerMessageTask.java index 114361291a2b..d11726bae91b 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/Pre38MapAddNearCacheEntryListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/map/Pre38MapAddNearCacheEntryListenerMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.EventListenerFilter; import com.hazelcast.map.impl.nearcache.invalidation.UuidFilter; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventFilter; import java.util.List; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/AbstractMultiMapAddEntryListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/AbstractMultiMapAddEntryListenerMessageTask.java index 932747a8a7cd..212206f8626c 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/AbstractMultiMapAddEntryListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/AbstractMultiMapAddEntryListenerMessageTask.java @@ -27,7 +27,7 @@ import com.hazelcast.map.impl.DataAwareEntryEvent; import com.hazelcast.multimap.impl.MultiMapService; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MultiMapPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapAddEntryListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapAddEntryListenerMessageTask.java index 93ab741976d8..53513ef095d2 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapAddEntryListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapAddEntryListenerMessageTask.java @@ -20,7 +20,7 @@ import com.hazelcast.client.impl.protocol.codec.MultiMapAddEntryListenerCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Client Protocol Task for handling messages with type ID: diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapAddEntryListenerToKeyMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapAddEntryListenerToKeyMessageTask.java index a91bbd6ebbf1..d7fd745acf71 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapAddEntryListenerToKeyMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapAddEntryListenerToKeyMessageTask.java @@ -20,7 +20,7 @@ import com.hazelcast.client.impl.protocol.codec.MultiMapAddEntryListenerToKeyCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Client Protocol Task for handling messages with type ID: diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapEntrySetMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapEntrySetMessageTask.java index 86118d831204..69fa32191fda 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapEntrySetMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapEntrySetMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.multimap.impl.operations.EntrySetResponse; import com.hazelcast.multimap.impl.operations.MultiMapOperationFactory; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MultiMapPermission; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapGetMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapGetMessageTask.java index 2a5270195891..d460851f3fc2 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapGetMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapGetMessageTask.java @@ -25,7 +25,7 @@ import com.hazelcast.multimap.impl.operations.GetAllOperation; import com.hazelcast.multimap.impl.operations.MultiMapResponse; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MultiMapPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapKeySetMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapKeySetMessageTask.java index 7e4b1652df6f..0ed2e41ec536 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapKeySetMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapKeySetMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.multimap.impl.operations.MultiMapOperationFactory; import com.hazelcast.multimap.impl.operations.MultiMapResponse; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MultiMapPermission; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapRemoveMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapRemoveMessageTask.java index bba302ce5ec2..deedd0839a88 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapRemoveMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapRemoveMessageTask.java @@ -25,7 +25,7 @@ import com.hazelcast.multimap.impl.operations.MultiMapResponse; import com.hazelcast.multimap.impl.operations.RemoveAllOperation; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MultiMapPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapValuesMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapValuesMessageTask.java index 4c4927ce4492..5950c1f2a220 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapValuesMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/multimap/MultiMapValuesMessageTask.java @@ -25,7 +25,7 @@ import com.hazelcast.multimap.impl.operations.MultiMapOperationFactory; import com.hazelcast.multimap.impl.operations.MultiMapResponse; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MultiMapPermission; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueAddListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueAddListenerMessageTask.java index 2bc3f6a67b1e..2223ef2af77f 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueAddListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueAddListenerMessageTask.java @@ -26,7 +26,7 @@ import com.hazelcast.collection.ItemListener; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.QueuePermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueDrainMaxSizeMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueDrainMaxSizeMessageTask.java index dd030733f020..f36505fd6392 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueDrainMaxSizeMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueDrainMaxSizeMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.queue.operations.DrainOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.QueuePermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueDrainMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueDrainMessageTask.java index dca9118700f0..1b6c7400a7e2 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueDrainMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueDrainMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.queue.operations.DrainOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.QueuePermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueIteratorMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueIteratorMessageTask.java index 901dbf6ff274..759874dc9213 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueIteratorMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueIteratorMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.queue.operations.IteratorOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.QueuePermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueuePeekMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueuePeekMessageTask.java index 1c56ec698fab..6b4d959400cc 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueuePeekMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueuePeekMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.queue.operations.PeekOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.QueuePermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueuePollMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueuePollMessageTask.java index 4e49d709597d..be940ec380fb 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueuePollMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueuePollMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.queue.operations.PollOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.QueuePermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueTakeMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueTakeMessageTask.java index b9af63810dd3..a84f603a1ef4 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueTakeMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/queue/QueueTakeMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.queue.operations.PollOperation; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.QueuePermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/AbstractReplicatedMapAddEntryListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/AbstractReplicatedMapAddEntryListenerMessageTask.java index a88086808365..0052eb038455 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/AbstractReplicatedMapAddEntryListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/AbstractReplicatedMapAddEntryListenerMessageTask.java @@ -27,7 +27,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.map.impl.DataAwareEntryEvent; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.replicatedmap.impl.ReplicatedMapEventPublishingService; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerMessageTask.java index dd9c416b5f07..cabf3baaf4d4 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerMessageTask.java @@ -20,7 +20,7 @@ import com.hazelcast.client.impl.protocol.codec.ReplicatedMapAddEntryListenerCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; public class ReplicatedMapAddEntryListenerMessageTask diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerToKeyMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerToKeyMessageTask.java index 8abb27fa3ad0..09b25fc68308 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerToKeyMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerToKeyMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.client.impl.protocol.codec.ReplicatedMapAddEntryListenerToKeyCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; public class ReplicatedMapAddEntryListenerToKeyMessageTask diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerToKeyWithPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerToKeyWithPredicateMessageTask.java index 0522442579ca..1cc8686e136e 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerToKeyWithPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerToKeyWithPredicateMessageTask.java @@ -20,7 +20,7 @@ import com.hazelcast.client.impl.protocol.codec.ReplicatedMapAddEntryListenerToKeyWithPredicateCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; public class ReplicatedMapAddEntryListenerToKeyWithPredicateMessageTask diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerWithPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerWithPredicateMessageTask.java index 22a6dc5bf6ee..47ba201bd041 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerWithPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddEntryListenerWithPredicateMessageTask.java @@ -20,7 +20,7 @@ import com.hazelcast.client.impl.protocol.codec.ReplicatedMapAddEntryListenerWithPredicateCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; public class ReplicatedMapAddEntryListenerWithPredicateMessageTask diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddNearCacheListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddNearCacheListenerMessageTask.java index dcea1d729094..190ec03b30ce 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddNearCacheListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapAddNearCacheListenerMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.client.impl.protocol.codec.ReplicatedMapAddNearCacheEntryListenerCodec; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; public class ReplicatedMapAddNearCacheListenerMessageTask diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapValuesMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapValuesMessageTask.java index a6e00cb60302..7fa9592e9399 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapValuesMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/replicatedmap/ReplicatedMapValuesMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.client.impl.protocol.task.AbstractPartitionMessageTask; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.client.ReplicatedMapValueCollection; import com.hazelcast.replicatedmap.impl.operation.ValuesOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/ringbuffer/RingbufferAddAllMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/ringbuffer/RingbufferAddAllMessageTask.java index bf2437ff1c14..5dfb8ba62f83 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/ringbuffer/RingbufferAddAllMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/ringbuffer/RingbufferAddAllMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.client.impl.protocol.task.AbstractPartitionMessageTask; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.OverflowPolicy; import com.hazelcast.ringbuffer.impl.RingbufferService; import com.hazelcast.ringbuffer.impl.operations.AddAllOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/ringbuffer/RingbufferReadManyMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/ringbuffer/RingbufferReadManyMessageTask.java index 844723642168..72f252d972ac 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/ringbuffer/RingbufferReadManyMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/ringbuffer/RingbufferReadManyMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.core.IFunction; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; import com.hazelcast.ringbuffer.impl.RingbufferService; import com.hazelcast.ringbuffer.impl.operations.ReadManyOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/ringbuffer/RingbufferReadOneMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/ringbuffer/RingbufferReadOneMessageTask.java index 06eaae5992c7..bce9a425a656 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/ringbuffer/RingbufferReadOneMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/ringbuffer/RingbufferReadOneMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.client.impl.protocol.task.AbstractPartitionMessageTask; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.impl.RingbufferService; import com.hazelcast.ringbuffer.impl.operations.ReadOneOperation; import com.hazelcast.security.permission.ActionConstants; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/scheduledexecutor/ScheduledExecutorTaskGetResultFromAddressMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/scheduledexecutor/ScheduledExecutorTaskGetResultFromAddressMessageTask.java index 7074789c07d5..43c44a092681 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/scheduledexecutor/ScheduledExecutorTaskGetResultFromAddressMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/scheduledexecutor/ScheduledExecutorTaskGetResultFromAddressMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Address; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.scheduledexecutor.ScheduledTaskHandler; import com.hazelcast.scheduledexecutor.impl.DistributedScheduledExecutorService; import com.hazelcast.scheduledexecutor.impl.ScheduledTaskHandlerImpl; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/scheduledexecutor/ScheduledExecutorTaskGetResultFromPartitionMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/scheduledexecutor/ScheduledExecutorTaskGetResultFromPartitionMessageTask.java index a5e8e7a3eb33..b5049f5b4d28 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/scheduledexecutor/ScheduledExecutorTaskGetResultFromPartitionMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/scheduledexecutor/ScheduledExecutorTaskGetResultFromPartitionMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.client.impl.protocol.task.AbstractPartitionMessageTask; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.scheduledexecutor.ScheduledTaskHandler; import com.hazelcast.scheduledexecutor.impl.DistributedScheduledExecutorService; import com.hazelcast.scheduledexecutor.impl.ScheduledTaskHandlerImpl; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetAddListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetAddListenerMessageTask.java index efc3f95e68ed..83655ef50802 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetAddListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetAddListenerMessageTask.java @@ -28,7 +28,7 @@ import com.hazelcast.collection.ItemListener; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.SetPermission; import com.hazelcast.spi.impl.eventservice.EventRegistration; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetCompareAndRemoveAllMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetCompareAndRemoveAllMessageTask.java index 493aa68d017f..d20c5dada4fd 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetCompareAndRemoveAllMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetCompareAndRemoveAllMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.set.SetService; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.SetPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetCompareAndRetainAllMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetCompareAndRetainAllMessageTask.java index 0d311fbe92fe..1a2c437bc8ee 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetCompareAndRetainAllMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetCompareAndRetainAllMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.set.SetService; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.SetPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetContainsAllMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetContainsAllMessageTask.java index eb4ed5035ea8..4008e3fe6668 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetContainsAllMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/set/SetContainsAllMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.set.SetService; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.SetPermission; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/topic/TopicAddMessageListenerMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/topic/TopicAddMessageListenerMessageTask.java index df9290f17b7a..eb9ecf7be0ef 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/topic/TopicAddMessageListenerMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/topic/TopicAddMessageListenerMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.topic.MessageListener; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.TopicPermission; import com.hazelcast.topic.impl.DataAwareMessage; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transaction/XAClearRemoteTransactionMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transaction/XAClearRemoteTransactionMessageTask.java index f01a522e9cf1..366d44334f66 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transaction/XAClearRemoteTransactionMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transaction/XAClearRemoteTransactionMessageTask.java @@ -22,7 +22,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.internal.partition.InternalPartitionService; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.TransactionPermission; import com.hazelcast.spi.impl.operationservice.InvocationBuilder; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transaction/XACollectTransactionsMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transaction/XACollectTransactionsMessageTask.java index 0553767d9dba..33fbd0f231d7 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transaction/XACollectTransactionsMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transaction/XACollectTransactionsMessageTask.java @@ -24,7 +24,7 @@ import com.hazelcast.core.MemberLeftException; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.TransactionPermission; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.SerializableList; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transaction/XAFinalizeTransactionMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transaction/XAFinalizeTransactionMessageTask.java index f8452d557d0a..1bd3adc99a90 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transaction/XAFinalizeTransactionMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transaction/XAFinalizeTransactionMessageTask.java @@ -21,7 +21,7 @@ import com.hazelcast.client.impl.protocol.task.AbstractPartitionMessageTask; import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.TransactionPermission; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.transaction.impl.xa.XAService; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapKeySetMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapKeySetMessageTask.java index 38add54cb466..4835d46a595b 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapKeySetMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapKeySetMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.map.impl.MapService; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; import com.hazelcast.transaction.TransactionContext; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapKeySetWithPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapKeySetWithPredicateMessageTask.java index 7d7624bbc924..ca0f92eefaf5 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapKeySetWithPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapKeySetWithPredicateMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.map.impl.MapService; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapValuesMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapValuesMessageTask.java index 3f3d375801df..d767203826c7 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapValuesMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapValuesMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.map.impl.MapService; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; import com.hazelcast.transaction.TransactionContext; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapValuesWithPredicateMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapValuesWithPredicateMessageTask.java index 56c42231b96f..ad6945808c59 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapValuesWithPredicateMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmap/TransactionalMapValuesWithPredicateMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.map.impl.MapService; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MapPermission; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmultimap/TransactionalMultiMapGetMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmultimap/TransactionalMultiMapGetMessageTask.java index 2f5b45ac3a56..7a66b1a3697d 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmultimap/TransactionalMultiMapGetMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmultimap/TransactionalMultiMapGetMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.multimap.impl.MultiMapService; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MultiMapPermission; import com.hazelcast.transaction.TransactionContext; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmultimap/TransactionalMultiMapRemoveMessageTask.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmultimap/TransactionalMultiMapRemoveMessageTask.java index 7c3879bcf95b..0a17952a11e2 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmultimap/TransactionalMultiMapRemoveMessageTask.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/transactionalmultimap/TransactionalMultiMapRemoveMessageTask.java @@ -23,7 +23,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.multimap.impl.MultiMapService; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.security.permission.ActionConstants; import com.hazelcast.security.permission.MultiMapPermission; import com.hazelcast.transaction.TransactionContext; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/util/MessageFlyweight.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/util/MessageFlyweight.java index fd5dba54af6e..b47e2df11936 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/util/MessageFlyweight.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/util/MessageFlyweight.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.impl.HeapData; import com.hazelcast.nio.Bits; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.ArrayList; import java.util.Collection; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/util/ParameterUtil.java b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/util/ParameterUtil.java index 5f524341bc9d..0e4755ae2d34 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/util/ParameterUtil.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/protocol/util/ParameterUtil.java @@ -17,7 +17,7 @@ package com.hazelcast.client.impl.protocol.util; import com.hazelcast.nio.Bits; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.Map; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientCardinalityEstimatorProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientCardinalityEstimatorProxy.java index 037a2d0ea981..5b0e2a7ee326 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientCardinalityEstimatorProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientCardinalityEstimatorProxy.java @@ -22,7 +22,7 @@ import com.hazelcast.client.impl.protocol.codec.CardinalityEstimatorAddCodec; import com.hazelcast.client.impl.protocol.codec.CardinalityEstimatorEstimateCodec; import com.hazelcast.client.impl.spi.ClientContext; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InternalCompletableFuture; import static com.hazelcast.util.Preconditions.checkNotNull; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientExecutorServiceProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientExecutorServiceProxy.java index cc19dfbd8aac..58244b7f113b 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientExecutorServiceProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientExecutorServiceProxy.java @@ -36,7 +36,7 @@ import com.hazelcast.partition.PartitionAware; import com.hazelcast.monitor.LocalExecutorStats; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.util.Clock; import com.hazelcast.util.UuidUtil; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientListProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientListProxy.java index d391b54e8178..299344717c18 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientListProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientListProxy.java @@ -49,7 +49,7 @@ import com.hazelcast.collection.ItemListener; import com.hazelcast.collection.impl.common.DataAwareItemEvent; import com.hazelcast.core.ItemEventType; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.UnmodifiableLazyList; import javax.annotation.Nonnull; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientMapProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientMapProxy.java index 3b705acc9aa3..5fc2befda72b 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientMapProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientMapProxy.java @@ -129,7 +129,7 @@ import com.hazelcast.map.listener.MapPartitionLostListener; import com.hazelcast.monitor.LocalMapStats; import com.hazelcast.monitor.impl.LocalMapStatsImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.projection.Projection; import com.hazelcast.query.PagingPredicate; import com.hazelcast.query.PagingPredicateAccessor; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientMultiMapProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientMultiMapProxy.java index b6e7c94285dd..969350547a52 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientMultiMapProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientMultiMapProxy.java @@ -54,7 +54,7 @@ import com.hazelcast.map.impl.ListenerAdapter; import com.hazelcast.monitor.LocalMultiMapStats; import com.hazelcast.multimap.MultiMap; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.UnmodifiableLazyList; import com.hazelcast.util.ThreadUtil; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientQueueProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientQueueProxy.java index acde3d74e7d9..a4020a6b32c6 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientQueueProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientQueueProxy.java @@ -50,7 +50,7 @@ import com.hazelcast.core.HazelcastException; import com.hazelcast.core.ItemEventType; import com.hazelcast.monitor.LocalQueueStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import javax.annotation.Nonnull; import java.util.Collection; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientReliableTopicProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientReliableTopicProxy.java index 7b6c6d772ac1..6577e48cbe46 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientReliableTopicProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientReliableTopicProxy.java @@ -24,7 +24,7 @@ import com.hazelcast.topic.MessageListener; import com.hazelcast.logging.ILogger; import com.hazelcast.monitor.LocalTopicStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.OverflowPolicy; import com.hazelcast.ringbuffer.Ringbuffer; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientReplicatedMapProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientReplicatedMapProxy.java index 8bf7107e47b7..f93f29b593e9 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientReplicatedMapProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientReplicatedMapProxy.java @@ -51,7 +51,7 @@ import com.hazelcast.map.MapEvent; import com.hazelcast.map.impl.DataAwareEntryEvent; import com.hazelcast.monitor.LocalReplicatedMapStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.replicatedmap.ReplicatedMap; import com.hazelcast.spi.impl.UnmodifiableLazyList; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientRingbufferProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientRingbufferProxy.java index 72ad4526c817..ee7c0f949051 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientRingbufferProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientRingbufferProxy.java @@ -34,7 +34,7 @@ import com.hazelcast.client.impl.spi.impl.ClientInvocationFuture; import com.hazelcast.core.ICompletableFuture; import com.hazelcast.core.IFunction; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.ringbuffer.OverflowPolicy; import com.hazelcast.ringbuffer.ReadResultSet; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientScheduledExecutorProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientScheduledExecutorProxy.java index 496734c29092..8a897279b828 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientScheduledExecutorProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientScheduledExecutorProxy.java @@ -30,7 +30,7 @@ import com.hazelcast.logging.ILogger; import com.hazelcast.logging.Logger; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.PartitionAware; import com.hazelcast.quorum.QuorumException; import com.hazelcast.scheduledexecutor.IScheduledExecutorService; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientScheduledFutureProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientScheduledFutureProxy.java index eb472fe252a8..b5d47f4c47c9 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientScheduledFutureProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientScheduledFutureProxy.java @@ -36,7 +36,7 @@ import com.hazelcast.client.impl.spi.impl.ClientInvocation; import com.hazelcast.client.impl.spi.impl.ClientInvocationFuture; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.scheduledexecutor.IScheduledFuture; import com.hazelcast.scheduledexecutor.ScheduledTaskHandler; import com.hazelcast.scheduledexecutor.ScheduledTaskStatistics; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientSetProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientSetProxy.java index 09e8454698e8..c72f7e5854c3 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientSetProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientSetProxy.java @@ -40,7 +40,7 @@ import com.hazelcast.collection.ItemListener; import com.hazelcast.collection.impl.common.DataAwareItemEvent; import com.hazelcast.core.ItemEventType; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.UnmodifiableLazyList; import javax.annotation.Nonnull; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientTopicProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientTopicProxy.java index 952d746dee6e..6a879fab79fb 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientTopicProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/ClientTopicProxy.java @@ -28,7 +28,7 @@ import com.hazelcast.topic.MessageListener; import com.hazelcast.cluster.Member; import com.hazelcast.monitor.LocalTopicStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.topic.impl.DataAwareMessage; import javax.annotation.Nonnull; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/NearCachedClientMapProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/NearCachedClientMapProxy.java index 27a2faaedd5b..d3d756a10f82 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/NearCachedClientMapProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/NearCachedClientMapProxy.java @@ -38,7 +38,7 @@ import com.hazelcast.map.EntryProcessor; import com.hazelcast.monitor.LocalMapStats; import com.hazelcast.monitor.impl.LocalMapStatsImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.util.CollectionUtil; import com.hazelcast.util.executor.CompletedFuture; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnListProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnListProxy.java index 15c0c46de726..819148552ce4 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnListProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnListProxy.java @@ -23,7 +23,7 @@ import com.hazelcast.client.impl.spi.ClientTransactionContext; import com.hazelcast.collection.impl.list.ListService; import com.hazelcast.transaction.TransactionalList; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.util.Preconditions; import static com.hazelcast.util.ThreadUtil.getThreadId; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnMapProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnMapProxy.java index dffaecc41f2b..e51d50b0e003 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnMapProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnMapProxy.java @@ -36,7 +36,7 @@ import com.hazelcast.client.impl.spi.ClientTransactionContext; import com.hazelcast.transaction.TransactionalMap; import com.hazelcast.map.impl.MapService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.spi.impl.UnmodifiableLazyList; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnMultiMapProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnMultiMapProxy.java index 4cfcd26b4fb7..6c0c759f359f 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnMultiMapProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnMultiMapProxy.java @@ -26,7 +26,7 @@ import com.hazelcast.client.impl.spi.ClientTransactionContext; import com.hazelcast.transaction.TransactionalMultiMap; import com.hazelcast.multimap.impl.MultiMapService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.UnmodifiableLazyList; import com.hazelcast.transaction.TransactionException; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnProxy.java index edc18ed94bc6..8052abf89b12 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnProxy.java @@ -21,7 +21,7 @@ import com.hazelcast.client.impl.protocol.ClientMessage; import com.hazelcast.client.impl.protocol.codec.ClientDestroyProxyCodec; import com.hazelcast.client.impl.spi.ClientTransactionContext; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.transaction.TransactionalObject; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnQueueProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnQueueProxy.java index b099a0e5e03b..ec1d42308d70 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnQueueProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnQueueProxy.java @@ -25,7 +25,7 @@ import com.hazelcast.client.impl.spi.ClientTransactionContext; import com.hazelcast.collection.impl.queue.QueueService; import com.hazelcast.transaction.TransactionalQueue; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import javax.annotation.Nonnull; import java.util.concurrent.TimeUnit; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnSetProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnSetProxy.java index 3cb4ffe6b702..ec3a105c1b4c 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnSetProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/ClientTxnSetProxy.java @@ -23,7 +23,7 @@ import com.hazelcast.client.impl.spi.ClientTransactionContext; import com.hazelcast.collection.impl.set.SetService; import com.hazelcast.transaction.TransactionalSet; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.util.Preconditions; import static com.hazelcast.util.ThreadUtil.getThreadId; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/xa/XAResourceProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/xa/XAResourceProxy.java index 2d4e9f236781..870df64929b1 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/xa/XAResourceProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/proxy/txn/xa/XAResourceProxy.java @@ -24,7 +24,7 @@ import com.hazelcast.client.impl.spi.ClientProxy; import com.hazelcast.client.impl.spi.ClientTransactionManagerService; import com.hazelcast.logging.ILogger; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.transaction.HazelcastXAResource; import com.hazelcast.transaction.TransactionContext; import com.hazelcast.transaction.TransactionException; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/querycache/subscriber/ClientQueryCacheEndToEndConstructor.java b/hazelcast/src/main/java/com/hazelcast/client/impl/querycache/subscriber/ClientQueryCacheEndToEndConstructor.java index 9a8971123942..e8d365c7b186 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/querycache/subscriber/ClientQueryCacheEndToEndConstructor.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/querycache/subscriber/ClientQueryCacheEndToEndConstructor.java @@ -26,7 +26,7 @@ import com.hazelcast.map.impl.querycache.subscriber.InternalQueryCache; import com.hazelcast.map.impl.querycache.subscriber.QueryCacheEndToEndConstructor; import com.hazelcast.map.impl.querycache.subscriber.QueryCacheRequest; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Client-side implementation of {@code QueryCacheEndToEndConstructor}. diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/querycache/subscriber/ClientQueryCacheEventService.java b/hazelcast/src/main/java/com/hazelcast/client/impl/querycache/subscriber/ClientQueryCacheEventService.java index 895598f96545..1153cc8f3ffc 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/querycache/subscriber/ClientQueryCacheEventService.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/querycache/subscriber/ClientQueryCacheEventService.java @@ -38,7 +38,7 @@ import com.hazelcast.map.impl.querycache.event.QueryCacheEventData; import com.hazelcast.map.impl.querycache.event.SingleIMapEvent; import com.hazelcast.map.listener.MapListener; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.QueryEntry; import com.hazelcast.query.impl.getters.Extractors; import com.hazelcast.spi.impl.eventservice.EventFilter; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/spi/ClientContext.java b/hazelcast/src/main/java/com/hazelcast/client/impl/spi/ClientContext.java index 069a646a2188..df7b0ea4100b 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/spi/ClientContext.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/spi/ClientContext.java @@ -34,7 +34,7 @@ import com.hazelcast.logging.ILogger; import com.hazelcast.logging.LoggingService; import com.hazelcast.map.impl.MapService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.properties.HazelcastProperties; import com.hazelcast.util.ConstructorFunction; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/spi/ClientPartitionService.java b/hazelcast/src/main/java/com/hazelcast/client/impl/spi/ClientPartitionService.java index 54c81f0dbd7e..b11e149cbcc4 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/spi/ClientPartitionService.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/spi/ClientPartitionService.java @@ -18,7 +18,7 @@ import com.hazelcast.partition.Partition; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Partition service for Hazelcast clients. diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/spi/ClientProxy.java b/hazelcast/src/main/java/com/hazelcast/client/impl/spi/ClientProxy.java index 72066a873552..fa0d24547d30 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/spi/ClientProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/spi/ClientProxy.java @@ -23,7 +23,7 @@ import com.hazelcast.client.impl.spi.impl.ListenerMessageCodec; import com.hazelcast.core.DistributedObject; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.util.ExceptionUtil; diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/spi/impl/ClientPartitionServiceImpl.java b/hazelcast/src/main/java/com/hazelcast/client/impl/spi/impl/ClientPartitionServiceImpl.java index 1bbc3428c2cf..7cee1c1c6376 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/impl/spi/impl/ClientPartitionServiceImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/client/impl/spi/impl/ClientPartitionServiceImpl.java @@ -35,7 +35,7 @@ import com.hazelcast.logging.ILogger; import com.hazelcast.nio.Address; import com.hazelcast.nio.Connection; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.NoDataMemberInClusterException; import com.hazelcast.util.ExceptionUtil; import com.hazelcast.util.HashUtil; diff --git a/hazelcast/src/main/java/com/hazelcast/client/map/impl/ClientMapQueryPartitionIterator.java b/hazelcast/src/main/java/com/hazelcast/client/map/impl/ClientMapQueryPartitionIterator.java index 4c2803bf8cee..47fe773f6670 100644 --- a/hazelcast/src/main/java/com/hazelcast/client/map/impl/ClientMapQueryPartitionIterator.java +++ b/hazelcast/src/main/java/com/hazelcast/client/map/impl/ClientMapQueryPartitionIterator.java @@ -25,7 +25,7 @@ import com.hazelcast.client.impl.spi.impl.ClientInvocationFuture; import com.hazelcast.map.IMap; import com.hazelcast.map.impl.iterator.AbstractMapQueryPartitionIterator; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.projection.Projection; import com.hazelcast.query.Predicate; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/AbstractCollectionProxyImpl.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/AbstractCollectionProxyImpl.java index 0adae9b3a633..70327380b366 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/AbstractCollectionProxyImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/AbstractCollectionProxyImpl.java @@ -31,7 +31,7 @@ import com.hazelcast.config.ItemListenerConfig; import com.hazelcast.core.HazelcastInstanceAware; import com.hazelcast.nio.ClassLoaderUtil; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.AbstractDistributedObject; import com.hazelcast.spi.impl.eventservice.EventRegistration; import com.hazelcast.spi.impl.eventservice.EventService; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionContainer.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionContainer.java index 666671b0522c..1f7a85d725fe 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionContainer.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionContainer.java @@ -20,7 +20,7 @@ import com.hazelcast.logging.ILogger; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.transaction.TransactionException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionEvent.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionEvent.java index 605c3b37fa0c..541a9ccde000 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionEvent.java @@ -20,7 +20,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionItem.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionItem.java index 05865130b2ee..92a785a8ff5b 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionItem.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionItem.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.util.Clock; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionService.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionService.java index d098890f8980..086c18db1968 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionService.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/CollectionService.java @@ -25,7 +25,7 @@ import com.hazelcast.collection.ItemListener; import com.hazelcast.cluster.impl.MemberImpl; import com.hazelcast.logging.ILogger; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.spi.impl.eventservice.EventPublishingService; import com.hazelcast.internal.services.ManagedService; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/TxCollectionItem.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/TxCollectionItem.java index 1434ba283742..5496ca9f1111 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/TxCollectionItem.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/TxCollectionItem.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddAllBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddAllBackupOperation.java index 0376acdb0561..8866afeb8733 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddAllBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddAllBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.collection.impl.collection.CollectionDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddAllOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddAllOperation.java index ece732c2bf00..514b5123ce19 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddAllOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.core.ItemEventType; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddBackupOperation.java index 6773061f6b7a..12771157b17c 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.collection.impl.collection.CollectionDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddOperation.java index 1ff4caa6d9f0..c4f04fa32607 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionAddOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.core.ItemEventType; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionClearOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionClearOperation.java index dba4e009e24a..a6a31f4f64c0 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionClearOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionClearOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.collection.impl.collection.CollectionContainer; import com.hazelcast.collection.impl.collection.CollectionDataSerializerHook; import com.hazelcast.core.ItemEventType; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionCompareAndRemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionCompareAndRemoveOperation.java index a18c42552569..d11c0693fc13 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionCompareAndRemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionCompareAndRemoveOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.core.ItemEventType; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionContainsOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionContainsOperation.java index d1872dae6905..9b67a1271fb6 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionContainsOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionContainsOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.collection.impl.collection.CollectionDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionGetAllOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionGetAllOperation.java index 054460454538..45c63edff166 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionGetAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionGetAllOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.collection.impl.collection.CollectionContainer; import com.hazelcast.collection.impl.collection.CollectionDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; import com.hazelcast.spi.impl.SerializableList; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionOperation.java index c9ccffe4de07..1e1168533298 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionOperation.java @@ -27,7 +27,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.spi.impl.eventservice.EventRegistration; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionRemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionRemoveOperation.java index 5db15213d141..dc8d3ba73abc 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionRemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/collection/operations/CollectionRemoveOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.core.ItemEventType; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/common/DataAwareItemEvent.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/common/DataAwareItemEvent.java index 568eb0776214..d422a1dacc9b 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/common/DataAwareItemEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/common/DataAwareItemEvent.java @@ -19,7 +19,7 @@ import com.hazelcast.collection.ItemEvent; import com.hazelcast.core.ItemEventType; import com.hazelcast.cluster.Member; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/ListContainer.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/ListContainer.java index 4d788b95b174..f2f5f602c92c 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/ListContainer.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/ListContainer.java @@ -21,7 +21,7 @@ import com.hazelcast.collection.impl.collection.CollectionItem; import com.hazelcast.collection.impl.collection.TxCollectionItem; import com.hazelcast.config.ListConfig; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import java.util.ArrayList; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/ListProxyImpl.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/ListProxyImpl.java index d6df8d8adc09..958e9d53a474 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/ListProxyImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/ListProxyImpl.java @@ -26,7 +26,7 @@ import com.hazelcast.collection.impl.list.operations.ListSubOperation; import com.hazelcast.config.CollectionConfig; import com.hazelcast.collection.IList; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.SerializableList; import com.hazelcast.spi.impl.UnmodifiableLazyList; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListAddAllOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListAddAllOperation.java index c75f407afea1..69f6eaefe45f 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListAddAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListAddAllOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.collection.impl.list.ListContainer; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; import java.util.List; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListAddOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListAddOperation.java index 2e8cb84327ee..242ee9233842 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListAddOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListAddOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.list.ListContainer; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListIndexOfOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListIndexOfOperation.java index fac56e8e3e74..47a339f4607b 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListIndexOfOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListIndexOfOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.collection.impl.list.ListContainer; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListRemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListRemoveOperation.java index 96ddf955fb4f..a37e53e36201 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListRemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListRemoveOperation.java @@ -24,7 +24,7 @@ import com.hazelcast.core.ItemEventType; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListSetBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListSetBackupOperation.java index 8d7944dd9a4e..2118256e3c27 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListSetBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListSetBackupOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.collection.impl.list.ListContainer; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListSetOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListSetOperation.java index e4680a35ebe2..7b7a480d4025 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListSetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListSetOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.core.ItemEventType; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListSubOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListSubOperation.java index e995a5c43e11..1c4030800b64 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListSubOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/list/operations/ListSubOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.collection.impl.list.ListContainer; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; import com.hazelcast.spi.impl.SerializableList; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueContainer.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueContainer.java index ff9530d357b5..b388d0fba61d 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueContainer.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueContainer.java @@ -24,7 +24,7 @@ import com.hazelcast.monitor.impl.LocalQueueStatsImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueEvent.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueEvent.java index 7148ce7d4c01..96994c2f1aef 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueEvent.java @@ -20,7 +20,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueItem.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueItem.java index 5c0c8f85383f..64d3e6f95eaa 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueItem.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueItem.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.util.Clock; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueIterator.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueIterator.java index 55390a540faa..520d9fb19ef8 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueIterator.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueIterator.java @@ -16,7 +16,7 @@ package com.hazelcast.collection.impl.queue; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.util.Iterator; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueProxyImpl.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueProxyImpl.java index acaf76f53035..6f85c408447e 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueProxyImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueProxyImpl.java @@ -19,7 +19,7 @@ import com.hazelcast.collection.IQueue; import com.hazelcast.config.QueueConfig; import com.hazelcast.monitor.LocalQueueStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InitializingObject; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueProxySupport.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueProxySupport.java index 15508a6d06aa..e9a871678eb3 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueProxySupport.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueProxySupport.java @@ -35,7 +35,7 @@ import com.hazelcast.config.QueueConfig; import com.hazelcast.core.HazelcastInstanceAware; import com.hazelcast.nio.ClassLoaderUtil; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.AbstractDistributedObject; import com.hazelcast.spi.impl.InitializingObject; import com.hazelcast.spi.impl.InternalCompletableFuture; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueService.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueService.java index 260eddd4598e..a3fb7586b23a 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueService.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueService.java @@ -30,7 +30,7 @@ import com.hazelcast.monitor.LocalQueueStats; import com.hazelcast.monitor.impl.LocalQueueStatsImpl; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.spi.impl.eventservice.EventPublishingService; import com.hazelcast.spi.impl.eventservice.EventRegistration; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueStoreWrapper.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueStoreWrapper.java index 287432675240..33d08c28d7db 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueStoreWrapper.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/QueueStoreWrapper.java @@ -23,7 +23,7 @@ import com.hazelcast.internal.diagnostics.StoreLatencyPlugin; import com.hazelcast.internal.serialization.impl.HeapData; import com.hazelcast.nio.ClassLoaderUtil; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/AddAllBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/AddAllBackupOperation.java index 5a70402247d2..bd548c7e661e 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/AddAllBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/AddAllBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.collection.impl.queue.QueueDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/AddAllOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/AddAllOperation.java index 9d6c72e8347c..00dd4aee1150 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/AddAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/AddAllOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.monitor.impl.LocalQueueStatsImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Notifier; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/ClearOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/ClearOperation.java index 79c343e27275..4eb674b8a52e 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/ClearOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/ClearOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.collection.impl.queue.QueueDataSerializerHook; import com.hazelcast.core.ItemEventType; import com.hazelcast.monitor.impl.LocalQueueStatsImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Notifier; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/CompareAndRemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/CompareAndRemoveOperation.java index 5f85375d65b4..7275e4817c50 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/CompareAndRemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/CompareAndRemoveOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.monitor.impl.LocalQueueStatsImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Notifier; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/ContainsOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/ContainsOperation.java index 3563fa2f3e38..9e70be1c0e34 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/ContainsOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/ContainsOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.monitor.impl.LocalQueueStatsImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/DrainOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/DrainOperation.java index 047eced0b1fc..30d0262c4692 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/DrainOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/DrainOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.monitor.impl.LocalQueueStatsImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Notifier; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/IteratorOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/IteratorOperation.java index 1dad4aef7ba7..ddc73f9930b1 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/IteratorOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/IteratorOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.collection.impl.queue.QueueContainer; import com.hazelcast.collection.impl.queue.QueueDataSerializerHook; import com.hazelcast.monitor.impl.LocalQueueStatsImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; import com.hazelcast.spi.impl.SerializableList; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/OfferBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/OfferBackupOperation.java index 6b9bc24df58a..f6db888c588b 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/OfferBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/OfferBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.collection.impl.queue.QueueDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.BackupOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/OfferOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/OfferOperation.java index 139de1509835..ac548885dde9 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/OfferOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/OfferOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.monitor.impl.LocalQueueStatsImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.spi.impl.operationservice.Notifier; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/QueueOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/QueueOperation.java index 86c34cafb9fe..b09a7fc662a0 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/QueueOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/QueueOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.collection.impl.queue.QueueService; import com.hazelcast.core.ItemEventType; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.spi.impl.eventservice.EventRegistration; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/RemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/RemoveOperation.java index 3ebfcfb44ed2..03a08ff3e6b0 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/RemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/RemoveOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.monitor.impl.LocalQueueStatsImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Notifier; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/set/SetContainer.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/set/SetContainer.java index b502d543ffb2..e0fcc04cc0d3 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/set/SetContainer.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/set/SetContainer.java @@ -20,7 +20,7 @@ import com.hazelcast.collection.impl.collection.CollectionDataSerializerHook; import com.hazelcast.collection.impl.collection.CollectionItem; import com.hazelcast.config.SetConfig; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import java.util.ArrayList; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/AbstractTransactionalCollectionProxy.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/AbstractTransactionalCollectionProxy.java index 2a3f2ab0dba5..e4ca6b8413fb 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/AbstractTransactionalCollectionProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/AbstractTransactionalCollectionProxy.java @@ -22,7 +22,7 @@ import com.hazelcast.collection.impl.txncollection.operations.CollectionReserveRemoveOperation; import com.hazelcast.collection.impl.txncollection.operations.CollectionTxnAddOperation; import com.hazelcast.collection.impl.txncollection.operations.CollectionTxnRemoveOperation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.operationservice.OperationService; import com.hazelcast.internal.services.RemoteService; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionReserveAddOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionReserveAddOperation.java index 70443613c674..5193eed54015 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionReserveAddOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionReserveAddOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.collection.impl.collection.operations.CollectionOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.MutatingOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionReserveRemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionReserveRemoveOperation.java index 7202dc2e2d68..7b151a0c6b98 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionReserveRemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionReserveRemoveOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.collection.impl.collection.operations.CollectionOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.MutatingOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionTxnAddBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionTxnAddBackupOperation.java index 13e21673292a..732b17daa6c0 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionTxnAddBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionTxnAddBackupOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.collection.impl.collection.operations.CollectionOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionTxnAddOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionTxnAddOperation.java index db1293e6901d..e9b4cf641686 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionTxnAddOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/txncollection/operations/CollectionTxnAddOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.core.ItemEventType; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/TransactionalQueueProxy.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/TransactionalQueueProxy.java index 1af67afea775..aae05109f99b 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/TransactionalQueueProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/TransactionalQueueProxy.java @@ -17,7 +17,7 @@ package com.hazelcast.collection.impl.txnqueue; import com.hazelcast.collection.impl.queue.QueueService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.transaction.impl.Transaction; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/TransactionalQueueProxySupport.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/TransactionalQueueProxySupport.java index 56c52f12aedf..b7c373b8ef41 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/TransactionalQueueProxySupport.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/TransactionalQueueProxySupport.java @@ -27,7 +27,7 @@ import com.hazelcast.collection.impl.txnqueue.operations.TxnReservePollOperation; import com.hazelcast.config.QueueConfig; import com.hazelcast.transaction.TransactionalQueue; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/TxQueueItem.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/TxQueueItem.java index 149013718fe2..e70fa95af604 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/TxQueueItem.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/TxQueueItem.java @@ -21,7 +21,7 @@ import com.hazelcast.collection.impl.queue.QueueItem; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnOfferBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnOfferBackupOperation.java index 8f533a649b6f..21bc3a5cbb6a 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnOfferBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnOfferBackupOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.collection.impl.queue.operations.QueueOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnOfferOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnOfferOperation.java index 3bfd55f3bcf1..4f577937ecac 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnOfferOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnOfferOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.monitor.impl.LocalQueueStatsImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Notifier; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnPollOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnPollOperation.java index 618328327d8c..7be1a07b794e 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnPollOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnPollOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.collection.impl.queue.QueueDataSerializerHook; import com.hazelcast.core.ItemEventType; import com.hazelcast.monitor.impl.LocalQueueStatsImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Notifier; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnset/TransactionalSetProxy.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnset/TransactionalSetProxy.java index bfc01d0a1e7d..1a0aa4cb6194 100644 --- a/hazelcast/src/main/java/com/hazelcast/collection/impl/txnset/TransactionalSetProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/collection/impl/txnset/TransactionalSetProxy.java @@ -22,7 +22,7 @@ import com.hazelcast.collection.impl.txncollection.operations.CollectionReserveAddOperation; import com.hazelcast.collection.impl.txncollection.operations.CollectionTxnAddOperation; import com.hazelcast.transaction.TransactionalSet; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.transaction.TransactionException; import com.hazelcast.transaction.impl.Transaction; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/RaftAtomicRef.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/RaftAtomicRef.java index a9f8da87ae09..912354745c7c 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/RaftAtomicRef.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/RaftAtomicRef.java @@ -16,7 +16,7 @@ package com.hazelcast.cp.internal.datastructures.atomicref; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.cp.CPGroupId; /** diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/RaftAtomicRefService.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/RaftAtomicRefService.java index 47f1642d60b7..5be1965b2ce0 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/RaftAtomicRefService.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/RaftAtomicRefService.java @@ -26,7 +26,7 @@ import com.hazelcast.cp.internal.datastructures.spi.RaftRemoteService; import com.hazelcast.cp.internal.raft.SnapshotAwareService; import com.hazelcast.cp.internal.util.Tuple2; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.exception.DistributedObjectDestroyedException; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/RaftAtomicRefSnapshot.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/RaftAtomicRefSnapshot.java index 07d346320722..6f28fd4067fe 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/RaftAtomicRefSnapshot.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/RaftAtomicRefSnapshot.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/ApplyOp.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/ApplyOp.java index fb8bb7749abd..7fe9e53fec44 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/ApplyOp.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/ApplyOp.java @@ -22,7 +22,7 @@ import com.hazelcast.cp.internal.datastructures.atomicref.RaftAtomicReferenceDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.cp.CPGroupId; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/CompareAndSetOp.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/CompareAndSetOp.java index d04ea12335eb..85fe828bd0bb 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/CompareAndSetOp.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/CompareAndSetOp.java @@ -21,7 +21,7 @@ import com.hazelcast.cp.internal.datastructures.atomicref.RaftAtomicReferenceDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.cp.CPGroupId; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/ContainsOp.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/ContainsOp.java index 62f519e331ec..afa0751927bb 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/ContainsOp.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/ContainsOp.java @@ -21,7 +21,7 @@ import com.hazelcast.cp.internal.datastructures.atomicref.RaftAtomicReferenceDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.cp.CPGroupId; import com.hazelcast.cp.internal.IndeterminateOperationStateAware; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/SetOp.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/SetOp.java index 0e2f42a2695c..393aa81da81a 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/SetOp.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/operation/SetOp.java @@ -21,7 +21,7 @@ import com.hazelcast.cp.internal.datastructures.atomicref.RaftAtomicReferenceDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.cp.CPGroupId; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/proxy/RaftAtomicRefProxy.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/proxy/RaftAtomicRefProxy.java index 884d3f97f917..9596377f1b0c 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/proxy/RaftAtomicRefProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/atomicref/proxy/RaftAtomicRefProxy.java @@ -30,7 +30,7 @@ import com.hazelcast.cp.internal.datastructures.atomicref.operation.GetOp; import com.hazelcast.cp.internal.datastructures.atomicref.operation.SetOp; import com.hazelcast.cp.internal.datastructures.spi.operation.DestroyRaftObjectOp; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/AtomicReferenceContainer.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/AtomicReferenceContainer.java index f52f36d80ddb..e19c15786f45 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/AtomicReferenceContainer.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/AtomicReferenceContainer.java @@ -16,7 +16,7 @@ package com.hazelcast.cp.internal.datastructures.unsafe.atomicreference; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; public class AtomicReferenceContainer { diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/AtomicReferenceService.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/AtomicReferenceService.java index e7466ea0bf0a..d9bfe2758099 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/AtomicReferenceService.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/AtomicReferenceService.java @@ -19,7 +19,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.operations.AtomicReferenceReplicationOperation; import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.operations.MergeOperation; import com.hazelcast.config.AtomicReferenceConfig; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.internal.services.ManagedService; import com.hazelcast.spi.partition.MigrationAwareService; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AbstractAlterOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AbstractAlterOperation.java index af86ff633ba0..1cc082e05bbf 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AbstractAlterOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AbstractAlterOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AlterAndGetOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AlterAndGetOperation.java index fc34b19b19e6..de6255e1ece4 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AlterAndGetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AlterAndGetOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceContainer; import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceDataSerializerHook; import com.hazelcast.core.IFunction; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; public class AlterAndGetOperation extends AbstractAlterOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AlterOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AlterOperation.java index ed482fed742b..107639d5b591 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AlterOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AlterOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceContainer; import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceDataSerializerHook; import com.hazelcast.core.IFunction; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; public class AlterOperation extends AbstractAlterOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/ApplyOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/ApplyOperation.java index e26359470813..ee88027bfc6a 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/ApplyOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/ApplyOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.core.IFunction; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AtomicReferenceReplicationOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AtomicReferenceReplicationOperation.java index 63c5b8a286f9..7a0ab62f7422 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AtomicReferenceReplicationOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/AtomicReferenceReplicationOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceService; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/CompareAndSetOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/CompareAndSetOperation.java index 2785e2963e94..4b201445b449 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/CompareAndSetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/CompareAndSetOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/ContainsOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/ContainsOperation.java index 482d8d58792d..fd53abf536d3 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/ContainsOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/ContainsOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/GetAndAlterOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/GetAndAlterOperation.java index 5433bd266380..e22017b7a1bc 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/GetAndAlterOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/GetAndAlterOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceContainer; import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceDataSerializerHook; import com.hazelcast.core.IFunction; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; public class GetAndAlterOperation extends AbstractAlterOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/GetAndSetOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/GetAndSetOperation.java index 9fe78747e4e9..c455d5c8c2d3 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/GetAndSetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/GetAndSetOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceContainer; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/GetOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/GetOperation.java index 81a8e611a1e8..11d264d86a7f 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/GetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/GetOperation.java @@ -17,7 +17,7 @@ package com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.operations; import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; public class GetOperation extends AbstractAtomicReferenceOperation implements ReadonlyOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/MergeBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/MergeBackupOperation.java index 6f0d6eaded5b..ccea62ac7d9d 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/MergeBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/MergeBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceService; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.spi.merge.SplitBrainMergePolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/MergeOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/MergeOperation.java index 4280b5e1fcd2..20814a6ad296 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/MergeOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/MergeOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceService; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.merge.SplitBrainMergePolicy; import com.hazelcast.spi.merge.SplitBrainMergeTypes.AtomicReferenceMergeTypes; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/SetBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/SetBackupOperation.java index eb3725c40cf6..7969f124aa8f 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/SetBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/SetBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/SetOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/SetOperation.java index 80e50cc802ef..ad43df116851 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/SetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/atomicreference/operations/SetOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/countdownlatch/CountDownLatchProxy.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/countdownlatch/CountDownLatchProxy.java index c51ef0a183c2..d5d0ccd59d62 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/countdownlatch/CountDownLatchProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/countdownlatch/CountDownLatchProxy.java @@ -21,7 +21,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.countdownlatch.operations.GetCountOperation; import com.hazelcast.cp.internal.datastructures.unsafe.countdownlatch.operations.SetCountOperation; import com.hazelcast.cp.ICountDownLatch; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.AbstractDistributedObject; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/ConditionImpl.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/ConditionImpl.java index 0dec2af0ae27..b2be32a0f9bc 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/ConditionImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/ConditionImpl.java @@ -20,7 +20,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.BeforeAwaitOperation; import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.SignalOperation; import com.hazelcast.cp.lock.ICondition; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/ConditionKey.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/ConditionKey.java index c8bf03fb0ee8..5cbd69f182ae 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/ConditionKey.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/ConditionKey.java @@ -16,7 +16,7 @@ package com.hazelcast.cp.internal.datastructures.unsafe.lock; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; public final class ConditionKey implements WaitNotifyKey { diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockEvictionProcessor.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockEvictionProcessor.java index 1ffc87ebed9b..cc36442abd58 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockEvictionProcessor.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockEvictionProcessor.java @@ -19,7 +19,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.UnlockIfLeaseExpiredOperation; import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.UnlockOperation; import com.hazelcast.logging.ILogger; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockProxy.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockProxy.java index 748f5c0b1e73..b0678f7c8580 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockProxy.java @@ -18,7 +18,7 @@ import com.hazelcast.cp.lock.ICondition; import com.hazelcast.cp.lock.ILock; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.AbstractDistributedObject; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockProxySupport.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockProxySupport.java index b66a2664d73f..f38e643621d0 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockProxySupport.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockProxySupport.java @@ -21,7 +21,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.IsLockedOperation; import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.LockOperation; import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.UnlockOperation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockResource.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockResource.java index 6a9c7544fa0e..10d8e753a4fa 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockResource.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockResource.java @@ -16,7 +16,7 @@ package com.hazelcast.cp.internal.datastructures.unsafe.lock; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * A lock for a specific key in a specific namespace. It contains the details of a single lock in the system. diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockResourceImpl.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockResourceImpl.java index c55c15c2d2db..1bc7c9ed056e 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockResourceImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockResourceImpl.java @@ -19,7 +19,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.AwaitOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.util.Clock; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockServiceImpl.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockServiceImpl.java index 0f677172d8a4..d97a9522ba1c 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockServiceImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockServiceImpl.java @@ -22,7 +22,7 @@ import com.hazelcast.config.LockConfig; import com.hazelcast.core.DistributedObject; import com.hazelcast.cluster.impl.MemberImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.internal.services.ClientAwareService; import com.hazelcast.spi.partition.FragmentedMigrationAwareService; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStore.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStore.java index 82178fa1b2a0..d7ce0e8d1cdf 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStore.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStore.java @@ -16,7 +16,7 @@ package com.hazelcast.cp.internal.datastructures.unsafe.lock; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.Set; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreContainer.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreContainer.java index 3c6099ace3c6..96b054acfa09 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreContainer.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreContainer.java @@ -16,7 +16,7 @@ package com.hazelcast.cp.internal.datastructures.unsafe.lock; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.internal.services.ServiceNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreImpl.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreImpl.java index 8d4c1ba1f050..cb34771102e6 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreImpl.java @@ -19,7 +19,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.operations.AwaitOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreProxy.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreProxy.java index 0849faa4a13c..571b7c7c0f90 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreProxy.java @@ -16,7 +16,7 @@ package com.hazelcast.cp.internal.datastructures.unsafe.lock; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.ObjectNamespace; import java.util.Collections; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockWaitNotifyKey.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockWaitNotifyKey.java index a7848414d3dd..34f66c05b42e 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockWaitNotifyKey.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockWaitNotifyKey.java @@ -16,7 +16,7 @@ package com.hazelcast.cp.internal.datastructures.unsafe.lock; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/AbstractLockOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/AbstractLockOperation.java index 8c14438ae697..91c5cf1533d7 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/AbstractLockOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/AbstractLockOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockStoreImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.internal.services.LockInterceptorService; import com.hazelcast.spi.impl.operationservice.NamedOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/AwaitBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/AwaitBackupOperation.java index e10d80ae0a01..2fee7b86079c 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/AwaitBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/AwaitBackupOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockStoreImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/AwaitOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/AwaitOperation.java index 43e56659d04b..e48355872f8f 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/AwaitOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/AwaitOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockStoreImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/BaseSignalOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/BaseSignalOperation.java index b2e5f96cc169..c0e5e1e2c5ca 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/BaseSignalOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/BaseSignalOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockStoreImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.ObjectNamespace; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/BeforeAwaitBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/BeforeAwaitBackupOperation.java index 4f7f2d5abbcb..fb19b2e7a97d 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/BeforeAwaitBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/BeforeAwaitBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockStoreImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/BeforeAwaitOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/BeforeAwaitOperation.java index b2f8fb6e3cb7..a0e51fd00663 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/BeforeAwaitOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/BeforeAwaitOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockStoreImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Notifier; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/GetLockCountOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/GetLockCountOperation.java index 90764f4798d8..cec979d7a504 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/GetLockCountOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/GetLockCountOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockDataSerializerHook; import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockStoreImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/GetRemainingLeaseTimeOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/GetRemainingLeaseTimeOperation.java index f08b90246eb6..28a43d5fe61f 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/GetRemainingLeaseTimeOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/GetRemainingLeaseTimeOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockDataSerializerHook; import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockStoreImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/IsLockedOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/IsLockedOperation.java index 75e52435ad71..f5dbf867487e 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/IsLockedOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/IsLockedOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockDataSerializerHook; import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockStoreImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/LocalLockCleanupOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/LocalLockCleanupOperation.java index c02f947d7e67..33aa8bc1d82e 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/LocalLockCleanupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/LocalLockCleanupOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.logging.ILogger; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.operationservice.Notifier; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/LockBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/LockBackupOperation.java index cca116561539..3639327d66d7 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/LockBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/LockBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockStoreImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/LockOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/LockOperation.java index c87ec57c5f41..7a22e6c7d467 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/LockOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/LockOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockWaitNotifyKey; import com.hazelcast.core.OperationTimeoutException; import com.hazelcast.logging.ILogger; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/SignalBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/SignalBackupOperation.java index 371e7921f1a9..8d3393b667b1 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/SignalBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/SignalBackupOperation.java @@ -17,7 +17,7 @@ package com.hazelcast.cp.internal.datastructures.unsafe.lock.operations; import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/SignalOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/SignalOperation.java index b6cd5682e1cd..4bf7b03a6654 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/SignalOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/SignalOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockDataSerializerHook; import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockStoreImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/UnlockBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/UnlockBackupOperation.java index 716613f6bbd3..416c6561270c 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/UnlockBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/UnlockBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockStoreImpl; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/UnlockIfLeaseExpiredOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/UnlockIfLeaseExpiredOperation.java index 0a23b3c31069..1b90c0de830b 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/UnlockIfLeaseExpiredOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/UnlockIfLeaseExpiredOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.impl.operationservice.QuorumCheckAwareOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/UnlockOperation.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/UnlockOperation.java index cd2542530e5c..b2e37a11e036 100644 --- a/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/UnlockOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/operations/UnlockOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.logging.ILogger; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Notifier; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/durableexecutor/impl/DurableExecutorServiceProxy.java b/hazelcast/src/main/java/com/hazelcast/durableexecutor/impl/DurableExecutorServiceProxy.java index 8bce36e65beb..df01c786e9f0 100644 --- a/hazelcast/src/main/java/com/hazelcast/durableexecutor/impl/DurableExecutorServiceProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/durableexecutor/impl/DurableExecutorServiceProxy.java @@ -29,7 +29,7 @@ import com.hazelcast.executor.impl.RunnableAdapter; import com.hazelcast.logging.ILogger; import com.hazelcast.nio.Bits; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.quorum.QuorumException; import com.hazelcast.spi.impl.AbstractDistributedObject; import com.hazelcast.spi.impl.executionservice.ExecutionService; diff --git a/hazelcast/src/main/java/com/hazelcast/durableexecutor/impl/operations/TaskBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/durableexecutor/impl/operations/TaskBackupOperation.java index 7fe1fcff9451..1db32506a309 100644 --- a/hazelcast/src/main/java/com/hazelcast/durableexecutor/impl/operations/TaskBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/durableexecutor/impl/operations/TaskBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.durableexecutor.impl.DurableExecutorDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/durableexecutor/impl/operations/TaskOperation.java b/hazelcast/src/main/java/com/hazelcast/durableexecutor/impl/operations/TaskOperation.java index 47dcb6cf8ebd..47e8039554a0 100644 --- a/hazelcast/src/main/java/com/hazelcast/durableexecutor/impl/operations/TaskOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/durableexecutor/impl/operations/TaskOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.durableexecutor.impl.DurableExecutorDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/executor/impl/ExecutorServiceProxy.java b/hazelcast/src/main/java/com/hazelcast/executor/impl/ExecutorServiceProxy.java index 3b69fe1d57f3..411f91a123bc 100644 --- a/hazelcast/src/main/java/com/hazelcast/executor/impl/ExecutorServiceProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/executor/impl/ExecutorServiceProxy.java @@ -28,7 +28,7 @@ import com.hazelcast.logging.ILogger; import com.hazelcast.monitor.LocalExecutorStats; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.PartitionAware; import com.hazelcast.quorum.QuorumException; import com.hazelcast.spi.impl.AbstractDistributedObject; diff --git a/hazelcast/src/main/java/com/hazelcast/executor/impl/operations/AbstractCallableTaskOperation.java b/hazelcast/src/main/java/com/hazelcast/executor/impl/operations/AbstractCallableTaskOperation.java index 5ac35bf2845a..1b225888a53c 100644 --- a/hazelcast/src/main/java/com/hazelcast/executor/impl/operations/AbstractCallableTaskOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/executor/impl/operations/AbstractCallableTaskOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.executor.impl.ExecutorDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.CallStatus; import com.hazelcast.spi.impl.operationservice.NamedOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/executor/impl/operations/CallableTaskOperation.java b/hazelcast/src/main/java/com/hazelcast/executor/impl/operations/CallableTaskOperation.java index e26ba0ab2413..a6ee8ee61be9 100644 --- a/hazelcast/src/main/java/com/hazelcast/executor/impl/operations/CallableTaskOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/executor/impl/operations/CallableTaskOperation.java @@ -17,7 +17,7 @@ package com.hazelcast.executor.impl.operations; import com.hazelcast.executor.impl.ExecutorDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/executor/impl/operations/MemberCallableTaskOperation.java b/hazelcast/src/main/java/com/hazelcast/executor/impl/operations/MemberCallableTaskOperation.java index e365a33240df..ff069dd59664 100644 --- a/hazelcast/src/main/java/com/hazelcast/executor/impl/operations/MemberCallableTaskOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/executor/impl/operations/MemberCallableTaskOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.core.MemberLeftException; import com.hazelcast.executor.impl.ExecutorDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.ExceptionAction; import com.hazelcast.spi.exception.TargetNotMemberException; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/ascii/TextCommandServiceImpl.java b/hazelcast/src/main/java/com/hazelcast/internal/ascii/TextCommandServiceImpl.java index 275d98205414..ff127210615b 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/ascii/TextCommandServiceImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/ascii/TextCommandServiceImpl.java @@ -42,7 +42,7 @@ import com.hazelcast.nio.EndpointManager; import com.hazelcast.nio.NetworkingService; import com.hazelcast.nio.ascii.TextEncoder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.util.Clock; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/dynamicconfig/ClusterWideConfigurationService.java b/hazelcast/src/main/java/com/hazelcast/internal/dynamicconfig/ClusterWideConfigurationService.java index 0b92b4e31718..fadc38ca5dd2 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/dynamicconfig/ClusterWideConfigurationService.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/dynamicconfig/ClusterWideConfigurationService.java @@ -46,7 +46,7 @@ import com.hazelcast.internal.cluster.ClusterService; import com.hazelcast.internal.cluster.ClusterVersionListener; import com.hazelcast.logging.ILogger; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.internal.services.CoreService; import com.hazelcast.internal.services.ManagedService; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/eviction/ExpiredKey.java b/hazelcast/src/main/java/com/hazelcast/internal/eviction/ExpiredKey.java index 5a596ba79c33..71e9ca844f96 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/eviction/ExpiredKey.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/eviction/ExpiredKey.java @@ -16,7 +16,7 @@ package com.hazelcast.internal.eviction; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Holds expired key and related metadata. diff --git a/hazelcast/src/main/java/com/hazelcast/internal/journal/DeserializingEntry.java b/hazelcast/src/main/java/com/hazelcast/internal/journal/DeserializingEntry.java index 171f0b180c38..c90c587d21f6 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/journal/DeserializingEntry.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/journal/DeserializingEntry.java @@ -20,7 +20,7 @@ import com.hazelcast.core.HazelcastInstanceAware; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.SerializationServiceSupport; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/NearCache.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/NearCache.java index f495cc9281a3..d16952009e75 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/NearCache.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/NearCache.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.adapter.DataStructureAdapter; import com.hazelcast.monitor.NearCacheStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InitializingObject; import com.hazelcast.spi.properties.HazelcastProperty; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/NearCacheRecordStore.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/NearCacheRecordStore.java index 53ef104ff530..7dfe9be908e0 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/NearCacheRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/NearCacheRecordStore.java @@ -19,7 +19,7 @@ import com.hazelcast.internal.adapter.DataStructureAdapter; import com.hazelcast.internal.nearcache.impl.invalidation.StaleReadDetector; import com.hazelcast.monitor.NearCacheStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InitializingObject; /** diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/DefaultNearCache.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/DefaultNearCache.java index e2fe5b7c906f..a482db673f33 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/DefaultNearCache.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/DefaultNearCache.java @@ -24,7 +24,7 @@ import com.hazelcast.internal.nearcache.impl.store.NearCacheDataRecordStore; import com.hazelcast.internal.nearcache.impl.store.NearCacheObjectRecordStore; import com.hazelcast.monitor.NearCacheStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.executionservice.TaskScheduler; import com.hazelcast.spi.properties.HazelcastProperties; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/AbstractBaseNearCacheInvalidationListener.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/AbstractBaseNearCacheInvalidationListener.java index b93296698d7d..e66156d41584 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/AbstractBaseNearCacheInvalidationListener.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/AbstractBaseNearCacheInvalidationListener.java @@ -17,7 +17,7 @@ package com.hazelcast.internal.nearcache.impl.invalidation; import com.hazelcast.client.impl.protocol.ClientMessage; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.util.HashUtil; import java.util.ArrayList; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/BatchInvalidator.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/BatchInvalidator.java index 729bd4ef9528..c629e390ba8e 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/BatchInvalidator.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/BatchInvalidator.java @@ -20,7 +20,7 @@ import com.hazelcast.core.LifecycleEvent; import com.hazelcast.core.LifecycleListener; import com.hazelcast.core.LifecycleService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventRegistration; import com.hazelcast.spi.impl.executionservice.ExecutionService; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/Invalidation.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/Invalidation.java index 7db857098115..95ecf8c91f93 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/Invalidation.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/Invalidation.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/Invalidator.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/Invalidator.java index 4ee08fa2aef6..92156281c468 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/Invalidator.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/Invalidator.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.services.ManagedService; import com.hazelcast.logging.ILogger; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventRegistration; import com.hazelcast.spi.impl.eventservice.EventService; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/MinimalPartitionService.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/MinimalPartitionService.java index eeaf0bed03e4..4b10c95edfe2 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/MinimalPartitionService.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/MinimalPartitionService.java @@ -16,7 +16,7 @@ package com.hazelcast.internal.nearcache.impl.invalidation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Abstraction over member and client partition services to provide commonly useful methods. diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/RepairingHandler.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/RepairingHandler.java index a14fa964c7d5..327af5257a6d 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/RepairingHandler.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/RepairingHandler.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.nearcache.NearCache; import com.hazelcast.logging.ILogger; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.util.Collection; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/SingleNearCacheInvalidation.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/SingleNearCacheInvalidation.java index a835bd0b613c..b231ccfcfc4b 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/SingleNearCacheInvalidation.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/invalidation/SingleNearCacheInvalidation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; import java.util.UUID; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/preloader/NearCachePreloader.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/preloader/NearCachePreloader.java index 7df490952eaa..67b282e0622f 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/preloader/NearCachePreloader.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/preloader/NearCachePreloader.java @@ -26,7 +26,7 @@ import com.hazelcast.logging.Logger; import com.hazelcast.memory.MemoryUnit; import com.hazelcast.monitor.impl.NearCacheStatsImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.io.File; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/record/NearCacheDataRecord.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/record/NearCacheDataRecord.java index 3b9f987d97e3..cf70f6bac88e 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/record/NearCacheDataRecord.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/record/NearCacheDataRecord.java @@ -16,7 +16,7 @@ package com.hazelcast.internal.nearcache.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Implementation of {@link com.hazelcast.internal.nearcache.NearCacheRecord} to store {@link Data} type objects. diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/record/NearCacheObjectRecord.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/record/NearCacheObjectRecord.java index 5008c1abbb60..8585ff71e83a 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/record/NearCacheObjectRecord.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/record/NearCacheObjectRecord.java @@ -16,9 +16,11 @@ package com.hazelcast.internal.nearcache.impl.record; +import com.hazelcast.internal.serialization.Data; + /** * Implementation of {@link com.hazelcast.internal.nearcache.NearCacheRecord} to store - * any object type except {@link com.hazelcast.nio.serialization.Data}. + * any object type except {@link Data}. * * @param type of object instances to store. */ diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/store/AbstractNearCacheRecordStore.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/store/AbstractNearCacheRecordStore.java index 2350204c1732..cc74d541e574 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/store/AbstractNearCacheRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/store/AbstractNearCacheRecordStore.java @@ -31,7 +31,7 @@ import com.hazelcast.internal.nearcache.impl.invalidation.StaleReadDetector; import com.hazelcast.monitor.NearCacheStats; import com.hazelcast.monitor.impl.NearCacheStatsImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.util.Clock; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/store/BaseHeapNearCacheRecordStore.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/store/BaseHeapNearCacheRecordStore.java index 7ebe04a14e01..b2afa2417b52 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/store/BaseHeapNearCacheRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/store/BaseHeapNearCacheRecordStore.java @@ -25,7 +25,7 @@ import com.hazelcast.internal.nearcache.NearCacheRecord; import com.hazelcast.internal.nearcache.impl.maxsize.EntryCountNearCacheEvictionChecker; import com.hazelcast.internal.nearcache.impl.preloader.NearCachePreloader; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.util.Map; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/store/NearCacheDataRecordStore.java b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/store/NearCacheDataRecordStore.java index 59758566b3df..e218e0d94bf7 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/store/NearCacheDataRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/nearcache/impl/store/NearCacheDataRecordStore.java @@ -18,7 +18,7 @@ import com.hazelcast.config.NearCacheConfig; import com.hazelcast.internal.nearcache.impl.record.NearCacheDataRecord; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import static com.hazelcast.internal.nearcache.NearCacheRecord.TIME_NOT_SET; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/networking/OutboundFrame.java b/hazelcast/src/main/java/com/hazelcast/internal/networking/OutboundFrame.java index 709ca6eb6a35..e4f132fb76e2 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/networking/OutboundFrame.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/networking/OutboundFrame.java @@ -16,6 +16,8 @@ package com.hazelcast.internal.networking; +import com.hazelcast.internal.serialization.Data; + /** * Represents a payload to can be written to a {@link Channel} * @@ -31,7 +33,7 @@ * * There is no need for an InboundFrame interface. * - * @see com.hazelcast.nio.serialization.Data + * @see Data * @see Channel#write(OutboundFrame) */ public interface OutboundFrame { diff --git a/hazelcast/src/main/java/com/hazelcast/internal/partition/impl/InternalPartitionServiceImpl.java b/hazelcast/src/main/java/com/hazelcast/internal/partition/impl/InternalPartitionServiceImpl.java index 2e5deaef9662..7237d73a4542 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/partition/impl/InternalPartitionServiceImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/partition/impl/InternalPartitionServiceImpl.java @@ -45,7 +45,7 @@ import com.hazelcast.internal.partition.operation.ShutdownRequestOperation; import com.hazelcast.logging.ILogger; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.NoDataMemberInClusterException; import com.hazelcast.partition.PartitionEvent; import com.hazelcast.internal.partition.PartitionEventListener; diff --git a/hazelcast/src/main/java/com/hazelcast/nio/serialization/Data.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/Data.java similarity index 97% rename from hazelcast/src/main/java/com/hazelcast/nio/serialization/Data.java rename to hazelcast/src/main/java/com/hazelcast/internal/serialization/Data.java index 5ebb34d1d923..accbeacac5cd 100644 --- a/hazelcast/src/main/java/com/hazelcast/nio/serialization/Data.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/Data.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.hazelcast.nio.serialization; +package com.hazelcast.internal.serialization; +import com.hazelcast.nio.serialization.Serializer; import com.hazelcast.partition.PartitioningStrategy; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/InputOutputFactory.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/InputOutputFactory.java index 5e6e0c866851..219273301228 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/InputOutputFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/InputOutputFactory.java @@ -18,7 +18,6 @@ import com.hazelcast.nio.BufferObjectDataInput; import com.hazelcast.nio.BufferObjectDataOutput; -import com.hazelcast.nio.serialization.Data; import java.nio.ByteOrder; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/InternalSerializationService.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/InternalSerializationService.java index f7169b8d9ffd..914e90ff2455 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/InternalSerializationService.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/InternalSerializationService.java @@ -23,7 +23,6 @@ import com.hazelcast.nio.Disposable; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; import com.hazelcast.nio.serialization.DataType; import com.hazelcast.nio.serialization.PortableReader; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/PortableContext.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/PortableContext.java index 85a9763bbaf4..1eb89c47a335 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/PortableContext.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/PortableContext.java @@ -18,7 +18,6 @@ import com.hazelcast.core.ManagedContext; import com.hazelcast.nio.serialization.ClassDefinition; -import com.hazelcast.nio.serialization.Data; import com.hazelcast.nio.serialization.FieldDefinition; import com.hazelcast.nio.serialization.Portable; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/AbstractSerializationService.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/AbstractSerializationService.java index de3a8ac91b40..f38ee30f73b2 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/AbstractSerializationService.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/AbstractSerializationService.java @@ -31,7 +31,7 @@ import com.hazelcast.nio.BufferObjectDataOutput; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataSerializable; import com.hazelcast.nio.serialization.HazelcastSerializationException; import com.hazelcast.nio.serialization.Portable; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ByteArrayInputOutputFactory.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ByteArrayInputOutputFactory.java index ab3f716c8b80..e5da00dc4ed8 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ByteArrayInputOutputFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ByteArrayInputOutputFactory.java @@ -20,7 +20,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.nio.BufferObjectDataInput; import com.hazelcast.nio.BufferObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.nio.ByteOrder; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataInput.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataInput.java index b5991307ca1e..69c6816e26b2 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataInput.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataInput.java @@ -19,7 +19,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.nio.Bits; import com.hazelcast.nio.BufferObjectDataInput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.util.collection.ArrayUtils; import java.io.EOFException; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataOutput.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataOutput.java index bc4b9ceb3c79..d0f0540ea16e 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataOutput.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataOutput.java @@ -19,7 +19,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.nio.Bits; import com.hazelcast.nio.BufferObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.util.collection.ArrayUtils; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/EmptyObjectDataOutput.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/EmptyObjectDataOutput.java index b1cd1876a212..3f44afef57f2 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/EmptyObjectDataOutput.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/EmptyObjectDataOutput.java @@ -17,7 +17,7 @@ package com.hazelcast.internal.serialization.impl; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/HeapData.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/HeapData.java index 0e5837c828d2..d3cb1ac35a0c 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/HeapData.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/HeapData.java @@ -17,7 +17,7 @@ package com.hazelcast.internal.serialization.impl; import com.hazelcast.nio.Bits; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.util.HashUtil; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ObjectDataInputStream.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ObjectDataInputStream.java index 2f0eecf91e8f..ecc3d8c820a2 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ObjectDataInputStream.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ObjectDataInputStream.java @@ -17,7 +17,7 @@ package com.hazelcast.internal.serialization.impl; import com.hazelcast.internal.serialization.InternalSerializationService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.Closeable; import java.io.DataInputStream; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ObjectDataOutputStream.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ObjectDataOutputStream.java index 4946551b54b3..15caab432eb9 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ObjectDataOutputStream.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/ObjectDataOutputStream.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.io.Closeable; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/PortableContextImpl.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/PortableContextImpl.java index 97dff56cd29d..d6087ecc733b 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/PortableContextImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/PortableContextImpl.java @@ -23,7 +23,7 @@ import com.hazelcast.nio.BufferObjectDataInput; import com.hazelcast.nio.serialization.ClassDefinition; import com.hazelcast.nio.serialization.ClassDefinitionBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.FieldDefinition; import com.hazelcast.nio.serialization.FieldType; import com.hazelcast.nio.serialization.HazelcastSerializationException; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/SerializationServiceV1.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/SerializationServiceV1.java index 0db7c347c689..cadfcc4f06b6 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/SerializationServiceV1.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/SerializationServiceV1.java @@ -26,7 +26,7 @@ import com.hazelcast.nio.serialization.ClassNameFilter; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.serialization.ClassDefinition; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataSerializable; import com.hazelcast.nio.serialization.DataSerializableFactory; import com.hazelcast.nio.serialization.DataType; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/SerializationUtil.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/SerializationUtil.java index 895e121acc86..a2166aece490 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/SerializationUtil.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/SerializationUtil.java @@ -23,7 +23,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.ByteArraySerializer; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.HazelcastSerializationException; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.SerializableByConvention; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/UnsafeInputOutputFactory.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/UnsafeInputOutputFactory.java index ada800aa96f6..26bd4d1fe2f0 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/UnsafeInputOutputFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/UnsafeInputOutputFactory.java @@ -20,7 +20,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.nio.BufferObjectDataInput; import com.hazelcast.nio.BufferObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.nio.ByteOrder; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/bufferpool/BufferPool.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/bufferpool/BufferPool.java index 48e73c06a024..51918a3be9eb 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/bufferpool/BufferPool.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/bufferpool/BufferPool.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.BufferObjectDataInput; import com.hazelcast.nio.BufferObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * The BufferPool allows the pooling of the {@link BufferObjectDataInput} and {@link BufferObjectDataOutput} instances. diff --git a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/bufferpool/BufferPoolImpl.java b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/bufferpool/BufferPoolImpl.java index 4ba6a6f594db..697741efb3e2 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/bufferpool/BufferPoolImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/serialization/impl/bufferpool/BufferPoolImpl.java @@ -20,7 +20,7 @@ import com.hazelcast.internal.serialization.impl.HeapData; import com.hazelcast.nio.BufferObjectDataInput; import com.hazelcast.nio.BufferObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.Closeable; import java.util.ArrayDeque; diff --git a/hazelcast/src/main/java/com/hazelcast/internal/util/ToHeapDataConverter.java b/hazelcast/src/main/java/com/hazelcast/internal/util/ToHeapDataConverter.java index b2f539e094cc..f12d60835fb0 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/util/ToHeapDataConverter.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/util/ToHeapDataConverter.java @@ -17,7 +17,7 @@ package com.hazelcast.internal.util; import com.hazelcast.internal.serialization.impl.HeapData; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Converts any {@link Data} implementation to {@link HeapData} diff --git a/hazelcast/src/main/java/com/hazelcast/internal/util/comparators/BinaryValueComparator.java b/hazelcast/src/main/java/com/hazelcast/internal/util/comparators/BinaryValueComparator.java index fa81f67112c4..1b1858bf6d2c 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/util/comparators/BinaryValueComparator.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/util/comparators/BinaryValueComparator.java @@ -16,7 +16,7 @@ package com.hazelcast.internal.util.comparators; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; /** diff --git a/hazelcast/src/main/java/com/hazelcast/internal/util/comparators/ObjectValueComparator.java b/hazelcast/src/main/java/com/hazelcast/internal/util/comparators/ObjectValueComparator.java index a77d64c5f623..6c64f88740f0 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/util/comparators/ObjectValueComparator.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/util/comparators/ObjectValueComparator.java @@ -16,7 +16,7 @@ package com.hazelcast.internal.util.comparators; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; /** diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/BinaryMapEntryCostEstimator.java b/hazelcast/src/main/java/com/hazelcast/map/impl/BinaryMapEntryCostEstimator.java index 98135b08c35e..22df462b541c 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/BinaryMapEntryCostEstimator.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/BinaryMapEntryCostEstimator.java @@ -18,7 +18,7 @@ import com.hazelcast.config.InMemoryFormat; import com.hazelcast.map.impl.record.Record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import static com.hazelcast.util.JVMUtil.REFERENCE_COST_IN_BYTES; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/DataAwareEntryEvent.java b/hazelcast/src/main/java/com/hazelcast/map/impl/DataAwareEntryEvent.java index 4421269022cb..d8c0efcbe324 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/DataAwareEntryEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/DataAwareEntryEvent.java @@ -18,7 +18,7 @@ import com.hazelcast.core.EntryEvent; import com.hazelcast.cluster.Member; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/EntryEventFilter.java b/hazelcast/src/main/java/com/hazelcast/map/impl/EntryEventFilter.java index 209ab9f9db17..b341430f58fd 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/EntryEventFilter.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/EntryEventFilter.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.eventservice.EventFilter; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/JsonMetadataInitializer.java b/hazelcast/src/main/java/com/hazelcast/map/impl/JsonMetadataInitializer.java index 4e988142604c..8c1789289ba3 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/JsonMetadataInitializer.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/JsonMetadataInitializer.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.hazelcast.core.HazelcastJsonValue; import com.hazelcast.json.internal.JsonSchemaHelper; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/LazyMapEntry.java b/hazelcast/src/main/java/com/hazelcast/map/impl/LazyMapEntry.java index 4ce9a45c5f5c..f15001db7841 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/LazyMapEntry.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/LazyMapEntry.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.operation.EntryOperator; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.query.Metadata; import com.hazelcast.query.impl.CachedQueryEntry; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/LockAwareLazyMapEntry.java b/hazelcast/src/main/java/com/hazelcast/map/impl/LockAwareLazyMapEntry.java index 8e69b01f2350..d8fd7ebfc641 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/LockAwareLazyMapEntry.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/LockAwareLazyMapEntry.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.map.LockAware; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.getters.Extractors; /** diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapContainer.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapContainer.java index 77ee3e02d688..74f3ec8e6bf9 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MapContainer.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MapContainer.java @@ -42,7 +42,7 @@ import com.hazelcast.map.impl.record.ObjectRecordFactory; import com.hazelcast.map.impl.record.RecordFactory; import com.hazelcast.nio.ClassLoaderUtil; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.PartitioningStrategy; import com.hazelcast.query.impl.Index; import com.hazelcast.query.impl.Indexes; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapEntries.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapEntries.java index 981acf8e3f01..4ec0be1f902a 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MapEntries.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MapEntries.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapKeyLoader.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapKeyLoader.java index 33f68911fec0..3f02be44db69 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MapKeyLoader.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MapKeyLoader.java @@ -28,7 +28,7 @@ import com.hazelcast.map.impl.operation.MapOperationProvider; import com.hazelcast.map.impl.operation.TriggerLoadIfNeededOperation; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.executionservice.ExecutionService; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.spi.impl.AbstractCompletableFuture; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapKeyLoaderUtil.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapKeyLoaderUtil.java index 0188c391de80..26a0b4ad5af5 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MapKeyLoaderUtil.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MapKeyLoaderUtil.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl; import com.hazelcast.config.MaxSizeConfig; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.partition.IPartitionService; import com.hazelcast.util.CollectionUtil; import com.hazelcast.util.UnmodifiableIterator; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapKeySet.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapKeySet.java index 211ec1541856..34f017b94821 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MapKeySet.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MapKeySet.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapMergeRunnable.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapMergeRunnable.java index c4ee0f4b5d76..eb9f060a8aaf 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MapMergeRunnable.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MapMergeRunnable.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.operation.MapOperationProvider; import com.hazelcast.map.impl.record.Record; import com.hazelcast.map.impl.recordstore.RecordStore; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.merge.AbstractMergeRunnable; import com.hazelcast.spi.impl.operationservice.OperationFactory; import com.hazelcast.spi.merge.SplitBrainMergePolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapMigrationAwareService.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapMigrationAwareService.java index 38959b6d4426..541e4b7e2893 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MapMigrationAwareService.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MapMigrationAwareService.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.record.Records; import com.hazelcast.map.impl.recordstore.RecordStore; import com.hazelcast.map.impl.recordstore.RecordStoreAdapter; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.Index; import com.hazelcast.query.impl.Indexes; import com.hazelcast.query.impl.InternalIndex; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapRecordKey.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapRecordKey.java index 7fcebacc3484..21adb8275ab7 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MapRecordKey.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MapRecordKey.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; public class MapRecordKey { final String mapName; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapReplicationSupportingService.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapReplicationSupportingService.java index f2d40d2720bc..9a36c66a2237 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MapReplicationSupportingService.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MapReplicationSupportingService.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.operation.MapOperationProvider; import com.hazelcast.map.impl.wan.MapReplicationRemove; import com.hazelcast.map.impl.wan.MapReplicationUpdate; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.internal.services.ReplicationSupportingService; import com.hazelcast.spi.merge.SplitBrainMergePolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapService.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapService.java index 8aaa447345a4..a5117bd51488 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MapService.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MapService.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.event.MapEventPublishingService; import com.hazelcast.map.impl.recordstore.RecordStore; import com.hazelcast.monitor.LocalMapStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.ClientAwareService; import com.hazelcast.internal.services.DistributedObjectNamespace; import com.hazelcast.spi.impl.eventservice.EventFilter; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapServiceContext.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapServiceContext.java index 66840114b354..153f39350464 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MapServiceContext.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MapServiceContext.java @@ -35,7 +35,7 @@ import com.hazelcast.map.impl.recordstore.RecordStore; import com.hazelcast.map.impl.recordstore.RecordStoreMutationObserver; import com.hazelcast.monitor.impl.LocalMapStatsImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.PartitioningStrategy; import com.hazelcast.query.impl.IndexCopyBehavior; import com.hazelcast.query.impl.IndexProvider; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapServiceContextImpl.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapServiceContextImpl.java index a9b50c8ceeb3..8316bd374569 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MapServiceContextImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MapServiceContextImpl.java @@ -68,7 +68,7 @@ import com.hazelcast.map.impl.recordstore.RecordStoreMutationObserver; import com.hazelcast.map.listener.MapPartitionLostListener; import com.hazelcast.monitor.impl.LocalMapStatsImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataType; import com.hazelcast.partition.PartitioningStrategy; import com.hazelcast.query.impl.DefaultIndexProvider; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapValueCollection.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapValueCollection.java index eab1e3697d7d..6ac0264a5e3f 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MapValueCollection.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MapValueCollection.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MerkleTreeNodeEntries.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MerkleTreeNodeEntries.java index 4d2d32682d9e..8a9e9e640fb1 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MerkleTreeNodeEntries.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MerkleTreeNodeEntries.java @@ -21,7 +21,7 @@ import com.hazelcast.internal.util.collection.InflatableSet.Builder; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.wan.impl.merkletree.MerkleTree; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MetadataInitializer.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MetadataInitializer.java index 521a578f8921..2994e3e14a3a 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/MetadataInitializer.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/MetadataInitializer.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/event/AbstractFilteringStrategy.java b/hazelcast/src/main/java/com/hazelcast/map/impl/event/AbstractFilteringStrategy.java index 890f7d6580cc..68ce7afd31d2 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/event/AbstractFilteringStrategy.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/event/AbstractFilteringStrategy.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.EntryEventFilter; import com.hazelcast.map.impl.MapServiceContext; import com.hazelcast.map.impl.query.QueryEventFilter; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.CachedQueryEntry; import com.hazelcast.query.impl.QueryableEntry; import com.hazelcast.query.impl.getters.Extractors; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/event/DefaultEntryEventFilteringStrategy.java b/hazelcast/src/main/java/com/hazelcast/map/impl/event/DefaultEntryEventFilteringStrategy.java index 6f12f04d7e43..0939f355d221 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/event/DefaultEntryEventFilteringStrategy.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/event/DefaultEntryEventFilteringStrategy.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.MapServiceContext; import com.hazelcast.map.impl.query.QueryEventFilter; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventFilter; import com.hazelcast.spi.impl.eventservice.impl.TrueEventFilter; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/event/EntryEventData.java b/hazelcast/src/main/java/com/hazelcast/map/impl/event/EntryEventData.java index fad4f98ca94a..6c12ceb25f16 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/event/EntryEventData.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/event/EntryEventData.java @@ -20,7 +20,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.BinaryInterface; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/event/EntryEventDataCache.java b/hazelcast/src/main/java/com/hazelcast/map/impl/event/EntryEventDataCache.java index 241ecb56b569..f738ecd97cbc 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/event/EntryEventDataCache.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/event/EntryEventDataCache.java @@ -18,7 +18,7 @@ import com.hazelcast.core.EntryEventType; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.Collection; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/event/FilteringStrategy.java b/hazelcast/src/main/java/com/hazelcast/map/impl/event/FilteringStrategy.java index aa03ca1ff638..2e71402fd814 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/event/FilteringStrategy.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/event/FilteringStrategy.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.event; import com.hazelcast.core.EntryEventType; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventFilter; /** diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/event/MapEventPublisher.java b/hazelcast/src/main/java/com/hazelcast/map/impl/event/MapEventPublisher.java index d493f1a6369e..7ce796220cc4 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/event/MapEventPublisher.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/event/MapEventPublisher.java @@ -19,7 +19,7 @@ import com.hazelcast.core.EntryEventType; import com.hazelcast.core.EntryView; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Helper methods for publishing events related to map diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/event/MapEventPublisherImpl.java b/hazelcast/src/main/java/com/hazelcast/map/impl/event/MapEventPublisherImpl.java index 4deb44c6c0e2..9c98e5aac4ca 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/event/MapEventPublisherImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/event/MapEventPublisherImpl.java @@ -28,7 +28,7 @@ import com.hazelcast.map.impl.wan.MapReplicationRemove; import com.hazelcast.map.impl.wan.MapReplicationUpdate; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventFilter; import com.hazelcast.spi.impl.eventservice.EventRegistration; import com.hazelcast.spi.impl.eventservice.EventService; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/event/QueryCacheEventPublisher.java b/hazelcast/src/main/java/com/hazelcast/map/impl/event/QueryCacheEventPublisher.java index 093357abcdde..2c14dbc114ae 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/event/QueryCacheEventPublisher.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/event/QueryCacheEventPublisher.java @@ -27,7 +27,7 @@ import com.hazelcast.map.impl.querycache.publisher.PublisherContext; import com.hazelcast.map.impl.querycache.publisher.PublisherRegistry; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventFilter; import java.util.Collection; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/event/QueryCacheNaturalFilteringStrategy.java b/hazelcast/src/main/java/com/hazelcast/map/impl/event/QueryCacheNaturalFilteringStrategy.java index 2f86c129d17d..30c5bbad944a 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/event/QueryCacheNaturalFilteringStrategy.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/event/QueryCacheNaturalFilteringStrategy.java @@ -25,7 +25,7 @@ import com.hazelcast.map.impl.nearcache.invalidation.UuidFilter; import com.hazelcast.map.impl.query.QueryEventFilter; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventFilter; import com.hazelcast.spi.impl.eventservice.impl.TrueEventFilter; import com.hazelcast.util.collection.Int2ObjectHashMap; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/eviction/Evictor.java b/hazelcast/src/main/java/com/hazelcast/map/impl/eviction/Evictor.java index ba2b83c904f2..aaa4ba4abfa4 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/eviction/Evictor.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/eviction/Evictor.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.eviction; import com.hazelcast.map.impl.recordstore.RecordStore; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import static java.lang.Integer.getInteger; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/eviction/EvictorImpl.java b/hazelcast/src/main/java/com/hazelcast/map/impl/eviction/EvictorImpl.java index f0b4f669da2a..70ee02933ad5 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/eviction/EvictorImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/eviction/EvictorImpl.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.recordstore.LazyEntryViewFromRecord; import com.hazelcast.map.impl.recordstore.RecordStore; import com.hazelcast.map.impl.recordstore.Storage; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.partition.IPartition; import com.hazelcast.spi.partition.IPartitionService; import com.hazelcast.util.Clock; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/AbstractMapPartitionIterator.java b/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/AbstractMapPartitionIterator.java index 7ace987c22e6..a2a1d4102683 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/AbstractMapPartitionIterator.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/AbstractMapPartitionIterator.java @@ -19,7 +19,7 @@ import com.hazelcast.map.IMap; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.map.impl.LazyMapEntry; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.util.Iterator; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/AbstractMapQueryPartitionIterator.java b/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/AbstractMapQueryPartitionIterator.java index 645a51073d44..734cbef85f0a 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/AbstractMapQueryPartitionIterator.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/AbstractMapQueryPartitionIterator.java @@ -18,7 +18,7 @@ import com.hazelcast.map.IMap; import com.hazelcast.map.impl.query.Query; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.projection.Projection; import com.hazelcast.query.Predicate; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/MapEntriesWithCursor.java b/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/MapEntriesWithCursor.java index fb965d24fda1..7ebd99dc2401 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/MapEntriesWithCursor.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/MapEntriesWithCursor.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; import java.util.AbstractMap; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/MapKeysWithCursor.java b/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/MapKeysWithCursor.java index 8f723ba14c1a..6b25bfc19ea4 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/MapKeysWithCursor.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/MapKeysWithCursor.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; import java.util.List; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/MapQueryPartitionIterator.java b/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/MapQueryPartitionIterator.java index 250f82456479..bef54aa3a092 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/MapQueryPartitionIterator.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/iterator/MapQueryPartitionIterator.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.query.QueryResult; import com.hazelcast.map.impl.query.QueryResultRow; import com.hazelcast.map.impl.query.ResultSegment; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.projection.Projection; import com.hazelcast.query.Predicate; import com.hazelcast.spi.impl.InternalCompletableFuture; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/DeserializingEventJournalMapEvent.java b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/DeserializingEventJournalMapEvent.java index 33768d48f85a..b26276424f4e 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/DeserializingEventJournalMapEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/DeserializingEventJournalMapEvent.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.map.journal.EventJournalMapEvent; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.SerializationServiceSupport; import com.hazelcast.spi.serialization.SerializationService; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/InternalEventJournalMapEvent.java b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/InternalEventJournalMapEvent.java index 738af991100c..02631777a70a 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/InternalEventJournalMapEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/InternalEventJournalMapEvent.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournal.java b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournal.java index cc6cca869afe..be2c614eb6bb 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournal.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournal.java @@ -18,7 +18,7 @@ import com.hazelcast.config.EventJournalConfig; import com.hazelcast.internal.journal.EventJournal; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.ObjectNamespace; /** diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/RingbufferMapEventJournalImpl.java b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/RingbufferMapEventJournalImpl.java index 32265454b66d..6ae3fdf4dc8c 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/RingbufferMapEventJournalImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/RingbufferMapEventJournalImpl.java @@ -24,7 +24,7 @@ import com.hazelcast.logging.ILogger; import com.hazelcast.map.impl.MapContainer; import com.hazelcast.map.impl.MapServiceContext; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataType; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; import com.hazelcast.ringbuffer.impl.RingbufferContainer; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/AbstractMapDataStore.java b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/AbstractMapDataStore.java index b8e76049bdab..5174dfb53291 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/AbstractMapDataStore.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/AbstractMapDataStore.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.map.impl.MapStoreWrapper; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataType; import com.hazelcast.util.Clock; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/MapDataStore.java b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/MapDataStore.java index 7d90a05a9e6e..b17a093a059c 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/MapDataStore.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/MapDataStore.java @@ -16,6 +16,7 @@ package com.hazelcast.map.impl.mapstore; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.map.IMap; import com.hazelcast.map.MapLoader; @@ -61,7 +62,7 @@ public interface MapDataStore { /** * Removes keys from map store. - * It also handles {@link com.hazelcast.nio.serialization.Data} to object conversions of keys. + * It also handles {@link Data} to object conversions of keys. * * @param keys to be removed */ diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/CoalescedWriteBehindQueue.java b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/CoalescedWriteBehindQueue.java index 92d854e70e6b..d4a5505926c4 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/CoalescedWriteBehindQueue.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/CoalescedWriteBehindQueue.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.mapstore.writebehind; import com.hazelcast.map.impl.mapstore.writebehind.entry.DelayedEntry; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.ArrayList; import java.util.Collection; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/CyclicWriteBehindQueue.java b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/CyclicWriteBehindQueue.java index a608e50b340f..03e3f9adcb87 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/CyclicWriteBehindQueue.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/CyclicWriteBehindQueue.java @@ -19,7 +19,7 @@ import com.hazelcast.map.IMap; import com.hazelcast.map.MapLoader; import com.hazelcast.map.impl.mapstore.writebehind.entry.DelayedEntry; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.util.MutableInteger; import java.util.ArrayDeque; @@ -52,7 +52,7 @@ class CyclicWriteBehindQueue implements WriteBehindQueue { * At that point if one tries to get that evicted key, {@link MapLoader} will * try to load it from store and that may cause data inconsistencies. * - * @see WriteBehindStore#loadable(com.hazelcast.nio.serialization.Data) + * @see WriteBehindStore#loadable(Data) */ private final Map index; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/DefaultWriteBehindProcessor.java b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/DefaultWriteBehindProcessor.java index 288aeea02915..fe2a5a6d084c 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/DefaultWriteBehindProcessor.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/DefaultWriteBehindProcessor.java @@ -19,7 +19,7 @@ import com.hazelcast.map.EntryLoader.MetadataAwareValue; import com.hazelcast.map.impl.mapstore.MapStoreContext; import com.hazelcast.map.impl.mapstore.writebehind.entry.DelayedEntry; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.ArrayList; import java.util.Collection; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/WriteBehindStore.java b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/WriteBehindStore.java index 398368c3ff5f..3226b640ea80 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/WriteBehindStore.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writebehind/WriteBehindStore.java @@ -30,7 +30,7 @@ import com.hazelcast.map.impl.mapstore.writebehind.entry.DelayedEntries; import com.hazelcast.map.impl.mapstore.writebehind.entry.DelayedEntry; import com.hazelcast.map.impl.operation.NotifyMapFlushOperation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationService; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writethrough/WriteThroughStore.java b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writethrough/WriteThroughStore.java index 6c5b253fe737..7f07efcf3b01 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writethrough/WriteThroughStore.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/mapstore/writethrough/WriteThroughStore.java @@ -20,7 +20,7 @@ import com.hazelcast.map.EntryLoader.MetadataAwareValue; import com.hazelcast.map.impl.MapStoreWrapper; import com.hazelcast.map.impl.mapstore.AbstractMapDataStore; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Write through map data store implementation. diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/nearcache/MemberMinimalPartitionService.java b/hazelcast/src/main/java/com/hazelcast/map/impl/nearcache/MemberMinimalPartitionService.java index a782796c01d0..f441a4f1ca86 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/nearcache/MemberMinimalPartitionService.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/nearcache/MemberMinimalPartitionService.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.nearcache; import com.hazelcast.internal.nearcache.impl.invalidation.MinimalPartitionService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.partition.IPartitionService; /** diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/AddIndexOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/AddIndexOperation.java index aef109ff9ef7..f1430287919a 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/AddIndexOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/AddIndexOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.map.impl.recordstore.RecordStoreAdapter; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.Index; import com.hazelcast.query.impl.Indexes; import com.hazelcast.query.impl.InternalIndex; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/BasePutOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/BasePutOperation.java index da0a75637307..086b04cc64cb 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/BasePutOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/BasePutOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.core.EntryEventType; import com.hazelcast.map.impl.record.Record; import com.hazelcast.map.impl.record.RecordInfo; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/BaseRemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/BaseRemoveOperation.java index c9e55d0382d7..4850a461703f 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/BaseRemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/BaseRemoveOperation.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.operation; import com.hazelcast.core.EntryEventType; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ContainsKeyOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ContainsKeyOperation.java index fbd41c874a25..7b3f4a82c7c3 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ContainsKeyOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ContainsKeyOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockWaitNotifyKey; import com.hazelcast.core.OperationTimeoutException; import com.hazelcast.map.impl.MapDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ContainsValueOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ContainsValueOperation.java index ed4e57fd3e39..8d4bec0409f3 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ContainsValueOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ContainsValueOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.PartitionAwareOperation; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ContainsValueOperationFactory.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ContainsValueOperationFactory.java index d1abd31d09a3..cf242efbe409 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ContainsValueOperationFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ContainsValueOperationFactory.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/DefaultMapOperationProvider.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/DefaultMapOperationProvider.java index ef13842ff221..191aab955978 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/DefaultMapOperationProvider.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/DefaultMapOperationProvider.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.tx.TxnDeleteOperation; import com.hazelcast.map.impl.tx.TxnLockAndGetOperation; import com.hazelcast.map.impl.tx.TxnSetOperation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/DeleteOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/DeleteOperation.java index 7a23b8981b07..9faca731e25d 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/DeleteOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/DeleteOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryBackupOperation.java index adb15507da0f..48903cf39da5 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryBackupOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryOffloadableSetUnlockOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryOffloadableSetUnlockOperation.java index c55ba16fd9c9..6b1349048c62 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryOffloadableSetUnlockOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryOffloadableSetUnlockOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.map.impl.MapService; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Notifier; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryOperation.java index 30a37a8ce8b3..90a9d7c506a0 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryOperation.java @@ -28,7 +28,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.spi.impl.operationservice.CallStatus; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryOperator.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryOperator.java index c531ae0c0133..9283c0703aea 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryOperator.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EntryOperator.java @@ -31,7 +31,7 @@ import com.hazelcast.map.impl.recordstore.RecordStore; import com.hazelcast.monitor.impl.LocalMapStatsImpl; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; import com.hazelcast.query.impl.QueryableEntry; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EvictBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EvictBackupOperation.java index 1b13a5b925d2..1c110f8e0049 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EvictBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EvictBackupOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EvictOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EvictOperation.java index b8e1c79b3d95..5fdcb674aacf 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EvictOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/EvictOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/GetAllOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/GetAllOperation.java index 1dff3e0d45e6..f84ba9a6ed27 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/GetAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/GetAllOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.MapEntries; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.PartitionAwareOperation; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; import com.hazelcast.spi.partition.IPartitionService; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/GetEntryViewOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/GetEntryViewOperation.java index 9ca1c8da6245..5be3f5db04a9 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/GetEntryViewOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/GetEntryViewOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.EntryViews; import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.map.impl.record.Record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/GetOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/GetOperation.java index aafd486f4cb6..58df0e7fb070 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/GetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/GetOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockWaitNotifyKey; import com.hazelcast.core.OperationTimeoutException; import com.hazelcast.map.impl.MapDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; 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 d358d29eac68..73ac9e76cb9d 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 @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.PartitionAwareOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/LoadAllOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/LoadAllOperation.java index 1147b9912213..f90c33dcfa31 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/LoadAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/LoadAllOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.PartitionAwareOperation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; import com.hazelcast.spi.partition.IPartitionService; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/LockAwareOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/LockAwareOperation.java index ae1a4788ecdf..b6fbd2e6fa44 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/LockAwareOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/LockAwareOperation.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.operation; import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockWaitNotifyKey; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapGetAllOperationFactory.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapGetAllOperationFactory.java index 4c9a789bfa53..4087a06c1579 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapGetAllOperationFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapGetAllOperationFactory.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapLoadAllOperationFactory.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapLoadAllOperationFactory.java index d5a1463efe16..33d2c0289879 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapLoadAllOperationFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapLoadAllOperationFactory.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapOperation.java index cdec35ffec43..6c43b5277095 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapOperation.java @@ -30,7 +30,7 @@ import com.hazelcast.map.impl.record.Record; import com.hazelcast.map.impl.recordstore.RecordStore; import com.hazelcast.memory.NativeOutOfMemoryError; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapOperationProvider.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapOperationProvider.java index 4c4bacfd2883..f205c65f99dd 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapOperationProvider.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MapOperationProvider.java @@ -20,7 +20,7 @@ import com.hazelcast.map.IMap; import com.hazelcast.map.impl.MapEntries; import com.hazelcast.map.impl.query.Query; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationFactory; 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 b05cf539a8e9..2f1f46b50860 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 @@ -27,7 +27,7 @@ import com.hazelcast.memory.NativeOutOfMemoryError; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.internal.services.ServiceNamespace; 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 1672446be85c..75ea1d4e82e4 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,7 @@ import com.hazelcast.map.impl.recordstore.RecordStore; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.query.impl.Index; import com.hazelcast.query.impl.IndexInfo; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MergeOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MergeOperation.java index c2246e27346d..a876d19f3a1d 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MergeOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MergeOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.record.RecordInfo; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.PartitionAwareOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MergeOperationFactory.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MergeOperationFactory.java index 9e8b2433e0cb..8a797fdc0482 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MergeOperationFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MergeOperationFactory.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.impl.operations.PartitionAwareOperationFactory; import com.hazelcast.spi.merge.SplitBrainMergePolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryBackupOperation.java index 1881a2acfba8..031cf7b137b3 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryOperation.java index 0ef0809e914d..90991bbeced3 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.MapEntries; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryOperationFactory.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryOperationFactory.java index 2b62fce8f3ba..1ab406cbbd05 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryOperationFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryOperationFactory.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryWithPredicateBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryWithPredicateBackupOperation.java index 127bc803b141..f081daf4168f 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryWithPredicateBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryWithPredicateBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryWithPredicateOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryWithPredicateOperation.java index de002babd973..f10e15d617d2 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryWithPredicateOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/MultipleEntryWithPredicateOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PartitionWideEntryBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PartitionWideEntryBackupOperation.java index e845b8f22893..5e4f41fa0d86 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PartitionWideEntryBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PartitionWideEntryBackupOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.map.impl.record.Record; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.util.Clock; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PartitionWideEntryOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PartitionWideEntryOperation.java index 4f2a8838eabe..a795e494345c 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PartitionWideEntryOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PartitionWideEntryOperation.java @@ -25,7 +25,7 @@ import com.hazelcast.map.impl.record.Record; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.impl.Indexes; import com.hazelcast.query.impl.QueryableEntry; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PartitionWideEntryWithPredicateOperationFactory.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PartitionWideEntryWithPredicateOperationFactory.java index 12171ca1f538..63d2f895e7d0 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PartitionWideEntryWithPredicateOperationFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PartitionWideEntryWithPredicateOperationFactory.java @@ -28,7 +28,7 @@ import com.hazelcast.map.impl.query.QueryRunner; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutAllBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutAllBackupOperation.java index 32b46da366a7..9b09f1495e76 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutAllBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutAllBackupOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.record.RecordInfo; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.spi.impl.operationservice.PartitionAwareOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutAllOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutAllOperation.java index 121c08222dfd..7c07c57c686b 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutAllOperation.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.record.RecordInfo; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.PartitionAwareOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutBackupOperation.java index 876d42eb5c72..ddd115d740b2 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutBackupOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.record.Records; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutFromLoadAllBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutFromLoadAllBackupOperation.java index fb21d4b94678..7f938f7730fb 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutFromLoadAllBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutFromLoadAllBackupOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutFromLoadAllOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutFromLoadAllOperation.java index 866201c7ddd5..3835446cc034 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutFromLoadAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutFromLoadAllOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.map.impl.record.Record; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.PartitionAwareOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutIfAbsentOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutIfAbsentOperation.java index 0b449fe3450f..916ab408af42 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutIfAbsentOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutIfAbsentOperation.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.operation; import com.hazelcast.map.impl.MapDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.MutatingOperation; public class PutIfAbsentOperation extends BasePutOperation implements MutatingOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutOperation.java index 9c1e3606e901..6adf170fa92b 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutOperation.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.operation; import com.hazelcast.map.impl.MapDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.MutatingOperation; public class PutOperation extends BasePutOperation implements MutatingOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutTransientOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutTransientOperation.java index bddbd57250a2..accf40e8e489 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutTransientOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/PutTransientOperation.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.operation; import com.hazelcast.map.impl.MapDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.MutatingOperation; public class PutTransientOperation extends BasePutOperation implements MutatingOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ReadonlyKeyBasedMapOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ReadonlyKeyBasedMapOperation.java index e6d4c3f8fad5..ef1f2d303d75 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ReadonlyKeyBasedMapOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ReadonlyKeyBasedMapOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.PartitionAwareOperation; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveBackupOperation.java index 5a3055ae7bed..b2824fa620c9 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveBackupOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveFromLoadAllOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveFromLoadAllOperation.java index 8a3e95086138..f18c97a39331 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveFromLoadAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveFromLoadAllOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.map.impl.recordstore.Storage; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.PartitionAwareOperation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveIfSameOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveIfSameOperation.java index 3be107e27aeb..a3580ef3a9c6 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveIfSameOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveIfSameOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveOperation.java index cca42c03ceb4..a91eaaaeb97a 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/RemoveOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ReplaceIfSameOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ReplaceIfSameOperation.java index 8e7240929d8d..10347c529ec3 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ReplaceIfSameOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ReplaceIfSameOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.MutatingOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ReplaceOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ReplaceOperation.java index 7a931e962871..3b5ff7a6ddea 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ReplaceOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/ReplaceOperation.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.operation; import com.hazelcast.map.impl.MapDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.MutatingOperation; public class ReplaceOperation extends BasePutOperation implements MutatingOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/SetOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/SetOperation.java index 7ee6542bd540..ee97135cfaf2 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/SetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/SetOperation.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.operation; import com.hazelcast.map.impl.MapDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.MutatingOperation; import static com.hazelcast.core.EntryEventType.ADDED; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/SetTtlBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/SetTtlBackupOperation.java index 13bb07736a41..d12297e2f39f 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/SetTtlBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/SetTtlBackupOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.map.impl.record.Record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import static com.hazelcast.map.impl.recordstore.RecordStore.DEFAULT_MAX_IDLE; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/SetTtlOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/SetTtlOperation.java index 3c73c6071413..bab39a1f5482 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/SetTtlOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/SetTtlOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.map.impl.record.Record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/TryPutOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/TryPutOperation.java index d5e8541a7911..d4f88af7ca4e 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/TryPutOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/TryPutOperation.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.operation; import com.hazelcast.map.impl.MapDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.MutatingOperation; public class TryPutOperation extends BasePutOperation implements MutatingOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/TryRemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/TryRemoveOperation.java index 927beade40a6..f28e661810f2 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/TryRemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/TryRemoveOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/WanEventHolder.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/WanEventHolder.java index 09678f35fab7..8a6650f7f971 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/WanEventHolder.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/WanEventHolder.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.operation; import com.hazelcast.core.EntryEventType; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import static com.hazelcast.internal.util.ToHeapDataConverter.toHeapData; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/WriteBehindStateHolder.java b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/WriteBehindStateHolder.java index 0ef56902b563..7b6f544ca8e7 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/operation/WriteBehindStateHolder.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/operation/WriteBehindStateHolder.java @@ -29,7 +29,7 @@ import com.hazelcast.map.impl.recordstore.RecordStore; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.internal.services.ServiceNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/proxy/MapProxyImpl.java b/hazelcast/src/main/java/com/hazelcast/map/impl/proxy/MapProxyImpl.java index 785dae5fee75..909f791c13c1 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/proxy/MapProxyImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/proxy/MapProxyImpl.java @@ -46,7 +46,7 @@ import com.hazelcast.map.journal.EventJournalMapEvent; import com.hazelcast.map.listener.MapListener; import com.hazelcast.map.listener.MapPartitionLostListener; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.projection.Projection; import com.hazelcast.query.PagingPredicate; import com.hazelcast.query.Predicate; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/proxy/MapProxySupport.java b/hazelcast/src/main/java/com/hazelcast/map/impl/proxy/MapProxySupport.java index 95fa0f679b6a..b67319a5c99a 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/proxy/MapProxySupport.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/proxy/MapProxySupport.java @@ -65,7 +65,7 @@ import com.hazelcast.monitor.impl.LocalMapStatsImpl; import com.hazelcast.nio.Address; import com.hazelcast.nio.ClassLoaderUtil; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.PartitioningStrategy; import com.hazelcast.projection.Projection; import com.hazelcast.query.PartitionPredicate; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/proxy/NearCachedMapProxyImpl.java b/hazelcast/src/main/java/com/hazelcast/map/impl/proxy/NearCachedMapProxyImpl.java index 822b84a4a9ff..c87f06cd9569 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/proxy/NearCachedMapProxyImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/proxy/NearCachedMapProxyImpl.java @@ -31,7 +31,7 @@ import com.hazelcast.map.impl.nearcache.MapNearCacheManager; import com.hazelcast.map.impl.nearcache.invalidation.InvalidationListener; import com.hazelcast.map.impl.nearcache.invalidation.UuidFilter; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.spi.impl.eventservice.EventFilter; import com.hazelcast.spi.impl.executionservice.ExecutionService; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/query/PartitionScanRunner.java b/hazelcast/src/main/java/com/hazelcast/map/impl/query/PartitionScanRunner.java index 513e3d3af1ab..800f0847eaf5 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/query/PartitionScanRunner.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/query/PartitionScanRunner.java @@ -31,7 +31,7 @@ import com.hazelcast.map.impl.record.Records; import com.hazelcast.map.impl.recordstore.RecordStore; import com.hazelcast.map.impl.recordstore.RecordStoreAdapter; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Metadata; import com.hazelcast.query.PagingPredicate; import com.hazelcast.query.Predicate; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryEntryFactory.java b/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryEntryFactory.java index 8078ce68f1c5..3560794b25cd 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryEntryFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryEntryFactory.java @@ -18,7 +18,7 @@ import com.hazelcast.config.CacheDeserializedValues; import com.hazelcast.internal.serialization.InternalSerializationService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.CachedQueryEntry; import com.hazelcast.query.impl.QueryEntry; import com.hazelcast.query.impl.QueryableEntry; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryEventFilter.java b/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryEventFilter.java index b1da749d500e..02f25c089500 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryEventFilter.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryEventFilter.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.impl.QueryableEntry; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryResult.java b/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryResult.java index 6935ee973320..f4412a22592c 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryResult.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryResult.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.projection.Projection; import com.hazelcast.query.PagingPredicate; import com.hazelcast.query.impl.QueryableEntry; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryResultRow.java b/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryResultRow.java index 42a0f71fcda5..3f2b1605aa87 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryResultRow.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/query/QueryResultRow.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/NodeQueryCacheContext.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/NodeQueryCacheContext.java index d5c13b3e011c..afbd853405cf 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/NodeQueryCacheContext.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/NodeQueryCacheContext.java @@ -33,7 +33,7 @@ import com.hazelcast.map.impl.querycache.subscriber.NodeSubscriberContext; import com.hazelcast.map.impl.querycache.subscriber.SubscriberContext; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.util.ContextMutexFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/QueryCacheContext.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/QueryCacheContext.java index fa5f04251e85..d81335451950 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/QueryCacheContext.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/QueryCacheContext.java @@ -21,7 +21,7 @@ import com.hazelcast.map.impl.querycache.publisher.PublisherContext; import com.hazelcast.map.impl.querycache.subscriber.SubscriberContext; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.util.ContextMutexFactory; import java.util.Collection; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/DefaultQueryCacheEventData.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/DefaultQueryCacheEventData.java index 32792684bf3c..8234cb0783a3 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/DefaultQueryCacheEventData.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/DefaultQueryCacheEventData.java @@ -20,7 +20,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.BinaryInterface; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.util.Clock; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/LocalEntryEventData.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/LocalEntryEventData.java index e123577f0011..20480e1da99e 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/LocalEntryEventData.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/LocalEntryEventData.java @@ -21,7 +21,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.BinaryInterface; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/QueryCacheEventData.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/QueryCacheEventData.java index 836e1c2d60e0..4e4d7b53bf6a 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/QueryCacheEventData.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/QueryCacheEventData.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.event.EventData; import com.hazelcast.map.impl.querycache.event.sequence.Sequenced; import com.hazelcast.nio.serialization.BinaryInterface; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; /** diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/QueryCacheEventDataBuilder.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/QueryCacheEventDataBuilder.java index 6d367f6ea82d..35911994277a 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/QueryCacheEventDataBuilder.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/event/QueryCacheEventDataBuilder.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.querycache.event; import com.hazelcast.internal.serialization.InternalSerializationService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Builder for creating a serializable event data for query cache system. diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/publisher/CoalescingPublisherAccumulator.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/publisher/CoalescingPublisherAccumulator.java index ecf59e9e9967..27846bc2c868 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/publisher/CoalescingPublisherAccumulator.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/publisher/CoalescingPublisherAccumulator.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.querycache.event.BatchEventData; import com.hazelcast.map.impl.querycache.event.QueryCacheEventData; import com.hazelcast.map.impl.querycache.event.sequence.Sequenced; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.Collection; import java.util.HashMap; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/AbstractInternalQueryCache.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/AbstractInternalQueryCache.java index 49f792b419ec..4f6629e6a901 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/AbstractInternalQueryCache.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/AbstractInternalQueryCache.java @@ -27,7 +27,7 @@ import com.hazelcast.map.impl.querycache.QueryCacheContext; import com.hazelcast.map.impl.querycache.QueryCacheEventService; import com.hazelcast.map.impl.querycache.subscriber.record.QueryCacheRecord; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.PartitioningStrategy; import com.hazelcast.query.Predicate; import com.hazelcast.query.impl.CachedQueryEntry; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/DefaultQueryCache.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/DefaultQueryCache.java index ba590ace9bc0..ccd733cc5f95 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/DefaultQueryCache.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/DefaultQueryCache.java @@ -32,7 +32,7 @@ import com.hazelcast.map.impl.querycache.subscriber.record.QueryCacheRecord; import com.hazelcast.map.listener.MapListener; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; import com.hazelcast.query.impl.CachedQueryEntry; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/DefaultQueryCacheRecordStore.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/DefaultQueryCacheRecordStore.java index 62c95c0a3fdf..60e099099917 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/DefaultQueryCacheRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/DefaultQueryCacheRecordStore.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.querycache.subscriber.record.ObjectQueryCacheRecordFactory; import com.hazelcast.map.impl.querycache.subscriber.record.QueryCacheRecord; import com.hazelcast.map.impl.querycache.subscriber.record.QueryCacheRecordFactory; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.Index; import com.hazelcast.query.impl.Indexes; import com.hazelcast.query.impl.QueryEntry; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/EventPublisherHelper.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/EventPublisherHelper.java index e6e7e77f7737..41802bf9b6ba 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/EventPublisherHelper.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/EventPublisherHelper.java @@ -30,7 +30,7 @@ import com.hazelcast.map.impl.querycache.event.LocalCacheWideEventData; import com.hazelcast.map.impl.querycache.event.LocalEntryEventData; import com.hazelcast.map.impl.querycache.subscriber.record.QueryCacheRecord; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.getters.Extractors; import com.hazelcast.spi.impl.eventservice.EventFilter; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/EvictionOperator.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/EvictionOperator.java index ff885f3a1a56..5ba9c8b745eb 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/EvictionOperator.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/EvictionOperator.java @@ -23,7 +23,7 @@ import com.hazelcast.internal.eviction.impl.evaluator.EvictionPolicyEvaluator; import com.hazelcast.internal.eviction.impl.strategy.sampling.SamplingEvictionStrategy; import com.hazelcast.map.impl.querycache.subscriber.record.QueryCacheRecord; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import static com.hazelcast.internal.config.ConfigValidator.checkEvictionConfig; import static com.hazelcast.internal.eviction.EvictionChecker.EVICT_ALWAYS; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/NodeQueryCacheEndToEndConstructor.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/NodeQueryCacheEndToEndConstructor.java index 593db7072c39..e9d5dd1b997c 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/NodeQueryCacheEndToEndConstructor.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/NodeQueryCacheEndToEndConstructor.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.querycache.subscriber.operation.MadePublishableOperation; import com.hazelcast.map.impl.querycache.subscriber.operation.PublisherCreateOperation; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.util.ExceptionUtil; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/NodeQueryCacheEventService.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/NodeQueryCacheEventService.java index 365d018053fd..b14e05789bf4 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/NodeQueryCacheEventService.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/NodeQueryCacheEventService.java @@ -29,7 +29,7 @@ import com.hazelcast.map.impl.querycache.event.LocalCacheWideEventData; import com.hazelcast.map.impl.querycache.event.LocalEntryEventData; import com.hazelcast.map.listener.MapListener; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.QueryEntry; import com.hazelcast.query.impl.QueryableEntry; import com.hazelcast.query.impl.getters.Extractors; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/QueryCacheRecordHashMap.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/QueryCacheRecordHashMap.java index 6180873f3657..51fa22dfe2c8 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/QueryCacheRecordHashMap.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/QueryCacheRecordHashMap.java @@ -21,7 +21,7 @@ import com.hazelcast.internal.eviction.EvictionListener; import com.hazelcast.internal.eviction.impl.strategy.sampling.SampleableEvictableStore; import com.hazelcast.map.impl.querycache.subscriber.record.QueryCacheRecord; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.SerializableByConvention; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.util.SampleableConcurrentHashMap; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/QueryCacheRecordStore.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/QueryCacheRecordStore.java index e79bad4a1f56..d6c341bbb084 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/QueryCacheRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/QueryCacheRecordStore.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.querycache.subscriber; import com.hazelcast.map.impl.querycache.subscriber.record.QueryCacheRecord; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.Map; import java.util.Set; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/SubscriberAccumulatorHandler.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/SubscriberAccumulatorHandler.java index 42c2478774de..883af6cce918 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/SubscriberAccumulatorHandler.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/SubscriberAccumulatorHandler.java @@ -20,7 +20,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.map.impl.querycache.accumulator.AccumulatorHandler; import com.hazelcast.map.impl.querycache.event.QueryCacheEventData; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/operation/PublisherCreateOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/operation/PublisherCreateOperation.java index ed560e935fe3..bd1a78296839 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/operation/PublisherCreateOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/operation/PublisherCreateOperation.java @@ -37,7 +37,7 @@ import com.hazelcast.map.impl.querycache.utils.QueryCacheUtil; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.AbstractNamedOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationService; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/DataQueryCacheRecord.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/DataQueryCacheRecord.java index 8573a5f461b3..e0f0b5ac4348 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/DataQueryCacheRecord.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/DataQueryCacheRecord.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.querycache.subscriber.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; /** diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/DataQueryCacheRecordFactory.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/DataQueryCacheRecordFactory.java index 562f2457d77b..ac968f8bcf78 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/DataQueryCacheRecordFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/DataQueryCacheRecordFactory.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.querycache.subscriber.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; /** diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/ObjectQueryCacheRecord.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/ObjectQueryCacheRecord.java index 5c5472e18415..cf58e7510464 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/ObjectQueryCacheRecord.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/ObjectQueryCacheRecord.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.querycache.subscriber.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; /** diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/ObjectQueryCacheRecordFactory.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/ObjectQueryCacheRecordFactory.java index 9da233a6cc12..677e4a964b75 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/ObjectQueryCacheRecordFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/ObjectQueryCacheRecordFactory.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.querycache.subscriber.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; /** diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/QueryCacheRecordFactory.java b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/QueryCacheRecordFactory.java index 555c29fa6d86..02d99d1bf329 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/QueryCacheRecordFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/querycache/subscriber/record/QueryCacheRecordFactory.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.querycache.subscriber.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Contract for various {@link QueryCacheRecord} factories. diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/record/AbstractRecord.java b/hazelcast/src/main/java/com/hazelcast/map/impl/record/AbstractRecord.java index 45c260389308..23be48124d74 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/record/AbstractRecord.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/record/AbstractRecord.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Metadata; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/record/CachedDataRecord.java b/hazelcast/src/main/java/com/hazelcast/map/impl/record/CachedDataRecord.java index e8f35ac6f270..fc53c9070eaf 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/record/CachedDataRecord.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/record/CachedDataRecord.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/record/CachedDataRecordWithStats.java b/hazelcast/src/main/java/com/hazelcast/map/impl/record/CachedDataRecordWithStats.java index 08ef03f32a6f..5cd36f4d33d3 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/record/CachedDataRecordWithStats.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/record/CachedDataRecordWithStats.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/record/DataRecord.java b/hazelcast/src/main/java/com/hazelcast/map/impl/record/DataRecord.java index ce9afa50cef7..a0a317375ab3 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/record/DataRecord.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/record/DataRecord.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import static com.hazelcast.util.JVMUtil.REFERENCE_COST_IN_BYTES; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/record/DataRecordFactory.java b/hazelcast/src/main/java/com/hazelcast/map/impl/record/DataRecordFactory.java index ede7c2af0ab7..5ad175a612e1 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/record/DataRecordFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/record/DataRecordFactory.java @@ -19,7 +19,7 @@ import com.hazelcast.config.CacheDeserializedValues; import com.hazelcast.config.MapConfig; import com.hazelcast.partition.PartitioningStrategy; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; public class DataRecordFactory implements RecordFactory { diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/record/DataRecordWithStats.java b/hazelcast/src/main/java/com/hazelcast/map/impl/record/DataRecordWithStats.java index 543f8b1dfba9..a2c85f139c62 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/record/DataRecordWithStats.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/record/DataRecordWithStats.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import static com.hazelcast.util.JVMUtil.REFERENCE_COST_IN_BYTES; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/record/ObjectRecordFactory.java b/hazelcast/src/main/java/com/hazelcast/map/impl/record/ObjectRecordFactory.java index 930e6fb2a650..2fe94b7c6e10 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/record/ObjectRecordFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/record/ObjectRecordFactory.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.record; import com.hazelcast.config.MapConfig; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; public class ObjectRecordFactory implements RecordFactory { diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/record/Record.java b/hazelcast/src/main/java/com/hazelcast/map/impl/record/Record.java index 23dc74fdbd40..cf8a98e6705a 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/record/Record.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/record/Record.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Metadata; /** diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/record/RecordFactory.java b/hazelcast/src/main/java/com/hazelcast/map/impl/record/RecordFactory.java index d55ce1a0ebef..eff173329cd3 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/record/RecordFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/record/RecordFactory.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Factory for creating records. Created for every partition. diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/record/RecordReplicationInfo.java b/hazelcast/src/main/java/com/hazelcast/map/impl/record/RecordReplicationInfo.java index 09c2179e1822..36b861e9b45e 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/record/RecordReplicationInfo.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/record/RecordReplicationInfo.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/record/Records.java b/hazelcast/src/main/java/com/hazelcast/map/impl/record/Records.java index 7036e6226766..d05541d2de96 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/record/Records.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/record/Records.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import static com.hazelcast.map.impl.record.Record.NOT_CACHED; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/AbstractEvictableRecordStore.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/AbstractEvictableRecordStore.java index 967776776310..3af57864c2be 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/AbstractEvictableRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/AbstractEvictableRecordStore.java @@ -26,7 +26,7 @@ import com.hazelcast.map.impl.eviction.Evictor; import com.hazelcast.map.impl.record.Record; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventService; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.merge.SplitBrainMergeTypes.MapMergeTypes; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/AbstractRecordStore.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/AbstractRecordStore.java index 63ac4fa22ca6..4955d591af32 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/AbstractRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/AbstractRecordStore.java @@ -33,7 +33,7 @@ import com.hazelcast.map.impl.record.Records; import com.hazelcast.monitor.LocalRecordStoreStats; import com.hazelcast.monitor.impl.LocalRecordStoreStatsImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.Index; import com.hazelcast.query.impl.Indexes; import com.hazelcast.query.impl.QueryableEntry; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/BasicRecordStoreLoader.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/BasicRecordStoreLoader.java index fd42e389f4ba..698743614ebf 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/BasicRecordStoreLoader.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/BasicRecordStoreLoader.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.mapstore.MapDataStore; import com.hazelcast.map.impl.operation.MapOperationProvider; import com.hazelcast.map.impl.operation.RemoveFromLoadAllOperation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.executionservice.ExecutionService; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/CompositeRecordStoreMutationObserver.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/CompositeRecordStoreMutationObserver.java index 3a7295108492..f9708d13c589 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/CompositeRecordStoreMutationObserver.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/CompositeRecordStoreMutationObserver.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.recordstore; import com.hazelcast.map.impl.record.Record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.Collection; import java.util.LinkedList; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/DefaultRecordStore.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/DefaultRecordStore.java index 783b6abcdfbb..da0060e4222b 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/DefaultRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/DefaultRecordStore.java @@ -40,7 +40,7 @@ import com.hazelcast.map.impl.record.Record; import com.hazelcast.map.impl.record.Records; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.Index; import com.hazelcast.query.impl.Indexes; import com.hazelcast.query.impl.InternalIndex; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/EntryRecordStoreLoader.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/EntryRecordStoreLoader.java index 86c0d85c5691..9af392d1eb00 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/EntryRecordStoreLoader.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/EntryRecordStoreLoader.java @@ -18,7 +18,7 @@ import com.hazelcast.map.EntryLoader.MetadataAwareValue; import com.hazelcast.map.impl.operation.MapOperationProvider; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import java.util.ArrayList; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/EventJournalWriterRecordStoreMutationObserver.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/EventJournalWriterRecordStoreMutationObserver.java index aa17a216309a..a0d75c571651 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/EventJournalWriterRecordStoreMutationObserver.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/EventJournalWriterRecordStoreMutationObserver.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.MapContainer; import com.hazelcast.map.impl.journal.MapEventJournal; import com.hazelcast.map.impl.record.Record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.ObjectNamespace; public class EventJournalWriterRecordStoreMutationObserver implements RecordStoreMutationObserver { diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/JsonMetadataRecordStoreMutationObserver.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/JsonMetadataRecordStoreMutationObserver.java index d2a38961224b..7bd051e8f258 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/JsonMetadataRecordStoreMutationObserver.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/JsonMetadataRecordStoreMutationObserver.java @@ -19,7 +19,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.map.impl.MetadataInitializer; import com.hazelcast.map.impl.record.Record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Metadata; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/RecordStore.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/RecordStore.java index 10e711b2b5bc..caf48d7b7d5e 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/RecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/RecordStore.java @@ -31,7 +31,7 @@ import com.hazelcast.map.impl.record.RecordFactory; import com.hazelcast.monitor.LocalRecordStoreStats; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.exception.RetryableHazelcastException; import com.hazelcast.spi.merge.SplitBrainMergePolicy; import com.hazelcast.spi.merge.SplitBrainMergeTypes.MapMergeTypes; @@ -154,11 +154,11 @@ public interface RecordStore { * Called when {@link com.hazelcast.config.MapConfig#isReadBackupData} is true from * {@link com.hazelcast.map.impl.proxy.MapProxySupport#getInternal} *

- * Returns corresponding value for key as {@link com.hazelcast.nio.serialization.Data}. + * Returns corresponding value for key as {@link Data}. * This adds an extra serialization step. For the reason of this behaviour please see issue 1292 on github. * * @param key key to be accessed - * @return value as {@link com.hazelcast.nio.serialization.Data} + * @return value as {@link Data} * independent of {@link com.hazelcast.config.InMemoryFormat} */ Data readBackupData(Data key); diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/RecordStoreLoader.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/RecordStoreLoader.java index 26161045b1d3..ba048ed71d6b 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/RecordStoreLoader.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/RecordStoreLoader.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.recordstore; import com.hazelcast.map.MapLoader; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.List; import java.util.concurrent.Future; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/RecordStoreMutationObserver.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/RecordStoreMutationObserver.java index 42af37914975..fcf7e93670bf 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/RecordStoreMutationObserver.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/RecordStoreMutationObserver.java @@ -18,7 +18,7 @@ import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.record.Record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import javax.annotation.Nonnull; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/StorageImpl.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/StorageImpl.java index c46f48bcb3cc..e7ae5d9fe1fc 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/StorageImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/StorageImpl.java @@ -23,7 +23,7 @@ import com.hazelcast.map.impl.iterator.MapKeysWithCursor; import com.hazelcast.map.impl.record.Record; import com.hazelcast.map.impl.record.RecordFactory; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.util.AbstractMap; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/StorageSCHM.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/StorageSCHM.java index 477c3eef0beb..924f81fac47d 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/StorageSCHM.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/StorageSCHM.java @@ -18,7 +18,7 @@ import com.hazelcast.map.IMap; import com.hazelcast.map.impl.record.Record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.SerializableByConvention; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.util.SampleableConcurrentHashMap; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/MapTransactionLogRecord.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/MapTransactionLogRecord.java index 4ce94c86a551..73e75826c469 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/MapTransactionLogRecord.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/MapTransactionLogRecord.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.MapRecordKey; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.transaction.impl.TransactionLogRecord; import com.hazelcast.util.ThreadUtil; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TransactionalMapProxy.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TransactionalMapProxy.java index 1a3d6a221fb9..517be40ac1cb 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TransactionalMapProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TransactionalMapProxy.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.query.QueryResultUtils; import com.hazelcast.map.impl.query.Target; import com.hazelcast.map.impl.tx.TxnValueWrapper.Type; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.PagingPredicate; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TransactionalMapProxySupport.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TransactionalMapProxySupport.java index c0e512eda6f8..d38567ae4813 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TransactionalMapProxySupport.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TransactionalMapProxySupport.java @@ -25,7 +25,7 @@ import com.hazelcast.map.impl.nearcache.MapNearCacheManager; import com.hazelcast.map.impl.operation.MapOperation; import com.hazelcast.map.impl.operation.MapOperationProvider; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.PartitioningStrategy; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.TransactionalDistributedObject; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnDeleteBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnDeleteBackupOperation.java index d75b790d64a1..0a5b1267ae1f 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnDeleteBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnDeleteBackupOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.map.impl.operation.RemoveBackupOperation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; public class TxnDeleteBackupOperation extends RemoveBackupOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnDeleteOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnDeleteOperation.java index 16a61bfc4d37..97d1f0e4ac76 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnDeleteOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnDeleteOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.map.impl.record.Record; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; import com.hazelcast.transaction.TransactionException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnLockAndGetOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnLockAndGetOperation.java index e989d8395665..e7dc6eee0425 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnLockAndGetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnLockAndGetOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.map.impl.record.Record; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.MutatingOperation; import com.hazelcast.transaction.TransactionException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnPrepareBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnPrepareBackupOperation.java index ab8213dddbd7..f51f8204de35 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnPrepareBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnPrepareBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.operation.KeyBasedMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.transaction.TransactionException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnPrepareOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnPrepareOperation.java index 6fb72c382de4..81a6faeb889b 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnPrepareOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnPrepareOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.map.impl.operation.KeyBasedMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnRollbackBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnRollbackBackupOperation.java index 8b06145ad7bc..f3c62b2e51f1 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnRollbackBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnRollbackBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.operation.KeyBasedMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.transaction.TransactionException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnRollbackOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnRollbackOperation.java index b59f97edd19c..d88a37c54732 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnRollbackOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnRollbackOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.map.impl.operation.KeyBasedMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Notifier; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnSetBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnSetBackupOperation.java index 0abb0dd5a526..fdb21e98f807 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnSetBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnSetBackupOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.map.impl.operation.PutBackupOperation; import com.hazelcast.map.impl.record.RecordInfo; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; public class TxnSetBackupOperation extends PutBackupOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnSetOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnSetOperation.java index e55126f92fba..9277e3b40e42 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnSetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnSetOperation.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.record.RecordInfo; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventService; import com.hazelcast.spi.impl.operationservice.MutatingOperation; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnUnlockBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnUnlockBackupOperation.java index ee6d35e759c7..c5a71600b329 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnUnlockBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnUnlockBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.operation.KeyBasedMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnUnlockOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnUnlockOperation.java index 63d14e67b1e6..e3b6b77fc319 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnUnlockOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TxnUnlockOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.operation.LockAwareOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/VersionedValue.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/VersionedValue.java index bcbb5ec4c240..6f26ad8d876a 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/VersionedValue.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/VersionedValue.java @@ -19,13 +19,13 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; /** - * Wrapper for {@link com.hazelcast.nio.serialization.Data} value objects with version information. + * Wrapper for {@link Data} value objects with version information. */ public class VersionedValue implements IdentifiedDataSerializable { diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/wan/MapReplicationRemove.java b/hazelcast/src/main/java/com/hazelcast/map/impl/wan/MapReplicationRemove.java index 09dc9d9cc3f3..824158767b97 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/wan/MapReplicationRemove.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/wan/MapReplicationRemove.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.wan.ReplicationEventObject; import com.hazelcast.wan.DistributedServiceWanEventCounters; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/wan/MapReplicationUpdate.java b/hazelcast/src/main/java/com/hazelcast/map/impl/wan/MapReplicationUpdate.java index f9545ec697ca..2125e44cfc40 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/wan/MapReplicationUpdate.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/wan/MapReplicationUpdate.java @@ -19,7 +19,7 @@ import com.hazelcast.core.EntryView; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.merge.SplitBrainMergePolicy; import com.hazelcast.wan.DistributedServiceWanEventCounters; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapContainer.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapContainer.java index c698da5a77bf..7065c4559429 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapContainer.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapContainer.java @@ -18,7 +18,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockService; import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockStore; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.DistributedObjectNamespace; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.merge.SplitBrainMergePolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapContainerSupport.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapContainerSupport.java index 1a8ec01d2bd0..9ed10b5cecbc 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapContainerSupport.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapContainerSupport.java @@ -17,7 +17,7 @@ package com.hazelcast.multimap.impl; import com.hazelcast.config.MultiMapConfig; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import java.util.Collection; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapEventFilter.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapEventFilter.java index 2a78f2d21936..44169f0b18db 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapEventFilter.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapEventFilter.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.eventservice.EventFilter; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapEventsPublisher.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapEventsPublisher.java index 2a26a8678a77..72558db17c70 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapEventsPublisher.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapEventsPublisher.java @@ -20,7 +20,7 @@ import com.hazelcast.map.impl.event.EntryEventData; import com.hazelcast.map.impl.event.MapEventData; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventRegistration; import com.hazelcast.spi.impl.eventservice.EventService; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapMergeContainer.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapMergeContainer.java index f52cbf03526c..60a39a6e3777 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapMergeContainer.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapMergeContainer.java @@ -19,7 +19,7 @@ import com.hazelcast.multimap.MultiMap; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapProxySupport.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapProxySupport.java index b5800a696160..8bd33332fa7e 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapProxySupport.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapProxySupport.java @@ -29,7 +29,7 @@ import com.hazelcast.multimap.impl.operations.PutOperation; import com.hazelcast.multimap.impl.operations.RemoveAllOperation; import com.hazelcast.multimap.impl.operations.RemoveOperation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.AbstractDistributedObject; import com.hazelcast.internal.services.DistributedObjectNamespace; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapService.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapService.java index f50366d6f182..65938330bd6a 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapService.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/MultiMapService.java @@ -30,7 +30,7 @@ import com.hazelcast.multimap.impl.operations.MultiMapReplicationOperation; import com.hazelcast.multimap.impl.txn.TransactionalMultiMapProxy; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.quorum.QuorumService; import com.hazelcast.quorum.QuorumType; import com.hazelcast.spi.impl.eventservice.EventPublishingService; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/ObjectMultiMapProxy.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/ObjectMultiMapProxy.java index c980e1a8d290..74f578c8dd97 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/ObjectMultiMapProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/ObjectMultiMapProxy.java @@ -25,7 +25,7 @@ import com.hazelcast.multimap.impl.operations.EntrySetResponse; import com.hazelcast.multimap.impl.operations.MultiMapResponse; import com.hazelcast.nio.ClassLoaderUtil; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.quorum.QuorumType; import com.hazelcast.spi.impl.InitializingObject; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/AbstractBackupAwareMultiMapOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/AbstractBackupAwareMultiMapOperation.java index fd45d9f40512..c782ff9f3abb 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/AbstractBackupAwareMultiMapOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/AbstractBackupAwareMultiMapOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.multimap.impl.MultiMapService; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.internal.services.DistributedObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/AbstractKeyBasedMultiMapOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/AbstractKeyBasedMultiMapOperation.java index 6a5c19ddada1..6c72b4af71f5 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/AbstractKeyBasedMultiMapOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/AbstractKeyBasedMultiMapOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.PartitionAwareOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/AbstractMultiMapOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/AbstractMultiMapOperation.java index deb9e3da7244..28c3182e3527 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/AbstractMultiMapOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/AbstractMultiMapOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.multimap.impl.MultiMapService; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.NamedOperation; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/ContainsEntryOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/ContainsEntryOperation.java index 085ecbd40d16..7e04334ae95d 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/ContainsEntryOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/ContainsEntryOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.multimap.impl.MultiMapService; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.internal.services.DistributedObjectNamespace; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/CountOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/CountOperation.java index 46c90beaa7fc..6535facf01ff 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/CountOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/CountOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.multimap.impl.MultiMapDataSerializerHook; import com.hazelcast.multimap.impl.MultiMapService; import com.hazelcast.multimap.impl.MultiMapValue; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.internal.services.DistributedObjectNamespace; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/DeleteBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/DeleteBackupOperation.java index 1d4b1368c45c..63ddfc029ff9 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/DeleteBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/DeleteBackupOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.multimap.impl.MultiMapContainer; import com.hazelcast.multimap.impl.MultiMapDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; public class DeleteBackupOperation extends AbstractKeyBasedMultiMapOperation implements BackupOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/DeleteOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/DeleteOperation.java index 845c4103aa79..b6d8c6b9049a 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/DeleteOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/DeleteOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.multimap.impl.MultiMapContainer; import com.hazelcast.multimap.impl.MultiMapDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/EntrySetResponse.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/EntrySetResponse.java index 7f5cffa41c23..e34ed1d67cff 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/EntrySetResponse.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/EntrySetResponse.java @@ -20,7 +20,7 @@ import com.hazelcast.multimap.impl.MultiMapRecord; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/GetAllOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/GetAllOperation.java index 43a4b0d9a467..5f302da6d7b7 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/GetAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/GetAllOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.multimap.impl.MultiMapRecord; import com.hazelcast.multimap.impl.MultiMapService; import com.hazelcast.multimap.impl.MultiMapValue; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.internal.services.DistributedObjectNamespace; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MergeBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MergeBackupOperation.java index aa940063b1d1..30ccfa3c8ab4 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MergeBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MergeBackupOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.multimap.impl.MultiMapValue; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.spi.merge.SplitBrainMergePolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MergeOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MergeOperation.java index c1d3417b907e..f2adddc43c48 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MergeOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MergeOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.multimap.impl.MultiMapValue; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.merge.SplitBrainMergePolicy; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MultiMapOperationFactory.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MultiMapOperationFactory.java index 1033525003bf..fc059d2ff71d 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MultiMapOperationFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MultiMapOperationFactory.java @@ -19,7 +19,7 @@ import com.hazelcast.multimap.impl.MultiMapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationFactory; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MultiMapReplicationOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MultiMapReplicationOperation.java index 0dca25ff764c..f167aa0de8f4 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MultiMapReplicationOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/MultiMapReplicationOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.multimap.impl.MultiMapValue; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/PutBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/PutBackupOperation.java index 815a5d4b36e3..94a6ce6d4bc5 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/PutBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/PutBackupOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.multimap.impl.MultiMapValue; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/PutOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/PutOperation.java index b9174561269a..513d9ee697dc 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/PutOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/PutOperation.java @@ -22,7 +22,7 @@ import com.hazelcast.multimap.impl.MultiMapRecord; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveAllBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveAllBackupOperation.java index 6cea392470cb..a79a6197d3a4 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveAllBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveAllBackupOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.multimap.impl.MultiMapContainer; import com.hazelcast.multimap.impl.MultiMapDataSerializerHook; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; public class RemoveAllBackupOperation extends AbstractKeyBasedMultiMapOperation implements BackupOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveAllOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveAllOperation.java index 463b9e1abf5b..27f6976f9ff4 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/operations/RemoveAllOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.multimap.impl.MultiMapContainer; import com.hazelcast.multimap.impl.MultiMapDataSerializerHook; import com.hazelcast.multimap.impl.MultiMapRecord; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; 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 a217fa2fa5e5..0726e59defc7 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 @@ -22,7 +22,7 @@ import com.hazelcast.multimap.impl.MultiMapValue; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; 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 ae5eee816b2e..42a6fc97c47d 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 @@ -23,7 +23,7 @@ import com.hazelcast.multimap.impl.MultiMapValue; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/MultiMapTransactionLogRecord.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/MultiMapTransactionLogRecord.java index 94efb269b102..270b2aec4d74 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/MultiMapTransactionLogRecord.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/MultiMapTransactionLogRecord.java @@ -19,7 +19,7 @@ import com.hazelcast.multimap.impl.MultiMapDataSerializerHook; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.transaction.impl.TransactionLogRecord; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TransactionRecordKey.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TransactionRecordKey.java index 358b7ef98b95..0bfd334da5b1 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TransactionRecordKey.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TransactionRecordKey.java @@ -16,7 +16,7 @@ package com.hazelcast.multimap.impl.txn; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; class TransactionRecordKey { diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TransactionalMultiMapProxy.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TransactionalMultiMapProxy.java index e3ad2340fc96..5967ec6f7a80 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TransactionalMultiMapProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TransactionalMultiMapProxy.java @@ -18,7 +18,7 @@ import com.hazelcast.multimap.impl.MultiMapRecord; import com.hazelcast.multimap.impl.MultiMapService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.transaction.TransactionException; import com.hazelcast.transaction.impl.Transaction; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TransactionalMultiMapProxySupport.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TransactionalMultiMapProxySupport.java index f57d89221fe5..62393a0f6f56 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TransactionalMultiMapProxySupport.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TransactionalMultiMapProxySupport.java @@ -24,7 +24,7 @@ import com.hazelcast.multimap.impl.operations.GetAllOperation; import com.hazelcast.multimap.impl.operations.MultiMapOperationFactory; import com.hazelcast.multimap.impl.operations.MultiMapResponse; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.operationservice.OperationService; import com.hazelcast.spi.impl.TransactionalDistributedObject; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnCommitBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnCommitBackupOperation.java index 5ea7139de191..fbcb5cd34966 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnCommitBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnCommitBackupOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.multimap.impl.operations.AbstractKeyBasedMultiMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnCommitOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnCommitOperation.java index 3da8a221295b..fcd44d2af7df 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnCommitOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnCommitOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.multimap.impl.operations.AbstractBackupAwareMultiMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Notifier; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnGenerateRecordIdOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnGenerateRecordIdOperation.java index 9b1e7fb2ec8d..61dcc3c256af 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnGenerateRecordIdOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnGenerateRecordIdOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.multimap.impl.MultiMapDataSerializerHook; import com.hazelcast.multimap.impl.operations.AbstractKeyBasedMultiMapOperation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; public class TxnGenerateRecordIdOperation extends AbstractKeyBasedMultiMapOperation { diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnLockAndGetOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnLockAndGetOperation.java index 27102780b492..88b52fa785fc 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnLockAndGetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnLockAndGetOperation.java @@ -26,7 +26,7 @@ import com.hazelcast.multimap.impl.operations.MultiMapResponse; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.internal.services.DistributedObjectNamespace; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; 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 894da8157031..1392dd089a21 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 @@ -21,7 +21,7 @@ import com.hazelcast.multimap.impl.operations.AbstractKeyBasedMultiMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.transaction.TransactionException; 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 8a6c2e5f4e3e..ee7533a0499c 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 @@ -19,7 +19,7 @@ import com.hazelcast.multimap.impl.MultiMapContainer; import com.hazelcast.multimap.impl.MultiMapDataSerializerHook; import com.hazelcast.multimap.impl.operations.AbstractBackupAwareMultiMapOperation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.transaction.TransactionException; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPutBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPutBackupOperation.java index 56858f4f2be1..59a2be5fdd39 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPutBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPutBackupOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.multimap.impl.operations.AbstractKeyBasedMultiMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPutOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPutOperation.java index c1ad08144df6..381c262eaf54 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPutOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnPutOperation.java @@ -25,7 +25,7 @@ import com.hazelcast.multimap.impl.operations.AbstractKeyBasedMultiMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveAllBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveAllBackupOperation.java index 10161e61eae8..aa6a0d23691a 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveAllBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveAllBackupOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.multimap.impl.operations.AbstractKeyBasedMultiMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveAllOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveAllOperation.java index ea8a18ec5058..34fa5c53e864 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveAllOperation.java @@ -25,7 +25,7 @@ import com.hazelcast.multimap.impl.operations.AbstractKeyBasedMultiMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveBackupOperation.java index 1f6a05557833..366828baaabc 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveBackupOperation.java @@ -23,7 +23,7 @@ import com.hazelcast.multimap.impl.operations.AbstractKeyBasedMultiMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveOperation.java index 6f3b7dc37b20..8ae201fa44a9 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRemoveOperation.java @@ -25,7 +25,7 @@ import com.hazelcast.multimap.impl.operations.AbstractKeyBasedMultiMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.MutatingOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRollbackBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRollbackBackupOperation.java index 16a1fd7e1fd7..6daf6e8d72dc 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRollbackBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRollbackBackupOperation.java @@ -21,7 +21,7 @@ import com.hazelcast.multimap.impl.operations.AbstractKeyBasedMultiMapOperation; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.transaction.TransactionException; diff --git a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRollbackOperation.java b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRollbackOperation.java index 63c32ec28305..fa72e7891d1f 100644 --- a/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRollbackOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/multimap/impl/txn/TxnRollbackOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.multimap.impl.MultiMapContainer; import com.hazelcast.multimap.impl.MultiMapDataSerializerHook; import com.hazelcast.multimap.impl.operations.AbstractBackupAwareMultiMapOperation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Notifier; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.WaitNotifyKey; diff --git a/hazelcast/src/main/java/com/hazelcast/nio/IOUtil.java b/hazelcast/src/main/java/com/hazelcast/nio/IOUtil.java index da2e827059c0..d7a517422a6b 100644 --- a/hazelcast/src/main/java/com/hazelcast/nio/IOUtil.java +++ b/hazelcast/src/main/java/com/hazelcast/nio/IOUtil.java @@ -22,7 +22,7 @@ import com.hazelcast.internal.networking.ChannelOptions; import com.hazelcast.logging.Logger; import com.hazelcast.nio.serialization.ClassNameFilter; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.annotation.PrivateApi; import java.io.ByteArrayOutputStream; diff --git a/hazelcast/src/main/java/com/hazelcast/nio/ObjectDataInput.java b/hazelcast/src/main/java/com/hazelcast/nio/ObjectDataInput.java index 79e98909ae2f..5960fcb623c4 100644 --- a/hazelcast/src/main/java/com/hazelcast/nio/ObjectDataInput.java +++ b/hazelcast/src/main/java/com/hazelcast/nio/ObjectDataInput.java @@ -17,7 +17,7 @@ package com.hazelcast.nio; import com.hazelcast.internal.serialization.InternalSerializationService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.DataInput; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/nio/ObjectDataOutput.java b/hazelcast/src/main/java/com/hazelcast/nio/ObjectDataOutput.java index f5a840047805..220b73d66112 100644 --- a/hazelcast/src/main/java/com/hazelcast/nio/ObjectDataOutput.java +++ b/hazelcast/src/main/java/com/hazelcast/nio/ObjectDataOutput.java @@ -16,7 +16,7 @@ package com.hazelcast.nio; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.io.DataOutput; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/AbstractIndex.java b/hazelcast/src/main/java/com/hazelcast/query/impl/AbstractIndex.java index 315f0d224b18..fc612f8359aa 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/AbstractIndex.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/AbstractIndex.java @@ -23,7 +23,7 @@ import com.hazelcast.monitor.impl.PerIndexStats; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.getters.Extractors; import com.hazelcast.query.impl.getters.MultiResult; import com.hazelcast.query.impl.predicates.PredicateDataSerializerHook; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/AttributeIndexRegistry.java b/hazelcast/src/main/java/com/hazelcast/query/impl/AttributeIndexRegistry.java index bb0efecd74ec..b4d69af650f0 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/AttributeIndexRegistry.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/AttributeIndexRegistry.java @@ -18,7 +18,7 @@ import com.hazelcast.core.TypeConverter; import com.hazelcast.monitor.impl.PerIndexStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.HashSet; import java.util.Set; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/BaseIndexStore.java b/hazelcast/src/main/java/com/hazelcast/query/impl/BaseIndexStore.java index 1b7396b6364d..8fd644fc82ea 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/BaseIndexStore.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/BaseIndexStore.java @@ -19,7 +19,7 @@ import com.hazelcast.internal.json.NonTerminalJsonValue; import com.hazelcast.map.impl.record.Record; import com.hazelcast.monitor.impl.IndexOperationStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.getters.MultiResult; import com.hazelcast.util.Clock; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/CachedQueryEntry.java b/hazelcast/src/main/java/com/hazelcast/query/impl/CachedQueryEntry.java index acf0093611c5..ae36ba1b433b 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/CachedQueryEntry.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/CachedQueryEntry.java @@ -17,7 +17,7 @@ package com.hazelcast.query.impl; import com.hazelcast.internal.serialization.InternalSerializationService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.query.impl.getters.Extractors; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/DuplicateDetectingMultiResult.java b/hazelcast/src/main/java/com/hazelcast/query/impl/DuplicateDetectingMultiResult.java index 365dbc329f30..328ad97b1137 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/DuplicateDetectingMultiResult.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/DuplicateDetectingMultiResult.java @@ -16,7 +16,7 @@ package com.hazelcast.query.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.AbstractSet; import java.util.Collections; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/FastMultiResultSet.java b/hazelcast/src/main/java/com/hazelcast/query/impl/FastMultiResultSet.java index 955f4d3daa70..bd4962658166 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/FastMultiResultSet.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/FastMultiResultSet.java @@ -16,7 +16,7 @@ package com.hazelcast.query.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.AbstractSet; import java.util.ArrayList; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/GlobalQueryContextWithStats.java b/hazelcast/src/main/java/com/hazelcast/query/impl/GlobalQueryContextWithStats.java index 8bc935095389..fd8f486fd89f 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/GlobalQueryContextWithStats.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/GlobalQueryContextWithStats.java @@ -18,7 +18,7 @@ import com.hazelcast.core.TypeConverter; import com.hazelcast.monitor.impl.PerIndexStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.HashMap; import java.util.HashSet; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/Index.java b/hazelcast/src/main/java/com/hazelcast/query/impl/Index.java index 6677ed8424ca..a541ed2a6601 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/Index.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/Index.java @@ -17,7 +17,7 @@ package com.hazelcast.query.impl; import com.hazelcast.core.TypeConverter; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.QueryException; import com.hazelcast.query.impl.predicates.PredicateUtils; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/IndexStore.java b/hazelcast/src/main/java/com/hazelcast/query/impl/IndexStore.java index a4454345aec6..11ee9774abae 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/IndexStore.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/IndexStore.java @@ -17,7 +17,7 @@ package com.hazelcast.query.impl; import com.hazelcast.monitor.impl.IndexOperationStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.Set; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/Indexes.java b/hazelcast/src/main/java/com/hazelcast/query/impl/Indexes.java index 671e4fed66d2..622742a4c550 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/Indexes.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/Indexes.java @@ -22,7 +22,7 @@ import com.hazelcast.monitor.impl.GlobalIndexesStats; import com.hazelcast.monitor.impl.IndexesStats; import com.hazelcast.monitor.impl.PartitionIndexesStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.impl.getters.Extractors; import com.hazelcast.query.impl.predicates.IndexAwarePredicate; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/MultiResultSet.java b/hazelcast/src/main/java/com/hazelcast/query/impl/MultiResultSet.java index 75086a8af04c..aa769073c0fe 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/MultiResultSet.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/MultiResultSet.java @@ -16,7 +16,7 @@ package com.hazelcast.query.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.Map; import java.util.Set; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/OrderedIndexStore.java b/hazelcast/src/main/java/com/hazelcast/query/impl/OrderedIndexStore.java index 890e758ce00d..c9676348da2f 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/OrderedIndexStore.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/OrderedIndexStore.java @@ -16,7 +16,7 @@ package com.hazelcast.query.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.Collections; import java.util.HashMap; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/QueryEntry.java b/hazelcast/src/main/java/com/hazelcast/query/impl/QueryEntry.java index c467ae6e4f51..7a0ec443ce26 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/QueryEntry.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/QueryEntry.java @@ -17,7 +17,7 @@ package com.hazelcast.query.impl; import com.hazelcast.internal.serialization.InternalSerializationService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.getters.Extractors; /** diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/QueryableEntry.java b/hazelcast/src/main/java/com/hazelcast/query/impl/QueryableEntry.java index c09fd56026da..af3b1e04b93f 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/QueryableEntry.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/QueryableEntry.java @@ -22,7 +22,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.map.impl.StoreAdapter; import com.hazelcast.map.impl.record.Record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.query.Metadata; import com.hazelcast.query.QueryException; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/SingleResultSet.java b/hazelcast/src/main/java/com/hazelcast/query/impl/SingleResultSet.java index ee4460ac973d..650e7259d0ee 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/SingleResultSet.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/SingleResultSet.java @@ -16,7 +16,7 @@ package com.hazelcast.query.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.AbstractSet; import java.util.Collections; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/UnorderedIndexStore.java b/hazelcast/src/main/java/com/hazelcast/query/impl/UnorderedIndexStore.java index 61daec7f0c50..b201e0e467b4 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/UnorderedIndexStore.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/UnorderedIndexStore.java @@ -16,7 +16,7 @@ package com.hazelcast.query.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.Collections; import java.util.HashMap; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/getters/ExtractorGetter.java b/hazelcast/src/main/java/com/hazelcast/query/impl/getters/ExtractorGetter.java index 48f89a80bf7b..d2e444c463a0 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/getters/ExtractorGetter.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/getters/ExtractorGetter.java @@ -17,7 +17,7 @@ package com.hazelcast.query.impl.getters; import com.hazelcast.internal.serialization.InternalSerializationService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.extractor.ValueExtractor; import com.hazelcast.query.impl.DefaultValueCollector; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/getters/Extractors.java b/hazelcast/src/main/java/com/hazelcast/query/impl/getters/Extractors.java index c4ba773bd399..d8e5cc09048d 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/getters/Extractors.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/getters/Extractors.java @@ -19,7 +19,7 @@ import com.hazelcast.config.MapAttributeConfig; import com.hazelcast.core.HazelcastJsonValue; import com.hazelcast.internal.serialization.InternalSerializationService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.HazelcastSerializationException; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.query.QueryException; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/getters/JsonDataGetter.java b/hazelcast/src/main/java/com/hazelcast/query/impl/getters/JsonDataGetter.java index 95a8c6a0a936..75a39d400d79 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/getters/JsonDataGetter.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/getters/JsonDataGetter.java @@ -21,7 +21,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DataInputNavigableJsonAdapter; import com.hazelcast.internal.serialization.impl.NavigableJsonInputAdapter; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/getters/PortableGetter.java b/hazelcast/src/main/java/com/hazelcast/query/impl/getters/PortableGetter.java index f8c15fc56710..455f16e40869 100644 --- a/hazelcast/src/main/java/com/hazelcast/query/impl/getters/PortableGetter.java +++ b/hazelcast/src/main/java/com/hazelcast/query/impl/getters/PortableGetter.java @@ -20,7 +20,7 @@ import com.hazelcast.internal.serialization.PortableContext; import com.hazelcast.internal.serialization.impl.DefaultPortableReader; import com.hazelcast.nio.serialization.ClassDefinition; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.FieldDefinition; import com.hazelcast.nio.serialization.PortableReader; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/ReplicatedMapEventPublishingService.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/ReplicatedMapEventPublishingService.java index 10ad833e3a3d..ca27772ecc09 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/ReplicatedMapEventPublishingService.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/ReplicatedMapEventPublishingService.java @@ -31,7 +31,7 @@ import com.hazelcast.map.impl.event.MapEventData; import com.hazelcast.monitor.impl.LocalReplicatedMapStatsImpl; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.QueryEntry; import com.hazelcast.replicatedmap.ReplicatedMapCantBeCreatedOnLiteMemberException; import com.hazelcast.replicatedmap.impl.record.AbstractReplicatedRecordStore; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/ReplicatedMapProxy.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/ReplicatedMapProxy.java index c96d2e1fb7e2..0bb40633bd85 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/ReplicatedMapProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/ReplicatedMapProxy.java @@ -22,7 +22,7 @@ import com.hazelcast.internal.util.ResultSet; import com.hazelcast.monitor.LocalReplicatedMapStats; import com.hazelcast.monitor.impl.EmptyLocalReplicatedMapStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.quorum.QuorumType; import com.hazelcast.replicatedmap.ReplicatedMap; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapEntries.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapEntries.java index 3ad13bc4aa89..a23e90b9851b 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapEntries.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapEntries.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableReader; import com.hazelcast.nio.serialization.PortableWriter; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapKeys.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapKeys.java index 3494e2fd3a68..be94848039a2 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapKeys.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapKeys.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableReader; import com.hazelcast.nio.serialization.PortableWriter; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapPortableEntryEvent.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapPortableEntryEvent.java index 59495726cc84..25be164caefd 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapPortableEntryEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapPortableEntryEvent.java @@ -19,7 +19,7 @@ import com.hazelcast.core.EntryEventType; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableReader; import com.hazelcast.nio.serialization.PortableWriter; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapValueCollection.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapValueCollection.java index 5907ba20b52a..df0a6b04883f 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapValueCollection.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/client/ReplicatedMapValueCollection.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableReader; import com.hazelcast.nio.serialization.PortableWriter; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/AbstractReplicatedMapOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/AbstractReplicatedMapOperation.java index c9d3adde522b..607153048efb 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/AbstractReplicatedMapOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/AbstractReplicatedMapOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.cluster.memberselector.MemberSelectors; import com.hazelcast.cluster.Member; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationService; import com.hazelcast.spi.impl.operationservice.impl.responses.NormalResponse; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ContainsKeyOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ContainsKeyOperation.java index 9f76d3af1b9e..e43cbf433a7b 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ContainsKeyOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ContainsKeyOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.record.ReplicatedRecordStore; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ContainsValueOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ContainsValueOperation.java index 1f2e9cc1f0c3..a14dd0842ede 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ContainsValueOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ContainsValueOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.record.ReplicatedRecordStore; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/EntrySetOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/EntrySetOperation.java index 083053da968f..15ef166ee757 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/EntrySetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/EntrySetOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.client.ReplicatedMapEntries; import com.hazelcast.replicatedmap.impl.record.ReplicatedRecord; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/GetOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/GetOperation.java index 2c2747d3c96d..2bb190c56c3d 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/GetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/GetOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.record.ReplicatedRecord; import com.hazelcast.replicatedmap.impl.record.ReplicatedRecordStore; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/KeySetOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/KeySetOperation.java index 2e76dcddc5d6..7c8863e1b7c1 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/KeySetOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/KeySetOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.client.ReplicatedMapKeys; import com.hazelcast.replicatedmap.impl.record.ReplicatedRecordStore; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/PutAllOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/PutAllOperation.java index 47478eb18f5f..0298ffe50fad 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/PutAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/PutAllOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapEventPublishingService; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.client.ReplicatedMapEntries; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/PutOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/PutOperation.java index 66b2a74501be..0a9f1625ac69 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/PutOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/PutOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapEventPublishingService; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.record.ReplicatedRecordStore; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/RemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/RemoveOperation.java index 2ab72a02824c..811d4f908ac8 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/RemoveOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/RemoveOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapEventPublishingService; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.record.ReplicatedRecordStore; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ReplicateUpdateOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ReplicateUpdateOperation.java index 57e14686bcaf..19c2a499ece1 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ReplicateUpdateOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ReplicateUpdateOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapEventPublishingService; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.record.ReplicatedRecordStore; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ReplicateUpdateToCallerOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ReplicateUpdateToCallerOperation.java index 5afc3e07bf89..ac3b98d68a38 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ReplicateUpdateToCallerOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ReplicateUpdateToCallerOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapEventPublishingService; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.record.ReplicatedRecordStore; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ReplicationOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ReplicationOperation.java index ab6288a60e58..d890b8a69a7b 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ReplicationOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ReplicationOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.logging.ILogger; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.PartitionContainer; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.record.AbstractReplicatedRecordStore; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/RequestMapDataOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/RequestMapDataOperation.java index e6bcc8cd1786..17d873d55be6 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/RequestMapDataOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/RequestMapDataOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.PartitionContainer; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.record.RecordMigrationInfo; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ValuesOperation.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ValuesOperation.java index 6571763110e6..10c421ed9759 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ValuesOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/operation/ValuesOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.client.ReplicatedMapValueCollection; import com.hazelcast.replicatedmap.impl.record.ReplicatedRecord; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/AbstractReplicatedRecordStore.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/AbstractReplicatedRecordStore.java index 810d9d27825b..adb232fec1a3 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/AbstractReplicatedRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/AbstractReplicatedRecordStore.java @@ -19,7 +19,7 @@ import com.hazelcast.cluster.Member; import com.hazelcast.cluster.memberselector.MemberSelectors; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapEventPublishingService; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.replicatedmap.impl.operation.ReplicateUpdateOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/DataReplicatedRecordStore.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/DataReplicatedRecordStore.java index cac03af2e8f7..a2ff191de8e0 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/DataReplicatedRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/DataReplicatedRecordStore.java @@ -16,12 +16,12 @@ package com.hazelcast.replicatedmap.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; import com.hazelcast.spi.impl.NodeEngine; /** - * This is a {@link com.hazelcast.nio.serialization.Data} based {@link ReplicatedRecordStore} + * This is a {@link Data} based {@link ReplicatedRecordStore} * implementation */ public class DataReplicatedRecordStore extends AbstractReplicatedRecordStore { diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/RecordMigrationInfo.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/RecordMigrationInfo.java index 493a3ad99f60..2b3684a6b589 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/RecordMigrationInfo.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/RecordMigrationInfo.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.replicatedmap.impl.operation.ReplicatedMapDataSerializerHook; diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/ReplicatedEntryEventFilter.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/ReplicatedEntryEventFilter.java index 4548cbf6ef7c..1c4c01c4e162 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/ReplicatedEntryEventFilter.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/ReplicatedEntryEventFilter.java @@ -16,7 +16,7 @@ package com.hazelcast.replicatedmap.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventFilter; /** diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/ReplicatedQueryEventFilter.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/ReplicatedQueryEventFilter.java index 1a02f64322bf..7c74a90eb89b 100644 --- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/ReplicatedQueryEventFilter.java +++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/record/ReplicatedQueryEventFilter.java @@ -16,7 +16,7 @@ package com.hazelcast.replicatedmap.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.impl.QueryableEntry; 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 324dea16e5e0..d07a80ec426f 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/ReadResultSetImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/ReadResultSetImpl.java @@ -21,7 +21,7 @@ import com.hazelcast.core.IFunction; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.projection.Projection; import com.hazelcast.ringbuffer.ReadResultSet; 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 ef3ca67db94c..2563c02d7b58 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferContainer.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferContainer.java @@ -21,7 +21,7 @@ import com.hazelcast.core.HazelcastException; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.HazelcastSerializationException; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.ringbuffer.StaleSequenceException; diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferProxy.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferProxy.java index 7dea828560a1..250dcbfcae38 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferProxy.java @@ -19,7 +19,7 @@ import com.hazelcast.config.RingbufferConfig; import com.hazelcast.core.ICompletableFuture; import com.hazelcast.core.IFunction; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.quorum.QuorumType; import com.hazelcast.ringbuffer.OverflowPolicy; import com.hazelcast.ringbuffer.ReadResultSet; diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferService.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferService.java index 1c1661c8758c..4670730e5205 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferService.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferService.java @@ -19,7 +19,7 @@ import com.hazelcast.config.Config; import com.hazelcast.config.RingbufferConfig; import com.hazelcast.core.DistributedObject; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.quorum.QuorumService; import com.hazelcast.quorum.QuorumType; diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferStoreWrapper.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferStoreWrapper.java index b8ea92741431..7c989d221479 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferStoreWrapper.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/RingbufferStoreWrapper.java @@ -24,7 +24,7 @@ import com.hazelcast.internal.diagnostics.StoreLatencyPlugin; import com.hazelcast.internal.serialization.impl.HeapData; import com.hazelcast.nio.ClassLoaderUtil; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.impl.NodeEngineImpl; diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/client/PortableReadResultSet.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/client/PortableReadResultSet.java index 0f702e3c3853..162d990ce89c 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/client/PortableReadResultSet.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/client/PortableReadResultSet.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableReader; import com.hazelcast.nio.serialization.PortableWriter; diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddAllBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddAllBackupOperation.java index 08b6437bfca6..72e2c93bbca8 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddAllBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddAllBackupOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.impl.RingbufferContainer; import com.hazelcast.spi.impl.operationservice.BackupOperation; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddAllOperation.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddAllOperation.java index 052fee71a739..c7421d46dfeb 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddAllOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddAllOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.OverflowPolicy; import com.hazelcast.ringbuffer.impl.RingbufferContainer; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddBackupOperation.java index e77a2762fb92..9c9c71a9ca9a 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddBackupOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddOperation.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddOperation.java index 34bd7eade1fd..be02b3ff26c6 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/AddOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.OverflowPolicy; import com.hazelcast.ringbuffer.impl.RingbufferContainer; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/MergeOperation.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/MergeOperation.java index 120453dfdf19..1f4314e3ec0a 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/MergeOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/MergeOperation.java @@ -25,7 +25,7 @@ import com.hazelcast.map.impl.journal.MapEventJournal; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.ringbuffer.impl.ArrayRingbuffer; import com.hazelcast.ringbuffer.impl.Ringbuffer; diff --git a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/ReadOneOperation.java b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/ReadOneOperation.java index 25b671151153..80c2f649f305 100644 --- a/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/ReadOneOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/ringbuffer/impl/operations/ReadOneOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.impl.RingbufferContainer; import com.hazelcast.spi.impl.operationservice.BlockingOperation; import com.hazelcast.spi.impl.operationservice.ReadonlyOperation; diff --git a/hazelcast/src/main/java/com/hazelcast/security/TokenCredentials.java b/hazelcast/src/main/java/com/hazelcast/security/TokenCredentials.java index b6592c270d40..4244a369eda8 100644 --- a/hazelcast/src/main/java/com/hazelcast/security/TokenCredentials.java +++ b/hazelcast/src/main/java/com/hazelcast/security/TokenCredentials.java @@ -16,7 +16,7 @@ package com.hazelcast.security; import com.hazelcast.internal.serialization.impl.HeapData; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * {@link Credentials} type for custom authentication (token based). diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/AbstractDistributedObject.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/AbstractDistributedObject.java index 68622a86c895..32c7e86d6897 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/AbstractDistributedObject.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/AbstractDistributedObject.java @@ -20,7 +20,7 @@ import com.hazelcast.core.HazelcastInstanceNotActiveException; import com.hazelcast.spi.impl.proxyservice.ProxyService; import com.hazelcast.internal.services.RemoteService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.PartitioningStrategy; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/NodeEngine.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/NodeEngine.java index 87c082719cba..617787389999 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/NodeEngine.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/NodeEngine.java @@ -27,7 +27,7 @@ import com.hazelcast.spi.impl.proxyservice.ProxyService; import com.hazelcast.logging.ILogger; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.quorum.QuorumService; import com.hazelcast.spi.annotation.PrivateApi; import com.hazelcast.spi.impl.operationservice.OperationService; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/NodeEngineImpl.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/NodeEngineImpl.java index 8de8811a2d63..131043b43b11 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/NodeEngineImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/NodeEngineImpl.java @@ -49,7 +49,7 @@ import com.hazelcast.logging.LoggingServiceImpl; import com.hazelcast.nio.Address; import com.hazelcast.nio.Packet; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.quorum.impl.QuorumServiceImpl; import com.hazelcast.spi.exception.RetryableHazelcastException; import com.hazelcast.spi.exception.ServiceNotFoundException; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/PortableCollection.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/PortableCollection.java index 02c48a830c00..343b36b60006 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/PortableCollection.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/PortableCollection.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableReader; import com.hazelcast.nio.serialization.PortableWriter; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/PortableEntryEvent.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/PortableEntryEvent.java index b221c7cf0768..2b2f70161f5c 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/PortableEntryEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/PortableEntryEvent.java @@ -19,7 +19,7 @@ import com.hazelcast.core.EntryEventType; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableReader; import com.hazelcast.nio.serialization.PortableWriter; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/PortableItemEvent.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/PortableItemEvent.java index 6f15c8b860d2..9f06cc773395 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/PortableItemEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/PortableItemEvent.java @@ -17,7 +17,7 @@ package com.hazelcast.spi.impl; import com.hazelcast.core.ItemEventType; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableReader; import com.hazelcast.nio.serialization.PortableWriter; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/SerializableList.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/SerializableList.java index a9eeabbd6291..2459a2502d9f 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/SerializableList.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/SerializableList.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.util.UnmodifiableIterator; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/UnmodifiableLazyList.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/UnmodifiableLazyList.java index 1e75f98d5476..ebab04b95f20 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/UnmodifiableLazyList.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/UnmodifiableLazyList.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.util.UnmodifiableListIterator; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/EventEnvelope.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/EventEnvelope.java index 77320628ab46..cec6db7c5163 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/EventEnvelope.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/EventEnvelope.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.SpiDataSerializerHook; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/EventProcessor.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/EventProcessor.java index bb925bdccc61..ed6966fc8c97 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/EventProcessor.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/EventProcessor.java @@ -16,7 +16,7 @@ package com.hazelcast.spi.impl.eventservice.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventPublishingService; import com.hazelcast.util.executor.StripedRunnable; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/EventServiceImpl.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/EventServiceImpl.java index 2b00221ac4a5..554084c3b026 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/EventServiceImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/eventservice/impl/EventServiceImpl.java @@ -29,7 +29,7 @@ import com.hazelcast.nio.Connection; import com.hazelcast.nio.EndpointManager; import com.hazelcast.nio.Packet; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.impl.eventservice.EventFilter; import com.hazelcast.spi.impl.eventservice.EventRegistration; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/AbstractMergeRunnable.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/AbstractMergeRunnable.java index a83faf230513..ab03eed4fb28 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/AbstractMergeRunnable.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/AbstractMergeRunnable.java @@ -22,7 +22,7 @@ import com.hazelcast.logging.ILogger; import com.hazelcast.map.IMap; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataType; import com.hazelcast.replicatedmap.ReplicatedMap; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/CacheMergingEntryImpl.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/CacheMergingEntryImpl.java index c7dc518f27d7..aaaebb1a4635 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/CacheMergingEntryImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/CacheMergingEntryImpl.java @@ -19,7 +19,7 @@ import com.hazelcast.nio.IOUtil; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.merge.SplitBrainMergeTypes.CacheMergeTypes; import com.hazelcast.spi.serialization.SerializationService; 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 31cc6bc50761..0ffc9ac2ba0f 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 @@ -19,7 +19,7 @@ import com.hazelcast.nio.IOUtil; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.merge.SplitBrainMergeTypes.MapMergeTypes; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/MergingValueFactory.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/MergingValueFactory.java index ba4972771741..2a42e23d0681 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/MergingValueFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/MergingValueFactory.java @@ -26,7 +26,7 @@ import com.hazelcast.multimap.impl.MultiMapContainer; import com.hazelcast.multimap.impl.MultiMapMergeContainer; import com.hazelcast.multimap.impl.MultiMapRecord; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.impl.record.ReplicatedRecord; import com.hazelcast.ringbuffer.impl.Ringbuffer; import com.hazelcast.scheduledexecutor.impl.ScheduledTaskDescriptor; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/MultiMapMergingEntryImpl.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/MultiMapMergingEntryImpl.java index 84a8273b20a5..1946e497bf66 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/MultiMapMergingEntryImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/merge/MultiMapMergingEntryImpl.java @@ -19,7 +19,7 @@ import com.hazelcast.nio.IOUtil; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.merge.SplitBrainMergeTypes.MultiMapMergeTypes; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/BinaryOperationFactory.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/BinaryOperationFactory.java index 083318e313f6..36e682334861 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/BinaryOperationFactory.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/BinaryOperationFactory.java @@ -19,7 +19,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.internal.services.NodeAware; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/InvocationBuilder.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/InvocationBuilder.java index f188b2675a3e..ab678403aa3f 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/InvocationBuilder.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/InvocationBuilder.java @@ -19,6 +19,7 @@ import com.hazelcast.core.ExecutionCallback; import com.hazelcast.core.IndeterminateOperationStateException; import com.hazelcast.internal.partition.InternalPartition; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.Address; import com.hazelcast.nio.EndpointManager; import com.hazelcast.spi.impl.InternalCompletableFuture; @@ -107,7 +108,7 @@ public InvocationBuilder setReplicaIndex(int replicaIndex) { /** * Checks if the Future should automatically deserialize the result. In most cases, you don't want - * {@link com.hazelcast.nio.serialization.Data} to be returned, but the deserialized object. But in some + * {@link Data} to be returned, but the deserialized object. But in some * cases, you want to get the raw Data object. *

* Defaults to true. diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/InvocationFuture.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/InvocationFuture.java index 22afa9b21c65..2f30df39168a 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/InvocationFuture.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/InvocationFuture.java @@ -21,7 +21,7 @@ import com.hazelcast.core.OperationTimeoutException; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.nio.Packet; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.AbstractInvocationFuture; import com.hazelcast.spi.impl.operationservice.impl.responses.NormalResponse; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/OperationBackupHandler.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/OperationBackupHandler.java index da40d0a1b7b5..a7302ef1f877 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/OperationBackupHandler.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/OperationBackupHandler.java @@ -23,7 +23,7 @@ import com.hazelcast.internal.partition.PartitionReplica; import com.hazelcast.internal.partition.PartitionReplicaVersionManager; import com.hazelcast.logging.ILogger; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.partition.FragmentedMigrationAwareService; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/OperationRunnerImpl.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/OperationRunnerImpl.java index 2b239bdb5952..44a9c87553da 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/OperationRunnerImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/OperationRunnerImpl.java @@ -37,7 +37,7 @@ import com.hazelcast.nio.Connection; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.Packet; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.HazelcastSerializationException; import com.hazelcast.quorum.QuorumException; import com.hazelcast.quorum.impl.QuorumServiceImpl; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/OutboundResponseHandler.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/OutboundResponseHandler.java index 1f7ed8548b23..a0a6f3f09669 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/OutboundResponseHandler.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/OutboundResponseHandler.java @@ -21,7 +21,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.EndpointManager; import com.hazelcast.nio.Packet; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationResponseHandler; import com.hazelcast.spi.impl.SpiDataSerializerHook; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/operations/Backup.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/operations/Backup.java index b73b22d73d0b..a5abde8b4e91 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/operations/Backup.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/operations/Backup.java @@ -25,7 +25,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.internal.services.ServiceNamespace; import com.hazelcast.spi.impl.AllowedDuringPassiveState; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/responses/NormalResponse.java b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/responses/NormalResponse.java index 5684e8a30178..28fd874df523 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/responses/NormalResponse.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/impl/responses/NormalResponse.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/merge/SplitBrainMergeTypes.java b/hazelcast/src/main/java/com/hazelcast/spi/merge/SplitBrainMergeTypes.java index 3c02aedc6bb7..40770213c2c9 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/merge/SplitBrainMergeTypes.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/merge/SplitBrainMergeTypes.java @@ -24,7 +24,7 @@ import com.hazelcast.multimap.MultiMap; import com.hazelcast.cp.IAtomicLong; import com.hazelcast.cp.IAtomicReference; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.replicatedmap.ReplicatedMap; import com.hazelcast.scheduledexecutor.impl.ScheduledTaskDescriptor; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/partition/IPartitionService.java b/hazelcast/src/main/java/com/hazelcast/spi/partition/IPartitionService.java index 49ee1ec1e4bc..6f39db2f6ad4 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/partition/IPartitionService.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/partition/IPartitionService.java @@ -18,7 +18,7 @@ import com.hazelcast.partition.MigrationListener; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.NoDataMemberInClusterException; import com.hazelcast.partition.PartitionLostListener; import com.hazelcast.internal.services.CoreService; diff --git a/hazelcast/src/main/java/com/hazelcast/spi/serialization/SerializationService.java b/hazelcast/src/main/java/com/hazelcast/spi/serialization/SerializationService.java index 442e4848240d..4f1a2550934b 100644 --- a/hazelcast/src/main/java/com/hazelcast/spi/serialization/SerializationService.java +++ b/hazelcast/src/main/java/com/hazelcast/spi/serialization/SerializationService.java @@ -18,7 +18,7 @@ import com.hazelcast.core.ManagedContext; import com.hazelcast.partition.PartitioningStrategy; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * SPI to serialize user objects to {@link Data} and back to Object diff --git a/hazelcast/src/main/java/com/hazelcast/topic/impl/DataAwareMessage.java b/hazelcast/src/main/java/com/hazelcast/topic/impl/DataAwareMessage.java index af10c697634f..8cff9318f97b 100644 --- a/hazelcast/src/main/java/com/hazelcast/topic/impl/DataAwareMessage.java +++ b/hazelcast/src/main/java/com/hazelcast/topic/impl/DataAwareMessage.java @@ -18,7 +18,7 @@ import com.hazelcast.topic.Message; import com.hazelcast.cluster.Member; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.io.IOException; diff --git a/hazelcast/src/main/java/com/hazelcast/topic/impl/PublishOperation.java b/hazelcast/src/main/java/com/hazelcast/topic/impl/PublishOperation.java index 22a2dd8822c1..b88b1cf39887 100644 --- a/hazelcast/src/main/java/com/hazelcast/topic/impl/PublishOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/topic/impl/PublishOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.config.TopicConfig; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.eventservice.EventRegistration; import com.hazelcast.spi.impl.eventservice.EventService; diff --git a/hazelcast/src/main/java/com/hazelcast/topic/impl/TopicEvent.java b/hazelcast/src/main/java/com/hazelcast/topic/impl/TopicEvent.java index d05a7b58f429..2982f0b5b443 100644 --- a/hazelcast/src/main/java/com/hazelcast/topic/impl/TopicEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/topic/impl/TopicEvent.java @@ -19,7 +19,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.util.Clock; diff --git a/hazelcast/src/main/java/com/hazelcast/topic/impl/TopicService.java b/hazelcast/src/main/java/com/hazelcast/topic/impl/TopicService.java index 002575ae2e46..7e762d9eb326 100644 --- a/hazelcast/src/main/java/com/hazelcast/topic/impl/TopicService.java +++ b/hazelcast/src/main/java/com/hazelcast/topic/impl/TopicService.java @@ -22,7 +22,7 @@ import com.hazelcast.monitor.LocalTopicStats; import com.hazelcast.monitor.impl.LocalTopicStatsImpl; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.eventservice.EventPublishingService; import com.hazelcast.spi.impl.eventservice.EventRegistration; import com.hazelcast.spi.impl.eventservice.EventService; diff --git a/hazelcast/src/main/java/com/hazelcast/topic/impl/reliable/ReliableTopicMessage.java b/hazelcast/src/main/java/com/hazelcast/topic/impl/reliable/ReliableTopicMessage.java index e34e668af119..e1d3c57b2b25 100644 --- a/hazelcast/src/main/java/com/hazelcast/topic/impl/reliable/ReliableTopicMessage.java +++ b/hazelcast/src/main/java/com/hazelcast/topic/impl/reliable/ReliableTopicMessage.java @@ -20,7 +20,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.BinaryInterface; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.util.Clock; diff --git a/hazelcast/src/main/java/com/hazelcast/topic/impl/reliable/ReliableTopicProxy.java b/hazelcast/src/main/java/com/hazelcast/topic/impl/reliable/ReliableTopicProxy.java index 9382c2cd55fe..3c5644ba2905 100644 --- a/hazelcast/src/main/java/com/hazelcast/topic/impl/reliable/ReliableTopicProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/topic/impl/reliable/ReliableTopicProxy.java @@ -26,7 +26,7 @@ import com.hazelcast.monitor.impl.LocalTopicStatsImpl; import com.hazelcast.nio.Address; import com.hazelcast.nio.ClassLoaderUtil; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.OverflowPolicy; import com.hazelcast.ringbuffer.Ringbuffer; import com.hazelcast.spi.impl.AbstractDistributedObject; diff --git a/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/XAResourceImpl.java b/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/XAResourceImpl.java index 8f3232122b58..ced1ed0b5af7 100644 --- a/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/XAResourceImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/XAResourceImpl.java @@ -23,7 +23,7 @@ import com.hazelcast.internal.cluster.ClusterService; import com.hazelcast.logging.ILogger; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.AbstractDistributedObject; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.spi.impl.NodeEngine; diff --git a/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/ClearRemoteTransactionBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/ClearRemoteTransactionBackupOperation.java index b7f1ea3d44b5..5cee078ef826 100644 --- a/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/ClearRemoteTransactionBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/ClearRemoteTransactionBackupOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.transaction.impl.TransactionDataSerializerHook; import com.hazelcast.transaction.impl.xa.SerializableXID; diff --git a/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/ClearRemoteTransactionOperation.java b/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/ClearRemoteTransactionOperation.java index a6a48435400a..fd5a9596a5fd 100644 --- a/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/ClearRemoteTransactionOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/ClearRemoteTransactionOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.transaction.impl.TransactionDataSerializerHook; diff --git a/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/CollectRemoteTransactionsOperation.java b/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/CollectRemoteTransactionsOperation.java index dec510ea7acd..01a51a7ef4e9 100644 --- a/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/CollectRemoteTransactionsOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/CollectRemoteTransactionsOperation.java @@ -16,7 +16,7 @@ package com.hazelcast.transaction.impl.xa.operations; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.impl.SerializableList; import com.hazelcast.transaction.impl.TransactionDataSerializerHook; diff --git a/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/FinalizeRemoteTransactionBackupOperation.java b/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/FinalizeRemoteTransactionBackupOperation.java index 8fa8f801ec55..0861369c9db5 100644 --- a/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/FinalizeRemoteTransactionBackupOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/FinalizeRemoteTransactionBackupOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupOperation; import com.hazelcast.transaction.impl.TransactionDataSerializerHook; import com.hazelcast.transaction.impl.xa.SerializableXID; diff --git a/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/FinalizeRemoteTransactionOperation.java b/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/FinalizeRemoteTransactionOperation.java index 99c746986b1a..785c03a730ae 100644 --- a/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/FinalizeRemoteTransactionOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/transaction/impl/xa/operations/FinalizeRemoteTransactionOperation.java @@ -19,7 +19,7 @@ import com.hazelcast.core.ExecutionCallback; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.BackupAwareOperation; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.transaction.impl.TransactionDataSerializerHook; diff --git a/hazelcast/src/main/java/com/hazelcast/util/CollectionUtil.java b/hazelcast/src/main/java/com/hazelcast/util/CollectionUtil.java index 07217f437520..45dc96272165 100644 --- a/hazelcast/src/main/java/com/hazelcast/util/CollectionUtil.java +++ b/hazelcast/src/main/java/com/hazelcast/util/CollectionUtil.java @@ -16,7 +16,7 @@ package com.hazelcast.util; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.util.ArrayList; diff --git a/hazelcast/src/main/java/com/hazelcast/util/executor/CompletedFuture.java b/hazelcast/src/main/java/com/hazelcast/util/executor/CompletedFuture.java index 6f1a557d04aa..3b62c854c49d 100644 --- a/hazelcast/src/main/java/com/hazelcast/util/executor/CompletedFuture.java +++ b/hazelcast/src/main/java/com/hazelcast/util/executor/CompletedFuture.java @@ -17,7 +17,7 @@ package com.hazelcast.util.executor; import com.hazelcast.core.ExecutionCallback; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/util/executor/DelegatingFuture.java b/hazelcast/src/main/java/com/hazelcast/util/executor/DelegatingFuture.java index bfc6cabd8234..dfa114689a35 100644 --- a/hazelcast/src/main/java/com/hazelcast/util/executor/DelegatingFuture.java +++ b/hazelcast/src/main/java/com/hazelcast/util/executor/DelegatingFuture.java @@ -19,7 +19,7 @@ import com.hazelcast.core.ExecutionCallback; import com.hazelcast.core.ICompletableFuture; import com.hazelcast.internal.serialization.InternalSerializationService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/main/java/com/hazelcast/wan/ReplicationEventObject.java b/hazelcast/src/main/java/com/hazelcast/wan/ReplicationEventObject.java index 7c1fcf93f985..00d44e9b4b57 100644 --- a/hazelcast/src/main/java/com/hazelcast/wan/ReplicationEventObject.java +++ b/hazelcast/src/main/java/com/hazelcast/wan/ReplicationEventObject.java @@ -16,7 +16,7 @@ package com.hazelcast.wan; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; /** * Interface for all WAN replication messages diff --git a/hazelcast/src/test/java/com/hazelcast/aggregation/TestSamples.java b/hazelcast/src/test/java/com/hazelcast/aggregation/TestSamples.java index 1ded0116e235..ed4f23e584d5 100644 --- a/hazelcast/src/test/java/com/hazelcast/aggregation/TestSamples.java +++ b/hazelcast/src/test/java/com/hazelcast/aggregation/TestSamples.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.map.impl.MapEntrySimple; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.QueryableEntry; import com.hazelcast.query.impl.getters.Extractors; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/CacheBasicAbstractTest.java b/hazelcast/src/test/java/com/hazelcast/cache/CacheBasicAbstractTest.java index ead87e9040f4..1d0c007a423f 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/CacheBasicAbstractTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/CacheBasicAbstractTest.java @@ -19,7 +19,7 @@ import com.hazelcast.config.CacheConfig; import com.hazelcast.core.ICompletableFuture; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.AssertTask; import com.hazelcast.util.SampleableConcurrentHashMap; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/CacheClearTest.java b/hazelcast/src/test/java/com/hazelcast/cache/CacheClearTest.java index 8df50b1db4b7..58c9015c4724 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/CacheClearTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/CacheClearTest.java @@ -25,7 +25,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.internal.nearcache.impl.invalidation.Invalidation; import com.hazelcast.internal.partition.InternalPartitionService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.AssertTask; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/CacheLoadAllTest.java b/hazelcast/src/test/java/com/hazelcast/cache/CacheLoadAllTest.java index a57ee4336eb8..271465c0cfb3 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/CacheLoadAllTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/CacheLoadAllTest.java @@ -23,7 +23,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.instance.impl.Node; import com.hazelcast.internal.partition.InternalPartitionService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.TestHazelcastInstanceFactory; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/CachePutAllTest.java b/hazelcast/src/test/java/com/hazelcast/cache/CachePutAllTest.java index 315436b974c0..33f23097705a 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/CachePutAllTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/CachePutAllTest.java @@ -24,7 +24,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.internal.metrics.MetricsRegistry; import com.hazelcast.internal.partition.InternalPartitionService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.OperationService; import com.hazelcast.spi.impl.operationservice.impl.OperationServiceAccessor; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/CacheSerializationTest.java b/hazelcast/src/test/java/com/hazelcast/cache/CacheSerializationTest.java index 254c81eab2f9..bf0a23436f7e 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/CacheSerializationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/CacheSerializationTest.java @@ -32,7 +32,7 @@ import com.hazelcast.internal.serialization.SerializationServiceBuilder; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.ServiceNamespace; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/entryprocessor/CacheEntryProcessorTest.java b/hazelcast/src/test/java/com/hazelcast/cache/entryprocessor/CacheEntryProcessorTest.java index a21ddb263330..0fb2ab06b1f3 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/entryprocessor/CacheEntryProcessorTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/entryprocessor/CacheEntryProcessorTest.java @@ -27,7 +27,7 @@ import com.hazelcast.partition.PartitionService; import com.hazelcast.instance.impl.HazelcastInstanceImpl; import com.hazelcast.instance.impl.HazelcastInstanceProxy; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.AssertTask; import com.hazelcast.test.HazelcastSerialClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/impl/DeferredValueTest.java b/hazelcast/src/test/java/com/hazelcast/cache/impl/DeferredValueTest.java index 4126affe49e7..6e7231b25d88 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/impl/DeferredValueTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/impl/DeferredValueTest.java @@ -17,7 +17,7 @@ package com.hazelcast.cache.impl; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/impl/PreJoinCacheConfigTest.java b/hazelcast/src/test/java/com/hazelcast/cache/impl/PreJoinCacheConfigTest.java index 0acec85b7ede..d76d2500d77a 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/impl/PreJoinCacheConfigTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/impl/PreJoinCacheConfigTest.java @@ -25,7 +25,7 @@ import com.hazelcast.config.CacheConfigTest; import com.hazelcast.core.HazelcastException; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/impl/operation/CacheReplicationOperationTest.java b/hazelcast/src/test/java/com/hazelcast/cache/impl/operation/CacheReplicationOperationTest.java index 7fc225130883..454609395b43 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/impl/operation/CacheReplicationOperationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/impl/operation/CacheReplicationOperationTest.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.impl.CachePartitionSegment; import com.hazelcast.cache.impl.CacheService; import com.hazelcast.config.CacheConfig; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.ServiceNamespace; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.test.HazelcastSerialClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/recordstore/CacheRecordStoreTestSupport.java b/hazelcast/src/test/java/com/hazelcast/cache/recordstore/CacheRecordStoreTestSupport.java index 1b5a0b0fe5ee..4524371b5fd3 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/recordstore/CacheRecordStoreTestSupport.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/recordstore/CacheRecordStoreTestSupport.java @@ -25,7 +25,7 @@ import com.hazelcast.config.InMemoryFormat; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/client/ClientListenersTest.java b/hazelcast/src/test/java/com/hazelcast/client/ClientListenersTest.java index 562eae492e6e..b2928943679e 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/ClientListenersTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/ClientListenersTest.java @@ -35,7 +35,7 @@ import com.hazelcast.map.impl.operation.MergeOperation; import com.hazelcast.map.impl.record.Record; import com.hazelcast.map.listener.EntryMergedListener; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableFactory; import com.hazelcast.spi.impl.NodeEngineImpl; diff --git a/hazelcast/src/test/java/com/hazelcast/client/cache/impl/CallbackAwareClientDelegatingFutureTest.java b/hazelcast/src/test/java/com/hazelcast/client/cache/impl/CallbackAwareClientDelegatingFutureTest.java index c42007ab8c74..586b01d45a58 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/cache/impl/CallbackAwareClientDelegatingFutureTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/cache/impl/CallbackAwareClientDelegatingFutureTest.java @@ -26,7 +26,7 @@ import com.hazelcast.client.test.TestHazelcastFactory; import com.hazelcast.config.CacheConfig; import com.hazelcast.config.CacheConfiguration; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/client/cache/impl/nearcache/ClientCacheInvalidationListener.java b/hazelcast/src/test/java/com/hazelcast/client/cache/impl/nearcache/ClientCacheInvalidationListener.java index 43df29a3a3d1..ed1398047171 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/cache/impl/nearcache/ClientCacheInvalidationListener.java +++ b/hazelcast/src/test/java/com/hazelcast/client/cache/impl/nearcache/ClientCacheInvalidationListener.java @@ -21,7 +21,7 @@ import com.hazelcast.client.impl.protocol.ClientMessage; import com.hazelcast.client.impl.protocol.codec.CacheAddNearCacheInvalidationListenerCodec; import com.hazelcast.client.impl.spi.EventHandler; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import java.util.ArrayList; import java.util.Collection; diff --git a/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCacheBasicTest.java b/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCacheBasicTest.java index 1702e2c550ba..eb1ed9a9c68d 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCacheBasicTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCacheBasicTest.java @@ -37,7 +37,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.NearCacheTestUtils; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCacheLeakTest.java b/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCacheLeakTest.java index 28424d0c41e7..cb4c2b92a716 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCacheLeakTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCacheLeakTest.java @@ -40,7 +40,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.impl.invalidation.RepairingTask; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCachePreloaderTest.java b/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCachePreloaderTest.java index d21686db350d..8dfc5b54a5e3 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCachePreloaderTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCachePreloaderTest.java @@ -35,7 +35,7 @@ import com.hazelcast.internal.nearcache.NearCacheManager; import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCacheSerializationCountTest.java b/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCacheSerializationCountTest.java index d0cc1537826e..7da6ba9f45ba 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCacheSerializationCountTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/cache/nearcache/ClientCacheNearCacheSerializationCountTest.java @@ -39,7 +39,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.NearCacheTestUtils; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/client/impl/protocol/util/ParameterUtilTest.java b/hazelcast/src/test/java/com/hazelcast/client/impl/protocol/util/ParameterUtilTest.java index 5e4e11d8198f..da67fc53f6b5 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/impl/protocol/util/ParameterUtilTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/impl/protocol/util/ParameterUtilTest.java @@ -19,7 +19,7 @@ import com.hazelcast.internal.serialization.impl.HeapData; import com.hazelcast.map.impl.MapEntrySimple; import com.hazelcast.nio.Bits; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheBasicTest.java b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheBasicTest.java index 9191c66ac844..9464119d7827 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheBasicTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheBasicTest.java @@ -31,7 +31,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.NearCacheTestUtils; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheLeakTest.java b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheLeakTest.java index 0e14f7c7cbeb..1fc1607f8244 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheLeakTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheLeakTest.java @@ -33,7 +33,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.impl.invalidation.RepairingTask; import com.hazelcast.map.impl.MapService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCachePreloaderTest.java b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCachePreloaderTest.java index f090d03aea7e..50acd67ee208 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCachePreloaderTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCachePreloaderTest.java @@ -29,7 +29,7 @@ import com.hazelcast.internal.nearcache.NearCacheManager; import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheSerializationCountTest.java b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheSerializationCountTest.java index 61487b475fbb..b085667e1560 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheSerializationCountTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheSerializationCountTest.java @@ -33,7 +33,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.NearCacheTestUtils; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheTest.java b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheTest.java index 69b9320ea38a..e555927ea02f 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/ClientMapNearCacheTest.java @@ -34,7 +34,7 @@ import com.hazelcast.internal.nearcache.NearCache; import com.hazelcast.map.impl.nearcache.NearCacheTestSupport; import com.hazelcast.monitor.NearCacheStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.properties.GroupProperty; import com.hazelcast.test.AssertTask; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/LiteMemberClientMapNearCacheBasicTest.java b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/LiteMemberClientMapNearCacheBasicTest.java index 4c28cb2700e5..f12424db6328 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/LiteMemberClientMapNearCacheBasicTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/LiteMemberClientMapNearCacheBasicTest.java @@ -32,7 +32,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.NearCacheTestUtils; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/NearCacheStatsStressTest.java b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/NearCacheStatsStressTest.java index e2b830ac7e41..cf34add34a41 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/NearCacheStatsStressTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/map/impl/nearcache/NearCacheStatsStressTest.java @@ -25,7 +25,7 @@ import com.hazelcast.internal.nearcache.NearCache; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.monitor.NearCacheStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/client/protocol/MapMessageEncodeDecodeTest.java b/hazelcast/src/test/java/com/hazelcast/client/protocol/MapMessageEncodeDecodeTest.java index 7c25f0561026..faaf85d8a24a 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/protocol/MapMessageEncodeDecodeTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/protocol/MapMessageEncodeDecodeTest.java @@ -22,7 +22,7 @@ import com.hazelcast.client.impl.protocol.util.ClientProtocolBuffer; import com.hazelcast.client.impl.protocol.util.SafeBuffer; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastSerialClassRunner; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/client/protocol/compatibility/ReferenceObjects.java b/hazelcast/src/test/java/com/hazelcast/client/protocol/compatibility/ReferenceObjects.java index 8fe56e116cc5..c452947c1cf6 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/protocol/compatibility/ReferenceObjects.java +++ b/hazelcast/src/test/java/com/hazelcast/client/protocol/compatibility/ReferenceObjects.java @@ -64,7 +64,7 @@ import com.hazelcast.map.impl.querycache.event.QueryCacheEventData; import com.hazelcast.memory.NativeOutOfMemoryError; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.HazelcastSerializationException; import com.hazelcast.partition.NoDataMemberInClusterException; import com.hazelcast.query.Predicates; diff --git a/hazelcast/src/test/java/com/hazelcast/client/replicatedmap/nearcache/ClientReplicatedMapNearCacheBasicTest.java b/hazelcast/src/test/java/com/hazelcast/client/replicatedmap/nearcache/ClientReplicatedMapNearCacheBasicTest.java index 4684ebf8eafd..10226c31c01b 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/replicatedmap/nearcache/ClientReplicatedMapNearCacheBasicTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/replicatedmap/nearcache/ClientReplicatedMapNearCacheBasicTest.java @@ -31,7 +31,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.NearCacheTestUtils; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/client/replicatedmap/nearcache/ClientReplicatedMapNearCacheLeakTest.java b/hazelcast/src/test/java/com/hazelcast/client/replicatedmap/nearcache/ClientReplicatedMapNearCacheLeakTest.java index ce8584e11d8e..c211445aa7f9 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/replicatedmap/nearcache/ClientReplicatedMapNearCacheLeakTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/replicatedmap/nearcache/ClientReplicatedMapNearCacheLeakTest.java @@ -29,7 +29,7 @@ import com.hazelcast.internal.nearcache.NearCacheManager; import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastSerialParametersRunnerFactory; import com.hazelcast.test.annotation.QuickTest; import org.junit.After; diff --git a/hazelcast/src/test/java/com/hazelcast/client/replicatedmap/nearcache/ClientReplicatedMapNearCacheSerializationCountTest.java b/hazelcast/src/test/java/com/hazelcast/client/replicatedmap/nearcache/ClientReplicatedMapNearCacheSerializationCountTest.java index 1b2c962023bd..09d4dac6f407 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/replicatedmap/nearcache/ClientReplicatedMapNearCacheSerializationCountTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/replicatedmap/nearcache/ClientReplicatedMapNearCacheSerializationCountTest.java @@ -33,7 +33,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.NearCacheTestUtils; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastSerialParametersRunnerFactory; import com.hazelcast.test.annotation.QuickTest; import org.junit.After; diff --git a/hazelcast/src/test/java/com/hazelcast/cluster/impl/MemberImplTest.java b/hazelcast/src/test/java/com/hazelcast/cluster/impl/MemberImplTest.java index 8024627d1b61..71dfc63434b2 100644 --- a/hazelcast/src/test/java/com/hazelcast/cluster/impl/MemberImplTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cluster/impl/MemberImplTest.java @@ -21,7 +21,7 @@ import com.hazelcast.instance.EndpointQualifier; import com.hazelcast.instance.impl.HazelcastInstanceImpl; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/collection/impl/queue/QueueStoreTest.java b/hazelcast/src/test/java/com/hazelcast/collection/impl/queue/QueueStoreTest.java index cc22fe0113c4..7a080bb97b7d 100644 --- a/hazelcast/src/test/java/com/hazelcast/collection/impl/queue/QueueStoreTest.java +++ b/hazelcast/src/test/java/com/hazelcast/collection/impl/queue/QueueStoreTest.java @@ -24,7 +24,7 @@ import com.hazelcast.collection.QueueStore; import com.hazelcast.collection.QueueStoreFactory; import com.hazelcast.transaction.TransactionalQueue; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastSerialClassRunner; import com.hazelcast.test.HazelcastTestSupport; import com.hazelcast.test.TestHazelcastInstanceFactory; diff --git a/hazelcast/src/test/java/com/hazelcast/collection/impl/set/SetEqualsHashTest.java b/hazelcast/src/test/java/com/hazelcast/collection/impl/set/SetEqualsHashTest.java index 5c12070645be..97b86e470f2e 100644 --- a/hazelcast/src/test/java/com/hazelcast/collection/impl/set/SetEqualsHashTest.java +++ b/hazelcast/src/test/java/com/hazelcast/collection/impl/set/SetEqualsHashTest.java @@ -19,7 +19,7 @@ import com.hazelcast.collection.impl.collection.CollectionItem; import com.hazelcast.internal.serialization.SerializationServiceBuilder; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/config/AbstractBasicConfigTest.java b/hazelcast/src/test/java/com/hazelcast/config/AbstractBasicConfigTest.java index 5602c4c66094..ae2a986090e4 100644 --- a/hazelcast/src/test/java/com/hazelcast/config/AbstractBasicConfigTest.java +++ b/hazelcast/src/test/java/com/hazelcast/config/AbstractBasicConfigTest.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastTestSupport; import org.junit.Before; import org.junit.Test; diff --git a/hazelcast/src/test/java/com/hazelcast/config/CountDownLatchConfigTest.java b/hazelcast/src/test/java/com/hazelcast/config/CountDownLatchConfigTest.java index 15fcd0605248..ba8148f30344 100644 --- a/hazelcast/src/test/java/com/hazelcast/config/CountDownLatchConfigTest.java +++ b/hazelcast/src/test/java/com/hazelcast/config/CountDownLatchConfigTest.java @@ -19,7 +19,7 @@ import com.hazelcast.config.CountDownLatchConfig.CountDownLatchConfigReadOnly; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/config/CustomWanPublisherConfigTest.java b/hazelcast/src/test/java/com/hazelcast/config/CustomWanPublisherConfigTest.java index 9c38918bcb07..414679ff238d 100644 --- a/hazelcast/src/test/java/com/hazelcast/config/CustomWanPublisherConfigTest.java +++ b/hazelcast/src/test/java/com/hazelcast/config/CustomWanPublisherConfigTest.java @@ -18,7 +18,7 @@ import com.hazelcast.config.ConfigCompatibilityChecker.WanCustomPublisherConfigChecker; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/config/MapConfigTest.java b/hazelcast/src/test/java/com/hazelcast/config/MapConfigTest.java index ce157cccdf35..ce36a0c6a0b4 100644 --- a/hazelcast/src/test/java/com/hazelcast/config/MapConfigTest.java +++ b/hazelcast/src/test/java/com/hazelcast/config/MapConfigTest.java @@ -19,7 +19,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.map.listener.MapPartitionLostListener; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.merge.DiscardMergePolicy; import com.hazelcast.spi.merge.PassThroughMergePolicy; import com.hazelcast.spi.merge.PutIfAbsentMergePolicy; diff --git a/hazelcast/src/test/java/com/hazelcast/config/MergePolicyConfigTest.java b/hazelcast/src/test/java/com/hazelcast/config/MergePolicyConfigTest.java index 323924e7b585..195e28458b27 100644 --- a/hazelcast/src/test/java/com/hazelcast/config/MergePolicyConfigTest.java +++ b/hazelcast/src/test/java/com/hazelcast/config/MergePolicyConfigTest.java @@ -17,7 +17,7 @@ package com.hazelcast.config; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.merge.DiscardMergePolicy; import com.hazelcast.spi.merge.HigherHitsMergePolicy; import com.hazelcast.spi.merge.PassThroughMergePolicy; diff --git a/hazelcast/src/test/java/com/hazelcast/config/NearCacheConfigTest.java b/hazelcast/src/test/java/com/hazelcast/config/NearCacheConfigTest.java index 91a18d19ce71..ece65bc8cd96 100644 --- a/hazelcast/src/test/java/com/hazelcast/config/NearCacheConfigTest.java +++ b/hazelcast/src/test/java/com/hazelcast/config/NearCacheConfigTest.java @@ -17,7 +17,7 @@ package com.hazelcast.config; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/config/NearCachePreloaderConfigTest.java b/hazelcast/src/test/java/com/hazelcast/config/NearCachePreloaderConfigTest.java index a46c600f4210..681f0f27e14f 100644 --- a/hazelcast/src/test/java/com/hazelcast/config/NearCachePreloaderConfigTest.java +++ b/hazelcast/src/test/java/com/hazelcast/config/NearCachePreloaderConfigTest.java @@ -17,7 +17,7 @@ package com.hazelcast.config; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/config/RingbufferStoreConfigTest.java b/hazelcast/src/test/java/com/hazelcast/config/RingbufferStoreConfigTest.java index 6dc08b0c7a2a..f976a2d2c30f 100644 --- a/hazelcast/src/test/java/com/hazelcast/config/RingbufferStoreConfigTest.java +++ b/hazelcast/src/test/java/com/hazelcast/config/RingbufferStoreConfigTest.java @@ -20,7 +20,7 @@ import com.hazelcast.ringbuffer.RingbufferStore; import com.hazelcast.ringbuffer.RingbufferStoreFactory; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.impl.RingbufferService; import com.hazelcast.ringbuffer.impl.RingbufferStoreWrapper; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/test/java/com/hazelcast/config/WanBatchReplicationPublisherConfigTest.java b/hazelcast/src/test/java/com/hazelcast/config/WanBatchReplicationPublisherConfigTest.java index 2761ec20742e..940f654a02aa 100644 --- a/hazelcast/src/test/java/com/hazelcast/config/WanBatchReplicationPublisherConfigTest.java +++ b/hazelcast/src/test/java/com/hazelcast/config/WanBatchReplicationPublisherConfigTest.java @@ -18,7 +18,7 @@ import com.hazelcast.config.ConfigCompatibilityChecker.WanBatchReplicationPublisherConfigChecker; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/config/WanConsumerConfigTest.java b/hazelcast/src/test/java/com/hazelcast/config/WanConsumerConfigTest.java index a4a9e18e51b5..7acde9e487ec 100644 --- a/hazelcast/src/test/java/com/hazelcast/config/WanConsumerConfigTest.java +++ b/hazelcast/src/test/java/com/hazelcast/config/WanConsumerConfigTest.java @@ -17,7 +17,7 @@ package com.hazelcast.config; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/config/WanReplicationConfigTest.java b/hazelcast/src/test/java/com/hazelcast/config/WanReplicationConfigTest.java index c620915d60e3..2588f89ab29a 100644 --- a/hazelcast/src/test/java/com/hazelcast/config/WanReplicationConfigTest.java +++ b/hazelcast/src/test/java/com/hazelcast/config/WanReplicationConfigTest.java @@ -17,7 +17,7 @@ package com.hazelcast.config; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/config/WanReplicationRefTest.java b/hazelcast/src/test/java/com/hazelcast/config/WanReplicationRefTest.java index cebb02674eaa..3c55d4bcdd79 100644 --- a/hazelcast/src/test/java/com/hazelcast/config/WanReplicationRefTest.java +++ b/hazelcast/src/test/java/com/hazelcast/config/WanReplicationRefTest.java @@ -17,7 +17,7 @@ package com.hazelcast.config; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockAdvancedTest.java b/hazelcast/src/test/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockAdvancedTest.java index 0a25bafab40b..e2031bb07b8c 100644 --- a/hazelcast/src/test/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockAdvancedTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockAdvancedTest.java @@ -24,7 +24,7 @@ import com.hazelcast.internal.serialization.impl.HeapData; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.quorum.QuorumType; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.spi.impl.operationservice.Operation; diff --git a/hazelcast/src/test/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreImplTest.java b/hazelcast/src/test/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreImplTest.java index 51f25c51b133..89531ee20f52 100644 --- a/hazelcast/src/test/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreImplTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreImplTest.java @@ -17,7 +17,7 @@ package com.hazelcast.cp.internal.datastructures.unsafe.lock; import com.hazelcast.internal.serialization.impl.HeapData; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.DistributedObjectNamespace; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreProxyTest.java b/hazelcast/src/test/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreProxyTest.java index 1148137c54cc..7359bf2e3bc7 100644 --- a/hazelcast/src/test/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreProxyTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cp/internal/datastructures/unsafe/lock/LockStoreProxyTest.java @@ -19,7 +19,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.internal.serialization.impl.HeapData; import com.hazelcast.map.impl.MapService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.services.DistributedObjectNamespace; import com.hazelcast.internal.services.ObjectNamespace; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/instance/impl/TestUtil.java b/hazelcast/src/test/java/com/hazelcast/instance/impl/TestUtil.java index 5c201414c59e..9fa6c6649320 100644 --- a/hazelcast/src/test/java/com/hazelcast/instance/impl/TestUtil.java +++ b/hazelcast/src/test/java/com/hazelcast/instance/impl/TestUtil.java @@ -18,7 +18,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.Partition; import com.hazelcast.partition.PartitionService; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/cluster/impl/ClusterDataSerializationTest.java b/hazelcast/src/test/java/com/hazelcast/internal/cluster/impl/ClusterDataSerializationTest.java index f02eea33542c..939f74d28f45 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/cluster/impl/ClusterDataSerializationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/cluster/impl/ClusterDataSerializationTest.java @@ -22,7 +22,7 @@ import com.hazelcast.internal.cluster.MemberInfo; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/cluster/impl/ExtendedBindMessageTest.java b/hazelcast/src/test/java/com/hazelcast/internal/cluster/impl/ExtendedBindMessageTest.java index b687d75a464b..4b5da1c89b1a 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/cluster/impl/ExtendedBindMessageTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/cluster/impl/ExtendedBindMessageTest.java @@ -19,7 +19,7 @@ import com.hazelcast.instance.ProtocolType; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/config/mergepolicies/CustomMapMergePolicy.java b/hazelcast/src/test/java/com/hazelcast/internal/config/mergepolicies/CustomMapMergePolicy.java index f96603f9a69c..a8a4078b2977 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/config/mergepolicies/CustomMapMergePolicy.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/config/mergepolicies/CustomMapMergePolicy.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.merge.SplitBrainMergePolicy; import com.hazelcast.spi.merge.SplitBrainMergeTypes; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/config/mergepolicies/CustomMapMergePolicyNoTypeVariable.java b/hazelcast/src/test/java/com/hazelcast/internal/config/mergepolicies/CustomMapMergePolicyNoTypeVariable.java index 075ba680c805..83c01f0a3ad5 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/config/mergepolicies/CustomMapMergePolicyNoTypeVariable.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/config/mergepolicies/CustomMapMergePolicyNoTypeVariable.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.merge.SplitBrainMergePolicy; import com.hazelcast.spi.merge.SplitBrainMergeTypes; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/diagnostics/EventQueuePluginTest.java b/hazelcast/src/test/java/com/hazelcast/internal/diagnostics/EventQueuePluginTest.java index 6b90608fe91d..a38d434f1462 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/diagnostics/EventQueuePluginTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/diagnostics/EventQueuePluginTest.java @@ -45,7 +45,7 @@ import com.hazelcast.map.listener.EntryAddedListener; import com.hazelcast.map.listener.EntryRemovedListener; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.impl.eventservice.impl.EventServiceImpl; import com.hazelcast.spi.impl.eventservice.impl.LocalEventDispatcher; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/eviction/EvictionStrategyTest.java b/hazelcast/src/test/java/com/hazelcast/internal/eviction/EvictionStrategyTest.java index 186eb72b9081..46262767ab47 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/eviction/EvictionStrategyTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/eviction/EvictionStrategyTest.java @@ -25,7 +25,7 @@ import com.hazelcast.internal.eviction.impl.evaluator.EvictionPolicyEvaluator; import com.hazelcast.internal.eviction.impl.strategy.sampling.SampleableEvictableStore; import com.hazelcast.internal.eviction.impl.strategy.sampling.SamplingEvictionStrategy; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastSerialClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/nearcache/NearCacheTestSupport.java b/hazelcast/src/test/java/com/hazelcast/internal/nearcache/NearCacheTestSupport.java index 28fb995f7f15..461f22eba2d7 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/nearcache/NearCacheTestSupport.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/nearcache/NearCacheTestSupport.java @@ -23,7 +23,7 @@ import com.hazelcast.internal.nearcache.impl.invalidation.StaleReadDetector; import com.hazelcast.monitor.NearCacheStats; import com.hazelcast.monitor.impl.NearCacheStatsImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.executionservice.ExecutionService; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.properties.HazelcastProperties; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/nearcache/NearCacheTestUtils.java b/hazelcast/src/test/java/com/hazelcast/internal/nearcache/NearCacheTestUtils.java index ea547dadcc9d..cb5ee08f2116 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/nearcache/NearCacheTestUtils.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/nearcache/NearCacheTestUtils.java @@ -38,7 +38,7 @@ import com.hazelcast.map.impl.nearcache.MapNearCacheManager; import com.hazelcast.monitor.NearCacheStats; import com.hazelcast.monitor.impl.NearCacheStatsImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.test.AssertTask; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/nearcache/impl/store/AbstractNearCacheRecordStoreTest.java b/hazelcast/src/test/java/com/hazelcast/internal/nearcache/impl/store/AbstractNearCacheRecordStoreTest.java index a6f4de30e9bf..ef210c5cf7d5 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/nearcache/impl/store/AbstractNearCacheRecordStoreTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/nearcache/impl/store/AbstractNearCacheRecordStoreTest.java @@ -19,7 +19,7 @@ import com.hazelcast.config.InMemoryFormat; import com.hazelcast.config.NearCacheConfig; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastSerialClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/partition/PartitionRuntimeStateTest.java b/hazelcast/src/test/java/com/hazelcast/internal/partition/PartitionRuntimeStateTest.java index 144738ea0990..d3e6b6dd9959 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/partition/PartitionRuntimeStateTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/partition/PartitionRuntimeStateTest.java @@ -20,7 +20,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/AbstractSerializationServiceTest.java b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/AbstractSerializationServiceTest.java index a39aec69a67c..dc1fe589df57 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/AbstractSerializationServiceTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/AbstractSerializationServiceTest.java @@ -23,7 +23,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.CustomSerializationTest; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataSerializable; import com.hazelcast.nio.serialization.HazelcastSerializationException; import com.hazelcast.nio.serialization.StreamSerializer; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataInputIntegrationTest.java b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataInputIntegrationTest.java index 3abcb44f5374..54480bf4727e 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataInputIntegrationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataInputIntegrationTest.java @@ -19,7 +19,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataSerializable; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataInputTest.java b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataInputTest.java index 681a93ced484..ca1a795bfabb 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataInputTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/ByteArrayObjectDataInputTest.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.nio.Bits; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/CompressionTest.java b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/CompressionTest.java index 068d552f95c4..ae08c98abd7f 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/CompressionTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/CompressionTest.java @@ -16,7 +16,7 @@ package com.hazelcast.internal.serialization.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/MorphingPortableReaderTest.java b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/MorphingPortableReaderTest.java index dff5dc20cee8..2c2d2274d493 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/MorphingPortableReaderTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/MorphingPortableReaderTest.java @@ -17,7 +17,7 @@ package com.hazelcast.internal.serialization.impl; import com.hazelcast.nio.BufferObjectDataInput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.MorphingBasePortable; import com.hazelcast.nio.serialization.MorphingPortable; import com.hazelcast.nio.serialization.Portable; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/ObjectDataInputStreamFinalMethodsTest.java b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/ObjectDataInputStreamFinalMethodsTest.java index db70fcd343df..af93c614bacf 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/ObjectDataInputStreamFinalMethodsTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/ObjectDataInputStreamFinalMethodsTest.java @@ -17,7 +17,7 @@ package com.hazelcast.internal.serialization.impl; import com.hazelcast.internal.serialization.InternalSerializationService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; import org.junit.Before; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/SerializationServiceV1Test.java b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/SerializationServiceV1Test.java index 3272565638dc..c9cd81777dfa 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/SerializationServiceV1Test.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/SerializationServiceV1Test.java @@ -18,7 +18,7 @@ import com.hazelcast.executor.impl.operations.CancellationOperation; import com.hazelcast.internal.serialization.InternalSerializationService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.spi.impl.operationservice.OperationAccessor; import com.hazelcast.test.AbstractTestOperation; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/bufferpool/BufferPoolTest.java b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/bufferpool/BufferPoolTest.java index a350a39d035b..ef5f39324a4c 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/bufferpool/BufferPoolTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/serialization/impl/bufferpool/BufferPoolTest.java @@ -22,7 +22,7 @@ import com.hazelcast.internal.serialization.impl.HeapData; import com.hazelcast.nio.BufferObjectDataInput; import com.hazelcast.nio.BufferObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/util/ToHeapDataConverterTest.java b/hazelcast/src/test/java/com/hazelcast/internal/util/ToHeapDataConverterTest.java index a10a95544b6f..a00e0ba6d286 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/util/ToHeapDataConverterTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/util/ToHeapDataConverterTest.java @@ -17,7 +17,7 @@ package com.hazelcast.internal.util; import com.hazelcast.internal.serialization.impl.HeapData; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastSerialClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/internal/util/comparators/AbstractValueComparatorTest.java b/hazelcast/src/test/java/com/hazelcast/internal/util/comparators/AbstractValueComparatorTest.java index 4d16601f5857..aceb5497ef98 100644 --- a/hazelcast/src/test/java/com/hazelcast/internal/util/comparators/AbstractValueComparatorTest.java +++ b/hazelcast/src/test/java/com/hazelcast/internal/util/comparators/AbstractValueComparatorTest.java @@ -21,7 +21,7 @@ import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.internal.serialization.impl.HeapData; import com.hazelcast.map.impl.record.Person; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.DefaultPartitioningStrategy; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/json/JsonValueSerializationTest.java b/hazelcast/src/test/java/com/hazelcast/json/JsonValueSerializationTest.java index af1cead4dec1..9b593db5546f 100644 --- a/hazelcast/src/test/java/com/hazelcast/json/JsonValueSerializationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/json/JsonValueSerializationTest.java @@ -19,7 +19,7 @@ import com.hazelcast.core.HazelcastJsonValue; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/json/internal/JsonMetadataCreationMigrationTest.java b/hazelcast/src/test/java/com/hazelcast/json/internal/JsonMetadataCreationMigrationTest.java index 904d36e5245a..bbcf6280e683 100644 --- a/hazelcast/src/test/java/com/hazelcast/json/internal/JsonMetadataCreationMigrationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/json/internal/JsonMetadataCreationMigrationTest.java @@ -26,7 +26,7 @@ import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.record.Record; import com.hazelcast.map.impl.recordstore.RecordStore; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Metadata; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.test.AssertTask; diff --git a/hazelcast/src/test/java/com/hazelcast/json/internal/JsonMetadataCreationTest.java b/hazelcast/src/test/java/com/hazelcast/json/internal/JsonMetadataCreationTest.java index 544442bdd3f0..20441f024114 100644 --- a/hazelcast/src/test/java/com/hazelcast/json/internal/JsonMetadataCreationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/json/internal/JsonMetadataCreationTest.java @@ -30,7 +30,7 @@ import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.record.Record; import com.hazelcast.map.impl.recordstore.RecordStore; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Metadata; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.properties.GroupProperty; diff --git a/hazelcast/src/test/java/com/hazelcast/map/BackupExpirationTest.java b/hazelcast/src/test/java/com/hazelcast/map/BackupExpirationTest.java index eb1f2e35940a..ccbeb2fc51ba 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/BackupExpirationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/BackupExpirationTest.java @@ -27,7 +27,7 @@ import com.hazelcast.map.impl.MapServiceContext; import com.hazelcast.map.impl.recordstore.RecordStore; import com.hazelcast.monitor.LocalMapStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; diff --git a/hazelcast/src/test/java/com/hazelcast/map/EntryProcessorTest.java b/hazelcast/src/test/java/com/hazelcast/map/EntryProcessorTest.java index d13dbb776a90..9965628b6baf 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/EntryProcessorTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/EntryProcessorTest.java @@ -37,7 +37,7 @@ import com.hazelcast.monitor.LocalMapStats; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataSerializable; import com.hazelcast.query.Predicate; import com.hazelcast.query.PredicateBuilder.EntryObject; diff --git a/hazelcast/src/test/java/com/hazelcast/map/MapMergePolicyQuickTest.java b/hazelcast/src/test/java/com/hazelcast/map/MapMergePolicyQuickTest.java index 46ee02f70351..74eafd374d52 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/MapMergePolicyQuickTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/MapMergePolicyQuickTest.java @@ -21,8 +21,8 @@ import com.hazelcast.map.impl.MapServiceContext; import com.hazelcast.map.impl.SimpleEntryView; import com.hazelcast.map.impl.recordstore.RecordStore; -import com.hazelcast.nio.serialization.Data; -import com.hazelcast.spi.impl.NodeEngine; +import com.hazelcast.internal.serialization.Data; +import com.hazelcast.spi.NodeEngine; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.merge.LatestUpdateMergePolicy; import com.hazelcast.spi.merge.PassThroughMergePolicy; diff --git a/hazelcast/src/test/java/com/hazelcast/map/MapMergePolicySerializationTest.java b/hazelcast/src/test/java/com/hazelcast/map/MapMergePolicySerializationTest.java index 1960edf2cd6d..7108cfa91745 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/MapMergePolicySerializationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/MapMergePolicySerializationTest.java @@ -24,7 +24,7 @@ import com.hazelcast.map.impl.recordstore.RecordStore; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataSerializable; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.merge.PutIfAbsentMergePolicy; diff --git a/hazelcast/src/test/java/com/hazelcast/map/MapPutAllWrongTargetForPartitionTest.java b/hazelcast/src/test/java/com/hazelcast/map/MapPutAllWrongTargetForPartitionTest.java index 992728f0325a..62aa29a19e51 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/MapPutAllWrongTargetForPartitionTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/MapPutAllWrongTargetForPartitionTest.java @@ -21,7 +21,7 @@ import com.hazelcast.map.impl.MapEntries; import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.operation.PutAllPartitionAwareOperationFactory; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.impl.operationservice.impl.OperationServiceImpl; import com.hazelcast.spi.impl.operationservice.impl.operations.PartitionAwareOperationFactory; diff --git a/hazelcast/src/test/java/com/hazelcast/map/MapRemoveFailingBackupTest.java b/hazelcast/src/test/java/com/hazelcast/map/MapRemoveFailingBackupTest.java index 4dc9ca9794f8..ddc603642cca 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/MapRemoveFailingBackupTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/MapRemoveFailingBackupTest.java @@ -21,11 +21,11 @@ import com.hazelcast.map.impl.operation.BaseRemoveOperation; import com.hazelcast.map.impl.operation.KeyBasedMapOperation; import com.hazelcast.map.impl.proxy.MapProxyImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataSerializableFactory; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import com.hazelcast.spi.impl.InternalCompletableFuture; -import com.hazelcast.spi.impl.NodeEngine; +import com.hazelcast.spi.InternalCompletableFuture; +import com.hazelcast.spi.NodeEngine; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationService; import com.hazelcast.spi.properties.GroupProperty; diff --git a/hazelcast/src/test/java/com/hazelcast/map/PartitionPredicateTest.java b/hazelcast/src/test/java/com/hazelcast/map/PartitionPredicateTest.java index 915e20ba6b7c..ff87f2744a61 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/PartitionPredicateTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/PartitionPredicateTest.java @@ -19,7 +19,7 @@ import com.hazelcast.aggregation.Aggregators; import com.hazelcast.config.Config; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.projection.Projections; import com.hazelcast.query.PartitionPredicate; import com.hazelcast.query.Predicate; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/LazyMapEntryTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/LazyMapEntryTest.java index 5cf42ccbcc53..89a24b06ea26 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/LazyMapEntryTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/LazyMapEntryTest.java @@ -20,7 +20,7 @@ import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataSerializable; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/EntryLoaderSimpleTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/EntryLoaderSimpleTest.java index 0ed1581ef106..153f2736e591 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/EntryLoaderSimpleTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/EntryLoaderSimpleTest.java @@ -27,7 +27,7 @@ import com.hazelcast.map.impl.record.Record; import com.hazelcast.map.impl.recordstore.RecordStore; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicates; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/writebehind/CoalescedWriteBehindQueueTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/writebehind/CoalescedWriteBehindQueueTest.java index 5b7dd0281636..68015c084006 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/writebehind/CoalescedWriteBehindQueueTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/writebehind/CoalescedWriteBehindQueueTest.java @@ -19,7 +19,7 @@ import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.map.impl.mapstore.writebehind.entry.DelayedEntries; import com.hazelcast.map.impl.mapstore.writebehind.entry.DelayedEntry; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/writebehind/WriteBehindQueueTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/writebehind/WriteBehindQueueTest.java index 376490c399e8..b65774032c98 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/writebehind/WriteBehindQueueTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/writebehind/WriteBehindQueueTest.java @@ -20,7 +20,7 @@ import com.hazelcast.map.ReachedMaxSizeException; import com.hazelcast.map.impl.mapstore.writebehind.entry.DelayedEntries; import com.hazelcast.map.impl.mapstore.writebehind.entry.DelayedEntry; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/LiteMemberMapNearCacheBasicTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/LiteMemberMapNearCacheBasicTest.java index 2496688d82a3..dd02b9b8a096 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/LiteMemberMapNearCacheBasicTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/LiteMemberMapNearCacheBasicTest.java @@ -29,7 +29,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.NearCacheTestUtils; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.TestHazelcastInstanceFactory; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/LiteMemberMapNearCacheLeakTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/LiteMemberMapNearCacheLeakTest.java index 18632269e165..1496dcbc186a 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/LiteMemberMapNearCacheLeakTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/LiteMemberMapNearCacheLeakTest.java @@ -28,7 +28,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.impl.invalidation.RepairingTask; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; import com.hazelcast.test.TestHazelcastInstanceFactory; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/LiteMemberMapNearCacheSerializationCountTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/LiteMemberMapNearCacheSerializationCountTest.java index c098b3371683..92f221661235 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/LiteMemberMapNearCacheSerializationCountTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/LiteMemberMapNearCacheSerializationCountTest.java @@ -32,7 +32,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.NearCacheTestUtils; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; import com.hazelcast.test.TestHazelcastInstanceFactory; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/MapNearCacheBasicTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/MapNearCacheBasicTest.java index 479c0e79d043..15706e0afdbf 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/MapNearCacheBasicTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/MapNearCacheBasicTest.java @@ -30,7 +30,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.NearCacheTestUtils; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.TestHazelcastInstanceFactory; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/MapNearCacheLeakTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/MapNearCacheLeakTest.java index a06fe92ee8e9..bfc6046134af 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/MapNearCacheLeakTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/MapNearCacheLeakTest.java @@ -28,7 +28,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.impl.invalidation.RepairingTask; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; import com.hazelcast.test.TestHazelcastInstanceFactory; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/MapNearCacheSerializationCountTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/MapNearCacheSerializationCountTest.java index 3b28d82d9722..cbca22430e08 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/MapNearCacheSerializationCountTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/MapNearCacheSerializationCountTest.java @@ -31,7 +31,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.NearCacheTestUtils; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; import com.hazelcast.test.TestHazelcastInstanceFactory; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/invalidation/AbstractInvalidatorTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/invalidation/AbstractInvalidatorTest.java index 7e578ad75b32..d52c02cb5bdb 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/invalidation/AbstractInvalidatorTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/invalidation/AbstractInvalidatorTest.java @@ -19,7 +19,7 @@ import com.hazelcast.config.Config; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.internal.nearcache.impl.invalidation.Invalidator; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.test.HazelcastTestSupport; import org.junit.Before; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/invalidation/InvalidationTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/invalidation/InvalidationTest.java index 3de9bfd3bcbc..c13346da34c6 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/invalidation/InvalidationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/nearcache/invalidation/InvalidationTest.java @@ -21,7 +21,7 @@ import com.hazelcast.internal.nearcache.impl.invalidation.BatchNearCacheInvalidation; import com.hazelcast.internal.nearcache.impl.invalidation.Invalidation; import com.hazelcast.internal.nearcache.impl.invalidation.SingleNearCacheInvalidation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastSerialClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/operation/RemoveBaseOperationWanFlagSerializationTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/operation/RemoveBaseOperationWanFlagSerializationTest.java index eb95fe6d182a..e12911f08f96 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/operation/RemoveBaseOperationWanFlagSerializationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/operation/RemoveBaseOperationWanFlagSerializationTest.java @@ -19,7 +19,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.ObjectDataInputStream; import com.hazelcast.internal.serialization.impl.ObjectDataOutputStream; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryEngine_DispatchTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryEngine_DispatchTest.java index 97772f081e60..942c4d6f9cc5 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryEngine_DispatchTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryEngine_DispatchTest.java @@ -19,7 +19,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; import com.hazelcast.map.impl.MapService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicates; import com.hazelcast.test.HazelcastSerialClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryEventFilterTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryEventFilterTest.java index 6a4c45baca34..2f73ad79327f 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryEventFilterTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryEventFilterTest.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.query; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; import com.hazelcast.query.impl.QueryableEntry; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryResultTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryResultTest.java index 8f5d5e54efc3..38ee554c0b2d 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryResultTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryResultTest.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.query; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryRunnerTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryRunnerTest.java index 186c87b08fbd..c55e350cf935 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryRunnerTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/query/QueryRunnerTest.java @@ -19,7 +19,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; import com.hazelcast.map.impl.MapService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; import com.hazelcast.query.impl.QueryContext; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/querycache/QueryCacheIMapEventHandlingTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/querycache/QueryCacheIMapEventHandlingTest.java index 212b5b495b5f..1aa8e835cebc 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/querycache/QueryCacheIMapEventHandlingTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/querycache/QueryCacheIMapEventHandlingTest.java @@ -25,7 +25,7 @@ import com.hazelcast.map.impl.record.Record; import com.hazelcast.map.listener.EntryAddedListener; import com.hazelcast.map.listener.EntryRemovedListener; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; import com.hazelcast.spi.impl.NodeEngineImpl; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/querycache/event/DefaultQueryCacheEventDataTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/querycache/event/DefaultQueryCacheEventDataTest.java index 6db0fcf01910..67aea5e3e1b5 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/querycache/event/DefaultQueryCacheEventDataTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/querycache/event/DefaultQueryCacheEventDataTest.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.querycache.event; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/querycache/event/LocalEntryEventDataTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/querycache/event/LocalEntryEventDataTest.java index 192c1d990244..58281fbf5dcb 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/querycache/event/LocalEntryEventDataTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/querycache/event/LocalEntryEventDataTest.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/record/AbstractRecordFactoryTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/record/AbstractRecordFactoryTest.java index 47d7c05ad414..ee9bfbd65818 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/record/AbstractRecordFactoryTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/record/AbstractRecordFactoryTest.java @@ -20,7 +20,7 @@ import com.hazelcast.partition.PartitioningStrategy; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.DefaultPartitioningStrategy; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/record/AbstractRecordTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/record/AbstractRecordTest.java index a56b95bd248f..b4e41fb05226 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/record/AbstractRecordTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/record/AbstractRecordTest.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/record/DataRecordFactoryTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/record/DataRecordFactoryTest.java index c2eef22ef1ad..acce743d5c49 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/record/DataRecordFactoryTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/record/DataRecordFactoryTest.java @@ -18,7 +18,7 @@ import com.hazelcast.config.CacheDeserializedValues; import com.hazelcast.config.MapConfig; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/record/DataRecordWithStatsTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/record/DataRecordWithStatsTest.java index bac5abff9062..6c86976034f1 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/record/DataRecordWithStatsTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/record/DataRecordWithStatsTest.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/record/ObjectRecordFactoryTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/record/ObjectRecordFactoryTest.java index 334d24b682ee..aa9b26003868 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/record/ObjectRecordFactoryTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/record/ObjectRecordFactoryTest.java @@ -18,7 +18,7 @@ import com.hazelcast.config.CacheDeserializedValues; import com.hazelcast.config.MapConfig; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/record/ObjectRecordWithStatsTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/record/ObjectRecordWithStatsTest.java index b5df1968f9c2..0be0ba608597 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/record/ObjectRecordWithStatsTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/record/ObjectRecordWithStatsTest.java @@ -16,7 +16,7 @@ package com.hazelcast.map.impl.record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/record/RecordInfoTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/record/RecordInfoTest.java index fab55d83f565..2e23bc298eab 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/record/RecordInfoTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/record/RecordInfoTest.java @@ -19,7 +19,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.SerializationServiceBuilder; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/record/RecordsTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/record/RecordsTest.java index de6462545401..2d6374e0345d 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/record/RecordsTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/record/RecordsTest.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.internal.serialization.impl.HeapData; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/recordstore/LazyEntryViewFromRecordTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/recordstore/LazyEntryViewFromRecordTest.java index fa789fbd2887..8d86f831871a 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/recordstore/LazyEntryViewFromRecordTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/recordstore/LazyEntryViewFromRecordTest.java @@ -22,7 +22,7 @@ import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.map.impl.record.DataRecordFactory; import com.hazelcast.map.impl.record.Record; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/tx/MapTransactionTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/tx/MapTransactionTest.java index ce63adab089c..abcfd66314b2 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/tx/MapTransactionTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/tx/MapTransactionTest.java @@ -32,14 +32,14 @@ import com.hazelcast.map.impl.operation.DefaultMapOperationProvider; import com.hazelcast.map.impl.operation.MapOperation; import com.hazelcast.map.impl.operation.MapOperationProvider; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableFactory; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; import com.hazelcast.query.SampleTestObjects; import com.hazelcast.query.SampleTestObjects.Employee; -import com.hazelcast.spi.impl.NodeEngine; +import com.hazelcast.spi.NodeEngine; import com.hazelcast.spi.properties.GroupProperty; import com.hazelcast.test.AssertTask; import com.hazelcast.test.ExpectedRuntimeException; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/tx/TxnMapNearCacheBasicTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/tx/TxnMapNearCacheBasicTest.java index cfc7577d7b49..5a4676242ff6 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/tx/TxnMapNearCacheBasicTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/tx/TxnMapNearCacheBasicTest.java @@ -29,7 +29,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.NearCacheTestUtils; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; import com.hazelcast.test.TestHazelcastInstanceFactory; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/tx/TxnMapNearCacheLeakTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/tx/TxnMapNearCacheLeakTest.java index a7f7da27b816..7ecc9c7ff78c 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/tx/TxnMapNearCacheLeakTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/tx/TxnMapNearCacheLeakTest.java @@ -28,7 +28,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.impl.invalidation.RepairingTask; import com.hazelcast.map.impl.nearcache.MapNearCacheManager; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; import com.hazelcast.test.TestHazelcastInstanceFactory; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/tx/TxnMapNearCacheSerializationCountTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/tx/TxnMapNearCacheSerializationCountTest.java index 8bf8ff45dbb1..1924278d64d3 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/tx/TxnMapNearCacheSerializationCountTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/tx/TxnMapNearCacheSerializationCountTest.java @@ -30,7 +30,7 @@ import com.hazelcast.internal.nearcache.NearCacheTestContext; import com.hazelcast.internal.nearcache.NearCacheTestContextBuilder; import com.hazelcast.internal.nearcache.NearCacheTestUtils; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; import com.hazelcast.test.TestHazelcastInstanceFactory; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/multimap/MultiMapContainerStatisticsTest.java b/hazelcast/src/test/java/com/hazelcast/multimap/MultiMapContainerStatisticsTest.java index 55a8af6673b6..dc7ecbb277fb 100644 --- a/hazelcast/src/test/java/com/hazelcast/multimap/MultiMapContainerStatisticsTest.java +++ b/hazelcast/src/test/java/com/hazelcast/multimap/MultiMapContainerStatisticsTest.java @@ -19,7 +19,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.multimap.impl.MultiMapContainer; import com.hazelcast.multimap.impl.MultiMapService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/multimap/MultiMapTestUtil.java b/hazelcast/src/test/java/com/hazelcast/multimap/MultiMapTestUtil.java index b27154d0c3f4..f9b180dea3fd 100644 --- a/hazelcast/src/test/java/com/hazelcast/multimap/MultiMapTestUtil.java +++ b/hazelcast/src/test/java/com/hazelcast/multimap/MultiMapTestUtil.java @@ -23,7 +23,7 @@ import com.hazelcast.multimap.impl.MultiMapRecord; import com.hazelcast.multimap.impl.MultiMapService; import com.hazelcast.multimap.impl.MultiMapValue; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/multimap/impl/MultiMapEventFilterTest.java b/hazelcast/src/test/java/com/hazelcast/multimap/impl/MultiMapEventFilterTest.java index 33b34dd282a7..9ab39fca42f2 100644 --- a/hazelcast/src/test/java/com/hazelcast/multimap/impl/MultiMapEventFilterTest.java +++ b/hazelcast/src/test/java/com/hazelcast/multimap/impl/MultiMapEventFilterTest.java @@ -16,7 +16,7 @@ package com.hazelcast.multimap.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/IOUtilTest.java b/hazelcast/src/test/java/com/hazelcast/nio/IOUtilTest.java index 9c364998a672..287957f71fee 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/IOUtilTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/IOUtilTest.java @@ -19,7 +19,7 @@ import com.hazelcast.core.HazelcastException; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/CollectionSerializationTest.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/CollectionSerializationTest.java index ba3b26f092a9..427764fbac12 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/CollectionSerializationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/CollectionSerializationTest.java @@ -16,6 +16,7 @@ package com.hazelcast.nio.serialization; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/CustomSerializationTest.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/CustomSerializationTest.java index 0c8ee3dc545b..74d6f9ab206c 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/CustomSerializationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/CustomSerializationTest.java @@ -18,6 +18,7 @@ import com.hazelcast.config.SerializationConfig; import com.hazelcast.config.SerializerConfig; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/DataDataSerializable.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/DataDataSerializable.java index 40e7a02d35ae..e0e1b95d6dc0 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/DataDataSerializable.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/DataDataSerializable.java @@ -16,6 +16,7 @@ package com.hazelcast.nio.serialization; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/EnumTest.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/EnumTest.java index caa052f9c9ff..64893829be17 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/EnumTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/EnumTest.java @@ -17,6 +17,7 @@ package com.hazelcast.nio.serialization; import com.hazelcast.core.EntryEventType; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastSerialClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/MapSerializationTest.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/MapSerializationTest.java index 0557cf7ccedc..39e25c8b9281 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/MapSerializationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/MapSerializationTest.java @@ -16,6 +16,7 @@ package com.hazelcast.nio.serialization; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.test.HazelcastParallelParametersRunnerFactory; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/PortableClassVersionTest.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/PortableClassVersionTest.java index cd5b65517f60..7f04a81c0b0b 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/PortableClassVersionTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/PortableClassVersionTest.java @@ -16,6 +16,7 @@ package com.hazelcast.nio.serialization; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.nio.BufferObjectDataInput; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/PortableTest.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/PortableTest.java index ab9e7c2d1bd9..1b8816fadb47 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/PortableTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/PortableTest.java @@ -18,6 +18,7 @@ import com.hazelcast.config.SerializationConfig; import com.hazelcast.config.SerializerConfig; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.PortableContext; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/PortableVersionTest.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/PortableVersionTest.java index 95390c51953f..6001e9b35092 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/PortableVersionTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/PortableVersionTest.java @@ -16,6 +16,7 @@ package com.hazelcast.nio.serialization; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.serialization.SerializationServiceBuilder; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/SerializationConcurrencyTest.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/SerializationConcurrencyTest.java index a7e2ea488791..31cc50c7a18b 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/SerializationConcurrencyTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/SerializationConcurrencyTest.java @@ -16,6 +16,7 @@ package com.hazelcast.nio.serialization; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/SerializationTest.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/SerializationTest.java index 94f584f8a434..9fe70ca6c5f8 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/SerializationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/SerializationTest.java @@ -21,6 +21,7 @@ import com.hazelcast.config.SerializerConfig; import com.hazelcast.cluster.Member; import com.hazelcast.core.MemberLeftException; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.PartitioningStrategy; import com.hazelcast.instance.BuildInfoProvider; import com.hazelcast.cluster.impl.MemberImpl; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/StringSerializationTest.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/StringSerializationTest.java index c74e9575d8c8..bc1221658ab7 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/StringSerializationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/StringSerializationTest.java @@ -16,6 +16,7 @@ package com.hazelcast.nio.serialization; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.internal.serialization.impl.HeapData; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/APortable.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/APortable.java index 62bd3d9fe40f..87348324bf2c 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/APortable.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/APortable.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableReader; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/AnIdentifiedDataSerializable.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/AnIdentifiedDataSerializable.java index 56823536d410..f2cda96fb5ee 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/AnIdentifiedDataSerializable.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/AnIdentifiedDataSerializable.java @@ -18,7 +18,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.nio.serialization.Portable; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/BinaryCompatibilityFileGenerator.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/BinaryCompatibilityFileGenerator.java index 241821afa18a..e885a4c0c688 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/BinaryCompatibilityFileGenerator.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/BinaryCompatibilityFileGenerator.java @@ -21,7 +21,7 @@ import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.nio.serialization.ClassDefinition; import com.hazelcast.nio.serialization.ClassDefinitionBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import java.io.DataOutputStream; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/BinaryCompatibilityTest.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/BinaryCompatibilityTest.java index 551ebb10dcc1..98f084e34316 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/BinaryCompatibilityTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/BinaryCompatibilityTest.java @@ -23,7 +23,7 @@ import com.hazelcast.internal.serialization.impl.HeapData; import com.hazelcast.nio.serialization.ClassDefinition; import com.hazelcast.nio.serialization.ClassDefinitionBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastSerialParametersRunnerFactory; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/ReferenceObjects.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/ReferenceObjects.java index 2e6b01d036b2..4547d6ad3301 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/ReferenceObjects.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/compatibility/ReferenceObjects.java @@ -18,7 +18,7 @@ import com.hazelcast.core.EntryEventType; import com.hazelcast.internal.serialization.impl.HeapData; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import java.io.Externalizable; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/impl/DefaultPortableReaderQuickTest.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/impl/DefaultPortableReaderQuickTest.java index 26be3f6919be..9c111a5aa077 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/impl/DefaultPortableReaderQuickTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/impl/DefaultPortableReaderQuickTest.java @@ -22,7 +22,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.map.EntryProcessor; import com.hazelcast.map.impl.LazyMapEntry; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.HazelcastSerializationException; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableFactory; diff --git a/hazelcast/src/test/java/com/hazelcast/nio/serialization/impl/DefaultPortableReaderSpecTest.java b/hazelcast/src/test/java/com/hazelcast/nio/serialization/impl/DefaultPortableReaderSpecTest.java index 79132710316e..6b24abed47f7 100644 --- a/hazelcast/src/test/java/com/hazelcast/nio/serialization/impl/DefaultPortableReaderSpecTest.java +++ b/hazelcast/src/test/java/com/hazelcast/nio/serialization/impl/DefaultPortableReaderSpecTest.java @@ -22,7 +22,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.map.EntryProcessor; import com.hazelcast.map.impl.LazyMapEntry; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableReader; import com.hazelcast.query.impl.getters.MultiResult; diff --git a/hazelcast/src/test/java/com/hazelcast/partition/PartitionControlledIdTest.java b/hazelcast/src/test/java/com/hazelcast/partition/PartitionControlledIdTest.java index 261e83150a85..8eae4805ab58 100644 --- a/hazelcast/src/test/java/com/hazelcast/partition/PartitionControlledIdTest.java +++ b/hazelcast/src/test/java/com/hazelcast/partition/PartitionControlledIdTest.java @@ -42,7 +42,7 @@ import com.hazelcast.cluster.Member; import com.hazelcast.instance.impl.HazelcastInstanceFactory; import com.hazelcast.instance.impl.Node; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.partition.strategy.StringAndPartitionAwarePartitioningStrategy; import com.hazelcast.partition.strategy.StringPartitioningStrategy; import com.hazelcast.ringbuffer.Ringbuffer; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/AndResultSetTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/AndResultSetTest.java index 655d4808f68e..e069e325f42d 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/AndResultSetTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/AndResultSetTest.java @@ -16,7 +16,7 @@ package com.hazelcast.query.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicates; import com.hazelcast.query.QueryException; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/CachedQueryEntryTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/CachedQueryEntryTest.java index d48170fc27e4..c5fbb0298492 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/CachedQueryEntryTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/CachedQueryEntryTest.java @@ -17,7 +17,7 @@ package com.hazelcast.query.impl; import com.hazelcast.internal.serialization.InternalSerializationService; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.query.SampleTestObjects.PortableEmployee; import com.hazelcast.query.impl.getters.Extractors; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/CompositeValueTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/CompositeValueTest.java index 636d6c6b2e04..36e984287cdd 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/CompositeValueTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/CompositeValueTest.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/ConverterResolutionTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/ConverterResolutionTest.java index 731bcda06e46..75dd4767de33 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/ConverterResolutionTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/ConverterResolutionTest.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.getters.Extractors; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/DuplicateDetectingMultiResultTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/DuplicateDetectingMultiResultTest.java index 275f549b3d6e..c91b5abf4954 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/DuplicateDetectingMultiResultTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/DuplicateDetectingMultiResultTest.java @@ -16,7 +16,7 @@ package com.hazelcast.query.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/FalsePredicateTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/FalsePredicateTest.java index 1a5fe0e5ca6f..cd0be27899b3 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/FalsePredicateTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/FalsePredicateTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.predicates.FalsePredicate; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/FastMultiResultSetTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/FastMultiResultSetTest.java index e60f34393f2a..772123913645 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/FastMultiResultSetTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/FastMultiResultSetTest.java @@ -16,7 +16,7 @@ package com.hazelcast.query.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/IndexFirstComponentDecoratorTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/IndexFirstComponentDecoratorTest.java index e588db157ad8..5e181342acbc 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/IndexFirstComponentDecoratorTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/IndexFirstComponentDecoratorTest.java @@ -19,7 +19,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.monitor.impl.PerIndexStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.getters.Extractors; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/IndexImplTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/IndexImplTest.java index 86f9d83b57e7..c2d0a1153da4 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/IndexImplTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/IndexImplTest.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.monitor.impl.PerIndexStats; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.impl.getters.Extractors; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/IndexJsonTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/IndexJsonTest.java index 919d71760021..45f0d6ccc9d8 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/IndexJsonTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/IndexJsonTest.java @@ -19,7 +19,7 @@ import com.hazelcast.core.HazelcastJsonValue; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicates; import com.hazelcast.query.impl.getters.Extractors; import com.hazelcast.query.impl.predicates.AndPredicate; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/IndexTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/IndexTest.java index b11d14ae52f4..c7d9e2e30f18 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/IndexTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/IndexTest.java @@ -25,7 +25,7 @@ import com.hazelcast.monitor.impl.PerIndexStats; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataSerializable; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.nio.serialization.PortableFactory; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/OrResultSetTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/OrResultSetTest.java index 931ba68c4cc0..881378bbc84f 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/OrResultSetTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/OrResultSetTest.java @@ -16,7 +16,7 @@ package com.hazelcast.query.impl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.QueryException; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/QueryEntryTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/QueryEntryTest.java index 4e9a1929813d..07111be7a5f8 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/QueryEntryTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/QueryEntryTest.java @@ -20,7 +20,7 @@ import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataSerializable; import com.hazelcast.nio.serialization.Portable; import com.hazelcast.query.QueryConstants; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/predicates/NotPredicateTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/predicates/NotPredicateTest.java index 926b0977bef1..687c633b2794 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/predicates/NotPredicateTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/predicates/NotPredicateTest.java @@ -17,7 +17,7 @@ package com.hazelcast.query.impl.predicates; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; import com.hazelcast.query.impl.Indexes; diff --git a/hazelcast/src/test/java/com/hazelcast/query/impl/predicates/PredicatesTest.java b/hazelcast/src/test/java/com/hazelcast/query/impl/predicates/PredicatesTest.java index 30524b18ed37..12b5c77eece3 100644 --- a/hazelcast/src/test/java/com/hazelcast/query/impl/predicates/PredicatesTest.java +++ b/hazelcast/src/test/java/com/hazelcast/query/impl/predicates/PredicatesTest.java @@ -20,7 +20,7 @@ import com.hazelcast.map.IMap; import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.query.Predicate; import com.hazelcast.query.PredicateBuilder.EntryObject; import com.hazelcast.query.Predicates; diff --git a/hazelcast/src/test/java/com/hazelcast/replicatedmap/ReplicatedMapReorderedReplicationTest.java b/hazelcast/src/test/java/com/hazelcast/replicatedmap/ReplicatedMapReorderedReplicationTest.java index cc519b912561..48544632fee0 100644 --- a/hazelcast/src/test/java/com/hazelcast/replicatedmap/ReplicatedMapReorderedReplicationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/replicatedmap/ReplicatedMapReorderedReplicationTest.java @@ -18,7 +18,7 @@ import com.hazelcast.config.Config; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataSerializableFactory; import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import com.hazelcast.replicatedmap.impl.ReplicatedMapService; diff --git a/hazelcast/src/test/java/com/hazelcast/replicatedmap/impl/record/EntryViewTest.java b/hazelcast/src/test/java/com/hazelcast/replicatedmap/impl/record/EntryViewTest.java index cdf0543d1b8b..f36698f46722 100644 --- a/hazelcast/src/test/java/com/hazelcast/replicatedmap/impl/record/EntryViewTest.java +++ b/hazelcast/src/test/java/com/hazelcast/replicatedmap/impl/record/EntryViewTest.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.SerializationServiceBuilder; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/RingbufferContainerSerializationTest.java b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/RingbufferContainerSerializationTest.java index 6c88fd994a7b..4fb2d3acabcc 100644 --- a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/RingbufferContainerSerializationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/RingbufferContainerSerializationTest.java @@ -22,7 +22,7 @@ import com.hazelcast.internal.serialization.InternalSerializationService; import com.hazelcast.nio.BufferObjectDataInput; import com.hazelcast.nio.BufferObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/RingbufferContainerTest.java b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/RingbufferContainerTest.java index a20034e1d966..f7e3069373d6 100644 --- a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/RingbufferContainerTest.java +++ b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/RingbufferContainerTest.java @@ -19,7 +19,7 @@ import com.hazelcast.config.InMemoryFormat; import com.hazelcast.config.RingbufferConfig; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.StaleSequenceException; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/RingbufferStoreTest.java b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/RingbufferStoreTest.java index 7843b13d4567..abe776db2b27 100644 --- a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/RingbufferStoreTest.java +++ b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/RingbufferStoreTest.java @@ -24,7 +24,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.ringbuffer.RingbufferStore; import com.hazelcast.ringbuffer.RingbufferStoreFactory; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.OverflowPolicy; import com.hazelcast.ringbuffer.Ringbuffer; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/AddAllOperationTest.java b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/AddAllOperationTest.java index 9437858e6582..aadd67d7327c 100644 --- a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/AddAllOperationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/AddAllOperationTest.java @@ -19,7 +19,7 @@ import com.hazelcast.config.Config; import com.hazelcast.config.RingbufferConfig; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.OverflowPolicy; import com.hazelcast.ringbuffer.Ringbuffer; import com.hazelcast.ringbuffer.impl.RingbufferService; diff --git a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/AddOperationsTest.java b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/AddOperationsTest.java index 5d2cc37d65f4..8380506f345f 100644 --- a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/AddOperationsTest.java +++ b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/AddOperationsTest.java @@ -19,7 +19,7 @@ import com.hazelcast.config.Config; import com.hazelcast.config.RingbufferConfig; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.OverflowPolicy; import com.hazelcast.ringbuffer.Ringbuffer; import com.hazelcast.ringbuffer.impl.RingbufferService; diff --git a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/GenericOperationTest.java b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/GenericOperationTest.java index 8e90520da6ee..63679f508e8e 100644 --- a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/GenericOperationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/GenericOperationTest.java @@ -19,7 +19,7 @@ import com.hazelcast.config.Config; import com.hazelcast.config.RingbufferConfig; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.Ringbuffer; import com.hazelcast.ringbuffer.impl.RingbufferContainer; import com.hazelcast.ringbuffer.impl.RingbufferService; diff --git a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/ReadOneOperationTest.java b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/ReadOneOperationTest.java index a27a0a493a28..0a3427c48667 100644 --- a/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/ReadOneOperationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/ringbuffer/impl/operations/ReadOneOperationTest.java @@ -19,7 +19,7 @@ import com.hazelcast.config.Config; import com.hazelcast.config.RingbufferConfig; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.ringbuffer.Ringbuffer; import com.hazelcast.ringbuffer.StaleSequenceException; import com.hazelcast.ringbuffer.impl.RingbufferContainer; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/LockInterceptorServiceTest.java b/hazelcast/src/test/java/com/hazelcast/spi/LockInterceptorServiceTest.java index c11e375bca57..a2f13dfac93f 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/LockInterceptorServiceTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/LockInterceptorServiceTest.java @@ -27,7 +27,7 @@ import com.hazelcast.internal.services.ManagedService; import com.hazelcast.spi.impl.NodeEngine; import com.hazelcast.internal.services.ObjectNamespace; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastSerialClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/impl/NodeEngineTest.java b/hazelcast/src/test/java/com/hazelcast/spi/impl/NodeEngineTest.java index 4405a0f8d47a..b94bbcfe67e4 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/impl/NodeEngineTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/impl/NodeEngineTest.java @@ -21,7 +21,7 @@ import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockService; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataSerializable; import com.hazelcast.nio.serialization.HazelcastSerializationException; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/impl/PortableCollectionTest.java b/hazelcast/src/test/java/com/hazelcast/spi/impl/PortableCollectionTest.java index bd8a35c261f8..0c500ab4dc32 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/impl/PortableCollectionTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/impl/PortableCollectionTest.java @@ -19,7 +19,7 @@ import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.Packet; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.PortableReader; import com.hazelcast.nio.serialization.PortableWriter; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/impl/operationservice/impl/InvocationFuture_GetNewInstanceTest.java b/hazelcast/src/test/java/com/hazelcast/spi/impl/operationservice/impl/InvocationFuture_GetNewInstanceTest.java index df690aba0e63..48c3d591cfc3 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/impl/operationservice/impl/InvocationFuture_GetNewInstanceTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/impl/operationservice/impl/InvocationFuture_GetNewInstanceTest.java @@ -21,7 +21,7 @@ import com.hazelcast.nio.Address; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.spi.impl.operationservice.OperationService; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/impl/operationservice/impl/Invocation_EndpointManagerTest.java b/hazelcast/src/test/java/com/hazelcast/spi/impl/operationservice/impl/Invocation_EndpointManagerTest.java index 2eb82e5fa5a7..908de4874217 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/impl/operationservice/impl/Invocation_EndpointManagerTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/impl/operationservice/impl/Invocation_EndpointManagerTest.java @@ -25,7 +25,7 @@ import com.hazelcast.nio.ConnectionListener; import com.hazelcast.nio.EndpointManager; import com.hazelcast.nio.Packet; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.operationservice.InvocationBuilder; import com.hazelcast.spi.impl.operationservice.Operation; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/impl/operationservice/impl/OperationServiceImpl_asyncInvokeOnPartitionTest.java b/hazelcast/src/test/java/com/hazelcast/spi/impl/operationservice/impl/OperationServiceImpl_asyncInvokeOnPartitionTest.java index 4a2d8ad404cc..7c0a8ceff325 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/impl/operationservice/impl/OperationServiceImpl_asyncInvokeOnPartitionTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/impl/operationservice/impl/OperationServiceImpl_asyncInvokeOnPartitionTest.java @@ -25,7 +25,7 @@ import com.hazelcast.map.EntryProcessor; import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.operation.PutOperation; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/merge/AbstractSplitBrainMergePolicyTest.java b/hazelcast/src/test/java/com/hazelcast/spi/merge/AbstractSplitBrainMergePolicyTest.java index f3089317307e..9445558579b2 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/merge/AbstractSplitBrainMergePolicyTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/merge/AbstractSplitBrainMergePolicyTest.java @@ -17,7 +17,7 @@ package com.hazelcast.spi.merge; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.merge.SplitBrainMergeTypes.MapMergeTypes; import com.hazelcast.spi.serialization.SerializationService; import org.junit.Before; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/merge/DiscardMergePolicyTest.java b/hazelcast/src/test/java/com/hazelcast/spi/merge/DiscardMergePolicyTest.java index 1ef0fa407ef0..2cf207b52cf0 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/merge/DiscardMergePolicyTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/merge/DiscardMergePolicyTest.java @@ -17,7 +17,7 @@ package com.hazelcast.spi.merge; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.merge.SplitBrainMergeTypes.MapMergeTypes; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/merge/ExpirationTimeSplitBrainMergePolicyTest.java b/hazelcast/src/test/java/com/hazelcast/spi/merge/ExpirationTimeSplitBrainMergePolicyTest.java index 3ede49fa8f3a..93cb7334971d 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/merge/ExpirationTimeSplitBrainMergePolicyTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/merge/ExpirationTimeSplitBrainMergePolicyTest.java @@ -16,7 +16,7 @@ package com.hazelcast.spi.merge; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.merge.SplitBrainMergeTypes.MapMergeTypes; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/merge/HigherHitsSplitBrainMergePolicyTest.java b/hazelcast/src/test/java/com/hazelcast/spi/merge/HigherHitsSplitBrainMergePolicyTest.java index f5424bf87506..7588d34238dc 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/merge/HigherHitsSplitBrainMergePolicyTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/merge/HigherHitsSplitBrainMergePolicyTest.java @@ -16,7 +16,7 @@ package com.hazelcast.spi.merge; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.merge.SplitBrainMergeTypes.MapMergeTypes; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/merge/LatestAccessSplitBrainMergePolicyTest.java b/hazelcast/src/test/java/com/hazelcast/spi/merge/LatestAccessSplitBrainMergePolicyTest.java index c9a66dd91e1b..be76fc49b4da 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/merge/LatestAccessSplitBrainMergePolicyTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/merge/LatestAccessSplitBrainMergePolicyTest.java @@ -16,7 +16,7 @@ package com.hazelcast.spi.merge; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.merge.SplitBrainMergeTypes.MapMergeTypes; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/merge/LatestUpdateSplitBrainMergePolicyTest.java b/hazelcast/src/test/java/com/hazelcast/spi/merge/LatestUpdateSplitBrainMergePolicyTest.java index 37548bc4df11..b8ea95935d07 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/merge/LatestUpdateSplitBrainMergePolicyTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/merge/LatestUpdateSplitBrainMergePolicyTest.java @@ -16,7 +16,7 @@ package com.hazelcast.spi.merge; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.merge.SplitBrainMergeTypes.MapMergeTypes; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/merge/PassThroughMergePolicyTest.java b/hazelcast/src/test/java/com/hazelcast/spi/merge/PassThroughMergePolicyTest.java index a57af0730ec6..39bf3e41d7d8 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/merge/PassThroughMergePolicyTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/merge/PassThroughMergePolicyTest.java @@ -17,7 +17,7 @@ package com.hazelcast.spi.merge; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.merge.SplitBrainMergeTypes.MapMergeTypes; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/spi/merge/PutIfAbsentMergePolicyTest.java b/hazelcast/src/test/java/com/hazelcast/spi/merge/PutIfAbsentMergePolicyTest.java index 07a979a1b4ed..6bdbbae33e51 100644 --- a/hazelcast/src/test/java/com/hazelcast/spi/merge/PutIfAbsentMergePolicyTest.java +++ b/hazelcast/src/test/java/com/hazelcast/spi/merge/PutIfAbsentMergePolicyTest.java @@ -17,7 +17,7 @@ package com.hazelcast.spi.merge; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.merge.SplitBrainMergeTypes.MapMergeTypes; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/test/backup/CacheBackupAccessor.java b/hazelcast/src/test/java/com/hazelcast/test/backup/CacheBackupAccessor.java index 41d78b7083ca..1b130fe1fca4 100644 --- a/hazelcast/src/test/java/com/hazelcast/test/backup/CacheBackupAccessor.java +++ b/hazelcast/src/test/java/com/hazelcast/test/backup/CacheBackupAccessor.java @@ -29,7 +29,7 @@ import com.hazelcast.internal.partition.InternalPartition; import com.hazelcast.internal.partition.InternalPartitionService; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.partition.IPartition; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/test/java/com/hazelcast/test/backup/MapBackupAccessor.java b/hazelcast/src/test/java/com/hazelcast/test/backup/MapBackupAccessor.java index 67151d9ecda7..a5c9537d000d 100644 --- a/hazelcast/src/test/java/com/hazelcast/test/backup/MapBackupAccessor.java +++ b/hazelcast/src/test/java/com/hazelcast/test/backup/MapBackupAccessor.java @@ -26,7 +26,7 @@ import com.hazelcast.map.impl.record.Record; import com.hazelcast.map.impl.recordstore.RecordStore; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.partition.IPartition; import com.hazelcast.spi.serialization.SerializationService; diff --git a/hazelcast/src/test/java/com/hazelcast/test/compatibility/SamplingSerializationService.java b/hazelcast/src/test/java/com/hazelcast/test/compatibility/SamplingSerializationService.java index c7ea9671ec00..6f48aeee8ff7 100644 --- a/hazelcast/src/test/java/com/hazelcast/test/compatibility/SamplingSerializationService.java +++ b/hazelcast/src/test/java/com/hazelcast/test/compatibility/SamplingSerializationService.java @@ -24,7 +24,7 @@ import com.hazelcast.nio.BufferObjectDataOutput; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.nio.serialization.DataType; import com.hazelcast.nio.serialization.PortableReader; import com.hazelcast.test.TestEnvironment; diff --git a/hazelcast/src/test/java/com/hazelcast/test/starter/answer/RecordStoreAnswer.java b/hazelcast/src/test/java/com/hazelcast/test/starter/answer/RecordStoreAnswer.java index ce5a2d0e4afb..2433d4a0eab9 100644 --- a/hazelcast/src/test/java/com/hazelcast/test/starter/answer/RecordStoreAnswer.java +++ b/hazelcast/src/test/java/com/hazelcast/test/starter/answer/RecordStoreAnswer.java @@ -17,7 +17,7 @@ package com.hazelcast.test.starter.answer; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import org.mockito.invocation.InvocationOnMock; import javax.cache.expiry.ExpiryPolicy; diff --git a/hazelcast/src/test/java/com/hazelcast/test/starter/answer/test/AnswerTest.java b/hazelcast/src/test/java/com/hazelcast/test/starter/answer/test/AnswerTest.java index 3ffb04ccc074..b0cd3027ef8e 100644 --- a/hazelcast/src/test/java/com/hazelcast/test/starter/answer/test/AnswerTest.java +++ b/hazelcast/src/test/java/com/hazelcast/test/starter/answer/test/AnswerTest.java @@ -56,7 +56,7 @@ import com.hazelcast.multimap.impl.MultiMapService; import com.hazelcast.multimap.impl.MultiMapValue; import com.hazelcast.nio.Address; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.impl.operationservice.impl.OperationServiceImpl; import com.hazelcast.spi.partition.IPartition; diff --git a/hazelcast/src/test/java/com/hazelcast/test/starter/constructor/DataAwareEntryEventConstructor.java b/hazelcast/src/test/java/com/hazelcast/test/starter/constructor/DataAwareEntryEventConstructor.java index aa2aaa809b43..64185cd39618 100644 --- a/hazelcast/src/test/java/com/hazelcast/test/starter/constructor/DataAwareEntryEventConstructor.java +++ b/hazelcast/src/test/java/com/hazelcast/test/starter/constructor/DataAwareEntryEventConstructor.java @@ -34,7 +34,7 @@ public DataAwareEntryEventConstructor(Class targetClass) { Object createNew0(Object delegate) throws Exception { // locate required classes on target class loader ClassLoader starterClassLoader = targetClass.getClassLoader(); - Class dataClass = starterClassLoader.loadClass("com.hazelcast.nio.serialization.Data"); + Class dataClass = starterClassLoader.loadClass("com.hazelcast.internal.serialization.Data"); Class memberClass = starterClassLoader.loadClass("com.hazelcast.cluster.Member"); Class serServiceClass = starterClassLoader.loadClass("com.hazelcast.spi.serialization.SerializationService"); Constructor constructor = targetClass.getConstructor(memberClass, Integer.TYPE, String.class, dataClass, diff --git a/hazelcast/src/test/java/com/hazelcast/test/starter/constructor/test/DataAwareEntryEventConstructorTest.java b/hazelcast/src/test/java/com/hazelcast/test/starter/constructor/test/DataAwareEntryEventConstructorTest.java index c454e13ac2bf..b1c1c26762c2 100644 --- a/hazelcast/src/test/java/com/hazelcast/test/starter/constructor/test/DataAwareEntryEventConstructorTest.java +++ b/hazelcast/src/test/java/com/hazelcast/test/starter/constructor/test/DataAwareEntryEventConstructorTest.java @@ -20,7 +20,7 @@ import com.hazelcast.cluster.Member; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.map.impl.DataAwareEntryEvent; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/test/starter/constructor/test/HeapDataConstructorTest.java b/hazelcast/src/test/java/com/hazelcast/test/starter/constructor/test/HeapDataConstructorTest.java index 8adc87474346..0fa99af3f3f0 100644 --- a/hazelcast/src/test/java/com/hazelcast/test/starter/constructor/test/HeapDataConstructorTest.java +++ b/hazelcast/src/test/java/com/hazelcast/test/starter/constructor/test/HeapDataConstructorTest.java @@ -18,7 +18,7 @@ import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; import com.hazelcast.internal.serialization.impl.HeapData; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/util/CollectionUtilTest.java b/hazelcast/src/test/java/com/hazelcast/util/CollectionUtilTest.java index da3ae350615d..a9a583ce767e 100644 --- a/hazelcast/src/test/java/com/hazelcast/util/CollectionUtilTest.java +++ b/hazelcast/src/test/java/com/hazelcast/util/CollectionUtilTest.java @@ -17,7 +17,7 @@ package com.hazelcast.util; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.HazelcastTestSupport; diff --git a/hazelcast/src/test/java/com/hazelcast/util/UnmodifiableLazyListTest.java b/hazelcast/src/test/java/com/hazelcast/util/UnmodifiableLazyListTest.java index 7ae4474f6366..8af9a1015faa 100644 --- a/hazelcast/src/test/java/com/hazelcast/util/UnmodifiableLazyListTest.java +++ b/hazelcast/src/test/java/com/hazelcast/util/UnmodifiableLazyListTest.java @@ -17,7 +17,7 @@ package com.hazelcast.util; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.UnmodifiableLazyList; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/util/executor/CompletedFutureTest.java b/hazelcast/src/test/java/com/hazelcast/util/executor/CompletedFutureTest.java index 8e6ea6d866a9..c0ddd5782500 100644 --- a/hazelcast/src/test/java/com/hazelcast/util/executor/CompletedFutureTest.java +++ b/hazelcast/src/test/java/com/hazelcast/util/executor/CompletedFutureTest.java @@ -18,7 +18,7 @@ import com.hazelcast.core.ICompletableFuture; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; diff --git a/hazelcast/src/test/java/com/hazelcast/util/executor/DelegatingFutureTest.java b/hazelcast/src/test/java/com/hazelcast/util/executor/DelegatingFutureTest.java index 7a39e48a8d56..c42cb0a8b2f6 100644 --- a/hazelcast/src/test/java/com/hazelcast/util/executor/DelegatingFutureTest.java +++ b/hazelcast/src/test/java/com/hazelcast/util/executor/DelegatingFutureTest.java @@ -19,7 +19,7 @@ import com.hazelcast.core.ExecutionCallback; import com.hazelcast.core.ICompletableFuture; import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.InternalCompletableFuture; import com.hazelcast.spi.serialization.SerializationService; import com.hazelcast.test.HazelcastParallelClassRunner; diff --git a/hazelcast/src/test/java/com/hazelcast/wan/impl/WanReplicationTest.java b/hazelcast/src/test/java/com/hazelcast/wan/impl/WanReplicationTest.java index d3d9890776d1..4f6cd6b2f141 100644 --- a/hazelcast/src/test/java/com/hazelcast/wan/impl/WanReplicationTest.java +++ b/hazelcast/src/test/java/com/hazelcast/wan/impl/WanReplicationTest.java @@ -32,7 +32,7 @@ import com.hazelcast.map.impl.operation.MapOperation; import com.hazelcast.map.impl.operation.MapOperationProvider; import com.hazelcast.map.impl.proxy.MapProxyImpl; -import com.hazelcast.nio.serialization.Data; +import com.hazelcast.internal.serialization.Data; import com.hazelcast.spi.impl.NodeEngineImpl; import com.hazelcast.spi.impl.operationservice.OperationFactory; import com.hazelcast.spi.impl.operationservice.impl.OperationServiceImpl;