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 4367ec4 ARTEMIS-649 deprecate the HTML based JMX reports
4367ec4 is described below
commit 4367ec40a6561eb6d9a93c778d3141db5d8959bb
Author: Justin Bertram <[email protected]>
AuthorDate: Tue Oct 26 12:35:16 2021 -0500
ARTEMIS-649 deprecate the HTML based JMX reports
The HTML output methods are hold-overs from way back when the code-base
started off as JBoss Messaging 2 and the broker mainly ran in JBoss AS 4
and 5 which leveraged an HTML-based JMX console where these methods
would be executed and spit out nicely formatted data. That stuff has all
long since been retired so this commit deprecates the HTML-based
management methods so they can be removed completely in a future release.
JSON is a better structured output format for this and most of the
deprecated methods have JSON alternatives.
---
.../activemq/artemis/api/core/management/ActiveMQServerControl.java | 1 +
.../org/apache/activemq/artemis/api/core/management/QueueControl.java | 1 +
.../java/org/apache/activemq/artemis/jms/server/JMSServerManager.java | 1 +
.../apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java | 1 +
.../artemis/core/management/impl/ActiveMQServerControlImpl.java | 2 ++
.../apache/activemq/artemis/core/management/impl/QueueControlImpl.java | 2 ++
.../activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java | 2 ++
7 files changed, 10 insertions(+)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
index 0e0f080..59b142c 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
@@ -1139,6 +1139,7 @@ public interface ActiveMQServerControl {
* List all the prepared transaction, sorted by date,
* oldest first, with details, in HTML format
*/
+ @Deprecated
@Operation(desc = "List all the prepared transaction, sorted by date,
oldest first, with details, in HTML format")
String listPreparedTransactionDetailsAsHTML() throws Exception;
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
index cbca467..a3b1326 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
@@ -632,6 +632,7 @@ public interface QueueControl {
/**
* Lists the message counter history for this queue as a HTML table.
*/
+ @Deprecated
@Operation(desc = "List the message counters history HTML", impact =
MBeanOperationInfo.INFO)
String listMessageCounterHistoryAsHTML() throws Exception;
diff --git
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java
index 163b418..c89c392 100644
---
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java
+++
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java
@@ -337,6 +337,7 @@ public interface JMSServerManager extends ActiveMQComponent
{
String listPreparedTransactionDetailsAsJSON() throws Exception;
+ @Deprecated
String listPreparedTransactionDetailsAsHTML() throws Exception;
ActiveMQServer getActiveMQServer();
diff --git
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
index 6284dec..1608178 100644
---
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
+++
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
@@ -1324,6 +1324,7 @@ public class JMSServerManagerImpl extends
CleaningActivateCallback implements JM
return
server.getActiveMQServerControl().listPreparedTransactionDetailsAsJSON((xid,
tx, creation) -> new JMSTransactionDetail(xid, tx, creation));
}
+ @Deprecated
@Override
public String listPreparedTransactionDetailsAsHTML() throws Exception {
return
server.getActiveMQServerControl().listPreparedTransactionDetailsAsHTML((xid,
tx, creation) -> new JMSTransactionDetail(xid, tx, creation));
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index dbc7216..70f8a2d 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -1985,11 +1985,13 @@ public class ActiveMQServerControlImpl extends
AbstractControl implements Active
}
}
+ @Deprecated
@Override
public String listPreparedTransactionDetailsAsHTML() throws Exception {
return listPreparedTransactionDetailsAsHTML((xid, tx, creation) -> new
CoreTransactionDetail(xid, tx, creation));
}
+ @Deprecated
public String listPreparedTransactionDetailsAsHTML(TransactionDetailFactory
factory) throws Exception {
if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listPreparedTransactionDetailsAsHTML(this.server,
factory);
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
index 62008af..fe19ff7 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
@@ -1416,6 +1416,7 @@ public class QueueControlImpl extends AbstractControl
implements QueueControl {
}
}
+ @Deprecated
@Override
public String listMessageCounterAsHTML() {
if (AuditLogger.isBaseLoggingEnabled()) {
@@ -1446,6 +1447,7 @@ public class QueueControlImpl extends AbstractControl
implements QueueControl {
}
}
+ @Deprecated
@Override
public String listMessageCounterHistoryAsHTML() {
if (AuditLogger.isBaseLoggingEnabled()) {
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java
index 22103f5..9a5cd61 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java
@@ -44,6 +44,7 @@ public class MessageCounterHelper {
return DayCounterInfo.toJSON(infos);
}
+ @Deprecated
public static String listMessageCounterAsHTML(final MessageCounter[]
counters) {
if (counters == null) {
return null;
@@ -84,6 +85,7 @@ public class MessageCounterHelper {
return ret.toString();
}
+ @Deprecated
public static String listMessageCounterHistoryAsHTML(final MessageCounter[]
counters) {
if (counters == null) {
return null;
