Skip to content

Commit

Permalink
Move hot restart private classes to internal package
Browse files Browse the repository at this point in the history
Moves internal hot restart classes from public to private API. Most
classes were in com.hazelcast.spi.hotrestart and since it is not an
actual SPI, all classes were moved to com.hazelcast.internal.hotrestart,
including already private classes like those in
com.hazelcast.spi.hotrestart.impl. Other than moving the classes and
fixing checkstyle, there is no code or behaviour change.

Classes moved:
com.hazelcast.hotrestart.InternalHotRestartService
com.hazelcast.hotrestart.NoOpHotRestartService
com.hazelcast.hotrestart.NoopInternalHotRestartService

com.hazelcast.cache.hotrestart.HotRestartEnterpriseCacheRecordStore

com.hazelcast.spi.hotrestart.backup.HotRestartBackupInterruptOperation
com.hazelcast.spi.hotrestart.backup.HotRestartBackupOperation
com.hazelcast.spi.hotrestart.backup.HotRestartBackupSerializerHook
com.hazelcast.spi.hotrestart.backup.HotRestartBackupTransactionLogRecord

com.hazelcast.spi.hotrestart.cluster.AbstractMetadataReader
com.hazelcast.spi.hotrestart.cluster.AbstractMetadataWriter
com.hazelcast.spi.hotrestart.cluster.AskForClusterStartResultOperation
com.hazelcast.spi.hotrestart.cluster.AskForExpectedMembersOperation
com.hazelcast.spi.hotrestart.cluster.ClusterHotRestartEventListener
com.hazelcast.spi.hotrestart.cluster.ClusterHotRestartStatusDTOUtil
com.hazelcast.spi.hotrestart.cluster.ClusterMetadataManager
com.hazelcast.spi.hotrestart.cluster.ClusterMetadataWriterLoop
com.hazelcast.spi.hotrestart.cluster.ClusterStateReader
com.hazelcast.spi.hotrestart.cluster.ClusterStateWriter
com.hazelcast.spi.hotrestart.cluster.ClusterVersionReader
com.hazelcast.spi.hotrestart.cluster.ClusterVersionWriter
com.hazelcast.spi.hotrestart.cluster.HotRestartClusterSerializerHook
com.hazelcast.spi.hotrestart.cluster.HotRestartClusterStartStatus
com.hazelcast.spi.hotrestart.cluster.LocalMemberReader
com.hazelcast.spi.hotrestart.cluster.MemberClusterStartInfo
com.hazelcast.spi.hotrestart.cluster.MemberListReader
com.hazelcast.spi.hotrestart.cluster.MemberListWriter
com.hazelcast.spi.hotrestart.cluster.package-info
com.hazelcast.spi.hotrestart.cluster.PartitionTableReader
com.hazelcast.spi.hotrestart.cluster.PartitionTableWriter
com.hazelcast.spi.hotrestart.cluster.PartitionThreadCountReader
com.hazelcast.spi.hotrestart.cluster.PartitionThreadCountWriter
com.hazelcast.spi.hotrestart.cluster.SendClusterStartResultOperation
com.hazelcast.spi.hotrestart.cluster.SendExcludedMemberUuidsOperation
com.hazelcast.spi.hotrestart.cluster.SendExpectedMembersOperation
com.hazelcast.spi.hotrestart.cluster.SendMemberClusterStartInfoOperation
com.hazelcast.spi.hotrestart.cluster.TriggerForceStartOnMasterOperation

com.hazelcast.spi.hotrestart.memory.HotRestartPoolingMemoryManager
com.hazelcast.spi.hotrestart.memory.HotRestartThreadLocalPoolingMemoryManager

com.hazelcast.spi.hotrestart.ConfigDescriptor
com.hazelcast.spi.hotrestart.ForceStartException
com.hazelcast.spi.hotrestart.HotBackupService
com.hazelcast.spi.hotrestart.HotRestartIntegrationService
com.hazelcast.spi.hotrestart.LoadedConfigurationListener
com.hazelcast.spi.hotrestart.PersistentConfigDescriptors
com.hazelcast.spi.hotrestart.RamStoreHelper

com.hazelcast.spi.hotrestart.impl.di.DiContainer
com.hazelcast.spi.hotrestart.impl.di.DiException
com.hazelcast.spi.hotrestart.impl.di.Initialize
com.hazelcast.spi.hotrestart.impl.di.Inject
com.hazelcast.spi.hotrestart.impl.di.Name

