Move config, partition and other private classes to internal API (#15887

) Move config, partition and other private classes to internal API com.hazelcast.client.config.AbstractQueryCacheConfigBuilderHelper com.hazelcast.client.config.ClientAliasedDiscoveryConfigUtils com.hazelcast.client.config.ClientConfigSections com.hazelcast.client.config.ClientDomConfigProcessor com.hazelcast.client.config.ClientFailoverConfigSections com.hazelcast.client.config.ClientFailoverDomConfigProcessor com.hazelcast.client.config.QueryCacheConfigBuilderHelper com.hazelcast.client.config.QueryCacheXmlConfigBuilderHelper com.hazelcast.client.config.QueryCacheYamlConfigBuilderHelper com.hazelcast.client.config.XmlClientConfigLocator com.hazelcast.client.config.XmlClientFailoverConfigLocator com.hazelcast.client.config.YamlClientConfigLocator com.hazelcast.client.config.YamlClientDomConfigProcessor com.hazelcast.client.config.YamlClientFailoverConfigLocator com.hazelcast.client.config.YamlClientFailoverDomConfigProcessor com.hazelcast.config.AbstractBasicConfig com.hazelcast.config.AbstractConfigLocator com.hazelcast.config.AbstractDomConfigProcessor com.hazelcast.config.AbstractDomVariableReplacer com.hazelcast.config.AliasedDiscoveryConfigUtils com.hazelcast.config.ConfigDataSerializerHook com.hazelcast.config.ConfigLoader com.hazelcast.config.ConfigReplacerHelper com.hazelcast.config.ConfigSections com.hazelcast.config.DomConfigHelper com.hazelcast.config.DomConfigProcessor com.hazelcast.config.DomVariableReplacer com.hazelcast.config.MemberDomConfigProcessor com.hazelcast.config.XmlConfigLocator com.hazelcast.config.XmlDomVariableReplacer com.hazelcast.config.YamlConfigLocator com.hazelcast.config.YamlDomVariableReplacer com.hazelcast.config.YamlMemberDomConfigProcessor com.hazelcast.spi.partition.FragmentedMigrationAwareService com.hazelcast.spi.partition.IPartition com.hazelcast.spi.partition.IPartitionLostEvent com.hazelcast.spi.partition.IPartitionService com.hazelcast.spi.partition.MigrationAwareService com.hazelcast.spi.partition.MigrationEndpoint com.hazelcast.spi.partition.PartitionAwareService com.hazelcast.spi.partition.PartitionMigrationEvent com.hazelcast.spi.partition.PartitionReplicationEvent com.hazelcast.map.journal.EventJournalMapEvent com.hazelcast.query.extractor.ArgumentParser
hazelcast · Oct 30, 2019 · 55765cc · 55765cc
1 parent d031b0e
commit 55765cc
Show file tree

Hide file tree

Showing 287 changed files with 939 additions and 556 deletions.
diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
@@ -67,7 +67,6 @@
     <suppress checks="NPathComplexity|CyclomaticComplexity" files="com[\\/]hazelcast[\\/]cache[\\/]impl[\\/]CacheEventDataImpl"/>
     <suppress checks="NPathComplexity"
               files="com[\\/]hazelcast[\\/]client[\\/]cache[\\/]impl[\\/]HazelcastClientCachingProvider"/>
-    <suppress checks="NPathComplexity|CyclomaticComplexity" files="com[\\/]hazelcast[\\/]config[\\/]AbstractCacheConfig"/>
     <suppress checks="FileLength" files="com[\\/]hazelcast[\\/]cache[\\/]impl[\\/]AbstractCacheRecordStore"/>
     <suppress checks="MethodCount" files="com[\\/]hazelcast[\\/]cache[\\/]impl[\\/]AbstractCacheService"/>
     <suppress checks="MethodCount"
@@ -98,11 +97,7 @@
     <suppress checks="MethodCount|CyclomaticComplexity|NPathComplexity|BooleanExpressionComplexity|ExecutableStatementCount"
               files="com[\\/]hazelcast[\\/]config[\\/]MapConfig"/>
     <suppress checks="MethodCount" files="com[\\/]hazelcast[\\/]config[\\/]SerializationConfig"/>
