removing deprecated client config methods

hazelcast · May 10, 2019 · 1ac3c1f · 1ac3c1f
1 parent 6ded404
commit 1ac3c1f
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 309 deletions.
diff --git a/...t-client/src/main/java/com/hazelcast/client/config/ClientAliasedDiscoveryConfigUtils.java b/...t-client/src/main/java/com/hazelcast/client/config/ClientAliasedDiscoveryConfigUtils.java
@@ -68,14 +68,4 @@ public static List<AliasedDiscoveryConfig<?>> aliasedDiscoveryConfigsFrom(Client
                 networkConfig.getAzureConfig(), networkConfig.getKubernetesConfig(), networkConfig.getEurekaConfig());
     }
 
-    /**
-     * Creates new {@link AliasedDiscoveryConfig} by the given {@code tag}.
-     */
-    public static AliasedDiscoveryConfig newAliasedDiscoveryConfig(String name) {
-        if ("aws".equals(name)) {
-            return new ClientAwsConfig();
-        } else {
-            return AliasedDiscoveryConfigUtils.newConfigFor(name);
-        }
-    }
 }
diff --git a/hazelcast-client/src/main/java/com/hazelcast/client/config/ClientAwsConfig.java b/hazelcast-client/src/main/java/com/hazelcast/client/config/ClientAwsConfig.java
diff --git a/hazelcast-client/src/main/java/com/hazelcast/client/config/ClientConfig.java b/hazelcast-client/src/main/java/com/hazelcast/client/config/ClientConfig.java
@@ -25,7 +25,6 @@
 import com.hazelcast.config.NearCacheConfig;
 import com.hazelcast.config.QueryCacheConfig;
 import com.hazelcast.config.SerializationConfig;
-import com.hazelcast.config.SocketInterceptorConfig;
 import com.hazelcast.config.matcher.MatchingPointConfigPatternMatcher;
 import com.hazelcast.core.ManagedContext;
 import com.hazelcast.flakeidgen.FlakeIdGenerator;
@@ -314,19 +313,6 @@ public void accept(ClientReliableTopicConfig clientReliableTopicConfig, String n
                 });
     }
 