com.hazelcast.spi.hotrestart.impl.gc.chunk.ActiveChunk
com.hazelcast.spi.hotrestart.impl.gc.chunk.ActiveValChunk
com.hazelcast.spi.hotrestart.impl.gc.chunk.Chunk
com.hazelcast.spi.hotrestart.impl.gc.chunk.EmptyLongSet
com.hazelcast.spi.hotrestart.impl.gc.chunk.GrowingChunk
com.hazelcast.spi.hotrestart.impl.gc.chunk.StableChunk
com.hazelcast.spi.hotrestart.impl.gc.chunk.StableTombChunk
com.hazelcast.spi.hotrestart.impl.gc.chunk.StableValChunk
com.hazelcast.spi.hotrestart.impl.gc.chunk.SurvivorValChunk
com.hazelcast.spi.hotrestart.impl.gc.chunk.WriteThroughChunk
com.hazelcast.spi.hotrestart.impl.gc.chunk.WriteThroughTombChunk

com.hazelcast.spi.hotrestart.impl.gc.mem.MmapMalloc
com.hazelcast.spi.hotrestart.impl.gc.mem.MmapSlab

com.hazelcast.spi.hotrestart.impl.gc.record.Record
com.hazelcast.spi.hotrestart.impl.gc.record.RecordDataHolder
com.hazelcast.spi.hotrestart.impl.gc.record.RecordMap
com.hazelcast.spi.hotrestart.impl.gc.record.RecordMapOffHeap
com.hazelcast.spi.hotrestart.impl.gc.record.RecordMapOnHeap
com.hazelcast.spi.hotrestart.impl.gc.record.RecordOffHeap
com.hazelcast.spi.hotrestart.impl.gc.record.RecordOnHeap
com.hazelcast.spi.hotrestart.impl.gc.record.SetOfKeyHandleOffHeap
com.hazelcast.spi.hotrestart.impl.gc.record.SetOfKeyHandleOnHeap
com.hazelcast.spi.hotrestart.impl.gc.record.SortedBySeqRecordCursorOffHeap
com.hazelcast.spi.hotrestart.impl.gc.record.SortedBySeqRecordCursorOnHeap

com.hazelcast.spi.hotrestart.impl.gc.tracker.Tracker
com.hazelcast.spi.hotrestart.impl.gc.tracker.TrackerMap
com.hazelcast.spi.hotrestart.impl.gc.tracker.TrackerMapBase
com.hazelcast.spi.hotrestart.impl.gc.tracker.TrackerMapOffHeap
com.hazelcast.spi.hotrestart.impl.gc.tracker.TrackerMapOnHeap
com.hazelcast.spi.hotrestart.impl.gc.tracker.TrackerOffHeap
com.hazelcast.spi.hotrestart.impl.gc.tracker.TrackerOnHeap

com.hazelcast.spi.hotrestart.impl.gc.BackupExecutor
com.hazelcast.spi.hotrestart.impl.gc.BackupTask
com.hazelcast.spi.hotrestart.impl.gc.ChunkManager
com.hazelcast.spi.hotrestart.impl.gc.ChunkPriorityQueue
com.hazelcast.spi.hotrestart.impl.gc.GcExecutor
com.hazelcast.spi.hotrestart.impl.gc.GcHelper
com.hazelcast.spi.hotrestart.impl.gc.GcLogger
com.hazelcast.spi.hotrestart.impl.gc.GcMainLoop
com.hazelcast.spi.hotrestart.impl.gc.GcParams
com.hazelcast.spi.hotrestart.impl.gc.MutatorCatchup
com.hazelcast.spi.hotrestart.impl.gc.package-info
com.hazelcast.spi.hotrestart.impl.gc.PrefixTombstoneManager
com.hazelcast.spi.hotrestart.impl.gc.Rebuilder
com.hazelcast.spi.hotrestart.impl.gc.Snapshotter
com.hazelcast.spi.hotrestart.impl.gc.TombChunkSelector
com.hazelcast.spi.hotrestart.impl.gc.TombEvacuator
com.hazelcast.spi.hotrestart.impl.gc.ValChunkSelector
com.hazelcast.spi.hotrestart.impl.gc.ValEvacuator

com.hazelcast.spi.hotrestart.impl.io.ChunkFileCursor
com.hazelcast.spi.hotrestart.impl.io.ChunkFileOut
com.hazelcast.spi.hotrestart.impl.io.ChunkFileRecord
com.hazelcast.spi.hotrestart.impl.io.ChunkFilesetCursor
com.hazelcast.spi.hotrestart.impl.io.DefaultCopyStrategy
com.hazelcast.spi.hotrestart.impl.io.FileCopyStrategy
com.hazelcast.spi.hotrestart.impl.io.HardLinkCopyStrategy
com.hazelcast.spi.hotrestart.impl.io.TombFileAccessor

