From 8906a53ae5b459677d3b62501d3c5483d112e5f8 Mon Sep 17 00:00:00 2001
From: Timothy Bish <tabish121@gmail.com>
Date: Tue, 22 Dec 2015 13:33:13 -0500
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-6105

Remove deprecated methods from JMX tree
---
 .../activemq/broker/jmx/JobSchedulerView.java |  5 -----
 .../broker/jmx/JobSchedulerViewMBean.java     | 17 -----------------
 .../activemq/broker/jmx/SubscriptionView.java | 19 -------------------
 .../broker/jmx/SubscriptionViewMBean.java     | 16 ----------------
 4 files changed, 57 deletions(-)

diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerView.java
index 2118a96099..def4218c69 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerView.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerView.java
@@ -113,11 +113,6 @@ public class JobSchedulerView implements JobSchedulerViewMBean {
         this.jobScheduler.remove(removeAtTime);
     }
 
-    @Override
-    public void removeJobAtScheduledTime(String time) throws Exception {
-        removeAllJobsAtScheduledTime(time);
-    }
-
     @Override
     public void removeJob(String jobId) throws Exception {
         this.jobScheduler.remove(jobId);
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerViewMBean.java
index 76a7926dd1..82a48ae770 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerViewMBean.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerViewMBean.java
@@ -20,23 +20,6 @@ import javax.management.openmbean.TabularData;
 
 public interface JobSchedulerViewMBean {
 
-    /**
-     * Remove all jobs scheduled to run at this time.  If there are no jobs scheduled
-     * at the given time this methods returns without making any modifications to the
-     * scheduler store.
-     *
-     * @param time
-     *        the string formated time that should be used to remove jobs.
-     *
-     * @throws Exception if an error occurs while performing the remove.
-     *
-     * @deprecated use removeAllJobsAtScheduledTime instead as it is more explicit about what
-     *             the method is actually doing.
-     */
-    @Deprecated
-    @MBeanInfo("remove jobs with matching execution time")
-    public abstract void removeJobAtScheduledTime(@MBeanInfo("time: yyyy-MM-dd hh:mm:ss")String time) throws Exception;
-
     /**
      * Remove all jobs scheduled to run at this time.  If there are no jobs scheduled
      * at the given time this methods returns without making any modifications to the
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java
index 41495ea8e2..85f1f14e42 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java
@@ -122,15 +122,6 @@ public class SubscriptionView implements SubscriptionViewMBean {
         return 0;
     }
 
-    /**
-     * @return the id of the Subscription
-     */
-    @Deprecated
-    @Override
-    public long getSubcriptionId() {
-        return getSubscriptionId();
-    }
-
     /**
      * @return the id of the Subscription
      */
@@ -296,16 +287,6 @@ public class SubscriptionView implements SubscriptionViewMBean {
         return info != null ? info.getPriority() : 0;
     }
 
-    /**
-     * @return the name of the consumer which is only used for durable
-     *         consumers.
-     */
-    @Deprecated
-    @Override
-    public String getSubcriptionName() {
-        return getSubscriptionName();
-    }
-
     /**
      * @return the name of the consumer which is only used for durable
      *         consumers.
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java
index 8fad1b60f2..f1dbf26faf 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java
@@ -42,13 +42,6 @@ public interface SubscriptionViewMBean {
     @MBeanInfo("ID of the Session the Subscription is on.")
     long getSessionId();
 
-    /**
-     * @return the id of the Subscription
-     */
-    @Deprecated
-    @MBeanInfo("ID of the Subscription.")
-    long getSubcriptionId();
-
     /**
      * @return the id of the Subscription
      */
@@ -182,14 +175,6 @@ public interface SubscriptionViewMBean {
     @MBeanInfo("The subscription priority")
     byte getPriority();
 
-    /**
-     * @return the name of the consumer which is only used for durable
-     *         consumers.
-     */
-    @Deprecated
-    @MBeanInfo("The name of the subscription (durable subscriptions only).")
-    String getSubcriptionName();
-
     /**
      * @return the name of the consumer which is only used for durable
      *         consumers.
@@ -241,7 +226,6 @@ public interface SubscriptionViewMBean {
     @MBeanInfo("ObjectName of the Connection that created this Subscription")
     ObjectName getConnection();
 
-
     @MBeanInfo("Resets statistics.")
     void resetStatistics();