move reconntion strategy to base

Signed-off-by: Shoham Elias <[email protected]>

Author: shohamazon

java/client/src/main/java/glide/managers/ConnectionManager.java

@@ -145,6 +145,19 @@ private ConnectionRequest.Builder setupConnectionRequestBuilderBaseConfiguration
             connectionRequestBuilder.setProtocolValue(configuration.getProtocol().ordinal());
         }
 
+        if (configuration.getReconnectStrategy() != null) {
+            var reconnectionStrategyBuilder =
+                    ConnectionRequestOuterClass.ConnectionRetryStrategy.newBuilder()
+                            .setNumberOfRetries(configuration.getReconnectStrategy().getNumOfRetries())
+                            .setExponentBase(configuration.getReconnectStrategy().getExponentBase())
+                            .setFactor(configuration.getReconnectStrategy().getFactor());
+            if (configuration.getReconnectStrategy().getJitterPercent() != null) {
+                reconnectionStrategyBuilder.setJitterPercent(
+                        configuration.getReconnectStrategy().getJitterPercent());
+            }
+            connectionRequestBuilder.setConnectionRetryStrategy(reconnectionStrategyBuilder.build());
+        }
+
         return connectionRequestBuilder;
     }
 
@@ -241,19 +254,6 @@ private ConnectionRequest.Builder setupConnectionRequestBuilderGlideClusterClien
                             connectionRequestBuilder, configuration.getAdvancedConfiguration());
         }
 
-        if (configuration.getReconnectStrategy() != null) {
-            var reconnectionStrategyBuilder =
-                    ConnectionRequestOuterClass.ConnectionRetryStrategy.newBuilder()
-                            .setNumberOfRetries(configuration.getReconnectStrategy().getNumOfRetries())
-                            .setExponentBase(configuration.getReconnectStrategy().getExponentBase())
-                            .setFactor(configuration.getReconnectStrategy().getFactor());
-            if (configuration.getReconnectStrategy().getJitterPercent() != null) {
-                reconnectionStrategyBuilder.setJitterPercent(
-                        configuration.getReconnectStrategy().getJitterPercent());
-            }
-            connectionRequestBuilder.setConnectionRetryStrategy(reconnectionStrategyBuilder.build());
-        }
-
         return connectionRequestBuilder;
     }
 

java/client/src/test/java/glide/managers/ConnectionManagerTest.java

@@ -341,6 +341,7 @@ public void test_reconnect_strategy_to_protobuf() {
         GlideClientConfiguration glideClientConfiguration =
                 GlideClientConfiguration.builder()
                         .address(NodeAddress.builder().host(HOST).port(PORT).build())
+                        .useTLS(true)
                         .reconnectStrategy(
                                 BackoffStrategy.builder()
                                         .numOfRetries(10)
@@ -351,6 +352,12 @@ public void test_reconnect_strategy_to_protobuf() {
                         .build();
         ConnectionRequest expectedProtobufConnectionRequest =
                 ConnectionRequest.newBuilder()
+                        .addAddresses(
+                                ConnectionRequestOuterClass.NodeAddress.newBuilder()
+                                        .setHost(HOST)
+                                        .setPort(PORT)
+                                        .build())
+                        .setTlsMode(TlsMode.SecureTls)
                         .setConnectionRetryStrategy(
                                 ConnectionRetryStrategy.newBuilder()
                                         .setNumberOfRetries(10)
@@ -378,6 +385,7 @@ public void test_reconnect_strategy_to_protobuf_cluster_client() {
         GlideClusterClientConfiguration glideClusterClientConfiguration =
                 GlideClusterClientConfiguration.builder()
                         .address(NodeAddress.builder().host(HOST).port(PORT).build())
+                        .useTLS(true)
                         .reconnectStrategy(
                                 BackoffStrategy.builder()
                                         .numOfRetries(10)
@@ -388,6 +396,12 @@ public void test_reconnect_strategy_to_protobuf_cluster_client() {
                         .build();
         ConnectionRequest expectedProtobufConnectionRequest =
                 ConnectionRequest.newBuilder()
+                        .addAddresses(
+                                ConnectionRequestOuterClass.NodeAddress.newBuilder()
+                                        .setHost(HOST)
+                                        .setPort(PORT)
+                                        .build())
+                        .setTlsMode(TlsMode.SecureTls)
                         .setClusterModeEnabled(true)
                         .setConnectionRetryStrategy(
                                 ConnectionRetryStrategy.newBuilder()