com.hazelcast.spi.hotrestart.impl.ConcurrentHotRestartStore
com.hazelcast.spi.hotrestart.impl.HotRestarter
com.hazelcast.spi.hotrestart.impl.HotRestartModule
com.hazelcast.spi.hotrestart.impl.HotRestartPersistenceEngine
com.hazelcast.spi.hotrestart.impl.HotRestartStoreConfig
com.hazelcast.spi.hotrestart.impl.KeyOffHeap
com.hazelcast.spi.hotrestart.impl.KeyOnHeap
com.hazelcast.spi.hotrestart.impl.package-info
com.hazelcast.spi.hotrestart.impl.RamStoreRestartLoop
com.hazelcast.spi.hotrestart.impl.RestartItem
com.hazelcast.spi.hotrestart.impl.RunnableWithStatus
com.hazelcast.spi.hotrestart.impl.SetOfKeyHandle
com.hazelcast.spi.hotrestart.impl.SimpleHandleOffHeap
com.hazelcast.spi.hotrestart.impl.SortedBySeqRecordCursor

com.hazelcast.spi.hotrestart.HotRestartException
com.hazelcast.spi.hotrestart.HotRestartKey
com.hazelcast.spi.hotrestart.HotRestartStore
com.hazelcast.spi.hotrestart.KeyHandle
com.hazelcast.spi.hotrestart.KeyHandleOffHeap
com.hazelcast.spi.hotrestart.RamStore
com.hazelcast.spi.hotrestart.RamStoreRegistry
com.hazelcast.spi.hotrestart.RecordDataSink
  • Loading branch information
Matko Medenjak committed Sep 24, 2019
1 parent 05fb452 commit 9079be0
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 16 deletions.
Expand Up @@ -26,9 +26,9 @@
import com.hazelcast.core.HazelcastInstanceAware;
import com.hazelcast.core.HazelcastInstanceNotActiveException;
import com.hazelcast.hotrestart.HotRestartService;
import com.hazelcast.hotrestart.InternalHotRestartService;
import com.hazelcast.hotrestart.NoOpHotRestartService;
import com.hazelcast.hotrestart.NoopInternalHotRestartService;
import com.hazelcast.internal.hotrestart.InternalHotRestartService;
import com.hazelcast.internal.hotrestart.NoOpHotRestartService;
import com.hazelcast.internal.hotrestart.NoopInternalHotRestartService;
import com.hazelcast.instance.BuildInfo;
import com.hazelcast.instance.BuildInfoProvider;
import com.hazelcast.instance.EndpointQualifier;
Expand Down
Expand Up @@ -18,7 +18,7 @@

import com.hazelcast.cluster.ClusterState;
import com.hazelcast.hotrestart.HotRestartService;
import com.hazelcast.hotrestart.InternalHotRestartService;
import com.hazelcast.internal.hotrestart.InternalHotRestartService;
import com.hazelcast.instance.EndpointQualifier;
import com.hazelcast.internal.ascii.TextCommandService;
import com.hazelcast.internal.cluster.impl.JoinMessage;
Expand Down
Expand Up @@ -18,7 +18,7 @@

import com.hazelcast.cluster.ClusterState;
import com.hazelcast.cluster.Member;
import com.hazelcast.hotrestart.InternalHotRestartService;
import com.hazelcast.internal.hotrestart.InternalHotRestartService;
import com.hazelcast.instance.BuildInfo;
import com.hazelcast.cluster.impl.MemberImpl;
import com.hazelcast.instance.impl.Node;
Expand Down
Expand Up @@ -19,7 +19,7 @@
import com.hazelcast.cluster.ClusterState;
import com.hazelcast.cluster.Member;
import com.hazelcast.cluster.MembershipEvent;
import com.hazelcast.hotrestart.InternalHotRestartService;
import com.hazelcast.internal.hotrestart.InternalHotRestartService;
import com.hazelcast.cluster.impl.MemberImpl;
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.cluster.MemberInfo;
Expand Down
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.hazelcast.hotrestart;
package com.hazelcast.internal.hotrestart;

import com.hazelcast.config.HotRestartPersistenceConfig;
import com.hazelcast.internal.management.dto.ClusterHotRestartStatusDTO;
Expand Down
Expand Up @@ -14,7 +14,11 @@
* limitations under the License.
*/

package com.hazelcast.hotrestart;
package com.hazelcast.internal.hotrestart;

import com.hazelcast.hotrestart.BackupTaskState;
import com.hazelcast.hotrestart.BackupTaskStatus;
import com.hazelcast.hotrestart.HotRestartService;

