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

[ISSUE #4166] Fix grpc AsyncPublishInstance has no push messages. #4167

Merged
merged 24 commits into from
Jun 30, 2023
Merged

[ISSUE #4166] Fix grpc AsyncPublishInstance has no push messages. #4167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ef7d801
Merge pull request #1 from apache/master
Alonexc May 15, 2023
b2fc918
Merge pull request #2 from apache/master
Alonexc May 16, 2023
7b39e63
Create .lift.toml
Alonexc May 18, 2023
1fe95be
Update .lift.toml
Alonexc May 18, 2023
b72c8cf
Update .lift.toml
Alonexc May 18, 2023
a73e9ce
Update .lift.toml
Alonexc May 18, 2023
ddd5ea0
Update .lift.toml
Alonexc May 19, 2023
7a61754
Update .lift.toml
Alonexc May 19, 2023
2a40cd8
Merge pull request #7 from apache/master
Alonexc May 24, 2023
f119a97
Merge pull request #8 from apache/master
Alonexc May 30, 2023
82283a2
Update .lift.toml
Alonexc May 30, 2023
a1a3518
Update .lift.toml
Alonexc May 30, 2023
505e559
Update .lift.toml
Alonexc May 30, 2023
4ed6ea9
Merge pull request #11 from apache/master
Alonexc May 31, 2023
f9642a1
delete lift
Alonexc May 31, 2023
5029dba
Merge pull request #12 from apache/master
Alonexc May 31, 2023
a297af9
Merge pull request #13 from apache/master
Alonexc Jun 13, 2023
5a21876
Merge pull request #14 from apache/master
Alonexc Jun 13, 2023
f2e9582
Merge pull request #15 from apache/master
Alonexc Jun 20, 2023
fcef164
Merge pull request #16 from apache/master
Alonexc Jun 27, 2023
5390b9a
Merge pull request #17 from apache/master
Alonexc Jun 29, 2023
7fe4809
Merge pull request #18 from apache/master
Alonexc Jun 30, 2023
e3325b2
push message optimization methods and correction of topic.
Alonexc Jun 30, 2023
3fa96a2
push message optimization methods and correction of topic.
Alonexc Jun 30, 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: 4 additions & 4 deletions eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/GrpcAbstractDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ protected static EventMeshGrpcClientConfig initEventMeshGrpcClientConfig(final S
.build();
}

protected static CloudEvent buildCloudEvent(final Map<String, String> content) {
protected static CloudEvent buildCloudEvent(final Map<String, String> content, String topic) {
return CloudEventBuilder.v1()
.withId(UUID.randomUUID().toString())
.withSubject(ExampleConstants.EVENTMESH_GRPC_ASYNC_TEST_TOPIC)
.withSubject(topic)
.withSource(URI.create("/"))
.withDataContentType(ExampleConstants.CLOUDEVENT_CONTENT_TYPE)
.withType(EventMeshCommon.CLOUD_EVENTS_PROTOCOL_NAME)
Expand All @@ -66,10 +66,10 @@ protected static CloudEvent buildCloudEvent(final Map<String, String> content) {

}

protected static EventMeshMessage buildEventMeshMessage(final Map<String, String> content) {
protected static EventMeshMessage buildEventMeshMessage(final Map<String, String> content, String topic) {
return EventMeshMessage.builder()
.content(JsonUtils.toJSONString(content))
.topic(ExampleConstants.EVENTMESH_GRPC_BROADCAT_TEST_TOPIC)
.topic(topic)
.uniqueId(RandomStringUtils.generateNum(30))
.bizSeqNo(RandomStringUtils.generateNum(30))
.build()
Expand Down
3 changes: 2 additions & 1 deletion .../main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsBatchPublishInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ public static void main(String[] args) throws Exception {

final List<CloudEvent> cloudEventList = new ArrayList<>();
for (int i = 0; i < 5; i++) {
cloudEventList.add(buildCloudEvent(content));
cloudEventList.add(buildCloudEvent(content,
ExampleConstants.EVENTMESH_GRPC_BROADCAT_TEST_TOPIC));
}
eventMeshGrpcProducer.publish(cloudEventList);
ThreadUtils.sleep(10, TimeUnit.SECONDS);
Expand Down
3 changes: 2 additions & 1 deletion ...s/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsPublishInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public static void main(String[] args) throws Exception {
content.put("content", "testAsyncMessage");

for (int i = 0; i < MESSAGE_SIZE; i++) {
eventMeshGrpcProducer.publish(buildCloudEvent(content));
eventMeshGrpcProducer.publish(buildCloudEvent(content,
ExampleConstants.EVENTMESH_GRPC_ASYNC_TEST_TOPIC));
ThreadUtils.sleep(1, TimeUnit.SECONDS);
}

Expand Down
3 changes: 2 additions & 1 deletion ...s/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsRequestInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public static void main(String[] args) throws Exception {
content.put("content", "testRequestReplyMessage");

for (int i = 0; i < MESSAGE_SIZE; i++) {
eventMeshGrpcProducer.requestReply(buildCloudEvent(content), EventMeshCommon.DEFAULT_TIME_OUT_MILLS);
eventMeshGrpcProducer.requestReply(buildCloudEvent(content,
ExampleConstants.EVENTMESH_GRPC_RR_TEST_TOPIC), EventMeshCommon.DEFAULT_TIME_OUT_MILLS);
ThreadUtils.sleep(1, TimeUnit.SECONDS);
}

Expand Down
3 changes: 2 additions & 1 deletion ...s/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/AsyncPublishBroadcast.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public static void main(String[] args) throws Exception {
content.put("content", "testAsyncMessage");

for (int i = 0; i < MESSAGE_SIZE; i++) {
eventMeshGrpcProducer.publish(buildEventMeshMessage(content));
eventMeshGrpcProducer.publish(buildEventMeshMessage(content,
ExampleConstants.EVENTMESH_GRPC_BROADCAT_TEST_TOPIC));
ThreadUtils.sleep(1, TimeUnit.SECONDS);
}
ThreadUtils.sleep(30, TimeUnit.SECONDS);
Expand Down
3 changes: 2 additions & 1 deletion ...es/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/AsyncPublishInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public static void main(String[] args) throws Exception {
content.put("content", "testAsyncMessage");

for (int i = 0; i < MESSAGE_SIZE; i++) {
buildEventMeshMessage(content);
eventMeshGrpcProducer.publish(buildEventMeshMessage(content,
ExampleConstants.EVENTMESH_GRPC_ASYNC_TEST_TOPIC));
ThreadUtils.sleep(1, TimeUnit.SECONDS);
}
ThreadUtils.sleep(30, TimeUnit.SECONDS);
Expand Down
3 changes: 2 additions & 1 deletion ...es/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/BatchPublishInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ public static void main(String[] args) throws Exception {

List<EventMeshMessage> messageList = new ArrayList<>();
for (int i = 0; i < 5; i++) {
messageList.add(buildEventMeshMessage(content));
messageList.add(buildEventMeshMessage(content,
ExampleConstants.EVENTMESH_GRPC_BROADCAT_TEST_TOPIC));
}

eventMeshGrpcProducer.publish(messageList);
Expand Down
3 changes: 2 additions & 1 deletion ...es/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/RequestReplyInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ public static void main(String[] args) throws Exception {
content.put("content", "testRequestReplyMessage");

for (int i = 0; i < MESSAGE_SIZE; i++) {
eventMeshGrpcProducer.requestReply(buildEventMeshMessage(content),
eventMeshGrpcProducer.requestReply(buildEventMeshMessage(content,
ExampleConstants.EVENTMESH_GRPC_RR_TEST_TOPIC),
EventMeshCommon.DEFAULT_TIME_OUT_MILLS);
ThreadUtils.sleep(1, TimeUnit.SECONDS);
}
Expand Down