Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #707 from AlexejTimonin/sendTextMessageWithProperties-delimiter 

[AMQ-8372] Allow custom delimiter when sending TextMessages via MBean
This commit is contained in:
Jean-Baptiste Onofré 2022-01-22 17:14:03 +01:00 committed by GitHub
parent 72b56f0941 7c63227003
commit 3d2fb2b609
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 78 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java
View File

@ -341,7 +341,22 @@ public class DestinationView implements DestinationViewMBean {
@Override
public String sendTextMessageWithProperties(String properties) throws Exception {
String[] kvs = properties.split(",");
Map<String, String> props = parseProps(properties, ",");
return sendTextMessage(props, props.remove("body"), props.remove("username"), props.remove("password"));
}
@Override
public String sendTextMessageWithProperties(String properties, String delimiter) throws Exception {
if (delimiter == null || delimiter.isEmpty()) {
return sendTextMessageWithProperties(properties);
} else {
Map<String, String> props = parseProps(properties, delimiter);
return sendTextMessage(props, props.remove("body"), props.remove("username"), props.remove("password"));
}
}
private Map<String, String> parseProps(String properties, String delimiter) {
String[] kvs = properties.split(delimiter);
Map<String, String> props = new HashMap<String, String>();
for (String kv : kvs) {
String[] it = kv.split("=");
@ -349,7 +364,7 @@ public class DestinationView implements DestinationViewMBean {
props.put(it[0],it[1]);
}
}
return sendTextMessage(props, props.remove("body"), props.remove("username"), props.remove("password"));
return props;
}
@Override

25
activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java
View File

@ -188,13 +188,30 @@ public interface DestinationViewMBean {
/**
* Sends a TextMessage to the destination.
*
* @param properties the message properties to set as a comma sep name=value list. Can only
* contain Strings maped to primitive types or JMS properties. eg: body=hi,JMSReplyTo=Queue2
* @param properties the message properties to set as name=value list separated
* by a comma. Can only contain Strings mapped to primitive
* types or JMS properties. eg: body=hi,JMSReplyTo=Queue2
* @return the message id of the message sent.
* @throws Exception
*/
@MBeanInfo("Sends a TextMessage to the destination.")
public String sendTextMessageWithProperties(String properties) throws Exception;
@MBeanInfo("Sends a TextMessage to the destination using comma separeted properties list. Example properties: body=value,header=value")
public String sendTextMessageWithProperties(@MBeanInfo("properties") String properties) throws Exception;
/**
* Sends a TextMessage to the destination.
*
* @param properties the message properties to set as name=value list separated
* by a custom delimiter. Can only contain Strings mapped to
* primitive types or JMS properties. eg:
* body=hi,JMSReplyTo=Queue2
* @param delimiter The delimiter that separates each property. Defaults to
* comma if none is provided.
* @return the message id of the message sent.
* @throws Exception
*/
@MBeanInfo("Sends a TextMessage to the destination using properties separeted by arbetrary delimiter. Example properties: body=value;header=value")
public String sendTextMessageWithProperties(@MBeanInfo("properties") String properties,
@MBeanInfo("delimiter") String delimiter) throws Exception;
/**
* Sends a TextMesage to the destination.

42
activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
View File

@ -46,8 +46,6 @@ import javax.management.ObjectName;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
import junit.textui.TestRunner;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQPrefetchPolicy;
@ -69,6 +67,9 @@ import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import junit.textui.TestRunner;
/**
* A test case of the various MBeans in ActiveMQ. If you want to look at the
* various MBeans after the test has been run then run this test case as a
@ -117,6 +118,7 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
// messages on a queue
assertSendViaMBean();
assertSendCsnvViaMBean();
assertSendTextMessageWithCustomDelimitedPropsViaMBean();
assertQueueBrowseWorks();
assertCreateAndDestroyDurableSubscriptions();
assertConsumerCounts();
@ -728,6 +730,42 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
browseAndVerifyTypes(proxy, true);
}
protected void assertSendTextMessageWithCustomDelimitedPropsViaMBean() throws Exception {
String queueName = getDestinationString() + ".SendMBBean";
ObjectName brokerName = assertRegisteredObjectName(domain + ":type=Broker,brokerName=localhost");
echo("Create QueueView MBean...");
BrokerViewMBean broker = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, brokerName, BrokerViewMBean.class, true);
broker.addQueue(queueName);
ObjectName queueViewMBeanName = assertRegisteredObjectName(domain + ":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + queueName);
echo("Create QueueView MBean...");
QueueViewMBean proxy = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, QueueViewMBean.class, true);
proxy.purge();
int count = 5;
String delimiter = ";";
for (int i = 0; i < count; i++) {
String props = String.join(delimiter,
"body=message:" + i,
"JMSCorrelationID=MyCorrId",
"JMSDeliveryMode=1",
"JMSXGroupID=MyGroupID",
"JMSXGroupSeq=1234",
"JMSPriority=" + (i + 1),
"JMSType=MyType",
"MyHeader=" + i,
"MyStringHeader=StringHeader" + i);
proxy.sendTextMessageWithProperties(props, delimiter);
}
browseAndVerifyTypes(proxy, true);
}
protected void assertComplexData(int messageIndex, CompositeData cdata, String name, Object expected) {
Object value = cdata.get(name);
assertEquals("Message " + messageIndex + " CData field: " + name, expected, value);