From 75b0f8a794f5310f594ffad5900ef81effc7bc0b Mon Sep 17 00:00:00 2001 From: Matko Medenjak Date: Wed, 30 Oct 2019 15:56:45 +0100 Subject: [PATCH 1/2] Move EventJournalCacheEvent and EventJournalMapEvent back to public API They are exposed as public API in jet. --- .../src/main/java/com/hazelcast/cache/impl/CacheProxy.java | 2 +- .../cache/impl/journal/CacheEventJournalFunctions.java | 1 + .../cache/impl/journal/CacheEventJournalReadOperation.java | 1 + .../cache/impl/journal/CacheEventJournalReadResultSetImpl.java | 1 + .../impl/journal/DeserializingEventJournalCacheEvent.java | 1 + .../cache/{impl => }/journal/EventJournalCacheEvent.java | 2 +- .../java/com/hazelcast/client/cache/impl/ClientCacheProxy.java | 2 +- .../impl/protocol/task/cache/CacheEventJournalReadTask.java | 2 +- .../client/impl/protocol/task/map/MapEventJournalReadTask.java | 2 +- .../java/com/hazelcast/client/impl/proxy/ClientMapProxy.java | 2 +- .../map/impl/journal/DeserializingEventJournalMapEvent.java | 1 + .../hazelcast/map/impl/journal/MapEventJournalFunctions.java | 1 + .../map/impl/journal/MapEventJournalReadOperation.java | 1 + .../map/impl/journal/MapEventJournalReadResultSetImpl.java | 1 + .../main/java/com/hazelcast/map/impl/proxy/MapProxyImpl.java | 2 +- .../hazelcast/map/{impl => }/journal/EventJournalMapEvent.java | 2 +- .../cache/impl/journal/CacheEventJournalBasicTest.java | 3 ++- .../impl/journal/EventJournalCacheDataStructureAdapter.java | 1 + .../cache/impl/journal/EventJournalCacheEventAdapter.java | 1 + .../map/impl/journal/EventJournalMapDataStructureAdapter.java | 1 + .../map/impl/journal/EventJournalMapEventAdapter.java | 1 + .../hazelcast/map/impl/journal/MapEventJournalBasicTest.java | 1 + .../map/impl/journal/MapEventJournalExpiringTest.java | 1 + 23 files changed, 24 insertions(+), 9 deletions(-) rename hazelcast/src/main/java/com/hazelcast/cache/{impl => }/journal/EventJournalCacheEvent.java (97%) rename hazelcast/src/main/java/com/hazelcast/map/{impl => }/journal/EventJournalMapEvent.java (97%) 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 374454f2c36b..6b4e2331dd68 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxy.java @@ -22,7 +22,7 @@ import com.hazelcast.cache.impl.event.InternalCachePartitionLostListenerAdapter; import com.hazelcast.cache.impl.journal.CacheEventJournalReadOperation; import com.hazelcast.cache.impl.journal.CacheEventJournalSubscribeOperation; -import com.hazelcast.cache.impl.journal.EventJournalCacheEvent; +import com.hazelcast.cache.journal.EventJournalCacheEvent; import com.hazelcast.config.CacheConfig; import com.hazelcast.internal.config.CacheConfigReadOnly; import com.hazelcast.internal.journal.EventJournalInitialSubscriberState; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalFunctions.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalFunctions.java index baaa6b2bd972..40a216e61333 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalFunctions.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalFunctions.java @@ -17,6 +17,7 @@ package com.hazelcast.cache.impl.journal; import com.hazelcast.cache.CacheEventType; +import com.hazelcast.cache.journal.EventJournalCacheEvent; import com.hazelcast.internal.journal.DeserializingEntry; import com.hazelcast.internal.serialization.SerializableByConvention; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadOperation.java index ed037cc4c4dc..850053c7a971 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadOperation.java @@ -18,6 +18,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.cache.impl.CacheService; +import com.hazelcast.cache.journal.EventJournalCacheEvent; import com.hazelcast.internal.journal.EventJournal; import com.hazelcast.internal.journal.EventJournalReadOperation; import com.hazelcast.nio.ObjectDataInput; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadResultSetImpl.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadResultSetImpl.java index e2ce635f306f..07b6ce7159c3 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadResultSetImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadResultSetImpl.java @@ -17,6 +17,7 @@ package com.hazelcast.cache.impl.journal; import com.hazelcast.cache.impl.CacheDataSerializerHook; +import com.hazelcast.cache.journal.EventJournalCacheEvent; import com.hazelcast.internal.serialization.SerializableByConvention; import com.hazelcast.projection.Projection; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; 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 fb97cbd4c5c7..26b3d6b4df14 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 @@ -18,6 +18,7 @@ import com.hazelcast.cache.CacheEventType; import com.hazelcast.cache.impl.CacheDataSerializerHook; +import com.hazelcast.cache.journal.EventJournalCacheEvent; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.HazelcastInstanceAware; import com.hazelcast.nio.ObjectDataOutput; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/EventJournalCacheEvent.java b/hazelcast/src/main/java/com/hazelcast/cache/journal/EventJournalCacheEvent.java similarity index 97% rename from hazelcast/src/main/java/com/hazelcast/cache/impl/journal/EventJournalCacheEvent.java rename to hazelcast/src/main/java/com/hazelcast/cache/journal/EventJournalCacheEvent.java index 925a83a5c94d..ffe8e497b05f 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/EventJournalCacheEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/journal/EventJournalCacheEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hazelcast.cache.impl.journal; +package com.hazelcast.cache.journal; import com.hazelcast.cache.CacheEventType; 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 6046c669484d..8e9178516995 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 @@ -21,7 +21,7 @@ import com.hazelcast.cache.impl.CacheEventListenerAdaptor; import com.hazelcast.cache.impl.CacheSyncListenerCompleter; import com.hazelcast.cache.impl.event.CachePartitionLostListener; -import com.hazelcast.cache.impl.journal.EventJournalCacheEvent; +import com.hazelcast.cache.journal.EventJournalCacheEvent; import com.hazelcast.client.impl.ClientDelegatingFuture; import com.hazelcast.client.impl.clientside.ClientMessageDecoder; import com.hazelcast.client.impl.protocol.ClientMessage; 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 42fc1cbbf8a7..1f18cd73b333 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 @@ -18,7 +18,7 @@ import com.hazelcast.cache.impl.CacheService; import com.hazelcast.cache.impl.journal.CacheEventJournalReadOperation; -import com.hazelcast.cache.impl.journal.EventJournalCacheEvent; +import com.hazelcast.cache.journal.EventJournalCacheEvent; import com.hazelcast.client.impl.protocol.ClientMessage; import com.hazelcast.client.impl.protocol.codec.CacheEventJournalReadCodec; import com.hazelcast.instance.impl.Node; 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 116241d852b2..eb50817c832b 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 @@ -21,7 +21,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.journal.MapEventJournalReadOperation; -import com.hazelcast.map.impl.journal.EventJournalMapEvent; +import com.hazelcast.map.journal.EventJournalMapEvent; import com.hazelcast.internal.nio.Connection; import com.hazelcast.nio.serialization.Data; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; 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 c712ad0ede2d..d77f1770643f 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 @@ -125,7 +125,7 @@ import com.hazelcast.map.impl.querycache.subscriber.QueryCacheEndToEndProvider; import com.hazelcast.map.impl.querycache.subscriber.QueryCacheRequest; import com.hazelcast.map.impl.querycache.subscriber.SubscriberContext; -import com.hazelcast.map.impl.journal.EventJournalMapEvent; +import com.hazelcast.map.journal.EventJournalMapEvent; import com.hazelcast.map.listener.MapListener; import com.hazelcast.map.listener.MapPartitionLostListener; import com.hazelcast.monitor.LocalMapStats; 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 653b079db631..d92ce2c338b1 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 @@ -20,6 +20,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.HazelcastInstanceAware; 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.spi.impl.SerializationServiceSupport; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalFunctions.java b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalFunctions.java index 86d535c9792b..bf73a8f1fbff 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalFunctions.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalFunctions.java @@ -19,6 +19,7 @@ import com.hazelcast.core.EntryEventType; import com.hazelcast.internal.journal.DeserializingEntry; import com.hazelcast.internal.serialization.SerializableByConvention; +import com.hazelcast.map.journal.EventJournalMapEvent; import java.io.Serializable; import java.util.Map.Entry; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadOperation.java index dbcee5389126..175d39d922d0 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadOperation.java @@ -20,6 +20,7 @@ import com.hazelcast.internal.journal.EventJournalReadOperation; import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.map.impl.MapService; +import com.hazelcast.map.journal.EventJournalMapEvent; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadResultSetImpl.java b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadResultSetImpl.java index 242e22562421..291002e2ca36 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadResultSetImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadResultSetImpl.java @@ -18,6 +18,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.internal.serialization.SerializableByConvention; +import com.hazelcast.map.journal.EventJournalMapEvent; import com.hazelcast.projection.Projection; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; import com.hazelcast.internal.serialization.SerializationService; 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 77c1dea1cfab..5213770b936e 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 @@ -42,7 +42,7 @@ import com.hazelcast.map.impl.querycache.subscriber.QueryCacheEndToEndProvider; import com.hazelcast.map.impl.querycache.subscriber.QueryCacheRequest; import com.hazelcast.map.impl.querycache.subscriber.SubscriberContext; -import com.hazelcast.map.impl.journal.EventJournalMapEvent; +import com.hazelcast.map.journal.EventJournalMapEvent; import com.hazelcast.map.listener.MapListener; import com.hazelcast.map.listener.MapPartitionLostListener; import com.hazelcast.nio.serialization.Data; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/EventJournalMapEvent.java b/hazelcast/src/main/java/com/hazelcast/map/journal/EventJournalMapEvent.java similarity index 97% rename from hazelcast/src/main/java/com/hazelcast/map/impl/journal/EventJournalMapEvent.java rename to hazelcast/src/main/java/com/hazelcast/map/journal/EventJournalMapEvent.java index 81f2c6ef4f62..5b86822f9c24 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/EventJournalMapEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/map/journal/EventJournalMapEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hazelcast.map.impl.journal; +package com.hazelcast.map.journal; import com.hazelcast.core.EntryEventType; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/CacheEventJournalBasicTest.java b/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/CacheEventJournalBasicTest.java index 06f92b193855..c65f5036aca3 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/CacheEventJournalBasicTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/CacheEventJournalBasicTest.java @@ -18,13 +18,14 @@ import com.hazelcast.cache.ICache; import com.hazelcast.cache.impl.HazelcastServerCachingProvider; +import com.hazelcast.cache.journal.EventJournalCacheEvent; import com.hazelcast.config.CacheSimpleConfig; import com.hazelcast.config.Config; import com.hazelcast.config.EvictionConfig.MaxSizePolicy; import com.hazelcast.config.InMemoryFormat; import com.hazelcast.journal.AbstractEventJournalBasicTest; import com.hazelcast.journal.EventJournalTestContext; -import com.hazelcast.map.impl.journal.EventJournalMapEvent; +import com.hazelcast.map.journal.EventJournalMapEvent; 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/cache/impl/journal/EventJournalCacheDataStructureAdapter.java b/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheDataStructureAdapter.java index ea070dab8710..1656cfa5c68a 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheDataStructureAdapter.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheDataStructureAdapter.java @@ -19,6 +19,7 @@ import com.hazelcast.cache.HazelcastExpiryPolicy; import com.hazelcast.cache.ICache; import com.hazelcast.cache.impl.CacheService; +import com.hazelcast.cache.journal.EventJournalCacheEvent; import com.hazelcast.internal.journal.EventJournalInitialSubscriberState; import com.hazelcast.internal.journal.EventJournalReader; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheEventAdapter.java b/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheEventAdapter.java index 9f69fbfed231..cd0792cdfa7c 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheEventAdapter.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheEventAdapter.java @@ -16,6 +16,7 @@ package com.hazelcast.cache.impl.journal; +import com.hazelcast.cache.journal.EventJournalCacheEvent; import com.hazelcast.journal.EventJournalEventAdapter; public class EventJournalCacheEventAdapter implements EventJournalEventAdapter> { diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapDataStructureAdapter.java b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapDataStructureAdapter.java index e2436e701297..f4f1f35e21d5 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapDataStructureAdapter.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapDataStructureAdapter.java @@ -22,6 +22,7 @@ import com.hazelcast.journal.EventJournalDataStructureAdapter; import com.hazelcast.map.IMap; import com.hazelcast.map.impl.MapService; +import com.hazelcast.map.journal.EventJournalMapEvent; import com.hazelcast.ringbuffer.ReadResultSet; import java.util.Map; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapEventAdapter.java b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapEventAdapter.java index 768687c911a8..a3b4f6039018 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapEventAdapter.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapEventAdapter.java @@ -17,6 +17,7 @@ package com.hazelcast.map.impl.journal; import com.hazelcast.journal.EventJournalEventAdapter; +import com.hazelcast.map.journal.EventJournalMapEvent; public class EventJournalMapEventAdapter implements EventJournalEventAdapter> { @Override diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalBasicTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalBasicTest.java index bb657e691d4a..0383cc8989e2 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalBasicTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalBasicTest.java @@ -23,6 +23,7 @@ import com.hazelcast.map.MapStore; import com.hazelcast.journal.AbstractEventJournalBasicTest; import com.hazelcast.journal.EventJournalTestContext; +import com.hazelcast.map.journal.EventJournalMapEvent; 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/journal/MapEventJournalExpiringTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalExpiringTest.java index f60a062a8e98..2e7e8e9dd28e 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalExpiringTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalExpiringTest.java @@ -21,6 +21,7 @@ import com.hazelcast.config.MapConfig; import com.hazelcast.journal.AbstractEventJournalExpiringTest; import com.hazelcast.journal.EventJournalTestContext; +import com.hazelcast.map.journal.EventJournalMapEvent; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.SlowTest; From 0e739f6aaaedf78a15ac5d9bfba56ab936a7fc07 Mon Sep 17 00:00:00 2001 From: Matko Medenjak Date: Thu, 31 Oct 2019 08:43:01 +0100 Subject: [PATCH 2/2] Move journal classes into parent package and remove empty package --- .../{journal => }/EventJournalCacheEvent.java | 4 +--- .../com/hazelcast/cache/impl/CacheProxy.java | 2 +- .../journal/CacheEventJournalFunctions.java | 2 +- .../CacheEventJournalReadOperation.java | 2 +- .../CacheEventJournalReadResultSetImpl.java | 2 +- .../DeserializingEventJournalCacheEvent.java | 2 +- .../hazelcast/cache/journal/package-info.java | 21 ------------------- .../client/cache/impl/ClientCacheProxy.java | 2 +- .../task/cache/CacheEventJournalReadTask.java | 2 +- .../task/map/MapEventJournalReadTask.java | 2 +- .../client/impl/proxy/ClientMapProxy.java | 2 +- .../{journal => }/EventJournalMapEvent.java | 2 +- .../DeserializingEventJournalMapEvent.java | 2 +- .../journal/MapEventJournalFunctions.java | 2 +- .../journal/MapEventJournalReadOperation.java | 2 +- .../MapEventJournalReadResultSetImpl.java | 2 +- .../map/impl/proxy/MapProxyImpl.java | 2 +- .../hazelcast/map/journal/package-info.java | 21 ------------------- .../journal/CacheEventJournalBasicTest.java | 4 ++-- ...EventJournalCacheDataStructureAdapter.java | 2 +- .../EventJournalCacheEventAdapter.java | 2 +- .../EventJournalMapDataStructureAdapter.java | 2 +- .../journal/EventJournalMapEventAdapter.java | 2 +- .../journal/MapEventJournalBasicTest.java | 2 +- .../journal/MapEventJournalExpiringTest.java | 2 +- 25 files changed, 24 insertions(+), 68 deletions(-) rename hazelcast/src/main/java/com/hazelcast/cache/{journal => }/EventJournalCacheEvent.java (95%) delete mode 100644 hazelcast/src/main/java/com/hazelcast/cache/journal/package-info.java rename hazelcast/src/main/java/com/hazelcast/map/{journal => }/EventJournalMapEvent.java (98%) delete mode 100644 hazelcast/src/main/java/com/hazelcast/map/journal/package-info.java diff --git a/hazelcast/src/main/java/com/hazelcast/cache/journal/EventJournalCacheEvent.java b/hazelcast/src/main/java/com/hazelcast/cache/EventJournalCacheEvent.java similarity index 95% rename from hazelcast/src/main/java/com/hazelcast/cache/journal/EventJournalCacheEvent.java rename to hazelcast/src/main/java/com/hazelcast/cache/EventJournalCacheEvent.java index ffe8e497b05f..5a654da57839 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/journal/EventJournalCacheEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/EventJournalCacheEvent.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package com.hazelcast.cache.journal; - -import com.hazelcast.cache.CacheEventType; +package com.hazelcast.cache; /** * The event for the cache event journal. 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 6b4e2331dd68..b615ca5eaaae 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxy.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxy.java @@ -22,7 +22,7 @@ import com.hazelcast.cache.impl.event.InternalCachePartitionLostListenerAdapter; import com.hazelcast.cache.impl.journal.CacheEventJournalReadOperation; import com.hazelcast.cache.impl.journal.CacheEventJournalSubscribeOperation; -import com.hazelcast.cache.journal.EventJournalCacheEvent; +import com.hazelcast.cache.EventJournalCacheEvent; import com.hazelcast.config.CacheConfig; import com.hazelcast.internal.config.CacheConfigReadOnly; import com.hazelcast.internal.journal.EventJournalInitialSubscriberState; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalFunctions.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalFunctions.java index 40a216e61333..9af45d20b6d9 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalFunctions.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalFunctions.java @@ -17,7 +17,7 @@ package com.hazelcast.cache.impl.journal; import com.hazelcast.cache.CacheEventType; -import com.hazelcast.cache.journal.EventJournalCacheEvent; +import com.hazelcast.cache.EventJournalCacheEvent; import com.hazelcast.internal.journal.DeserializingEntry; import com.hazelcast.internal.serialization.SerializableByConvention; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadOperation.java index 850053c7a971..59d6311394e8 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadOperation.java @@ -18,7 +18,7 @@ import com.hazelcast.cache.impl.CacheDataSerializerHook; import com.hazelcast.cache.impl.CacheService; -import com.hazelcast.cache.journal.EventJournalCacheEvent; +import com.hazelcast.cache.EventJournalCacheEvent; import com.hazelcast.internal.journal.EventJournal; import com.hazelcast.internal.journal.EventJournalReadOperation; import com.hazelcast.nio.ObjectDataInput; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadResultSetImpl.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadResultSetImpl.java index 07b6ce7159c3..8d8b907cbb3f 100644 --- a/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadResultSetImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/journal/CacheEventJournalReadResultSetImpl.java @@ -17,7 +17,7 @@ package com.hazelcast.cache.impl.journal; import com.hazelcast.cache.impl.CacheDataSerializerHook; -import com.hazelcast.cache.journal.EventJournalCacheEvent; +import com.hazelcast.cache.EventJournalCacheEvent; import com.hazelcast.internal.serialization.SerializableByConvention; import com.hazelcast.projection.Projection; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; 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 26b3d6b4df14..4b6ae9d38776 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 @@ -18,7 +18,7 @@ import com.hazelcast.cache.CacheEventType; import com.hazelcast.cache.impl.CacheDataSerializerHook; -import com.hazelcast.cache.journal.EventJournalCacheEvent; +import com.hazelcast.cache.EventJournalCacheEvent; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.HazelcastInstanceAware; import com.hazelcast.nio.ObjectDataOutput; diff --git a/hazelcast/src/main/java/com/hazelcast/cache/journal/package-info.java b/hazelcast/src/main/java/com/hazelcast/cache/journal/package-info.java deleted file mode 100644 index e1aa85660c2c..000000000000 --- a/hazelcast/src/main/java/com/hazelcast/cache/journal/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Contains {@link com.hazelcast.internal.journal.EventJournal} event interface for ICache. - * @since 3.9 - */ -package com.hazelcast.cache.journal; 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 8e9178516995..c912d20050b5 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 @@ -21,7 +21,7 @@ import com.hazelcast.cache.impl.CacheEventListenerAdaptor; import com.hazelcast.cache.impl.CacheSyncListenerCompleter; import com.hazelcast.cache.impl.event.CachePartitionLostListener; -import com.hazelcast.cache.journal.EventJournalCacheEvent; +import com.hazelcast.cache.EventJournalCacheEvent; import com.hazelcast.client.impl.ClientDelegatingFuture; import com.hazelcast.client.impl.clientside.ClientMessageDecoder; import com.hazelcast.client.impl.protocol.ClientMessage; 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 1f18cd73b333..1413c2cdc08b 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 @@ -18,7 +18,7 @@ import com.hazelcast.cache.impl.CacheService; import com.hazelcast.cache.impl.journal.CacheEventJournalReadOperation; -import com.hazelcast.cache.journal.EventJournalCacheEvent; +import com.hazelcast.cache.EventJournalCacheEvent; import com.hazelcast.client.impl.protocol.ClientMessage; import com.hazelcast.client.impl.protocol.codec.CacheEventJournalReadCodec; import com.hazelcast.instance.impl.Node; 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 eb50817c832b..3362b386773a 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 @@ -21,7 +21,7 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.map.impl.MapService; import com.hazelcast.map.impl.journal.MapEventJournalReadOperation; -import com.hazelcast.map.journal.EventJournalMapEvent; +import com.hazelcast.map.EventJournalMapEvent; import com.hazelcast.internal.nio.Connection; import com.hazelcast.nio.serialization.Data; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; 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 d77f1770643f..fd1c090c4bb3 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 @@ -125,7 +125,7 @@ import com.hazelcast.map.impl.querycache.subscriber.QueryCacheEndToEndProvider; import com.hazelcast.map.impl.querycache.subscriber.QueryCacheRequest; import com.hazelcast.map.impl.querycache.subscriber.SubscriberContext; -import com.hazelcast.map.journal.EventJournalMapEvent; +import com.hazelcast.map.EventJournalMapEvent; import com.hazelcast.map.listener.MapListener; import com.hazelcast.map.listener.MapPartitionLostListener; import com.hazelcast.monitor.LocalMapStats; diff --git a/hazelcast/src/main/java/com/hazelcast/map/journal/EventJournalMapEvent.java b/hazelcast/src/main/java/com/hazelcast/map/EventJournalMapEvent.java similarity index 98% rename from hazelcast/src/main/java/com/hazelcast/map/journal/EventJournalMapEvent.java rename to hazelcast/src/main/java/com/hazelcast/map/EventJournalMapEvent.java index 5b86822f9c24..3cbff57974a2 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/journal/EventJournalMapEvent.java +++ b/hazelcast/src/main/java/com/hazelcast/map/EventJournalMapEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hazelcast.map.journal; +package com.hazelcast.map; import com.hazelcast.core.EntryEventType; 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 d92ce2c338b1..4ba3188ad08b 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 @@ -20,7 +20,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.HazelcastInstanceAware; import com.hazelcast.map.impl.MapDataSerializerHook; -import com.hazelcast.map.journal.EventJournalMapEvent; +import com.hazelcast.map.EventJournalMapEvent; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.serialization.Data; import com.hazelcast.spi.impl.SerializationServiceSupport; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalFunctions.java b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalFunctions.java index bf73a8f1fbff..865be8a2e3d8 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalFunctions.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalFunctions.java @@ -19,7 +19,7 @@ import com.hazelcast.core.EntryEventType; import com.hazelcast.internal.journal.DeserializingEntry; import com.hazelcast.internal.serialization.SerializableByConvention; -import com.hazelcast.map.journal.EventJournalMapEvent; +import com.hazelcast.map.EventJournalMapEvent; import java.io.Serializable; import java.util.Map.Entry; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadOperation.java b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadOperation.java index 175d39d922d0..c247462f97f6 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadOperation.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadOperation.java @@ -20,7 +20,7 @@ import com.hazelcast.internal.journal.EventJournalReadOperation; import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.map.impl.MapService; -import com.hazelcast.map.journal.EventJournalMapEvent; +import com.hazelcast.map.EventJournalMapEvent; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadResultSetImpl.java b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadResultSetImpl.java index 291002e2ca36..f283283e78b4 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadResultSetImpl.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/journal/MapEventJournalReadResultSetImpl.java @@ -18,7 +18,7 @@ import com.hazelcast.map.impl.MapDataSerializerHook; import com.hazelcast.internal.serialization.SerializableByConvention; -import com.hazelcast.map.journal.EventJournalMapEvent; +import com.hazelcast.map.EventJournalMapEvent; import com.hazelcast.projection.Projection; import com.hazelcast.ringbuffer.impl.ReadResultSetImpl; import com.hazelcast.internal.serialization.SerializationService; 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 5213770b936e..bffd6a358c2b 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 @@ -42,7 +42,7 @@ import com.hazelcast.map.impl.querycache.subscriber.QueryCacheEndToEndProvider; import com.hazelcast.map.impl.querycache.subscriber.QueryCacheRequest; import com.hazelcast.map.impl.querycache.subscriber.SubscriberContext; -import com.hazelcast.map.journal.EventJournalMapEvent; +import com.hazelcast.map.EventJournalMapEvent; import com.hazelcast.map.listener.MapListener; import com.hazelcast.map.listener.MapPartitionLostListener; import com.hazelcast.nio.serialization.Data; diff --git a/hazelcast/src/main/java/com/hazelcast/map/journal/package-info.java b/hazelcast/src/main/java/com/hazelcast/map/journal/package-info.java deleted file mode 100644 index a929b4feddcc..000000000000 --- a/hazelcast/src/main/java/com/hazelcast/map/journal/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Contains {@link com.hazelcast.internal.journal.EventJournal} event interface for IMap. - * @since 3.9 - */ -package com.hazelcast.map.journal; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/CacheEventJournalBasicTest.java b/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/CacheEventJournalBasicTest.java index c65f5036aca3..eb661ba80dfa 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/CacheEventJournalBasicTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/CacheEventJournalBasicTest.java @@ -18,14 +18,14 @@ import com.hazelcast.cache.ICache; import com.hazelcast.cache.impl.HazelcastServerCachingProvider; -import com.hazelcast.cache.journal.EventJournalCacheEvent; +import com.hazelcast.cache.EventJournalCacheEvent; import com.hazelcast.config.CacheSimpleConfig; import com.hazelcast.config.Config; import com.hazelcast.config.EvictionConfig.MaxSizePolicy; import com.hazelcast.config.InMemoryFormat; import com.hazelcast.journal.AbstractEventJournalBasicTest; import com.hazelcast.journal.EventJournalTestContext; -import com.hazelcast.map.journal.EventJournalMapEvent; +import com.hazelcast.map.EventJournalMapEvent; 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/cache/impl/journal/EventJournalCacheDataStructureAdapter.java b/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheDataStructureAdapter.java index 1656cfa5c68a..2bb55ac8065a 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheDataStructureAdapter.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheDataStructureAdapter.java @@ -19,7 +19,7 @@ import com.hazelcast.cache.HazelcastExpiryPolicy; import com.hazelcast.cache.ICache; import com.hazelcast.cache.impl.CacheService; -import com.hazelcast.cache.journal.EventJournalCacheEvent; +import com.hazelcast.cache.EventJournalCacheEvent; import com.hazelcast.internal.journal.EventJournalInitialSubscriberState; import com.hazelcast.internal.journal.EventJournalReader; import com.hazelcast.internal.services.ObjectNamespace; diff --git a/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheEventAdapter.java b/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheEventAdapter.java index cd0792cdfa7c..10285b6f97d4 100644 --- a/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheEventAdapter.java +++ b/hazelcast/src/test/java/com/hazelcast/cache/impl/journal/EventJournalCacheEventAdapter.java @@ -16,7 +16,7 @@ package com.hazelcast.cache.impl.journal; -import com.hazelcast.cache.journal.EventJournalCacheEvent; +import com.hazelcast.cache.EventJournalCacheEvent; import com.hazelcast.journal.EventJournalEventAdapter; public class EventJournalCacheEventAdapter implements EventJournalEventAdapter> { diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapDataStructureAdapter.java b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapDataStructureAdapter.java index f4f1f35e21d5..4c58688eda9e 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapDataStructureAdapter.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapDataStructureAdapter.java @@ -22,7 +22,7 @@ import com.hazelcast.journal.EventJournalDataStructureAdapter; import com.hazelcast.map.IMap; import com.hazelcast.map.impl.MapService; -import com.hazelcast.map.journal.EventJournalMapEvent; +import com.hazelcast.map.EventJournalMapEvent; import com.hazelcast.ringbuffer.ReadResultSet; import java.util.Map; diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapEventAdapter.java b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapEventAdapter.java index a3b4f6039018..4f8e9c72fd27 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapEventAdapter.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/EventJournalMapEventAdapter.java @@ -17,7 +17,7 @@ package com.hazelcast.map.impl.journal; import com.hazelcast.journal.EventJournalEventAdapter; -import com.hazelcast.map.journal.EventJournalMapEvent; +import com.hazelcast.map.EventJournalMapEvent; public class EventJournalMapEventAdapter implements EventJournalEventAdapter> { @Override diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalBasicTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalBasicTest.java index 0383cc8989e2..7c3a1d8b8a6a 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalBasicTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalBasicTest.java @@ -23,7 +23,7 @@ import com.hazelcast.map.MapStore; import com.hazelcast.journal.AbstractEventJournalBasicTest; import com.hazelcast.journal.EventJournalTestContext; -import com.hazelcast.map.journal.EventJournalMapEvent; +import com.hazelcast.map.EventJournalMapEvent; 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/journal/MapEventJournalExpiringTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalExpiringTest.java index 2e7e8e9dd28e..501da330e176 100644 --- a/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalExpiringTest.java +++ b/hazelcast/src/test/java/com/hazelcast/map/impl/journal/MapEventJournalExpiringTest.java @@ -21,7 +21,7 @@ import com.hazelcast.config.MapConfig; import com.hazelcast.journal.AbstractEventJournalExpiringTest; import com.hazelcast.journal.EventJournalTestContext; -import com.hazelcast.map.journal.EventJournalMapEvent; +import com.hazelcast.map.EventJournalMapEvent; import com.hazelcast.test.HazelcastParallelClassRunner; import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.SlowTest;