(activemq-artemis) branch main updated: ARTEMIS-4759 restore compatibility with LiveOnlyPolicyConfiguration

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 2a43c53bb2 ARTEMIS-4759 restore compatibility with 
LiveOnlyPolicyConfiguration
2a43c53bb2 is described below

commit 2a43c53bb25c3115a23388db523abaa089e5ba3d
Author: Justin Bertram <jbert...@apache.org>
AuthorDate: Thu May 2 23:53:18 2024 -0500

    ARTEMIS-4759 restore compatibility with LiveOnlyPolicyConfiguration
---
 .../core/config/ha/LiveOnlyPolicyConfiguration.java    | 18 +-----------------
 .../core/config/impl/HAPolicyConfigurationTest.java    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/LiveOnlyPolicyConfiguration.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/LiveOnlyPolicyConfiguration.java
index 1efb2536ef..27efd4f78f 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/LiveOnlyPolicyConfiguration.java
+++ 
b/artemis-server/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 class LiveOnlyPolicyConfiguration implements 
HAPolicyConfiguration {
    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/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java
 
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java
index c448fecdd1..083b2c3758 100644
--- 
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java
+++ 
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java
@@ -25,6 +25,7 @@ import org.apache.activemq.artemis.core.config.Configuration;
 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 class HAPolicyConfigurationTest extends 
ServerTestBase {
       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;