From dca8cca568b6aeb6dbc610dbeaf5ce8d3eed294e Mon Sep 17 00:00:00 2001
From: ChaoWang <chaowan@redhat.com>
Date: Wed, 25 Feb 2015 16:45:46 +0800
Subject: [PATCH] AMQ-5613 revise set and get methods name of Activation Spec
 properties "RedeliveryBackOffMultiplier" and
 "RedeliveryUseExponentialBackOff" to allow configuration through
 @ActivationConfigProperty.

---
 .../activemq/ra/ActiveMQActivationSpec.java   | 32 +++++++++++++++----
 .../activemq/ra/MessageActivationSpec.java    |  6 ++++
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java
index 99d4d9c5ec5..2df00ee2578 100644
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java
@@ -593,6 +593,7 @@ public void setMaxMessagesPerBatch(String maxMessagesPerBatch) {
         }
     }
 
+    @Deprecated
     public double getBackOffMultiplier() {
         if (redeliveryPolicy == null) {
             return 0;
@@ -600,6 +601,13 @@ public double getBackOffMultiplier() {
         return redeliveryPolicy.getBackOffMultiplier();
     }
 
+    public double getRedeliveryBackOffMultiplier() {
+        if (redeliveryPolicy == null) {
+            return 0;
+        }
+        return redeliveryPolicy.getBackOffMultiplier();
+    }
+
     public long getInitialRedeliveryDelay() {
         if (redeliveryPolicy == null) {
             return 0;
@@ -614,6 +622,7 @@ public int getMaximumRedeliveries() {
         return redeliveryPolicy.getMaximumRedeliveries();
     }
 
+    @Deprecated
     public boolean isUseExponentialBackOff() {
         if (redeliveryPolicy == null) {
             return false;
@@ -621,12 +630,21 @@ public boolean isUseExponentialBackOff() {
         return redeliveryPolicy.isUseExponentialBackOff();
     }
 
-    /**
-     * 
-     */
+    public boolean isRedeliveryUseExponentialBackOff() {
+        if (redeliveryPolicy == null) {
+            return false;
+        }
+        return redeliveryPolicy.isUseExponentialBackOff();
+    }
+
+    @Deprecated
     public void setBackOffMultiplier(double backOffMultiplier) {
         lazyCreateRedeliveryPolicy().setBackOffMultiplier(backOffMultiplier);
     }
+
+    public void setRedeliveryBackOffMultiplier(double redeliveryBackOffMultiplier) {
+        lazyCreateRedeliveryPolicy().setBackOffMultiplier(redeliveryBackOffMultiplier);
+    }
     
     public long getMaximumRedeliveryDelay() {
         if (redeliveryPolicy == null) {
@@ -654,13 +672,15 @@ public void setMaximumRedeliveries(int maximumRedeliveries) {
         lazyCreateRedeliveryPolicy().setMaximumRedeliveries(maximumRedeliveries);
     }
 
-    /**
-     * 
-     */
+
     public void setUseExponentialBackOff(boolean useExponentialBackOff) {
         lazyCreateRedeliveryPolicy().setUseExponentialBackOff(useExponentialBackOff);
     }
 
+    public void setRedeliveryUseExponentialBackOff(boolean redeliveryUseExponentialBackOff) {
+        lazyCreateRedeliveryPolicy().setUseExponentialBackOff(redeliveryUseExponentialBackOff);
+    }
+
     // don't use getter to avoid causing introspection errors in containers
     public RedeliveryPolicy redeliveryPolicy() {
         return redeliveryPolicy;
diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/MessageActivationSpec.java b/activemq-ra/src/main/java/org/apache/activemq/ra/MessageActivationSpec.java
index 1b82747053d..b7dc6b9b28c 100644
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/MessageActivationSpec.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/MessageActivationSpec.java
@@ -115,7 +115,10 @@ public interface MessageActivationSpec extends ActivationSpec {
 
     String getMaxMessagesPerBatch();
 
+    @Deprecated
     double getBackOffMultiplier();
+
+    double getRedeliveryBackOffMultiplier();
     
     long getMaximumRedeliveryDelay();
 
@@ -123,8 +126,11 @@ public interface MessageActivationSpec extends ActivationSpec {
 
     int getMaximumRedeliveries();
 
+    @Deprecated
     boolean isUseExponentialBackOff();
 
+    boolean isRedeliveryUseExponentialBackOff();
+
     RedeliveryPolicy redeliveryPolicy();
 
     RedeliveryPolicy lazyCreateRedeliveryPolicy();