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 98dab59d3 simplified code
new f1fe1083b Merge pull request #2694 from
weihubeats/SendAsyncEventProcessor
98dab59d3 is described below
commit 98dab59d322f09985bd0782352dd1c608ba7ccf3
Author: weihu <[email protected]>
AuthorDate: Tue Dec 27 19:54:04 2022 +0800
simplified code
---
.../http/processor/SendAsyncEventProcessor.java | 24 ++++++++--------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SendAsyncEventProcessor.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SendAsyncEventProcessor.java
index d6d05f104..dae0437d4 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SendAsyncEventProcessor.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SendAsyncEventProcessor.java
@@ -58,7 +58,10 @@ import io.cloudevents.core.builder.CloudEventBuilder;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.HttpRequest;
+import lombok.RequiredArgsConstructor;
+
@EventMeshTrace(isEnable = true)
+@RequiredArgsConstructor
public class SendAsyncEventProcessor implements AsyncHttpProcessor {
public Logger messageLogger =
LoggerFactory.getLogger(EventMeshConstants.MESSAGE);
@@ -67,11 +70,8 @@ public class SendAsyncEventProcessor implements
AsyncHttpProcessor {
public Logger aclLogger = LoggerFactory.getLogger(EventMeshConstants.ACL);
- private EventMeshHTTPServer eventMeshHTTPServer;
+ private final EventMeshHTTPServer eventMeshHTTPServer;
- public SendAsyncEventProcessor(EventMeshHTTPServer eventMeshHTTPServer) {
- this.eventMeshHTTPServer = eventMeshHTTPServer;
- }
@Override
public void handler(HandlerService.HandlerSpecific handlerSpecific,
HttpRequest httpRequest) throws Exception {
@@ -127,11 +127,9 @@ public class SendAsyncEventProcessor implements
AsyncHttpProcessor {
//validate event
if (event == null
- || StringUtils.isBlank(event.getId())
|| event.getSource() == null
|| event.getSpecVersion() == null
- || StringUtils.isBlank(event.getType())
- || StringUtils.isBlank(event.getSubject())) {
+ || StringUtils.isAnyBlank(event.getId(), event.getType(),
event.getSubject())) {
handlerSpecific.sendErrorResponse(EventMeshRetCode.EVENTMESH_PROTOCOL_HEADER_ERR,
responseHeaderMap,
responseBodyMap,
EventMeshUtil.getCloudEventExtensionMap(SpecVersion.V1.toString(), event));
@@ -144,10 +142,9 @@ public class SendAsyncEventProcessor implements
AsyncHttpProcessor {
String sys =
Objects.requireNonNull(event.getExtension(ProtocolKey.ClientInstanceKey.SYS)).toString();
//validate event-extension
- if (StringUtils.isBlank(idc)
- || StringUtils.isBlank(pid)
- || !StringUtils.isNumeric(pid)
- || StringUtils.isBlank(sys)) {
+
+ if (StringUtils.isAnyBlank(idc, pid, sys)
+ || !StringUtils.isNumeric(pid)) {
handlerSpecific.sendErrorResponse(EventMeshRetCode.EVENTMESH_PROTOCOL_HEADER_ERR,
responseHeaderMap,
responseBodyMap,
EventMeshUtil.getCloudEventExtensionMap(SpecVersion.V1.toString(), event));
return;
@@ -158,10 +155,7 @@ public class SendAsyncEventProcessor implements
AsyncHttpProcessor {
String topic = event.getSubject();
//validate body
- if (StringUtils.isBlank(bizNo)
- || StringUtils.isBlank(uniqueId)
- || StringUtils.isBlank(producerGroup)
- || StringUtils.isBlank(topic)
+ if (StringUtils.isAnyBlank(bizNo, uniqueId, producerGroup, topic)
|| event.getData() == null) {
handlerSpecific.sendErrorResponse(EventMeshRetCode.EVENTMESH_PROTOCOL_BODY_ERR,
responseHeaderMap,
responseBodyMap,
EventMeshUtil.getCloudEventExtensionMap(SpecVersion.V1.toString(), event));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
