Merge pull request #5 from redis-developer/topic/hu-maintenace-notifications-config-rename

Maintenance notification settings rename

Author: ggivo

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

@@ -2,8 +2,8 @@
 
 import io.lettuce.core.AbstractRedisClient;
 import io.lettuce.core.ClientOptions;
-import io.lettuce.core.MaintenanceEventsOptions;
-import io.lettuce.core.MaintenanceEventsOptions.AddressType;
+import io.lettuce.core.MaintNotificationsConfig;
+import io.lettuce.core.MaintNotificationsConfig.EndpointType;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.SocketOptions;
 import io.lettuce.core.TimeoutOptions;
@@ -319,16 +319,16 @@ protected ClientOptions createClientOptions(ClientOptionsConfig config) {
             if (config.getMaintenanceEventsConfig() != null) {
                 MaintenanceEventsConfig maintEventsCfg = config.getMaintenanceEventsConfig();
                 if (maintEventsCfg.isEnabled()) {
-                    MaintenanceEventsOptions options;
+                    MaintNotificationsConfig options;
                     if (maintEventsCfg.getMovingEndpointAddressType() != null) {
-                        AddressType addrType = AddressType.valueOf(maintEventsCfg.getMovingEndpointAddressType());
-                        options = MaintenanceEventsOptions.enabled(addrType);
+                        EndpointType addrType = EndpointType.valueOf(maintEventsCfg.getMovingEndpointAddressType());
+                        options = MaintNotificationsConfig.enabled(addrType);
                         log.info("Enabling supportMaintenanceEvents with address type: {}", addrType);
                     } else {
-                        options = MaintenanceEventsOptions.enabled();
+                        options = MaintNotificationsConfig.enabled();
                         log.info("Enabling supportMaintenanceEvents with default (auto resolve) address type.");
                     }
-                    builder.supportMaintenanceEvents(options);
+                    builder.maintNotificationsConfig(options);
                 }
             }
 
@@ -362,17 +362,7 @@ private void applyTimeoutOptions(TimeoutOptions.Builder builder, TimeoutOptionsC
         }
 
         if (config.getTimeoutsRelaxingDuringMaintenance() != null) {
-            try {
-                Method timeoutsRelaxingDuringMaintenance = builder.getClass().getMethod("timeoutsRelaxingDuringMaintenance",
-                        Duration.class);
-                timeoutsRelaxingDuringMaintenance.invoke(builder, config.getTimeoutsRelaxingDuringMaintenance());
-                log.info("ProactiveTimeoutsRelaxingMethod enabled successfully.");
-            } catch (NoSuchMethodException e) {
-                throw new IllegalStateException(
-                        "The method 'timeoutsRelaxingDuringMaintenance' is not available in this build.", e);
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                throw new RuntimeException("Failed to invoke 'timeoutsRelaxingDuringMaintenance' method.", e);
-            }
+            builder.relaxedTimeoutsDuringMaintenance(config.getTimeoutsRelaxingDuringMaintenance());
         }
     }