-    <suppress checks="MethodCount|MethodLength|FileLength" files="com[\\/]hazelcast[\\/]config[\\/]MemberDomConfigProcessor"/>
-    <suppress checks="CyclomaticComplexity|ClassFanOutComplexity|ClassDataAbstractionCoupling"
-              files="com[\\/]hazelcast[\\/]config[\\/]MemberDomConfigProcessor"/>
-    <suppress checks="CyclomaticComplexity|ClassFanOutComplexity|ClassDataAbstractionCoupling|MethodCount"
-              files="com[\\/]hazelcast[\\/]config[\\/]YamlMemberDomConfigProcessor"/>
+    <suppress checks="FileLength" files="com[\\/]hazelcast[\\/]internal[\\/]config[\\/]MemberDomConfigProcessor"/>
 
     <!-- YAML -->
     <suppress checks="BooleanExpressionComplexity" files="com[\\/]hazelcast[\\/]internal[\\/]yaml[\\/]YamlUtil"/>
@@ -141,8 +136,6 @@
     <suppress checks="MethodCount" files="com[\\/]hazelcast[\\/]client[\\/]impl[\\/]connection[\\/]nio[\\/]ClientConnection"/>
     <suppress checks="MethodCount|ClassFanOutComplexity|ClassDataAbstractionCoupling"
               files="com[\\/]hazelcast[\\/]client[\\/]impl[\\/]ClientEngineImpl"/>
-    <suppress checks="CyclomaticComplexity|ClassDataAbstractionCoupling|ClassFanOutComplexity|MethodCount"
-              files="com[\\/]hazelcast[\\/]client[\\/]config[\\/]ClientDomConfigProcessor"/>
     <suppress checks="CyclomaticComplexity" files="com[\\/]hazelcast[\\/]client[\\/]config[\\/]YamlClientDomConfigProcessor"/>
     <suppress checks="MethodCount" files="com[\\/]hazelcast[\\/]client[\\/]impl[\\/]MemberImpl"/>
     <suppress checks="ClassFanOutComplexity|AnonInnerLength"

diff --git a/...cast-spring/src/main/java/com/hazelcast/spring/AbstractHazelcastBeanDefinitionParser.java b/...cast-spring/src/main/java/com/hazelcast/spring/AbstractHazelcastBeanDefinitionParser.java
@@ -21,7 +21,7 @@
 import com.hazelcast.config.ClassFilter;
 import com.hazelcast.config.DiscoveryConfig;
 import com.hazelcast.config.DiscoveryStrategyConfig;
-import com.hazelcast.config.DomConfigHelper;
+import com.hazelcast.internal.config.DomConfigHelper;
 import com.hazelcast.config.EvictionConfig;
 import com.hazelcast.config.EvictionPolicy;
 import com.hazelcast.config.GlobalSerializerConfig;
@@ -53,9 +53,9 @@
 import java.util.HashSet;
 import java.util.List;
 
-import static com.hazelcast.config.DomConfigHelper.childElements;
-import static com.hazelcast.config.DomConfigHelper.cleanNodeName;
-import static com.hazelcast.config.DomConfigHelper.getBooleanValue;
+import static com.hazelcast.internal.config.DomConfigHelper.childElements;
+import static com.hazelcast.internal.config.DomConfigHelper.cleanNodeName;
+import static com.hazelcast.internal.config.DomConfigHelper.getBooleanValue;
 import static com.hazelcast.internal.config.ConfigValidator.checkEvictionConfig;
 import static com.hazelcast.internal.util.StringUtil.upperCaseInternal;
 import static java.lang.Integer.parseInt;

diff --git a/hazelcast-spring/src/main/java/com/hazelcast/spring/CacheManagerBeanDefinitionParser.java b/hazelcast-spring/src/main/java/com/hazelcast/spring/CacheManagerBeanDefinitionParser.java
@@ -26,8 +26,8 @@
 
 import java.util.Properties;
 
