ARTEMIS-4759 restore compatibility with LiveOnlyPolicyConfiguration

apache · May 9, 2024 · 2a43c53 · 2a43c53
1 parent abb1a77
commit 2a43c53
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/...src/main/java/org/apache/activemq/artemis/core/config/ha/LiveOnlyPolicyConfiguration.java b/...src/main/java/org/apache/activemq/artemis/core/config/ha/LiveOnlyPolicyConfiguration.java
@@ -16,11 +16,10 @@
  */
 package org.apache.activemq.artemis.core.config.ha;
 
-import org.apache.activemq.artemis.core.config.HAPolicyConfiguration;
 import org.apache.activemq.artemis.core.config.ScaleDownConfiguration;
 
 @Deprecated(forRemoval = true)
-public class LiveOnlyPolicyConfiguration implements HAPolicyConfiguration {
+public class LiveOnlyPolicyConfiguration extends PrimaryOnlyPolicyConfiguration {
 
    @Deprecated(forRemoval = true)
    public LiveOnlyPolicyConfiguration() {
@@ -30,19 +29,4 @@ public LiveOnlyPolicyConfiguration() {
    public LiveOnlyPolicyConfiguration(ScaleDownConfiguration scaleDownConfiguration) {
       this.scaleDownConfiguration = scaleDownConfiguration;
    }
-
-   @Override
-   public TYPE getType() {
-      return TYPE.PRIMARY_ONLY;
-   }
-
-   public ScaleDownConfiguration getScaleDownConfiguration() {
-      return scaleDownConfiguration;
-   }
-
-   public void setScaleDownConfiguration(ScaleDownConfiguration scaleDownConfiguration) {
-      this.scaleDownConfiguration = scaleDownConfiguration;
-   }
-
-   ScaleDownConfiguration scaleDownConfiguration;
 }
diff --git a/...src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java b/...src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java
@@ -25,6 +25,7 @@
 import org.apache.activemq.artemis.core.config.FileDeploymentManager;
 import org.apache.activemq.artemis.core.config.HAPolicyConfiguration;
 import org.apache.activemq.artemis.core.config.StoreConfiguration;
+import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration;
 import org.apache.activemq.artemis.core.server.cluster.ha.ColocatedPolicy;
 import org.apache.activemq.artemis.core.server.cluster.ha.HAPolicy;
 import org.apache.activemq.artemis.core.server.cluster.ha.PrimaryOnlyPolicy;
@@ -142,6 +143,21 @@ public void primaryOnlyTest5() throws Exception {
       primaryOnlyTest("primary-only-hapolicy-config5.xml");
    }
 
+   @Test
+   public void liveOnlyTest() throws Exception {
+      ActiveMQServerImpl server = new ActiveMQServerImpl(createDefaultConfig(0, true));
+      server.getConfiguration().setHAPolicyConfiguration(new LiveOnlyPolicyConfiguration());
+      try {
+         server.start();
+         Activation activation = server.getActivation();
+         assertTrue(activation instanceof PrimaryOnlyActivation);
+         HAPolicy haPolicy = server.getHAPolicy();
+         assertTrue(haPolicy instanceof PrimaryOnlyPolicy);
+      } finally {
+         server.stop();
+      }
+   }
+
    public static class FakeDistributedLockManager implements DistributedLockManager {
 
       private final Map<String, String> config;