-    /**
-     * please use {@link ClientConfig#addNearCacheConfig(NearCacheConfig)}
-     *
-     * @param name            name of the IMap / ICache that Near Cache config will be applied to
-     * @param nearCacheConfig nearCacheConfig
-     * @return configured {@link com.hazelcast.client.config.ClientConfig} for chaining
-     */
-    @Deprecated
-    public ClientConfig addNearCacheConfig(String name, NearCacheConfig nearCacheConfig) {
-        nearCacheConfig.setName(name);
-        return addNearCacheConfig(nearCacheConfig);
-    }
-
     /**
      * Helper method to add a new NearCacheConfig
      *
@@ -541,91 +527,6 @@ public Map<String, ClientReliableTopicConfig> getReliableTopicConfigMap() {
         return reliableTopicConfigMap;
     }
 
-    /**
-     * Use {@link ClientNetworkConfig#isSmartRouting} instead
-     */
-    @Deprecated
-    public boolean isSmartRouting() {
-        return networkConfig.isSmartRouting();
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#setSmartRouting} instead
-     */
-    @Deprecated
-    public ClientConfig setSmartRouting(boolean smartRouting) {
-        networkConfig.setSmartRouting(smartRouting);
-        return this;
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#getSocketInterceptorConfig} instead
-     */
-    @Deprecated
-    public SocketInterceptorConfig getSocketInterceptorConfig() {
-        return networkConfig.getSocketInterceptorConfig();
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#setSocketInterceptorConfig} instead
-     */
-    @Deprecated
-    public ClientConfig setSocketInterceptorConfig(SocketInterceptorConfig socketInterceptorConfig) {
-        networkConfig.setSocketInterceptorConfig(socketInterceptorConfig);
-        return this;
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#getConnectionAttemptPeriod} instead
-     */
-    @Deprecated
-    public int getConnectionAttemptPeriod() {
-        return networkConfig.getConnectionAttemptPeriod();
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#setConnectionAttemptPeriod} instead
-     */
-    @Deprecated
-    public ClientConfig setConnectionAttemptPeriod(int connectionAttemptPeriod) {
-        networkConfig.setConnectionAttemptPeriod(connectionAttemptPeriod);
-        return this;
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#getConnectionAttemptLimit} instead
-     */
-    @Deprecated
-    public int getConnectionAttemptLimit() {
-        return networkConfig.getConnectionAttemptLimit();
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#setConnectionAttemptLimit} instead
-     */
-    @Deprecated
-    public ClientConfig setConnectionAttemptLimit(int connectionAttemptLimit) {
-        networkConfig.setConnectionAttemptLimit(connectionAttemptLimit);
-        return this;
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#getConnectionTimeout} instead
-     */
-    @Deprecated
-    public int getConnectionTimeout() {
-        return networkConfig.getConnectionTimeout();
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#setConnectionTimeout} instead
-     */
-    @Deprecated
-    public ClientConfig setConnectionTimeout(int connectionTimeout) {
-        networkConfig.setConnectionTimeout(connectionTimeout);
-        return this;
-    }
-
     /**
      * Gets {@link com.hazelcast.security.Credentials}
      *
@@ -647,32 +548,6 @@ public ClientConfig setCredentials(Credentials credentials) {
         return this;
     }
 
-    /**
-     * Use {@link ClientNetworkConfig#addAddress} instead
-     */
-    @Deprecated
-    public ClientConfig addAddress(String... addresses) {
-        networkConfig.addAddress(addresses);
-        return this;
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#setAddresses} instead
-     */
-    @Deprecated
-    public ClientConfig setAddresses(List<String> addresses) {
-        networkConfig.setAddresses(addresses);
-        return this;
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#getAddresses} instead
-     */
-    @Deprecated
-    public List<String> getAddresses() {
-        return networkConfig.getAddresses();
-    }
-
     /**
      * gets {@link GroupConfig}
      *
@@ -741,40 +616,6 @@ public ClientConfig setLoadBalancer(LoadBalancer loadBalancer) {
         return this;
     }
 
-    /**
-     * Use {@link ClientNetworkConfig#isRedoOperation} instead
-     */
-    @Deprecated
-    public boolean isRedoOperation() {
-        return networkConfig.isRedoOperation();
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#setRedoOperation} instead
-     */
-    @Deprecated
-    public ClientConfig setRedoOperation(boolean redoOperation) {
-        networkConfig.setRedoOperation(redoOperation);
-        return this;
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#getSocketOptions} instead
-     */
-    @Deprecated
-    public SocketOptions getSocketOptions() {
-        return networkConfig.getSocketOptions();
-    }
-
-    /**
-     * Use {@link ClientNetworkConfig#setSocketOptions} instead
-     */
-    @Deprecated
-    public ClientConfig setSocketOptions(SocketOptions socketOptions) {
-        networkConfig.setSocketOptions(socketOptions);
-        return this;
-    }
-
     /**
      * Gets the classLoader
      *
@@ -897,14 +738,6 @@ public String getLicenseKey() {
         return licenseKey;
     }
 
-    /**
-     * @deprecated As of Hazelcast 3.10.3, enterprise license keys are required only for members, and not for clients
-     */
-    public ClientConfig setLicenseKey(final String licenseKey) {
-        this.licenseKey = licenseKey;
-        return this;
-    }
-
     public ClientConfig addQueryCacheConfig(String mapName, QueryCacheConfig queryCacheConfig) {
         Map<String, Map<String, QueryCacheConfig>> queryCacheConfigsPerMap = getQueryCacheConfigs();
         String queryCacheName = queryCacheConfig.getName();

diff --git a/hazelcast-client/src/main/java/com/hazelcast/client/config/ClientConfigSections.java b/hazelcast-client/src/main/java/com/hazelcast/client/config/ClientConfigSections.java
@@ -35,7 +35,6 @@ enum ClientConfigSections {
     NEAR_CACHE("near-cache", true),
     QUERY_CACHES("query-caches", false),
     EXECUTOR_POOL_SIZE("executor-pool-size", false),
-    LICENSE_KEY("license-key", false),
     INSTANCE_NAME("instance-name", false),
     CONNECTION_STRATEGY("connection-strategy", false),
     USER_CODE_DEPLOYMENT("user-code-deployment", false), FLAKE_ID_GENERATOR("flake-id-generator", true), RELIABLE_TOPIC(

diff --git a/hazelcast-client/src/main/java/com/hazelcast/client/config/ClientConfigXmlGenerator.java b/hazelcast-client/src/main/java/com/hazelcast/client/config/ClientConfigXmlGenerator.java
@@ -19,6 +19,7 @@
 import com.hazelcast.client.LoadBalancer;
 import com.hazelcast.client.util.RandomLB;
 import com.hazelcast.client.util.RoundRobinLB;
+import com.hazelcast.config.AwsConfig;
 import com.hazelcast.config.ConfigXmlGenerator.XmlGenerator;
 import com.hazelcast.config.DiscoveryConfig;
 import com.hazelcast.config.DiscoveryStrategyConfig;
@@ -497,13 +498,13 @@ private static void ssl(XmlGenerator gen, SSLConfig ssl) {
            .close();
     }
 
-    private static void aws(XmlGenerator gen, ClientAwsConfig aws) {
+    private static void aws(XmlGenerator gen, AwsConfig aws) {
         if (aws == null) {
             return;
         }
         gen.open("aws", "enabled", aws.isEnabled(),
                 "connection-timeout-seconds", aws.getConnectionTimeoutSeconds())
-           .node("inside-aws", aws.isInsideAws())
+           .node("use-public-ip", aws.isUsePublicIp())
            .node("access-key", aws.getAccessKey())
            .node("secret-key", aws.getSecretKey())
            .node("iam-role", aws.getIamRole())

diff --git a/hazelcast-client/src/main/java/com/hazelcast/client/config/ClientDomConfigProcessor.java b/hazelcast-client/src/main/java/com/hazelcast/client/config/ClientDomConfigProcessor.java
@@ -49,7 +49,6 @@
 import static com.hazelcast.client.config.ClientConfigSections.GROUP;
 import static com.hazelcast.client.config.ClientConfigSections.INSTANCE_NAME;
 import static com.hazelcast.client.config.ClientConfigSections.LABELS;
-import static com.hazelcast.client.config.ClientConfigSections.LICENSE_KEY;
 import static com.hazelcast.client.config.ClientConfigSections.LISTENERS;
 import static com.hazelcast.client.config.ClientConfigSections.LOAD_BALANCER;
 import static com.hazelcast.client.config.ClientConfigSections.NATIVE_MEMORY;
@@ -128,8 +127,6 @@ private void handleNode(Node node, String nodeName) {
             queryCacheConfigBuilderHelper.handleQueryCache(clientConfig, node);
         } else if (EXECUTOR_POOL_SIZE.isEqual(nodeName)) {
             handleExecutorPoolSize(node);
-        } else if (LICENSE_KEY.isEqual(nodeName)) {
-            clientConfig.setLicenseKey(getTextContent(node));
         } else if (INSTANCE_NAME.isEqual(nodeName)) {
             clientConfig.setInstanceName(getTextContent(node));
         } else if (CONNECTION_STRATEGY.isEqual(nodeName)) {
@@ -544,7 +541,7 @@ private void handleSSLConfig(Node node, ClientNetworkConfig clientNetworkConfig)
     }
 
     private void handleSocketOptions(Node node, ClientNetworkConfig clientNetworkConfig) {
-        SocketOptions socketOptions = clientConfig.getSocketOptions();
+        SocketOptions socketOptions = clientConfig.getNetworkConfig().getSocketOptions();
         for (Node child : childElements(node)) {
             String nodeName = cleanNodeName(child);
             if ("tcp-no-delay".equals(nodeName)) {