-import static com.hazelcast.config.DomConfigHelper.childElements;
-import static com.hazelcast.config.DomConfigHelper.cleanNodeName;
+import static com.hazelcast.internal.config.DomConfigHelper.childElements;
+import static com.hazelcast.internal.config.DomConfigHelper.cleanNodeName;
 
 /**
  * Bean definition parser for JCache {@link javax.cache.CacheManager}.

diff --git a/hazelcast-spring/src/main/java/com/hazelcast/spring/HazelcastClientBeanDefinitionParser.java b/hazelcast-spring/src/main/java/com/hazelcast/spring/HazelcastClientBeanDefinitionParser.java
@@ -32,7 +32,7 @@
 import com.hazelcast.client.util.RandomLB;
 import com.hazelcast.client.util.RoundRobinLB;
 import com.hazelcast.config.AliasedDiscoveryConfig;
-import com.hazelcast.config.AliasedDiscoveryConfigUtils;
+import com.hazelcast.internal.config.AliasedDiscoveryConfigUtils;
 import com.hazelcast.config.CredentialsFactoryConfig;
 import com.hazelcast.config.EntryListenerConfig;
 import com.hazelcast.config.InMemoryFormat;
@@ -59,10 +59,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.hazelcast.config.DomConfigHelper.childElements;
-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.internal.config.DomConfigHelper.childElements;
+import static com.hazelcast.internal.config.DomConfigHelper.cleanNodeName;
+import static com.hazelcast.internal.config.DomConfigHelper.getBooleanValue;
+import static com.hazelcast.internal.config.DomConfigHelper.getIntegerValue;
 import static com.hazelcast.spring.HazelcastInstanceDefinitionParser.CP_SUBSYSTEM_SUFFIX;
 import static com.hazelcast.internal.util.StringUtil.upperCaseInternal;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;

diff --git a/hazelcast-spring/src/main/java/com/hazelcast/spring/HazelcastConfigBeanDefinitionParser.java b/hazelcast-spring/src/main/java/com/hazelcast/spring/HazelcastConfigBeanDefinitionParser.java
@@ -18,7 +18,7 @@
 
 import com.hazelcast.config.AdvancedNetworkConfig;
 import com.hazelcast.config.AliasedDiscoveryConfig;
-import com.hazelcast.config.AliasedDiscoveryConfigUtils;
+import com.hazelcast.internal.config.AliasedDiscoveryConfigUtils;
 import com.hazelcast.config.CRDTReplicationConfig;
 import com.hazelcast.config.CachePartitionLostListenerConfig;
 import com.hazelcast.config.CacheSimpleConfig;
@@ -150,13 +150,13 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static com.hazelcast.config.DomConfigHelper.childElementWithName;
-import static com.hazelcast.config.DomConfigHelper.childElements;
-import static com.hazelcast.config.DomConfigHelper.cleanNodeName;
-import static com.hazelcast.config.DomConfigHelper.getBooleanValue;
-import static com.hazelcast.config.DomConfigHelper.getDoubleValue;
-import static com.hazelcast.config.DomConfigHelper.getIntegerValue;
-import static com.hazelcast.config.DomConfigHelper.getLongValue;
+import static com.hazelcast.internal.config.DomConfigHelper.childElementWithName;
+import static com.hazelcast.internal.config.DomConfigHelper.childElements;
+import static com.hazelcast.internal.config.DomConfigHelper.cleanNodeName;
+import static com.hazelcast.internal.config.DomConfigHelper.getBooleanValue;
+import static com.hazelcast.internal.config.DomConfigHelper.getDoubleValue;
+import static com.hazelcast.internal.config.DomConfigHelper.getIntegerValue;
+import static com.hazelcast.internal.config.DomConfigHelper.getLongValue;
 import static com.hazelcast.internal.util.ExceptionUtil.rethrow;
 import static com.hazelcast.internal.util.Preconditions.checkHasText;
 import static com.hazelcast.internal.util.StringUtil.isNullOrEmpty;

diff --git a/...pring/src/main/java/com/hazelcast/spring/HazelcastFailoverClientBeanDefinitionParser.java b/...pring/src/main/java/com/hazelcast/spring/HazelcastFailoverClientBeanDefinitionParser.java
@@ -26,7 +26,7 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import static com.hazelcast.config.DomConfigHelper.childElements;
+import static com.hazelcast.internal.config.DomConfigHelper.childElements;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
 
 /**

diff --git a/hazelcast-spring/src/main/java/com/hazelcast/spring/HazelcastInstanceDefinitionParser.java b/hazelcast-spring/src/main/java/com/hazelcast/spring/HazelcastInstanceDefinitionParser.java
@@ -25,8 +25,8 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import static com.hazelcast.config.DomConfigHelper.childElements;
-import static com.hazelcast.config.DomConfigHelper.cleanNodeName;
+import static com.hazelcast.internal.config.DomConfigHelper.childElements;
+import static com.hazelcast.internal.config.DomConfigHelper.cleanNodeName;
 
 /**
  * BeanDefinitionParser for Hazelcast Instance Configuration.

diff --git a/hazelcast-spring/src/test/java/com/hazelcast/spring/MyServiceConfigParser.java b/hazelcast-spring/src/test/java/com/hazelcast/spring/MyServiceConfigParser.java
@@ -21,9 +21,9 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import static com.hazelcast.config.DomConfigHelper.childElements;
-import static com.hazelcast.config.DomConfigHelper.cleanNodeName;
-import static com.hazelcast.config.DomConfigHelper.getTextContent;
+import static com.hazelcast.internal.config.DomConfigHelper.childElements;
+import static com.hazelcast.internal.config.DomConfigHelper.cleanNodeName;
+import static com.hazelcast.internal.config.DomConfigHelper.getTextContent;
 
 public class MyServiceConfigParser extends AbstractXmlConfigHelper implements ServiceConfigurationParser<MyServiceConfig> {
 

diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheService.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheService.java
@@ -56,10 +56,10 @@
 import com.hazelcast.spi.impl.operationservice.Operation;
 import com.hazelcast.spi.merge.SplitBrainMergePolicy;
 import com.hazelcast.spi.merge.SplitBrainMergePolicyProvider;
-import com.hazelcast.spi.partition.IPartitionLostEvent;
-import com.hazelcast.spi.partition.MigrationEndpoint;
-import com.hazelcast.spi.partition.PartitionAwareService;
-import com.hazelcast.spi.partition.PartitionMigrationEvent;
+import com.hazelcast.internal.partition.IPartitionLostEvent;
+import com.hazelcast.internal.partition.MigrationEndpoint;
+import com.hazelcast.internal.partition.PartitionAwareService;
+import com.hazelcast.internal.partition.PartitionMigrationEvent;
 import com.hazelcast.spi.tenantcontrol.TenantControlFactory;
 import com.hazelcast.wan.impl.WanReplicationService;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxyLoadAllTask.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxyLoadAllTask.java
@@ -23,7 +23,7 @@
 import com.hazelcast.spi.impl.NodeEngine;
 import com.hazelcast.spi.impl.operationservice.OperationFactory;
 import com.hazelcast.spi.impl.operationservice.OperationService;
-import com.hazelcast.spi.partition.IPartitionService;
+import com.hazelcast.internal.partition.IPartitionService;
 import com.hazelcast.internal.util.collection.PartitionIdSet;
 
 import javax.cache.CacheException;

diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxySupport.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheProxySupport.java
@@ -43,7 +43,7 @@
 import com.hazelcast.spi.impl.operationservice.OperationFactory;
 import com.hazelcast.spi.impl.operationservice.OperationService;
 import com.hazelcast.spi.impl.operationservice.impl.InvocationFuture;
-import com.hazelcast.spi.partition.IPartitionService;
+import com.hazelcast.internal.partition.IPartitionService;
 
 import javax.cache.CacheException;
 import javax.cache.CacheManager;

diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheService.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/CacheService.java
@@ -22,16 +22,16 @@
 import com.hazelcast.internal.nearcache.impl.invalidation.MetaDataGenerator;
 import com.hazelcast.internal.services.DistributedObjectNamespace;
 import com.hazelcast.internal.services.ObjectNamespace;
-import com.hazelcast.spi.partition.MigrationAwareService;
-import com.hazelcast.spi.partition.PartitionMigrationEvent;
-import com.hazelcast.spi.partition.PartitionReplicationEvent;
+import com.hazelcast.internal.partition.MigrationAwareService;
+import com.hazelcast.internal.partition.PartitionMigrationEvent;
+import com.hazelcast.internal.partition.PartitionReplicationEvent;
 import com.hazelcast.spi.impl.operationservice.Operation;
 import com.hazelcast.internal.services.ServiceNamespace;
 
 import java.util.Collection;
 
-import static com.hazelcast.spi.partition.MigrationEndpoint.DESTINATION;
-import static com.hazelcast.spi.partition.MigrationEndpoint.SOURCE;
+import static com.hazelcast.internal.partition.MigrationEndpoint.DESTINATION;
+import static com.hazelcast.internal.partition.MigrationEndpoint.SOURCE;
 
 /**
  * Cache Service is the main access point of JCache implementation.

diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/ICacheService.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/ICacheService.java
@@ -23,7 +23,7 @@
 import com.hazelcast.config.InMemoryFormat;
 import com.hazelcast.internal.eviction.ExpirationManager;
 import com.hazelcast.nio.serialization.Data;
-import com.hazelcast.spi.partition.FragmentedMigrationAwareService;
+import com.hazelcast.internal.partition.FragmentedMigrationAwareService;
 import com.hazelcast.spi.impl.eventservice.EventFilter;
 import com.hazelcast.spi.impl.eventservice.EventPublishingService;
 import com.hazelcast.internal.services.ManagedService;

diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheClearOperation.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/operation/CacheClearOperation.java
@@ -26,7 +26,7 @@
 import com.hazelcast.spi.impl.operationservice.Operation;
 import com.hazelcast.internal.services.ServiceNamespaceAware;
 import com.hazelcast.spi.impl.operationservice.MutatingOperation;
-import com.hazelcast.spi.partition.IPartitionService;
+import com.hazelcast.internal.partition.IPartitionService;
 
 import javax.cache.CacheException;
 

diff --git a/...c/main/java/com/hazelcast/cache/impl/operation/CacheGetInvalidationMetaDataOperation.java b/...c/main/java/com/hazelcast/cache/impl/operation/CacheGetInvalidationMetaDataOperation.java
@@ -26,7 +26,7 @@
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
 import com.hazelcast.spi.impl.operationservice.Operation;
 import com.hazelcast.spi.impl.operationservice.ReadonlyOperation;
-import com.hazelcast.spi.partition.IPartitionService;
+import com.hazelcast.internal.partition.IPartitionService;
 
 import java.io.IOException;
 import java.util.AbstractMap;

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
@@ -32,7 +32,7 @@
 import com.hazelcast.internal.services.ServiceNamespaceAware;
 import com.hazelcast.spi.impl.operationservice.AbstractNamedOperation;
 import com.hazelcast.spi.impl.operationservice.MutatingOperation;
-import com.hazelcast.spi.partition.IPartitionService;
+import com.hazelcast.internal.partition.IPartitionService;
 
 import javax.cache.CacheException;
 import java.io.IOException;

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
@@ -29,7 +29,7 @@
 import com.hazelcast.spi.impl.operationservice.Operation;
 import com.hazelcast.internal.services.ServiceNamespaceAware;
 import com.hazelcast.spi.impl.operationservice.MutatingOperation;
-import com.hazelcast.spi.partition.IPartitionService;
+import com.hazelcast.internal.partition.IPartitionService;
 
 import javax.cache.CacheException;
 import java.io.IOException;

diff --git a/hazelcast/src/main/java/com/hazelcast/cardinality/impl/CardinalityEstimatorService.java b/hazelcast/src/main/java/com/hazelcast/cardinality/impl/CardinalityEstimatorService.java
@@ -29,11 +29,11 @@
 import com.hazelcast.spi.impl.operationservice.Operation;
 import com.hazelcast.spi.merge.SplitBrainMergePolicy;
 import com.hazelcast.spi.merge.SplitBrainMergeTypes.CardinalityEstimatorMergeTypes;
-import com.hazelcast.spi.partition.IPartitionService;
-import com.hazelcast.spi.partition.MigrationAwareService;
-import com.hazelcast.spi.partition.MigrationEndpoint;
-import com.hazelcast.spi.partition.PartitionMigrationEvent;
-import com.hazelcast.spi.partition.PartitionReplicationEvent;
+import com.hazelcast.internal.partition.IPartitionService;
+import com.hazelcast.internal.partition.MigrationAwareService;
+import com.hazelcast.internal.partition.MigrationEndpoint;
+import com.hazelcast.internal.partition.PartitionMigrationEvent;
+import com.hazelcast.internal.partition.PartitionReplicationEvent;
 import com.hazelcast.internal.util.ConstructorFunction;
 import com.hazelcast.internal.util.ContextMutexFactory;
 

diff --git a/hazelcast/src/main/java/com/hazelcast/client/config/ClientConfigXmlGenerator.java b/hazelcast/src/main/java/com/hazelcast/client/config/ClientConfigXmlGenerator.java
@@ -20,7 +20,7 @@
 import com.hazelcast.client.util.RandomLB;
 import com.hazelcast.client.util.RoundRobinLB;
 import com.hazelcast.config.AliasedDiscoveryConfig;
-import com.hazelcast.config.AliasedDiscoveryConfigUtils;
+import com.hazelcast.internal.config.AliasedDiscoveryConfigUtils;
 import com.hazelcast.config.ConfigXmlGenerator.XmlGenerator;
 import com.hazelcast.config.CredentialsFactoryConfig;
 import com.hazelcast.config.DiscoveryConfig;
@@ -59,7 +59,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.hazelcast.client.config.ClientAliasedDiscoveryConfigUtils.aliasedDiscoveryConfigsFrom;
+import static com.hazelcast.client.config.impl.ClientAliasedDiscoveryConfigUtils.aliasedDiscoveryConfigsFrom;
 import static com.hazelcast.internal.util.StringUtil.isNullOrEmpty;
 import static com.hazelcast.internal.nio.IOUtil.closeResource;
 

diff --git a/hazelcast/src/main/java/com/hazelcast/client/config/XmlClientConfigBuilder.java b/hazelcast/src/main/java/com/hazelcast/client/config/XmlClientConfigBuilder.java
@@ -16,13 +16,17 @@
 
 package com.hazelcast.client.config;
 
+import com.hazelcast.client.config.impl.ClientConfigSections;
+import com.hazelcast.client.config.impl.ClientDomConfigProcessor;
+import com.hazelcast.client.config.impl.XmlClientConfigLocator;
 import com.hazelcast.config.AbstractXmlConfigBuilder;
-import com.hazelcast.config.ConfigLoader;
+import com.hazelcast.internal.config.ConfigLoader;
 import com.hazelcast.config.InvalidConfigurationException;
 import com.hazelcast.logging.ILogger;
 import com.hazelcast.logging.Logger;
 import com.hazelcast.internal.nio.IOUtil;
 import com.hazelcast.internal.util.ExceptionUtil;
+import com.hazelcast.spi.annotation.PrivateApi;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -99,6 +103,7 @@ public XmlClientConfigBuilder() {
      *
      * @param locator the configured locator to use
      */
