Merge pull request #1326 from kenliao94/improve_cli

[AMQ-9596] Add priority and disableMessageTimestamp to the producer command

activemq-client/src/main/java/org/apache/activemq/util/ProducerThread.java

@@ -25,6 +25,8 @@ import java.net.URL;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static jakarta.jms.Message.DEFAULT_PRIORITY;
+
 public class ProducerThread extends Thread {
 
     private static final Logger LOG = LoggerFactory.getLogger(ProducerThread.class);
@@ -40,6 +42,8 @@ public class ProducerThread extends Thread {
     long msgTTL = 0L;
     String msgGroupID=null;
     int transactionBatchSize;
+    int priority = DEFAULT_PRIORITY;
+    boolean disableMessageTimestamp = false;
 
     int transactions = 0;
     AtomicInteger sentCount = new AtomicInteger(0);
@@ -64,6 +68,8 @@ public class ProducerThread extends Thread {
             producer = session.createProducer(destination);
             producer.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
             producer.setTimeToLive(msgTTL);
+            producer.setPriority(priority);
+            producer.setDisableMessageTimestamp(disableMessageTimestamp);
             initPayLoad();
             running = true;
 
@@ -306,4 +312,12 @@ public class ProducerThread extends Thread {
     public void resetCounters(){
         this.sentCount.set(0);
     }
+
+    public void setMessagePriority(int priority) {
+        this.priority = priority;
+    }
+
+    public void setDisableMessageTimestamp(boolean disableMessageTimestamp) {
+        this.disableMessageTimestamp = disableMessageTimestamp;
+    }
 }

activemq-console/src/main/java/org/apache/activemq/console/command/ProducerCommand.java

@@ -27,6 +27,8 @@ import jakarta.jms.Session;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
+import static jakarta.jms.Message.DEFAULT_PRIORITY;
+
 public class ProducerCommand extends AbstractCommand {
     private static final Logger LOG = LoggerFactory.getLogger(ProducerCommand.class);
 
@@ -45,6 +47,8 @@ public class ProducerCommand extends AbstractCommand {
     String msgGroupID=null;
     int transactionBatchSize;
     private int parallelThreads = 1;
+    int priority = DEFAULT_PRIORITY;
+    boolean disableMessageTimestamp = false;
 
     @Override
     protected void runTask(List<String> tokens) throws Exception {
@@ -82,6 +86,8 @@ public class ProducerCommand extends AbstractCommand {
                 producer.setMsgGroupID(msgGroupID);
                 producer.setTextMessageSize(textMessageSize);
                 producer.setFinished(active);
+                producer.setMessagePriority(priority);
+                producer.setDisableMessageTimestamp(disableMessageTimestamp);
                 producer.start();
             }
 
@@ -213,6 +219,14 @@ public class ProducerCommand extends AbstractCommand {
         this.message = message;
     }
 
+    public void setMessagePriority(int priority) {
+        this.priority = priority;
+    }
+
+    public void setDisableMessageTimestamp(boolean disableMessageTimestamp) {
+        this.disableMessageTimestamp = disableMessageTimestamp;
+    }
+
     @Override
     protected void printHelp() {
         printHelpFromFile();

activemq-console/src/main/resources/org/apache/activemq/console/command/producer.txt

@@ -16,3 +16,5 @@ Options :
     [--message                                      ..] - a text string to use as the message body
     [--payloadUrl                                  URL] - a url pointing to a document to use as the message body
     [--msgGroupID                                   ..] - JMS message group identifier
+    [--messagePriority                               N] - The message priority. Default is 4
+    [--disableMessageTimestamp              true|false] - Whether or not to disable timestamp on message, default false