Update configuration property names to match latest in lettuce

Author: ggivo

pom.xml

@@ -47,8 +47,7 @@
         <dependency>
             <groupId>io.lettuce</groupId>
             <artifactId>lettuce-core</artifactId>
-            <version>6.6.0.RELEASE</version>
-            <!--<version>6.6.0.BUILD-SNAPSHOT</version> -->
+            <version>7.0.0-SNAPSHOT</version>
          </dependency>
          <dependency>
              <groupId>com.fasterxml.jackson.dataformat</groupId>

runner-config.yaml

@@ -39,7 +39,7 @@ runner:
       commandLatencyMonitoring: true # Enables Lettuce internal command latency monitoring
       connectionMonitoring: true     # Enables Additional metrics for connection inactive time. Note supported with GA build of lettuce, and required custom Lettuce client build.  See README.md for instruction ho to enable them
     autoReconnect: true
-    proactiveRebind: false
+    supportMaintenanceEvents: false
     #reconnectOptions:
     #  fixedDelay: PT1S # 1s Configures constant delay between re-connection attempts
     #pingBeforeActivate: false
@@ -48,7 +48,7 @@ runner:
     #disconnectedBehavior: REJECT_COMMANDS  #Options: DEFAULT, ACCEPT_COMMANDS, REJECT_COMMANDS
     #timeoutOptions: # Options to configure command timeouts
     #    fixedTimeout: PT1S # 1 s
-    #    proactiveTimeoutsRelaxing: PT0.500S # 500 ms
+    #    timeoutsRelaxingDuringMaintenance: PT0.500S # 500 ms
     #socketOptions:  # Options to configure low-level socket options for the connections kept to Redis servers.
     #  connectTimeout: PT10S # 10 s
     #  tcpUserTimeoutOptions:

src/main/java/io/lettuce/test/WorkloadRunnerBase.java

@@ -297,8 +297,8 @@ protected ClientOptions createClientOptions(ClientOptionsConfig config) {
                 builder.autoReconnect(config.getAutoReconnect());
             }
 