/**
* Empty implementation of HotRestartService to avoid null checks. This will provide default behaviour when hot restart is
Expand Down
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.hazelcast.hotrestart;
package com.hazelcast.internal.hotrestart;

import com.hazelcast.internal.management.dto.ClusterHotRestartStatusDTO;
import com.hazelcast.nio.Address;
Expand Down
Expand Up @@ -16,7 +16,7 @@

package com.hazelcast.internal.management.request;

import com.hazelcast.hotrestart.InternalHotRestartService;
import com.hazelcast.internal.hotrestart.InternalHotRestartService;
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.management.ManagementCenterService;
import com.hazelcast.internal.json.JsonObject;
Expand Down
Expand Up @@ -16,6 +16,8 @@

package com.hazelcast.hotrestart;

import com.hazelcast.internal.hotrestart.NoOpHotRestartService;
import com.hazelcast.internal.hotrestart.NoopInternalHotRestartService;
import com.hazelcast.internal.management.dto.ClusterHotRestartStatusDTO;
import com.hazelcast.test.HazelcastParallelClassRunner;
import com.hazelcast.test.annotation.ParallelJVMTest;
Expand Down
Expand Up @@ -18,7 +18,7 @@

import com.hazelcast.cluster.ClusterState;
import com.hazelcast.hotrestart.HotRestartService;
import com.hazelcast.hotrestart.InternalHotRestartService;
import com.hazelcast.internal.hotrestart.InternalHotRestartService;
import com.hazelcast.instance.impl.HazelcastInstanceImpl;
import com.hazelcast.instance.impl.NodeExtension;
import com.hazelcast.internal.ascii.TextCommandService;
Expand Down
4 changes: 2 additions & 2 deletions hazelcast/src/test/resources/log4j.properties
Expand Up @@ -24,8 +24,8 @@ log4j.logger.com.hazelcast.instance=debug
log4j.logger.com.hazelcast.cluster=debug
log4j.logger.com.hazelcast.internal.cluster=debug
log4j.logger.com.hazelcast.internal.partition=debug
log4j.logger.com.hazelcast.spi.hotrestart=info
log4j.logger.com.hazelcast.spi.hotrestart.cluster=debug
log4j.logger.com.hazelcast.internal.hotrestart=info
log4j.logger.com.hazelcast.internal.hotrestart.cluster=debug
log4j.logger.com.hazelcast.test.mocknetwork=debug

#log4j.logger.com.hazelcast.internal.nearcache.impl.invalidation=trace
Expand Down
2 changes: 1 addition & 1 deletion hazelcast/src/test/resources/log4j2-debug-map.xml
Expand Up @@ -30,7 +30,7 @@
<Logger name="com.hazelcast.cluster" level="debug"/>
<Logger name="com.hazelcast.internal.cluster" level="debug"/>
<Logger name="com.hazelcast.internal.partition" level="debug"/>
<Logger name="com.hazelcast.spi.hotrestart.cluster" level="debug"/>
<Logger name="com.hazelcast.internal.hotrestart.cluster" level="debug"/>
<Logger name="com.hazelcast.test.mocknetwork" level="debug"/>
</Loggers>
</Configuration>
2 changes: 1 addition & 1 deletion hazelcast/src/test/resources/log4j2-debug.xml
Expand Up @@ -29,7 +29,7 @@
<Logger name="com.hazelcast.cluster" level="debug"/>
<Logger name="com.hazelcast.internal.cluster" level="debug"/>
<Logger name="com.hazelcast.internal.partition" level="debug"/>
<Logger name="com.hazelcast.spi.hotrestart.cluster" level="debug"/>
<Logger name="com.hazelcast.internal.hotrestart.cluster" level="debug"/>
<Logger name="com.hazelcast.test.mocknetwork" level="debug"/>
</Loggers>
</Configuration>
2 changes: 1 addition & 1 deletion hazelcast/src/test/resources/log4j2.xml
Expand Up @@ -29,7 +29,7 @@
<!--<Logger name="com.hazelcast.cluster" level="debug"/>-->
<!--<Logger name="com.hazelcast.internal.cluster" level="debug"/>-->
<!--<Logger name="com.hazelcast.internal.partition" level="debug"/>-->
<!--<Logger name="com.hazelcast.spi.hotrestart.cluster" level="debug"/>-->
<!--<Logger name="com.hazelcast.internal.hotrestart.cluster" level="debug"/>-->
<!--<Logger name="com.hazelcast.test.mocknetwork" level="debug"/>-->
<Logger name="com.hazelcast.client.impl.protocol.task" level="debug"/>
<Logger name="com.hazelcast.client.impl.operations" level="debug"/>
Expand Down

0 comments on commit 9079be0

Please sign in to comment.