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/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 50065fbe1 [ISSUE #4200]Do some code optimization.[ServiceUtils]
50065fbe1 is described below
commit 50065fbe1e0a6975e003c7ecb88876206d8f8fe3
Author: Vincent Low <[email protected]>
AuthorDate: Thu Jul 20 08:40:13 2023 +0700
[ISSUE #4200]Do some code optimization.[ServiceUtils]
---
.../runtime/core/protocol/grpc/service/ServiceUtils.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/ServiceUtils.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/ServiceUtils.java
index 128d058e9..1f6e6637c 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/ServiceUtils.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/ServiceUtils.java
@@ -42,6 +42,7 @@ import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.List;
+import java.util.Objects;
import com.fasterxml.jackson.core.type.TypeReference;
import com.google.protobuf.Any;
@@ -86,13 +87,13 @@ public class ServiceUtils {
}
final String dataContentType =
EventMeshCloudEventUtils.getDataContentType(cloudEvent);
if (ProtoSupport.isTextContent(dataContentType)) {
- return flag & (StringUtils.isNotEmpty(cloudEvent.getTextData()));
+ return flag && (StringUtils.isNotEmpty(cloudEvent.getTextData()));
}
if (ProtoSupport.isProtoContent(dataContentType)) {
- return flag & (cloudEvent.getProtoData() !=
Any.getDefaultInstance());
+ return flag && (cloudEvent.getProtoData() !=
Any.getDefaultInstance());
}
- return flag & (cloudEvent.getBinaryData() != ByteString.EMPTY);
+ return flag && (cloudEvent.getBinaryData() != ByteString.EMPTY);
}
public static boolean validateCloudEventBatchData(CloudEventBatch
cloudEventBatch) {
@@ -144,6 +145,7 @@ public class ServiceUtils {
List<HeartbeatItem> heartbeatItems =
JsonUtils.parseTypeReferenceObject(heartbeat.getTextData(),
new TypeReference<List<HeartbeatItem>>() {
});
+ Objects.requireNonNull(heartbeatItems, "heartbeatItems can't be null");
for (HeartbeatItem item : heartbeatItems) {
if (StringUtils.isEmpty(item.getTopic())) {
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