+    @PrivateApi
     public XmlClientConfigBuilder(XmlClientConfigLocator locator) {
         if (locator == null) {
             locator = new XmlClientConfigLocator();
@@ -175,7 +180,8 @@ private void checkRootElement(Element root) {
         String rootNodeName = root.getNodeName();
         if (!ClientConfigSections.HAZELCAST_CLIENT.isEqual(rootNodeName)) {
             throw new InvalidConfigurationException("Invalid root element in xml configuration! "
-                    + "Expected: <" + ClientConfigSections.HAZELCAST_CLIENT.name + ">, Actual: <" + rootNodeName + ">.");
+                    + "Expected: <" + ClientConfigSections.HAZELCAST_CLIENT.getName()
+                    + ">, Actual: <" + rootNodeName + ">.");
         }
     }
 }
diff --git a/hazelcast/src/main/java/com/hazelcast/client/config/XmlClientFailoverConfigBuilder.java b/hazelcast/src/main/java/com/hazelcast/client/config/XmlClientFailoverConfigBuilder.java
@@ -16,14 +16,18 @@
 
 package com.hazelcast.client.config;
 
+import com.hazelcast.client.config.impl.ClientFailoverConfigSections;
+import com.hazelcast.client.config.impl.ClientFailoverDomConfigProcessor;
+import com.hazelcast.client.config.impl.XmlClientFailoverConfigLocator;
 import com.hazelcast.config.AbstractXmlConfigBuilder;
