Move YAML, CRDT and memory classes to internal package (#15588)

Another "broad stroke" change in moving private API from public to
internal package. Also fixed checkstyle by adding package.info and
adding annotations where needed. Other than moving the classes
(package/import changes) and checkstyle, there is no code or behaviour
change.

Classes moved:
com.hazelcast.config.yaml.ElementAdapter
com.hazelcast.config.yaml.EmptyNamedNodeMap
com.hazelcast.config.yaml.EmptyNodeList
com.hazelcast.config.yaml.NamedNodeMapAdapter
com.hazelcast.config.yaml.NodeListMappingAdapter
com.hazelcast.config.yaml.NodeListScalarAdapter
com.hazelcast.config.yaml.NodeListSequenceAdapter
com.hazelcast.config.yaml.ScalarTextNodeAdapter
com.hazelcast.config.yaml.SingletonNodeList
com.hazelcast.config.yaml.W3cDomUtil
com.hazelcast.config.yaml.YamlDomChecker
com.hazelcast.config.yaml.YamlOrderedMapping
com.hazelcast.config.yaml.YamlOrderedMappingImpl

com.hazelcast.crdt.pncounter.operations.AbstractPNCounterOperation
com.hazelcast.crdt.pncounter.operations.AddOperation
com.hazelcast.crdt.pncounter.operations.CRDTTimestampedLong
com.hazelcast.crdt.pncounter.operations.GetOperation
com.hazelcast.crdt.pncounter.PNCounterImpl
com.hazelcast.crdt.pncounter.PNCounterProxy
com.hazelcast.crdt.pncounter.PNCounterReplicationOperation
com.hazelcast.crdt.pncounter.PNCounterService

com.hazelcast.crdt.AbstractCRDTReplicationOperation
com.hazelcast.crdt.CRDT
com.hazelcast.crdt.CRDTDataSerializerHook
com.hazelcast.crdt.CRDTMigrationTask
com.hazelcast.crdt.CRDTReplicationAwareService
com.hazelcast.crdt.CRDTReplicationContainer
com.hazelcast.crdt.CRDTReplicationMigrationService
com.hazelcast.crdt.CRDTReplicationTask
com.hazelcast.crdt.ReplicatedVectorClocks

com.hazelcast.memory.DefaultGarbageCollectorStats
com.hazelcast.memory.DefaultMemoryStats
com.hazelcast.memory.GarbageCollectorStats
com.hazelcast.memory.GCStatsSupport
com.hazelcast.memory.MemoryStats
com.hazelcast.memory.MemoryStatsSupport

com.hazelcast.cache.hidensity.HiDensityCacheRecord

com.hazelcast.elastic.map.BehmMemoryBlockProcessor
com.hazelcast.elastic.map.BehmSlotAccessor
com.hazelcast.elastic.map.BehmSlotAccessorFactory
com.hazelcast.elastic.map.BinaryElasticHashMap
com.hazelcast.elastic.map.ConcurrentElasticHashMap
com.hazelcast.elastic.map.ElasticHashMap
com.hazelcast.elastic.map.NativeBehmSlotAccessorFactory
com.hazelcast.elastic.map.NativeMemoryDataAccessor
com.hazelcast.elastic.map.SampleableElasticHashMap

com.hazelcast.elastic.queue.AbstractBlockingElasticQueue
com.hazelcast.elastic.queue.AbstractElasticQueue
com.hazelcast.elastic.queue.ArrayBlockingElasticQueue
com.hazelcast.elastic.queue.ArrayElasticQueue
com.hazelcast.elastic.queue.BlockingElasticQueue
com.hazelcast.elastic.queue.ConcurrentLinkedElasticQueue
com.hazelcast.elastic.queue.LinkedBlockingElasticQueue
com.hazelcast.elastic.queue.LinkedElasticQueue

com.hazelcast.elastic.tree.BinaryElasticNestedTreeMap
com.hazelcast.elastic.tree.ComparableComparator
com.hazelcast.elastic.tree.MapEntryFactory
com.hazelcast.elastic.tree.NativeBinaryElasticNestedTreeMap

com.hazelcast.elastic.map.ConcurrentElasticMap
com.hazelcast.elastic.map.ElasticMap

com.hazelcast.elastic.queue.ElasticQueue
com.hazelcast.elastic.queue.LongArrayBlockingQueue
com.hazelcast.elastic.queue.LongArrayQueue
com.hazelcast.elastic.queue.LongBlockingQueue
com.hazelcast.elastic.queue.LongConcurrentLinkedQueue
com.hazelcast.elastic.queue.LongConsumer
com.hazelcast.elastic.queue.LongLinkedBlockingQueue
com.hazelcast.elastic.queue.LongLinkedQueue
com.hazelcast.elastic.queue.LongQueue

com.hazelcast.elastic.tree.impl.EntryIterator
com.hazelcast.elastic.tree.impl.EntryValuesIterator
com.hazelcast.elastic.tree.impl.RedBlackTreeNode
com.hazelcast.elastic.tree.impl.RedBlackTreeStore

com.hazelcast.elastic.tree.OffHeapComparator
com.hazelcast.elastic.tree.OffHeapTreeEntry
com.hazelcast.elastic.tree.OffHeapTreeStore
com.hazelcast.elastic.tree.OrderingDirection

com.hazelcast.elastic.CapacityUtil
com.hazelcast.elastic.LongArray
com.hazelcast.elastic.LongIterator
com.hazelcast.elastic.SlottableIterator

com.hazelcast.memory.AbstractPoolingMemoryManager
com.hazelcast.memory.AddressQueue
com.hazelcast.memory.DestroyedAddressQueue
com.hazelcast.memory.FreeMemoryChecker
com.hazelcast.memory.GarbageCollectable
com.hazelcast.memory.GarbageCollector
com.hazelcast.memory.GlobalPoolingMemoryManager
com.hazelcast.memory.HazelcastMemoryManager
com.hazelcast.memory.MemoryBlock
com.hazelcast.memory.MemoryBlockAccessor
com.hazelcast.memory.NativeMemoryStats
com.hazelcast.memory.package-info
com.hazelcast.memory.PooledNativeMemoryStats
com.hazelcast.memory.PoolingMemoryManager
com.hazelcast.memory.SimpleGarbageCollector
com.hazelcast.memory.StandardMemoryManager
com.hazelcast.memory.ThreadLocalPoolingMemoryManager

checkstyle/suppressions.xml

@@ -101,8 +101,6 @@
               files="com[\\/]hazelcast[\\/]config[\\/]MemberDomConfigProcessor"/>
     <suppress checks="CyclomaticComplexity|ClassFanOutComplexity|ClassDataAbstractionCoupling|MethodCount"
               files="com[\\/]hazelcast[\\/]config[\\/]YamlMemberDomConfigProcessor"/>
-    <suppress checks="MethodCount" files="com[\\/]hazelcast[\\/]config[\\/]yaml[\\/]ScalarTextNodeAdapter"/>
-    <suppress checks="MethodCount" files="com[\\/]hazelcast[\\/]config[\\/]yaml[\\/]ElementAdapter"/>
 
     <!-- YAML -->
     <suppress checks="BooleanExpressionComplexity" files="com[\\/]hazelcast[\\/]internal[\\/]yaml[\\/]YamlUtil"/>

hazelcast-build-utils/src/test/resources/manifest.mf

@@ -252,7 +252,7 @@ Export-Package: com.hazelcast.cluster.impl;uses:="com.hazelcast.loggin
  memory.impl,javax.management,javax.management.openmbean,sun.misc,com.
  hazelcast.spi.properties,com.hazelcast.client.impl,com.hazelcast.conf
  ig,com.hazelcast.spi.impl.executionservice,com.hazelcast.internal.clu
- ster.impl,com.hazelcast.cluster.memberselector,com.hazelcast.memory,c
+ ster.impl,com.hazelcast.cluster.memberselector,com.hazelcast.internal.memory,c
  om.hazelcast.spi.impl,com.hazelcast.internal.partition,com.hazelcast.
  internal.eviction,com.hazelcast.query,com.hazelcast.map.impl.query,co
  m.hazelcast.query.impl";version="3.8.0.SNAPSHOT",com.hazelcast.core.s
@@ -270,7 +270,7 @@ Export-Package: com.hazelcast.cluster.impl;uses:="com.hazelcast.loggin
  zelcast.topic.impl,com.hazelcast.client.impl.protocol.task,com.hazelc
  ast.nio,com.hazelcast.spi.impl,com.hazelcast.instance,com.hazelcast.i
  nternal.serialization,com.hazelcast.security.permission,com.hazelcast
- .spi";version="3.8.0.SNAPSHOT",com.hazelcast.memory;uses:="com.hazelc
+ .spi";version="3.8.0.SNAPSHOT",com.hazelcast.internal.memory;uses:="com.hazelc
  ast.internal.util";version="3.8.0.SNAPSHOT",com.hazelcast.internal.metrics;use
  s:="com.hazelcast.internal.metrics.renderers";version="3.8.0.SNAPSHOT
  ",com.hazelcast.internal.util.sort;uses:="com.hazelcast.internal.memo
@@ -514,7 +514,7 @@ Export-Package: com.hazelcast.cluster.impl;uses:="com.hazelcast.loggin
  ast.spi.discovery.multicast.impl,com.hazelcast.spi.discovery,com.haze
  lcast.internal.util,com.hazelcast.spi.partitiongroup,com.hazelcast.nio,com.haz
  elcast.core";version="3.8.0.SNAPSHOT",com.hazelcast.console;uses:="co
- m.hazelcast.monitor,com.hazelcast.core,com.hazelcast.memory,com.hazel
+ m.hazelcast.monitor,com.hazelcast.core,com.hazelcast.internal.memory,com.hazel
  cast.internal.util,com.hazelcast.config,com.hazelcast.nio.serialization,com.ha
  zelcast.nio,com.hazelcast.nio.serialization.impl";version="3.8.0.SNAP
  SHOT",com.hazelcast.nio.ascii;uses:="com.hazelcast.logging,com.hazelc
@@ -671,7 +671,7 @@ Export-Package: com.hazelcast.cluster.impl;uses:="com.hazelcast.loggin
  ternal.networking,com.hazelcast.internal.networking.nio,com.h
  azelcast.spi.impl,com.hazelcast.hotrestart,com.hazelcast.wan.impl,com
  .hazelcast.spi.serialization,com.hazelcast.wan,com.hazelcast.internal
- .cluster.impl,com.hazelcast.map.impl,com.hazelcast.memory,com.hazelca
+ .cluster.impl,com.hazelcast.map.impl,com.hazelcast.internal.memory,com.hazelca
  st.spi.impl.servicemanager,com.hazelcast.internal.cluster,com.hazelca
  st.internal.serialization,com.hazelcast.cache.impl,com.hazelcast.inte
  rnal.serialization.impl,com.hazelcast.security,com.hazelcast.partitio
@@ -1024,7 +1024,7 @@ Export-Package: com.hazelcast.cluster.impl;uses:="com.hazelcast.loggin
  n;uses:="com.hazelcast.config,com.hazelcast.logging,com.hazelcast.cor
  e,com.hazelcast.spi,com.hazelcast.internal.util,com.hazelcast.internal.nearcac
  he,com.hazelcast.cluster.memberselector,com.hazelcast.map.impl,com.ha
- zelcast.monitor,com.hazelcast.spi.partition,com.hazelcast.memory,com.
+ zelcast.monitor,com.hazelcast.spi.partition,com.hazelcast.internal.memory,com.
  hazelcast.map.impl.recordstore,com.hazelcast.map.impl.nearcache,com.h
  azelcast.internal.cluster,com.hazelcast.nio,com.hazelcast.nio.seriali
  zation,com.hazelcast.map.eviction,com.hazelcast.map.impl.record,com.h
@@ -1203,7 +1203,7 @@ Export-Package: com.hazelcast.cluster.impl;uses:="com.hazelcast.loggin
  zelcast.internal.adapter,com.hazelcast.logging,com.hazelcast.nio.seri
  alization,com.hazelcast.internal.serialization.impl,com.hazelcast.internal.uti
  l,com.hazelcast.internal.util.collection,com.hazelcast.config,com.hazelcast.sp
- i.serialization,com.hazelcast.monitor.impl,com.hazelcast.memory,com.h
+ i.serialization,com.hazelcast.monitor.impl,com.hazelcast.internal.memory,com.h
  azelcast.internal.util,com.hazelcast.nio,com.hazelcast.core";version=
  "3.8.0.SNAPSHOT",com.hazelcast.client.impl.protocol.exception;uses:="
  com.hazelcast.core";version="3.8.0.SNAPSHOT",com.hazelcast.spi.impl.o
@@ -1546,7 +1546,7 @@ Export-Package: com.hazelcast.cluster.impl;uses:="com.hazelcast.loggin
  ast.internal.util,com.hazelcast.nio.serialization.impl,javax.xml.namespace,com
  .hazelcast.logging,org.w3c.dom,javax.xml.xpath,javax.xml,javax.xml.va
  lidation,com.hazelcast.core,javax.xml.transform.sax,javax.xml.transfo
- rm.dom,javax.xml.transform,com.hazelcast.memory,javax.xml.transform.s
+ rm.dom,javax.xml.transform,com.hazelcast.internal.memory,javax.xml.transform.s
  tream,org.xml.sax,com.hazelcast.nio,com.hazelcast.instance,com.hazelc
  ast.internal.eviction,com.hazelcast.cache.impl.event,com.hazelcast.sp
  i.partition,com.hazelcast.cache,com.hazelcast.cache.merge,com.hazelca

hazelcast/src/main/java/com/hazelcast/client/ClientExtension.java

@@ -25,7 +25,7 @@
 import com.hazelcast.internal.networking.ChannelInitializer;
 import com.hazelcast.internal.serialization.InternalSerializationService;
 import com.hazelcast.map.impl.MapService;
-import com.hazelcast.memory.MemoryStats;
+import com.hazelcast.internal.memory.MemoryStats;
 import com.hazelcast.nio.SocketInterceptor;
 
 /**

hazelcast/src/main/java/com/hazelcast/client/config/YamlClientConfigBuilder.java

@@ -19,7 +19,7 @@
 import com.hazelcast.config.AbstractYamlConfigBuilder;
 import com.hazelcast.config.ConfigLoader;
 import com.hazelcast.config.InvalidConfigurationException;
-import com.hazelcast.config.yaml.YamlDomChecker;
+import com.hazelcast.internal.config.yaml.YamlDomChecker;
 import com.hazelcast.internal.yaml.YamlLoader;
 import com.hazelcast.internal.yaml.YamlMapping;
 import com.hazelcast.internal.yaml.YamlNode;
@@ -34,7 +34,7 @@
 import java.net.URL;
 import java.util.Properties;
 
-import static com.hazelcast.config.yaml.W3cDomUtil.asW3cNode;
+import static com.hazelcast.internal.config.yaml.W3cDomUtil.asW3cNode;
 import static com.hazelcast.internal.util.Preconditions.checkNotNull;
 import static com.hazelcast.internal.util.Preconditions.checkTrue;
 

hazelcast/src/main/java/com/hazelcast/client/config/YamlClientDomConfigProcessor.java

@@ -36,7 +36,7 @@
 import static com.hazelcast.config.DomConfigHelper.cleanNodeName;
 import static com.hazelcast.config.DomConfigHelper.getBooleanValue;
 import static com.hazelcast.config.DomConfigHelper.getIntegerValue;
-import static com.hazelcast.config.yaml.W3cDomUtil.getWrappedYamlMapping;
+import static com.hazelcast.internal.config.yaml.W3cDomUtil.getWrappedYamlMapping;
 import static com.hazelcast.internal.yaml.YamlUtil.asScalar;
 
 class YamlClientDomConfigProcessor extends ClientDomConfigProcessor {

hazelcast/src/main/java/com/hazelcast/client/config/YamlClientFailoverConfigBuilder.java

@@ -19,7 +19,7 @@
 import com.hazelcast.config.AbstractYamlConfigBuilder;
 import com.hazelcast.config.ConfigLoader;
 import com.hazelcast.config.InvalidConfigurationException;
-import com.hazelcast.config.yaml.YamlDomChecker;
+import com.hazelcast.internal.config.yaml.YamlDomChecker;
 import com.hazelcast.core.HazelcastException;
 import com.hazelcast.internal.yaml.YamlLoader;
 import com.hazelcast.internal.yaml.YamlMapping;
@@ -35,7 +35,7 @@
 import java.net.URL;
 import java.util.Properties;
 
-import static com.hazelcast.config.yaml.W3cDomUtil.asW3cNode;
+import static com.hazelcast.internal.config.yaml.W3cDomUtil.asW3cNode;
 import static com.hazelcast.internal.util.Preconditions.checkNotNull;
 import static com.hazelcast.internal.util.Preconditions.checkTrue;
 

hazelcast/src/main/java/com/hazelcast/client/config/YamlClientFailoverDomConfigProcessor.java

@@ -17,7 +17,7 @@
 package com.hazelcast.client.config;
 
 import com.hazelcast.config.InvalidConfigurationException;
-import com.hazelcast.config.yaml.ElementAdapter;
+import com.hazelcast.internal.config.yaml.ElementAdapter;
 import org.w3c.dom.Node;
 
 import java.io.IOException;

hazelcast/src/main/java/com/hazelcast/client/impl/clientside/DefaultClientExtension.java

@@ -41,8 +41,8 @@
 import com.hazelcast.logging.ILogger;
 import com.hazelcast.logging.Logger;
 import com.hazelcast.map.impl.MapService;
-import com.hazelcast.memory.DefaultMemoryStats;
-import com.hazelcast.memory.MemoryStats;
+import com.hazelcast.internal.memory.DefaultMemoryStats;
+import com.hazelcast.internal.memory.MemoryStats;
 import com.hazelcast.nio.ClassLoaderUtil;
 import com.hazelcast.nio.SocketInterceptor;
 import com.hazelcast.partition.PartitioningStrategy;

hazelcast/src/main/java/com/hazelcast/client/impl/clientside/HazelcastClientInstanceImpl.java

@@ -88,7 +88,7 @@
 import com.hazelcast.cp.CPSubsystem;
 import com.hazelcast.cp.lock.ILock;
 import com.hazelcast.crdt.pncounter.PNCounter;
-import com.hazelcast.crdt.pncounter.PNCounterService;
+import com.hazelcast.internal.crdt.pncounter.PNCounterService;
 import com.hazelcast.durableexecutor.DurableExecutorService;
 import com.hazelcast.durableexecutor.impl.DistributedDurableExecutorService;
 import com.hazelcast.executor.impl.DistributedExecutorService;

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/crdt/pncounter/PNCounterAddMessageTask.java

@@ -22,9 +22,10 @@
 import com.hazelcast.client.impl.protocol.task.AbstractAddressMessageTask;
 import com.hazelcast.cluster.impl.VectorClock;
 import com.hazelcast.config.PNCounterConfig;
-import com.hazelcast.crdt.pncounter.PNCounterService;
-import com.hazelcast.crdt.pncounter.operations.AddOperation;
-import com.hazelcast.crdt.pncounter.operations.CRDTTimestampedLong;
+import com.hazelcast.crdt.pncounter.PNCounter;
+import com.hazelcast.internal.crdt.pncounter.PNCounterService;
+import com.hazelcast.internal.crdt.pncounter.operations.AddOperation;
+import com.hazelcast.internal.crdt.pncounter.operations.CRDTTimestampedLong;
 import com.hazelcast.instance.impl.Node;
 import com.hazelcast.nio.Address;
 import com.hazelcast.nio.Connection;
@@ -37,7 +38,7 @@
 
 /**
  * Task responsible for processing client messages for updating the
- * {@link com.hazelcast.crdt.pncounter.PNCounter} state.
+ * {@link PNCounter} state.
  * If this message was sent from a client with smart routing disabled, the
  * member may forward the request to a different target member.
  */

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/crdt/pncounter/PNCounterGetConfiguredReplicaCountMessageTask.java

@@ -20,7 +20,8 @@
 import com.hazelcast.client.impl.protocol.codec.PNCounterGetConfiguredReplicaCountCodec;
 import com.hazelcast.client.impl.protocol.codec.PNCounterGetConfiguredReplicaCountCodec.RequestParameters;
 import com.hazelcast.client.impl.protocol.task.AbstractCallableMessageTask;
-import com.hazelcast.crdt.pncounter.PNCounterService;
+import com.hazelcast.crdt.pncounter.PNCounter;
+import com.hazelcast.internal.crdt.pncounter.PNCounterService;
 import com.hazelcast.instance.impl.Node;
 import com.hazelcast.nio.Connection;
 import com.hazelcast.security.permission.ActionConstants;
@@ -30,7 +31,7 @@
 
 /**
  * Task responsible for processing client messages for returning the max
- * configured replica count for a {@link com.hazelcast.crdt.pncounter.PNCounter}.
+ * configured replica count for a {@link PNCounter}.
  */
 public class PNCounterGetConfiguredReplicaCountMessageTask
         extends AbstractCallableMessageTask<RequestParameters> {

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/crdt/pncounter/PNCounterGetMessageTask.java

@@ -22,9 +22,10 @@
 import com.hazelcast.client.impl.protocol.task.AbstractAddressMessageTask;
 import com.hazelcast.cluster.impl.VectorClock;
 import com.hazelcast.config.PNCounterConfig;
-import com.hazelcast.crdt.pncounter.PNCounterService;
-import com.hazelcast.crdt.pncounter.operations.CRDTTimestampedLong;
-import com.hazelcast.crdt.pncounter.operations.GetOperation;
+import com.hazelcast.crdt.pncounter.PNCounter;
+import com.hazelcast.internal.crdt.pncounter.PNCounterService;
+import com.hazelcast.internal.crdt.pncounter.operations.CRDTTimestampedLong;
+import com.hazelcast.internal.crdt.pncounter.operations.GetOperation;
 import com.hazelcast.instance.impl.Node;
 import com.hazelcast.nio.Address;
 import com.hazelcast.nio.Connection;
@@ -37,7 +38,7 @@
 
 /**
  * Task responsible for processing client messages for retrieving the
- * current {@link com.hazelcast.crdt.pncounter.PNCounter} state.
+ * current {@link PNCounter} state.
  * If this message was sent from a client with smart routing disabled, the
  * member may forward the request to a different target member.
  */

hazelcast/src/main/java/com/hazelcast/client/impl/spi/ProxyManager.java

@@ -71,7 +71,7 @@
 import com.hazelcast.cp.internal.datastructures.unsafe.atomicreference.AtomicReferenceService;
 import com.hazelcast.cp.internal.datastructures.unsafe.idgen.IdGeneratorService;
 import com.hazelcast.cp.internal.datastructures.unsafe.lock.LockServiceImpl;
-import com.hazelcast.crdt.pncounter.PNCounterService;
+import com.hazelcast.internal.crdt.pncounter.PNCounterService;
 import com.hazelcast.durableexecutor.impl.DistributedDurableExecutorService;
 import com.hazelcast.executor.impl.DistributedExecutorService;
 import com.hazelcast.flakeidgen.impl.FlakeIdGeneratorService;

hazelcast/src/main/java/com/hazelcast/config/AbstractYamlConfigBuilder.java

@@ -18,7 +18,7 @@
 
 import com.hazelcast.config.replacer.PropertyReplacer;
 import com.hazelcast.config.replacer.spi.ConfigReplacer;
-import com.hazelcast.config.yaml.ElementAdapter;
+import com.hazelcast.internal.config.yaml.ElementAdapter;
 import com.hazelcast.internal.yaml.MutableYamlMapping;
 import com.hazelcast.internal.yaml.MutableYamlSequence;
 import com.hazelcast.internal.yaml.YamlLoader;
@@ -40,7 +40,7 @@
 import static com.hazelcast.config.DomConfigHelper.childElements;
 import static com.hazelcast.config.DomConfigHelper.cleanNodeName;
 import static com.hazelcast.config.DomConfigHelper.getAttribute;
-import static com.hazelcast.config.yaml.W3cDomUtil.asW3cNode;
+import static com.hazelcast.internal.config.yaml.W3cDomUtil.asW3cNode;
 import static com.hazelcast.internal.yaml.YamlUtil.asMapping;
 import static com.hazelcast.internal.yaml.YamlUtil.asScalar;
 import static com.hazelcast.internal.yaml.YamlUtil.asSequence;

hazelcast/src/main/java/com/hazelcast/config/CRDTReplicationConfig.java

@@ -18,7 +18,7 @@
 
 /**
  * Configures the replication mechanism for all
- * {@link com.hazelcast.crdt.CRDT} implementations.
+ * {@link com.hazelcast.internal.crdt.CRDT} implementations.
  * The CRDT states are replicated in rounds (the period is configurable)
  * and in each round the state is replicated up to the configured number
  * of members.

hazelcast/src/main/java/com/hazelcast/config/Config.java

@@ -2660,7 +2660,7 @@ public CRDTReplicationConfig getCRDTReplicationConfig() {
     }
 
     /**
-     * Sets the replication configuration for {@link com.hazelcast.crdt.CRDT}
+     * Sets the replication configuration for {@link com.hazelcast.internal.crdt.CRDT}
      * implementations.
      *
      * @param crdtReplicationConfig the replication configuration

hazelcast/src/main/java/com/hazelcast/config/NativeMemoryConfig.java

@@ -19,6 +19,7 @@
 import com.hazelcast.map.IMap;
 import com.hazelcast.memory.MemorySize;
 import com.hazelcast.memory.MemoryUnit;
+import com.hazelcast.memory.NativeOutOfMemoryError;
 
 import static com.hazelcast.internal.util.Preconditions.checkPositive;
 import static com.hazelcast.internal.util.Preconditions.isNotNull;
@@ -96,7 +97,7 @@ public MemorySize getSize() {
      * <p>
      * Total size of the memory blocks allocated in native memory region cannot exceed this memory size.
      * When native memory region is completely allocated and in-use, further allocation requests will fail
-     * with {@link com.hazelcast.memory.NativeOutOfMemoryError}.
+     * with {@link NativeOutOfMemoryError}.
      *
      * @param size memory size
      * @return this {@link NativeMemoryConfig} instance

hazelcast/src/main/java/com/hazelcast/config/PNCounterConfig.java

@@ -16,6 +16,7 @@
 
 package com.hazelcast.config;
 
+import com.hazelcast.crdt.pncounter.PNCounter;
 import com.hazelcast.nio.ObjectDataInput;
 import com.hazelcast.nio.ObjectDataOutput;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
@@ -25,7 +26,7 @@
 import static com.hazelcast.internal.util.Preconditions.checkNotNull;
 
 /**
- * Configuration for a {@link com.hazelcast.crdt.pncounter.PNCounter}
+ * Configuration for a {@link PNCounter}
  *
  * @since 3.10
  */

hazelcast/src/main/java/com/hazelcast/config/YamlConfigBuilder.java

@@ -16,7 +16,7 @@
 
 package com.hazelcast.config;
 
-import com.hazelcast.config.yaml.YamlDomChecker;
+import com.hazelcast.internal.config.yaml.YamlDomChecker;
 import com.hazelcast.internal.yaml.YamlLoader;
 import com.hazelcast.internal.yaml.YamlMapping;
 import com.hazelcast.internal.yaml.YamlNode;
@@ -32,7 +32,7 @@
 import java.net.URL;
 import java.util.Properties;
 
-import static com.hazelcast.config.yaml.W3cDomUtil.asW3cNode;
+import static com.hazelcast.internal.config.yaml.W3cDomUtil.asW3cNode;
 import static com.hazelcast.internal.util.Preconditions.checkNotNull;
 import static com.hazelcast.internal.util.Preconditions.checkTrue;
 

hazelcast/src/main/java/com/hazelcast/config/YamlDomVariableReplacer.java

@@ -17,11 +17,11 @@
 package com.hazelcast.config;
 
 import com.hazelcast.config.replacer.spi.ConfigReplacer;
-import com.hazelcast.config.yaml.ElementAdapter;
+import com.hazelcast.internal.config.yaml.ElementAdapter;
 import com.hazelcast.internal.yaml.MutableYamlNode;
 import org.w3c.dom.Node;
 
-import static com.hazelcast.config.yaml.W3cDomUtil.getWrappedMutableYamlNode;
+import static com.hazelcast.internal.config.yaml.W3cDomUtil.getWrappedMutableYamlNode;
 
 class YamlDomVariableReplacer extends AbstractDomVariableReplacer {
 

hazelcast/src/main/java/com/hazelcast/config/YamlMemberDomConfigProcessor.java

@@ -37,8 +37,8 @@
 import static com.hazelcast.config.DomConfigHelper.cleanNodeName;
 import static com.hazelcast.config.DomConfigHelper.getBooleanValue;
 import static com.hazelcast.config.DomConfigHelper.getIntegerValue;
-import static com.hazelcast.config.yaml.W3cDomUtil.getWrappedYamlMapping;
-import static com.hazelcast.config.yaml.W3cDomUtil.getWrappedYamlSequence;
+import static com.hazelcast.internal.config.yaml.W3cDomUtil.getWrappedYamlMapping;
+import static com.hazelcast.internal.config.yaml.W3cDomUtil.getWrappedYamlSequence;
 import static com.hazelcast.internal.yaml.YamlUtil.asScalar;
 import static com.hazelcast.internal.util.StringUtil.lowerCaseInternal;
 import static com.hazelcast.internal.util.StringUtil.upperCaseInternal;

hazelcast/src/main/java/com/hazelcast/core/HazelcastInstance.java

@@ -464,7 +464,7 @@ public interface HazelcastInstance {
     CardinalityEstimator getCardinalityEstimator(String name);
 
     /**
-     * Creates or returns a {@link com.hazelcast.crdt.pncounter.PNCounter} with the given
+     * Creates or returns a {@link PNCounter} with the given
      * name.
      * <p>
      * The PN counter can be used as a counter with strong eventual consistency
@@ -473,7 +473,7 @@ public interface HazelcastInstance {
      * converge to the same value.
      *
      * @param name the name of the PN counter
-     * @return a {@link com.hazelcast.crdt.pncounter.PNCounter}
+     * @return a {@link PNCounter}
      */
     PNCounter getPNCounter(String name);
 

hazelcast/src/main/java/com/hazelcast/crdt/package-info.java

@@ -15,8 +15,8 @@
  */
 
 /**
- * This package contains CRDT (conflict-free replicated data type)
- * implementations based on the Hazelcast infrastructure.
+ * This package contains the common classes for CRDT (conflict-free replicated
+ * data type) implementations based on the Hazelcast infrastructure.
  *
  * @since 3.10
  */

hazelcast/src/main/java/com/hazelcast/crdt/pncounter/package-info.java

@@ -16,7 +16,7 @@
 
 /**
  * This package contains the PN (Positive-Negative) CRDT counter
- * implementation.
+ * interface.
  *
  * @since 3.10
  */

hazelcast/src/main/java/com/hazelcast/instance/impl/DefaultNodeExtension.java

@@ -68,8 +68,8 @@
 import com.hazelcast.internal.serialization.impl.DefaultSerializationServiceBuilder;
 import com.hazelcast.logging.ILogger;
 import com.hazelcast.map.impl.MapService;
-import com.hazelcast.memory.DefaultMemoryStats;
-import com.hazelcast.memory.MemoryStats;
+import com.hazelcast.internal.memory.DefaultMemoryStats;
+import com.hazelcast.internal.memory.MemoryStats;
 import com.hazelcast.nio.Address;
 import com.hazelcast.nio.ClassLoaderUtil;
 import com.hazelcast.nio.IOService;