This is an automated email from the ASF dual-hosted git repository.
mxsm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 8bb8b8f1b [ISSUE #3903] Unwritten public or protected field
[HeartbeatRequestBody] (#4757)
8bb8b8f1b is described below
commit 8bb8b8f1b98240f7cb35d32ca4dd854b26ab914c
Author: Aaron Ghebretinsae <[email protected]>
AuthorDate: Thu Jan 25 20:37:59 2024 -0500
[ISSUE #3903] Unwritten public or protected field [HeartbeatRequestBody]
(#4757)
* added appropriate getters and setters for HeartbeatEntity class in
HeartbeatRequestBody.java. updated EventMeshHttpConsumer.java to access
aforementioned variables using correct setters. Updated HeartbeatProcessor.java
to access aforementioned variables using correct getters.
* <Removed unnecessary getters and setters in
eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java
>
---
.../protocol/http/body/client/HeartbeatRequestBody.java | 14 +++++++++-----
.../core/protocol/http/processor/HeartBeatProcessor.java | 4 ++--
.../client/http/consumer/EventMeshHttpConsumer.java | 4 ++--
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java
index ea6b1c349..aef317782 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java
+++
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java
@@ -66,12 +66,16 @@ public class HeartbeatRequestBody extends Body {
return map;
}
- @ToString
+ @Data
public static class HeartbeatEntity {
- public String topic;
- public String serviceId;
- public String url;
- public String instanceId;
+ private String topic;
+ private String serviceId;
+ private String url;
+ private String instanceId;
+
+
}
+
+
}
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HeartBeatProcessor.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HeartBeatProcessor.java
index e4004e2dc..ed2673fdb 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HeartBeatProcessor.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HeartBeatProcessor.java
@@ -107,8 +107,8 @@ public class HeartBeatProcessor implements
HttpRequestProcessor {
client.setIp(heartbeatRequestHeader.getIp());
client.setPid(heartbeatRequestHeader.getPid());
client.setConsumerGroup(heartbeatRequestBody.getConsumerGroup());
- client.setTopic(heartbeatEntity.topic);
- client.setUrl(heartbeatEntity.url);
+ client.setTopic(heartbeatEntity.getTopic());
+ client.setUrl(heartbeatEntity.getUrl());
client.setLastUpTime(new Date());
if (StringUtils.isAnyBlank(client.getTopic(), client.getUrl())) {
diff --git
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/consumer/EventMeshHttpConsumer.java
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/consumer/EventMeshHttpConsumer.java
index b6ca4d06e..6e9b94bec 100644
---
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/consumer/EventMeshHttpConsumer.java
+++
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/consumer/EventMeshHttpConsumer.java
@@ -114,8 +114,8 @@ public class EventMeshHttpConsumer extends
AbstractHttpClient implements AutoClo
try {
final List<HeartbeatRequestBody.HeartbeatEntity>
heartbeatEntities = topicList.stream().map(subscriptionItem -> {
final HeartbeatRequestBody.HeartbeatEntity heartbeatEntity
= new HeartbeatRequestBody.HeartbeatEntity();
- heartbeatEntity.topic = subscriptionItem.getTopic();
- heartbeatEntity.url = subscribeUrl;
+ heartbeatEntity.setTopic(subscriptionItem.getTopic());
+ heartbeatEntity.setUrl(subscribeUrl);
return heartbeatEntity;
}).collect(Collectors.toList());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
