This is PR #116

rh-messaging · Oct 12, 2018 · 4e7f5d9 · 4e7f5d9
2 parents 9d2da1c + bcf8169
commit 4e7f5d9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/Producer.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/Producer.java
@@ -46,10 +46,13 @@ public class Producer extends DestAbstract {
    @Option(name = "--message-size", description = "Size of each byteMessage (The producer will use byte message on this case)")
    int messageSize = 0;
 
+   @Option(name = "--message", description = "Content of each textMessage (The producer will use text message on this case)")
+   String message = null;
+
    @Option(name = "--text-size", description = "Size of each textMessage (The producer will use text message on this case)")
    int textMessageSize;
 
-   @Option(name = "--object-size", description = "Size of each ObjectMessage (The producer will use object mesasge on this case)")
+   @Option(name = "--object-size", description = "Size of each ObjectMessage (The producer will use object message on this case)")
    int objectSize;
 
    @Option(name = "--msgttl", description = "TTL for each message")
@@ -121,7 +124,7 @@ public Object execute(ActionContext context) throws Exception {
                threadsArray[i] = new ProducerThread(session, dest, i);
 
                threadsArray[i].setVerbose(verbose).setSleep(sleep).setPersistent(!nonpersistent).
-                  setMessageSize(messageSize).setTextMessageSize(textMessageSize).setObjectSize(objectSize).
+                  setMessageSize(messageSize).setTextMessageSize(textMessageSize).setMessage(message).setObjectSize(objectSize).
                   setMsgTTL(msgTTL).setMsgGroupID(msgGroupID).setTransactionBatchSize(txBatchSize).
                   setMessageCount(messageCount).setQueueId(queueId);
             }

diff --git a/...s-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/ProducerThread.java b/...s-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/ProducerThread.java
@@ -53,7 +53,7 @@ public class ProducerThread extends Thread {
 
    int transactions = 0;
    final AtomicInteger sentCount = new AtomicInteger(0);
-   String message;
+   String message = null;
    String messageText = null;
    String payloadUrl = null;
    byte[] payload = null;

diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
@@ -587,6 +587,8 @@ public void testSimpleRun(String folderName) throws Exception {
          assertEquals(Integer.valueOf(10), Artemis.internalExecute("consumer", "--break-on-null", "--receive-timeout", "100", "--user", "admin", "--password", "admin"));
          assertEquals(Integer.valueOf(10), Artemis.internalExecute("producer", "--message-size", "500", "--message-count", "10", "--user", "admin", "--password", "admin"));
          assertEquals(Integer.valueOf(10), Artemis.internalExecute("consumer", "--break-on-null", "--receive-timeout", "100", "--user", "admin", "--password", "admin"));
+         assertEquals(Integer.valueOf(10), Artemis.internalExecute("producer", "--message", "message", "--message-count", "10", "--user", "admin", "--password", "admin"));
+         assertEquals(Integer.valueOf(10), Artemis.internalExecute("consumer", "--break-on-null", "--receive-timeout", "100", "--user", "admin", "--password", "admin"));
 
          ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61616");
          Connection connection = cf.createConnection("admin", "admin");