[activemq-artemis] branch master updated: ARTEMIS-2540 Display LargeMessage column in message browser of admin UI

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[activemq-artemis] branch master updated: ARTEMIS-2540 Display LargeMessage column in message browser of admin UI

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 318c26c  ARTEMIS-2540 Display LargeMessage column in message browser of admin UI
     new b733ea4  This closes #2883
318c26c is described below

commit 318c26cde7cb4c6003994fc96bf8eca2f74da2ba
Author: sebthom <[hidden email]>
AuthorDate: Tue Nov 5 22:04:39 2019 +0100

    ARTEMIS-2540 Display LargeMessage column in message browser of admin UI
---
 artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js    | 5 +++++
 .../core/management/impl/openmbean/CompositeDataConstants.java       | 4 +++-
 .../artemis/core/management/impl/openmbean/OpenTypeSupport.java      | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js
index ac5a91b..35ee593 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js
@@ -63,6 +63,11 @@ var ARTEMIS = (function(ARTEMIS) {
          field: 'redelivered',
          displayName: 'Redelivered',
          width: '10%'
+      },
+      {
+         field: 'largeMessage',
+         displayName: 'Large',
+         width: '10%'
       }
     ];
    var attributes = defaultAttributes;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/CompositeDataConstants.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/CompositeDataConstants.java
index d9d7015..feae788 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/CompositeDataConstants.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/CompositeDataConstants.java
@@ -29,10 +29,11 @@ public interface CompositeDataConstants {
    String TIMESTAMP = "timestamp";
    String BODY = "BodyPreview";
    String TEXT_BODY = "text";
+   String LARGE_MESSAGE = "largeMessage";
    String PROPERTIES = "PropertiesText";
 
    String ADDRESS_DESCRIPTION = "The Address";
-   String MESSAGE_ID_DESCRIPTION = " The message ID";
+   String MESSAGE_ID_DESCRIPTION = "The message ID";
    String USER_ID_DESCRIPTION = "The user ID";
    String TYPE_DESCRIPTION = "The message type";
    String DURABLE_DESCRIPTION = "Is the message durable";
@@ -41,6 +42,7 @@ public interface CompositeDataConstants {
    String REDELIVERED_DESCRIPTION = "Has the message been redelivered";
    String TIMESTAMP_DESCRIPTION = "The message timestamp";
    String BODY_DESCRIPTION = "The message body";
+   String LARGE_MESSAGE_DESCRIPTION = "Is the message treated as a large message";
    String PROPERTIES_DESCRIPTION = "The properties text";
 
    // User properties
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java
index 6c7a9b5..c19be9c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java
@@ -108,6 +108,7 @@ public final class OpenTypeSupport {
          addItem(CompositeDataConstants.PRIORITY, CompositeDataConstants.PRIORITY_DESCRIPTION, SimpleType.BYTE);
          addItem(CompositeDataConstants.REDELIVERED, CompositeDataConstants.REDELIVERED_DESCRIPTION, SimpleType.BOOLEAN);
          addItem(CompositeDataConstants.TIMESTAMP, CompositeDataConstants.TIMESTAMP_DESCRIPTION, SimpleType.STRING);
+         addItem(CompositeDataConstants.LARGE_MESSAGE, CompositeDataConstants.LARGE_MESSAGE_DESCRIPTION, SimpleType.BOOLEAN);
 
          addItem(CompositeDataConstants.PROPERTIES, CompositeDataConstants.PROPERTIES_DESCRIPTION, SimpleType.STRING);
 
@@ -148,6 +149,7 @@ public final class OpenTypeSupport {
          rc.put(CompositeDataConstants.TIMESTAMP, dateFormat.format(new Date(m.getTimestamp())));
          rc.put(CompositeDataConstants.PRIORITY, m.getPriority());
          rc.put(CompositeDataConstants.REDELIVERED, ref.getDeliveryCount() > 1);
+         rc.put(CompositeDataConstants.LARGE_MESSAGE, m.isLargeMessage());
 
          Map<String, Object> propertyMap = m.toPropertyMap();