-import com.hazelcast.config.ConfigLoader;
+import com.hazelcast.internal.config.ConfigLoader;
 import com.hazelcast.config.InvalidConfigurationException;
 import com.hazelcast.core.HazelcastException;
 import com.hazelcast.logging.ILogger;
 import com.hazelcast.logging.Logger;
 import com.hazelcast.internal.nio.IOUtil;
 import com.hazelcast.internal.util.ExceptionUtil;
+import com.hazelcast.spi.annotation.PrivateApi;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -101,6 +105,7 @@ public XmlClientFailoverConfigBuilder() {
      * @param locator the configured locator to use
      * @throws HazelcastException if no failover configuration is found
      */
+    @PrivateApi
     public XmlClientFailoverConfigBuilder(XmlClientFailoverConfigLocator locator) {
         if (locator == null) {
             locator = new XmlClientFailoverConfigLocator();

diff --git a/hazelcast/src/main/java/com/hazelcast/client/config/YamlClientConfigBuilder.java b/hazelcast/src/main/java/com/hazelcast/client/config/YamlClientConfigBuilder.java
@@ -16,15 +16,19 @@
 
 package com.hazelcast.client.config;
 
+import com.hazelcast.client.config.impl.ClientConfigSections;
+import com.hazelcast.client.config.impl.YamlClientConfigLocator;
+import com.hazelcast.client.config.impl.YamlClientDomConfigProcessor;
 import com.hazelcast.config.AbstractYamlConfigBuilder;
-import com.hazelcast.config.ConfigLoader;
+import com.hazelcast.internal.config.ConfigLoader;
 import com.hazelcast.config.InvalidConfigurationException;
 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;
 import com.hazelcast.internal.nio.IOUtil;
 import com.hazelcast.internal.util.ExceptionUtil;
+import com.hazelcast.spi.annotation.PrivateApi;
 import org.w3c.dom.Node;
 
 import java.io.File;
@@ -96,6 +100,7 @@ public YamlClientConfigBuilder() {
      *
      * @param locator the configured locator to use
      */
+    @PrivateApi
     public YamlClientConfigBuilder(YamlClientConfigLocator locator) {
         if (locator == null) {
             locator = new YamlClientConfigLocator();
@@ -139,7 +144,7 @@ private void parseAndBuildConfig(ClientConfig config) throws Exception {
             throw new InvalidConfigurationException("Invalid YAML configuration", ex);
         }
 
-        YamlNode clientRoot = yamlRootNode.childAsMapping(ClientConfigSections.HAZELCAST_CLIENT.name);
+        YamlNode clientRoot = yamlRootNode.childAsMapping(ClientConfigSections.HAZELCAST_CLIENT.getName());
         if (clientRoot == null) {
             clientRoot = yamlRootNode;
         }
@@ -155,6 +160,6 @@ private void parseAndBuildConfig(ClientConfig config) throws Exception {
 
     @Override
     protected String getConfigRoot() {
-        return ClientConfigSections.HAZELCAST_CLIENT.name;
+        return ClientConfigSections.HAZELCAST_CLIENT.getName();
     }
 }