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/12/04 04:49:08 UTC
[incubator-eventmesh] branch master updated: fix issue2373
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 eda27673a fix issue2373
new a7c313a6a Merge pull request #2448 from jonyangx/issue2373
eda27673a is described below
commit eda27673ab63748e217616b45877bf450e2719a9
Author: jonyangx <ya...@gmail.com>
AuthorDate: Sun Dec 4 09:49:41 2022 +0800
fix issue2373
---
.../core/protocol/grpc/service/ServiceUtils.java | 80 ++++++++++------------
1 file changed, 38 insertions(+), 42 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 51ac905ec..d2b2e07e5 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
@@ -38,33 +38,28 @@ import java.util.Map;
public class ServiceUtils {
public static boolean validateHeader(RequestHeader header) {
- return StringUtils.isNotEmpty(header.getIdc())
- && StringUtils.isNotEmpty(header.getEnv())
- && StringUtils.isNotEmpty(header.getIp())
- && StringUtils.isNotEmpty(header.getPid())
- && StringUtils.isNumeric(header.getPid())
- && StringUtils.isNotEmpty(header.getSys())
- && StringUtils.isNotEmpty(header.getUsername())
- && StringUtils.isNotEmpty(header.getPassword())
- && StringUtils.isNotEmpty(header.getLanguage());
+ return StringUtils.isNotEmpty(header.getIdc()) && StringUtils.isNotEmpty(header.getEnv())
+ && StringUtils.isNotEmpty(header.getIp()) && StringUtils.isNotEmpty(header.getPid())
+ && StringUtils.isNumeric(header.getPid()) && StringUtils.isNotEmpty(header.getSys())
+ && StringUtils.isNotEmpty(header.getUsername())
+ && StringUtils.isNotEmpty(header.getPassword())
+ && StringUtils.isNotEmpty(header.getLanguage());
}
public static boolean validateMessage(SimpleMessage message) {
- return StringUtils.isNotEmpty(message.getUniqueId())
- && StringUtils.isNotEmpty(message.getProducerGroup())
- && StringUtils.isNotEmpty(message.getTopic())
- && StringUtils.isNotEmpty(message.getContent())
- && StringUtils.isNotEmpty(message.getTtl());
+ return StringUtils.isNotEmpty(message.getUniqueId()) && StringUtils.isNotEmpty(message.getProducerGroup())
+ && StringUtils.isNotEmpty(message.getTopic()) && StringUtils.isNotEmpty(message.getContent())
+ && StringUtils.isNotEmpty(message.getTtl());
}
public static boolean validateBatchMessage(BatchMessage batchMessage) {
- if (StringUtils.isEmpty(batchMessage.getTopic())
- || StringUtils.isEmpty(batchMessage.getProducerGroup())) {
+ if (StringUtils.isEmpty(batchMessage.getTopic()) || StringUtils.isEmpty(batchMessage.getProducerGroup())) {
return false;
}
for (BatchMessage.MessageItem item : batchMessage.getMessageItemList()) {
if (StringUtils.isEmpty(item.getContent()) || StringUtils.isEmpty(item.getSeqNum())
- || StringUtils.isEmpty(item.getTtl()) || StringUtils.isEmpty(item.getUniqueId())) {
+ || StringUtils.isEmpty(item.getTtl())
+ || StringUtils.isEmpty(item.getUniqueId())) {
return false;
}
}
@@ -72,17 +67,17 @@ public class ServiceUtils {
}
public static boolean validateSubscription(GrpcType grpcType, Subscription subscription) {
- if (GrpcType.WEBHOOK.equals(grpcType) && StringUtils.isEmpty(subscription.getUrl())) {
+ if (GrpcType.WEBHOOK == grpcType && StringUtils.isEmpty(subscription.getUrl())) {
return false;
}
if (CollectionUtils.isEmpty(subscription.getSubscriptionItemsList())
- || StringUtils.isEmpty(subscription.getConsumerGroup())) {
+ || StringUtils.isEmpty(subscription.getConsumerGroup())) {
return false;
}
for (Subscription.SubscriptionItem item : subscription.getSubscriptionItemsList()) {
if (StringUtils.isEmpty(item.getTopic())
- || item.getMode() == Subscription.SubscriptionItem.SubscriptionMode.UNRECOGNIZED
- || item.getType() == Subscription.SubscriptionItem.SubscriptionType.UNRECOGNIZED) {
+ || item.getMode() == Subscription.SubscriptionItem.SubscriptionMode.UNRECOGNIZED
+ || item.getType() == Subscription.SubscriptionItem.SubscriptionType.UNRECOGNIZED) {
return false;
}
}
@@ -90,12 +85,10 @@ public class ServiceUtils {
}
public static boolean validateHeartBeat(Heartbeat heartbeat) {
- if (ClientType.SUB.equals(heartbeat.getClientType())
- && StringUtils.isEmpty(heartbeat.getConsumerGroup())) {
+ if (ClientType.SUB == heartbeat.getClientType() && StringUtils.isEmpty(heartbeat.getConsumerGroup())) {
return false;
}
- if (ClientType.PUB.equals(heartbeat.getClientType())
- && StringUtils.isEmpty(heartbeat.getProducerGroup())) {
+ if (ClientType.PUB == heartbeat.getClientType() && StringUtils.isEmpty(heartbeat.getProducerGroup())) {
return false;
}
for (Heartbeat.HeartbeatItem item : heartbeat.getHeartbeatItemsList()) {
@@ -108,51 +101,54 @@ public class ServiceUtils {
public static void sendRespAndDone(StatusCode code, EventEmitter<Response> emitter) {
Response response = Response.newBuilder()
- .setRespCode(code.getRetCode())
- .setRespMsg(code.getErrMsg())
- .setRespTime(String.valueOf(System.currentTimeMillis()))
- .build();
+ .setRespCode(code.getRetCode())
+ .setRespMsg(code.getErrMsg())
+ .setRespTime(String.valueOf(System.currentTimeMillis()))
+ .build();
emitter.onNext(response);
emitter.onCompleted();
}
public static void sendRespAndDone(StatusCode code, String message, EventEmitter<Response> emitter) {
Response response = Response.newBuilder()
- .setRespCode(code.getRetCode())
- .setRespMsg(code.getErrMsg() + EventMeshConstants.BLANK_SPACE + message)
- .setRespTime(String.valueOf(System.currentTimeMillis()))
- .build();
+ .setRespCode(code.getRetCode())
+ .setRespMsg(code.getErrMsg() + EventMeshConstants.BLANK_SPACE + message)
+ .setRespTime(String.valueOf(System.currentTimeMillis()))
+ .build();
emitter.onNext(response);
emitter.onCompleted();
}
- public static void sendStreamResp(RequestHeader header, StatusCode code, String message, EventEmitter<SimpleMessage> emitter) {
+ public static void sendStreamResp(RequestHeader header, StatusCode code, String message,
+ EventEmitter<SimpleMessage> emitter) {
Map<String, String> resp = new HashMap<>();
resp.put(EventMeshConstants.RESP_CODE, code.getRetCode());
resp.put(EventMeshConstants.RESP_MSG, code.getErrMsg() + EventMeshConstants.BLANK_SPACE + message);
SimpleMessage simpleMessage = SimpleMessage.newBuilder()
- .setHeader(header)
- .setContent(JsonUtils.serialize(resp))
- .build();
+ .setHeader(header)
+ .setContent(JsonUtils.serialize(resp))
+ .build();
emitter.onNext(simpleMessage);
}
- public static void sendStreamRespAndDone(RequestHeader header, StatusCode code, String message, EventEmitter<SimpleMessage> emitter) {
+ public static void sendStreamRespAndDone(RequestHeader header, StatusCode code, String message,
+ EventEmitter<SimpleMessage> emitter) {
sendStreamResp(header, code, message, emitter);
emitter.onCompleted();
}
- public static void sendStreamRespAndDone(RequestHeader header, StatusCode code, EventEmitter<SimpleMessage> emitter) {
+ public static void sendStreamRespAndDone(RequestHeader header, StatusCode code,
+ EventEmitter<SimpleMessage> emitter) {
Map<String, String> resp = new HashMap<>();
resp.put(EventMeshConstants.RESP_CODE, code.getRetCode());
resp.put(EventMeshConstants.RESP_MSG, code.getErrMsg());
SimpleMessage simpleMessage = SimpleMessage.newBuilder()
- .setHeader(header)
- .setContent(JsonUtils.serialize(resp))
- .build();
+ .setHeader(header)
+ .setContent(JsonUtils.serialize(resp))
+ .build();
emitter.onNext(simpleMessage);
emitter.onCompleted();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org