This is an automated email from the ASF dual-hosted git repository.
dinglei pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 3456f81 Validate message before sending
3456f81 is described below
commit 3456f812ff155524343ac0a613a9b402e7aa4981
Author: ShannonDing <[email protected]>
AuthorDate: Tue May 14 20:16:27 2019 +0800
Validate message before sending
---
.../rocketmq/client/producer/DefaultMQProducer.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git
a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
index 3a26e83..669b047 100644
---
a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
+++
b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
@@ -331,6 +331,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public SendResult send(
Message msg) throws MQClientException, RemotingException,
MQBrokerException, InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
return this.defaultMQProducerImpl.send(msg);
}
@@ -350,6 +351,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public SendResult send(Message msg,
long timeout) throws MQClientException, RemotingException,
MQBrokerException, InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
return this.defaultMQProducerImpl.send(msg, timeout);
}
@@ -374,6 +376,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public void send(Message msg,
SendCallback sendCallback) throws MQClientException,
RemotingException, InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
this.defaultMQProducerImpl.send(msg, sendCallback);
}
@@ -391,6 +394,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public void send(Message msg, SendCallback sendCallback, long timeout)
throws MQClientException, RemotingException, InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
this.defaultMQProducerImpl.send(msg, sendCallback, timeout);
}
@@ -406,6 +410,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
*/
@Override
public void sendOneway(Message msg) throws MQClientException,
RemotingException, InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
this.defaultMQProducerImpl.sendOneway(msg);
}
@@ -425,6 +430,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public SendResult send(Message msg, MessageQueue mq)
throws MQClientException, RemotingException, MQBrokerException,
InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
return this.defaultMQProducerImpl.send(msg, queueWithNamespace(mq));
}
@@ -445,6 +451,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public SendResult send(Message msg, MessageQueue mq, long timeout)
throws MQClientException, RemotingException, MQBrokerException,
InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
return this.defaultMQProducerImpl.send(msg, queueWithNamespace(mq),
timeout);
}
@@ -462,6 +469,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public void send(Message msg, MessageQueue mq, SendCallback sendCallback)
throws MQClientException, RemotingException, InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
this.defaultMQProducerImpl.send(msg, queueWithNamespace(mq),
sendCallback);
}
@@ -480,6 +488,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public void send(Message msg, MessageQueue mq, SendCallback sendCallback,
long timeout)
throws MQClientException, RemotingException, InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
this.defaultMQProducerImpl.send(msg, queueWithNamespace(mq),
sendCallback, timeout);
}
@@ -496,6 +505,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public void sendOneway(Message msg,
MessageQueue mq) throws MQClientException, RemotingException,
InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
this.defaultMQProducerImpl.sendOneway(msg, queueWithNamespace(mq));
}
@@ -516,6 +526,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public SendResult send(Message msg, MessageQueueSelector selector, Object
arg)
throws MQClientException, RemotingException, MQBrokerException,
InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
return this.defaultMQProducerImpl.send(msg, selector, arg);
}
@@ -537,6 +548,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public SendResult send(Message msg, MessageQueueSelector selector, Object
arg, long timeout)
throws MQClientException, RemotingException, MQBrokerException,
InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
return this.defaultMQProducerImpl.send(msg, selector, arg, timeout);
}
@@ -555,6 +567,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public void send(Message msg, MessageQueueSelector selector, Object arg,
SendCallback sendCallback)
throws MQClientException, RemotingException, InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
this.defaultMQProducerImpl.send(msg, selector, arg, sendCallback);
}
@@ -574,6 +587,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public void send(Message msg, MessageQueueSelector selector, Object arg,
SendCallback sendCallback, long timeout)
throws MQClientException, RemotingException, InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
this.defaultMQProducerImpl.send(msg, selector, arg, sendCallback,
timeout);
}
@@ -591,6 +605,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
@Override
public void sendOneway(Message msg, MessageQueueSelector selector, Object
arg)
throws MQClientException, RemotingException, InterruptedException {
+ Validators.checkMessage(msg, this);
msg.setTopic(withNamespace(msg.getTopic()));
this.defaultMQProducerImpl.sendOneway(msg, selector, arg);
}