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