You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by mi...@apache.org on 2022/06/01 02:12:15 UTC

[incubator-eventmesh] branch master updated: [ISSUE #896] Add ttl default value when building BatchMessage (#898)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 950e4388 [ISSUE #896] Add ttl default value when building BatchMessage (#898)
950e4388 is described below

commit 950e4388490c72cec241246c27f1c189767057ef
Author: wallezhang <do...@gmail.com>
AuthorDate: Wed Jun 1 10:12:11 2022 +0800

    [ISSUE #896] Add ttl default value when building BatchMessage (#898)
---
 .../java/org/apache/eventmesh/common/Constants.java     |  2 ++
 .../eventmesh/client/grpc/util/EventMeshClientUtil.java | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
index ed960859..daa36e08 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
@@ -39,6 +39,8 @@ public class Constants {
 
     public static final String EVENTMESH_MESSAGE_CONST_TTL = "ttl";
 
+    public static final String DEFAULT_EVENTMESH_MESSAGE_TTL = "4000";
+
     public static final Integer DEFAULT_CLIENT_UNACK = 12;
 
     public static final String CONSTANTS_SERVICE_DESC_ENV = "env";
diff --git a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshClientUtil.java b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshClientUtil.java
index ee92eca4..71b0e2aa 100644
--- a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshClientUtil.java
+++ b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshClientUtil.java
@@ -36,6 +36,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -121,7 +122,7 @@ public class EventMeshClientUtil {
             byte[] bodyByte = EventFormatProvider.getInstance().resolveFormat(contentType)
                 .serialize(cloudEvent);
             String content = new String(bodyByte, StandardCharsets.UTF_8);
-            String ttl = cloudEvent.getExtension(Constants.EVENTMESH_MESSAGE_CONST_TTL) == null ? "4000"
+            String ttl = cloudEvent.getExtension(Constants.EVENTMESH_MESSAGE_CONST_TTL) == null ? Constants.DEFAULT_EVENTMESH_MESSAGE_TTL
                 : cloudEvent.getExtension(Constants.EVENTMESH_MESSAGE_CONST_TTL).toString();
 
             String seqNum = cloudEvent.getExtension(ProtocolKey.SEQ_NUM) == null ? RandomStringUtils.generateNum(30)
@@ -148,7 +149,7 @@ public class EventMeshClientUtil {
         } else {
             EventMeshMessage eventMeshMessage = (EventMeshMessage) message;
 
-            String ttl = eventMeshMessage.getProp(Constants.EVENTMESH_MESSAGE_CONST_TTL) == null ? "4000"
+            String ttl = eventMeshMessage.getProp(Constants.EVENTMESH_MESSAGE_CONST_TTL) == null ? Constants.DEFAULT_EVENTMESH_MESSAGE_TTL
                 : eventMeshMessage.getProp(Constants.EVENTMESH_MESSAGE_CONST_TTL);
             Map<String, String> props = eventMeshMessage.getProp() == null ? new HashMap<>() : eventMeshMessage.getProp();
 
@@ -188,7 +189,7 @@ public class EventMeshClientUtil {
                     .serialize(event);
                 String content = new String(bodyByte, StandardCharsets.UTF_8);
 
-                String ttl = event.getExtension(Constants.EVENTMESH_MESSAGE_CONST_TTL) == null ? "4000"
+                String ttl = event.getExtension(Constants.EVENTMESH_MESSAGE_CONST_TTL) == null ? Constants.DEFAULT_EVENTMESH_MESSAGE_TTL
                     : event.getExtension(Constants.EVENTMESH_MESSAGE_CONST_TTL).toString();
 
                 BatchMessage.MessageItem messageItem = BatchMessage.MessageItem.newBuilder()
@@ -203,17 +204,19 @@ public class EventMeshClientUtil {
             }
             return messageBuilder.build();
         } else {
+            List<EventMeshMessage> eventMeshMessages = (List<EventMeshMessage>) messageList;
             BatchMessage.Builder messageBuilder = BatchMessage.newBuilder()
                 .setHeader(EventMeshClientUtil.buildHeader(clientConfig, protocolType))
-                .setProducerGroup(clientConfig.getProducerGroup());
+                .setProducerGroup(clientConfig.getProducerGroup())
+                .setTopic(eventMeshMessages.get(0).getTopic());
 
-            for (EventMeshMessage message : (List<EventMeshMessage>) messageList) {
-                messageBuilder.setTopic(message.getTopic());
+            for (EventMeshMessage message : eventMeshMessages) {
                 BatchMessage.MessageItem item = BatchMessage.MessageItem.newBuilder()
                     .setContent(message.getContent())
                     .setUniqueId(message.getUniqueId())
                     .setSeqNum(message.getBizSeqNo())
-                    .setTtl(message.getProp(Constants.EVENTMESH_MESSAGE_CONST_TTL))
+                    .setTtl(
+                        Optional.ofNullable(message.getProp(Constants.EVENTMESH_MESSAGE_CONST_TTL)).orElse(Constants.DEFAULT_EVENTMESH_MESSAGE_TTL))
                     .putAllProperties(message.getProp())
                     .build();
                 messageBuilder.addMessageItem(item);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org