- Use Cluster service to get Version

hazelcast · Sep 15, 2023 · dec631d · dec631d
1 parent 5043c94
commit dec631d
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/CPSubsystemImpl.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/CPSubsystemImpl.java
@@ -16,6 +16,7 @@
 
 package com.hazelcast.cp.internal;
 
+import com.hazelcast.cluster.Cluster;
 import com.hazelcast.core.DistributedObject;
 import com.hazelcast.core.HazelcastException;
 import com.hazelcast.cp.CPGroup;
@@ -42,7 +43,6 @@
 import com.hazelcast.internal.cluster.Versions;
 import com.hazelcast.logging.ILogger;
 import com.hazelcast.spi.impl.InternalCompletableFuture;
-import com.hazelcast.version.Version;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
@@ -126,7 +126,7 @@ public CPSubsystemManagementService getCPSubsystemManagementService() {
 
         RaftService raftService = getService(RaftService.SERVICE_NAME);
         cpSubsystemManagementService =
-                new CPSubsystemManagementServiceImpl(raftService, instance.getCluster().getClusterVersion());
+                new CPSubsystemManagementServiceImpl(raftService, instance.getCluster());
         return cpSubsystemManagementService;
     }
 
@@ -173,12 +173,12 @@ public boolean removeGroupAvailabilityListener(UUID id) {
 
     private static class CPSubsystemManagementServiceImpl implements CPSubsystemManagementService {
         private final RaftService raftService;
-        // TODO RU_COMPAT_5_3, clusterVersion, added for Version 5.3 compatibility. Should be removed at Version 5.5
-        private final Version clusterVersion;
+        // TODO RU_COMPAT_5_3, cluster, added for Version 5.3 compatibility. Should be removed at Version 5.5
+        private final Cluster cluster;
 
-        CPSubsystemManagementServiceImpl(RaftService raftService, Version clusterVersion) {
+        CPSubsystemManagementServiceImpl(RaftService raftService, Cluster cluster) {
             this.raftService = raftService;
-            this.clusterVersion = clusterVersion;
+            this.cluster = cluster;
         }
 
         @Override
@@ -233,7 +233,7 @@ public boolean awaitUntilDiscoveryCompleted(long timeout, TimeUnit timeUnit) thr
 
         @Override
         public CompletionStage<Void> wipeDestroyedObjects() {
-            if (clusterVersion.isUnknownOrLessThan(Versions.V5_4)) {
+            if (cluster.getClusterVersion().isUnknownOrLessThan(Versions.V5_4)) {
                 String message = "Wiping of previously destroyed CP objects is supported in cluster versions 5.4 and above";
                 throw new UnsupportedOperationException(message);
             }