activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6105
Date Tue, 22 Dec 2015 18:33:47 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 35627d9d6 -> 8906a53ae


https://issues.apache.org/jira/browse/AMQ-6105

Remove deprecated methods from JMX tree

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/8906a53a
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/8906a53a
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/8906a53a

Branch: refs/heads/master
Commit: 8906a53ae5b459677d3b62501d3c5483d112e5f8
Parents: 35627d9
Author: Timothy Bish <tabish121@gmail.com>
Authored: Tue Dec 22 13:33:13 2015 -0500
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Tue Dec 22 13:33:36 2015 -0500

----------------------------------------------------------------------
 .../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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/8906a53a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerView.java
----------------------------------------------------------------------
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 2118a96..def4218 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
@@ -114,11 +114,6 @@ public class JobSchedulerView implements JobSchedulerViewMBean {
     }
 
     @Override
-    public void removeJobAtScheduledTime(String time) throws Exception {
-        removeAllJobsAtScheduledTime(time);
-    }
-
-    @Override
     public void removeJob(String jobId) throws Exception {
         this.jobScheduler.remove(jobId);
     }

http://git-wip-us.apache.org/repos/asf/activemq/blob/8906a53a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/JobSchedulerViewMBean.java
----------------------------------------------------------------------
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 76a7926..82a48ae 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
@@ -29,23 +29,6 @@ public interface JobSchedulerViewMBean {
      *        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
-     * 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.
      */
     @MBeanInfo("remove jobs with matching execution time")
     public abstract void removeAllJobsAtScheduledTime(@MBeanInfo("time: yyyy-MM-dd hh:mm:ss")String
time) throws Exception;

http://git-wip-us.apache.org/repos/asf/activemq/blob/8906a53a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java
----------------------------------------------------------------------
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 41495ea..85f1f14 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
@@ -125,15 +125,6 @@ public class SubscriptionView implements SubscriptionViewMBean {
     /**
      * @return the id of the Subscription
      */
-    @Deprecated
-    @Override
-    public long getSubcriptionId() {
-        return getSubscriptionId();
-    }
-
-    /**
-     * @return the id of the Subscription
-     */
     @Override
     public long getSubscriptionId() {
         ConsumerInfo info = getConsumerInfo();
@@ -300,16 +291,6 @@ public class SubscriptionView implements SubscriptionViewMBean {
      * @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.
-     */
     @Override
     public String getSubscriptionName() {
         ConsumerInfo info = getConsumerInfo();

http://git-wip-us.apache.org/repos/asf/activemq/blob/8906a53a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java
----------------------------------------------------------------------
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 8fad1b6..f1dbf26 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
@@ -45,13 +45,6 @@ public interface SubscriptionViewMBean {
     /**
      * @return the id of the Subscription
      */
-    @Deprecated
-    @MBeanInfo("ID of the Subscription.")
-    long getSubcriptionId();
-
-    /**
-     * @return the id of the Subscription
-     */
     @MBeanInfo("ID of the Subscription.")
     long getSubscriptionId();
 
@@ -186,14 +179,6 @@ public interface SubscriptionViewMBean {
      * @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.
-     */
     @MBeanInfo("The name of the subscription (durable subscriptions only).")
     String getSubscriptionName();
 
@@ -241,7 +226,6 @@ public interface SubscriptionViewMBean {
     @MBeanInfo("ObjectName of the Connection that created this Subscription")
     ObjectName getConnection();
 
-
     @MBeanInfo("Resets statistics.")
     void resetStatistics();
 


Mime
View raw message