Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ISSUE #2693] SendAsyncEventProcessor judgment blanks can be simplified #2694

Merged
merged 1 commit into from
Dec 28, 2022
Merged

[ISSUE #2693] SendAsyncEventProcessor judgment blanks can be simplified #2694

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions ...va/org/apache/eventmesh/runtime/core/protocol/http/processor/SendAsyncEventProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@
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);
Expand All @@ -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 {
Expand Down Expand Up @@ -127,11 +127,9 @@ public void handler(HandlerService.HandlerSpecific handlerSpecific, HttpRequest

//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));
Expand All @@ -144,10 +142,9 @@ public void handler(HandlerService.HandlerSpecific handlerSpecific, HttpRequest
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;
Expand All @@ -158,10 +155,7 @@ public void handler(HandlerService.HandlerSpecific handlerSpecific, HttpRequest
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));
Expand Down