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

weihu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git


The following commit(s) were added to refs/heads/master by this push:
     new 86d966ef3 code optimization.
     new c4bdafb92 Merge pull request #3785 from pandaapo/master-issue3722
86d966ef3 is described below

commit 86d966ef32906fc4c2e1626b6e1d1d45c96be6ea
Author: pandaapo <[email protected]>
AuthorDate: Thu Apr 20 21:11:04 2023 +0800

    code optimization.
---
 .../cloudevent/impl/RocketMQMessageWriter.java     | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git 
a/eventmesh-storage-plugin/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/impl/RocketMQMessageWriter.java
 
b/eventmesh-storage-plugin/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/impl/RocketMQMessageWriter.java
index 47c4b1a78..e174c3b1f 100644
--- 
a/eventmesh-storage-plugin/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/impl/RocketMQMessageWriter.java
+++ 
b/eventmesh-storage-plugin/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/cloudevent/impl/RocketMQMessageWriter.java
@@ -17,8 +17,11 @@
 
 package org.apache.eventmesh.storage.rocketmq.cloudevent.impl;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.common.message.Message;
 
+import javax.annotation.Nonnull;
+
 import io.cloudevents.CloudEventData;
 import io.cloudevents.SpecVersion;
 import io.cloudevents.core.format.EventFormat;
@@ -27,45 +30,39 @@ import io.cloudevents.rw.CloudEventContextWriter;
 import io.cloudevents.rw.CloudEventRWException;
 import io.cloudevents.rw.CloudEventWriter;
 
-
 public final class RocketMQMessageWriter<R>
     implements MessageWriter<CloudEventWriter<Message>, Message>, 
CloudEventWriter<Message> {
 
-    private Message message;
+    private final Message message = new Message();
 
 
     public RocketMQMessageWriter(String topic) {
-        message = new Message();
         message.setTopic(topic);
     }
 
     public RocketMQMessageWriter(String topic, String keys) {
-        message = new Message();
-
         message.setTopic(topic);
 
-        if (keys != null && keys.length() > 0) {
+        if (StringUtils.isNotEmpty(keys)) {
             message.setKeys(keys);
         }
     }
 
     public RocketMQMessageWriter(String topic, String keys, String tags) {
-        message = new Message();
-
         message.setTopic(topic);
 
-        if (tags != null && tags.length() > 0) {
+        if (StringUtils.isNotEmpty(tags)) {
             message.setTags(tags);
         }
 
-        if (keys != null && keys.length() > 0) {
+        if (StringUtils.isNotEmpty(keys)) {
             message.setKeys(keys);
         }
     }
 
 
     @Override
-    public CloudEventContextWriter withContextAttribute(String name, String 
value)
+    public CloudEventContextWriter withContextAttribute(@Nonnull String name, 
@Nonnull String value)
         throws CloudEventRWException {
         message.putUserProperty(name, value);
         return this;
@@ -78,7 +75,7 @@ public final class RocketMQMessageWriter<R>
     }
 
     @Override
-    public Message setEvent(final EventFormat format, final byte[] value)
+    public Message setEvent(@Nonnull final EventFormat format, @Nonnull final 
byte[] value)
         throws CloudEventRWException {
         message.putUserProperty(RocketMQHeaders.CONTENT_TYPE, 
format.serializedContentType());
         message.setBody(value);
@@ -93,7 +90,6 @@ public final class RocketMQMessageWriter<R>
 
     @Override
     public Message end() {
-        message.setBody(null);
         return message;
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to