-            if (config.getProactiveRebind() != null) {
-                OptionalClientOptions.applyProactiveRebindOption(builder, config.getProactiveRebind());
+            if (config.getSupportMaintenanceEvents() != null) {
+                OptionalClientOptions.applySupportMaintenanceEventsOption(builder, config.getSupportMaintenanceEvents());
             }
 
             if (config.getPingBeforeActivate() != null) {
@@ -330,16 +330,16 @@ private void applyTimeoutOptions(TimeoutOptions.Builder builder, TimeoutOptionsC
             builder.fixedTimeout(config.getFixedTimeout());
         }
 
-        if (config.getProactiveTimeoutsRelaxing() != null) {
+        if (config.getTimeoutsRelaxingDuringMaintenance() != null) {
             try {
-                Method proactiveTimeoutsRelaxingMethod = builder.getClass().getMethod("proactiveTimeoutsRelaxing",
+                Method timeoutsRelaxingDuringMaintenance = builder.getClass().getMethod("timeoutsRelaxingDuringMaintenance",
                         Duration.class);
-                proactiveTimeoutsRelaxingMethod.invoke(builder, config.getProactiveTimeoutsRelaxing());
+                timeoutsRelaxingDuringMaintenance.invoke(builder, config.getTimeoutsRelaxingDuringMaintenance());
                 log.info("ProactiveTimeoutsRelaxingMethod enabled successfully.");
             } catch (NoSuchMethodException e) {
-                throw new IllegalStateException("The method 'proactiveTimeoutsRelaxing' is not available in this build.", e);
+                throw new IllegalStateException("The method 'timeoutsRelaxingDuringMaintenance' is not available in this build.", e);
             } catch (IllegalAccessException | InvocationTargetException e) {
-                throw new RuntimeException("Failed to invoke 'proactiveTimeoutsRelaxing' method.", e);
+                throw new RuntimeException("Failed to invoke 'timeoutsRelaxingDuringMaintenance' method.", e);
             }
         }
     }
@@ -387,15 +387,13 @@ private void applyKeepAliveOptions(SocketOptions.KeepAliveOptions.Builder builde
 
     static class OptionalClientOptions {
 
-        private static final Logger log = LoggerFactory.getLogger(OptionalClientOptions.class);
-
-        static public void applyProactiveRebindOption(ClientOptions.Builder builder, boolean value) {
+        static public void applySupportMaintenanceEventsOption(ClientOptions.Builder builder, boolean value) {
             try {
-                Method method = builder.getClass().getMethod("proactiveRebind", boolean.class);
+                Method method = builder.getClass().getMethod("supportMaintenanceEvents", boolean.class);
                 method.invoke(builder, value);
             } catch (NoSuchMethodException e) {
                 throw new IllegalStateException(
-                        "proactiveRebind configuration option can't be applied. Not available in this build.", e);
+                        "supportMaintenanceEvents configuration option can't be applied. Not available in this build.", e);
             } catch (IllegalAccessException | InvocationTargetException e) {
                 throw new RuntimeException("Failed to configure proactiveRebind option.", e);
             }

src/main/java/io/lettuce/test/config/WorkloadRunnerConfig.java

@@ -363,7 +363,7 @@ public static class ClientOptionsConfig {
 
         private Boolean autoReconnect;
 
-        private Boolean proactiveRebind;
+        private Boolean supportMaintenanceEvents;
 
         private Boolean pingBeforeActivate;
 
@@ -388,12 +388,12 @@ public void setAutoReconnect(Boolean autoReconnect) {
             this.autoReconnect = autoReconnect;
         }
 
-        public Boolean getProactiveRebind() {
-            return proactiveRebind;
+        public Boolean getSupportMaintenanceEvents() {
+            return supportMaintenanceEvents;
         }
 
-        public void setProactiveRebind(Boolean proactiveRebind) {
-            this.proactiveRebind = proactiveRebind;
+        public void setSupportMaintenanceEvents(Boolean supportMaintenanceEvents) {
+            this.supportMaintenanceEvents = supportMaintenanceEvents;
         }
 
         public Boolean getPingBeforeActivate() {
@@ -446,7 +446,7 @@ public void setReconnectOptions(ReconnectOptionsConfig reconnectOptions) {
 
         @Override
         public String toString() {
-            return "ClientOptionsConfig{" + "autoReconnect=" + autoReconnect + ", proactiveRebind=" + proactiveRebind
+            return "ClientOptionsConfig{" + "autoReconnect=" + autoReconnect + ", proactiveRebind=" + supportMaintenanceEvents
                     + ", pingBeforeActivate=" + pingBeforeActivate + ", requestQueueSize=" + requestQueueSize
                     + ", timeoutOptions=" + timeoutOptions + ", socketOptions=" + socketOptions + ", disconnectedBehavior='"
                     + disconnectedBehavior + '\'' + ", reconnectOptions=" + reconnectOptions + '}';
@@ -510,7 +510,7 @@ public static class TimeoutOptionsConfig {
 
         private Duration fixedTimeout;
 
-        private Duration proactiveTimeoutsRelaxing;
+        private Duration timeoutsRelaxingDuringMaintenance;
 
         // Getters and Setters
         public Duration getFixedTimeout() {
@@ -521,18 +521,18 @@ public void setFixedTimeout(Duration fixedTimeout) {
             this.fixedTimeout = fixedTimeout;
         }
 
-        public Duration getProactiveTimeoutsRelaxing() {
-            return proactiveTimeoutsRelaxing;
+        public Duration getTimeoutsRelaxingDuringMaintenance() {
+            return timeoutsRelaxingDuringMaintenance;
         }
 
-        public void setProactiveTimeoutsRelaxing(Duration proactiveTimeoutsRelaxing) {
-            this.proactiveTimeoutsRelaxing = proactiveTimeoutsRelaxing;
+        public void setTimeoutsRelaxingDuringMaintenance(Duration timeoutsRelaxingDuringMaintenance) {
+            this.timeoutsRelaxingDuringMaintenance = timeoutsRelaxingDuringMaintenance;
         }
 
         @Override
         public String toString() {
             return "TimeoutOptionsConfig{" + "fixedTimeout=" + fixedTimeout + ",proactiveExpiryRelaxTime="
-                    + proactiveTimeoutsRelaxing + '}';
+                    + timeoutsRelaxingDuringMaintenance + '}';
         }
 
     }

src/main/resources/runner-config-defaults.yaml

@@ -35,7 +35,7 @@ runner:
 
   #clientOptions:
     #autoReconnect: true
-    #proactiveRebind: false
+    #supportMaintenanceEvents: false
     #reconnectOptions:
     #  fixedDelay: PT1S # 1s Configures constant delay between re-connection attempts
     #  proactiveTimeoutsRelaxing: PT0.500S # 500 ms