Skip to content

[ISSUE #4195] Do some code optimization.[SubscribeProcessor] #4383

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

Merged
xwm1992 merged 6 commits into from
Aug 25, 2023
Merged

[ISSUE #4195] Do some code optimization.[SubscribeProcessor] #4383

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bd56546
#4195 issue: Update SubscribeProcessor.java
gautamsagar99 Aug 18, 2023
700d31c
apache#4195 issue: Modified SubscribeProcessor.java
gautamsagar99 Aug 18, 2023
b4323e6
apache#4195 issue:Fixed SubscribeProcessor.java
gautamsagar99 Aug 18, 2023
38d89d8
apache#4195 issue: Changed SubscribeProcessor.java
gautamsagar99 Aug 18, 2023
85ad999
apache#4195 issue:Resolved Syntax Error in SubscribeProcessor.java
gautamsagar99 Aug 18, 2023
fbd6072
Commiting after removing CI Merge Errors
gautamsagar99 Aug 21, 2023
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
8 changes: 5 additions & 3 deletions ...in/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/SubscribeProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
@Slf4j
public class SubscribeProcessor {

private final transient EventMeshGrpcServer eventMeshGrpcServer;
private final EventMeshGrpcServer eventMeshGrpcServer;

private final transient GrpcType grpcType = GrpcType.WEBHOOK;
private static final GrpcType grpcType = GrpcType.WEBHOOK;
Copy link
Member

@mxsm mxsm Aug 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about changing “grpcType” to “GRPC_TYPE”?


private final Acl acl;

Expand All @@ -70,7 +70,6 @@ public void process(final CloudEvent subscription, final EventEmitter<CloudEvent
ServiceUtils.sendResponseCompleted(StatusCode.EVENTMESH_PROTOCOL_BODY_ERR, emitter);
return;
}

try {
doAclCheck(subscription);
} catch (AclException e) {
Expand All @@ -88,6 +87,8 @@ public void process(final CloudEvent subscription, final EventEmitter<CloudEvent
List<SubscriptionItem> subscriptionItems = JsonUtils.parseTypeReferenceObject(subscription.getTextData(),
new TypeReference<List<SubscriptionItem>>() {
});

Objects.requireNonNull(subscriptionItems, "subscriptionItems must not be null");
final String env = EventMeshCloudEventUtils.getEnv(subscription);
final String idc = EventMeshCloudEventUtils.getIdc(subscription);
final String sys = EventMeshCloudEventUtils.getSys(subscription);
Expand Down Expand Up @@ -143,6 +144,7 @@ private void doAclCheck(final CloudEvent subscription) throws AclException {
List<SubscriptionItem> subscriptionItems = JsonUtils.parseTypeReferenceObject(subscription.getTextData(),
new TypeReference<List<SubscriptionItem>>() {
});
Objects.requireNonNull(subscriptionItems, "subscriptionItems must not be null");
if (eventMeshGrpcServer.getEventMeshGrpcConfiguration().isEventMeshServerSecurityEnable()) {
for (final SubscriptionItem item : subscriptionItems) {
this.acl.doAclCheckInHttpReceive(EventMeshCloudEventUtils.getConsumerGroup(subscription),
Expand Down