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/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 6cbb2d0f9 [ISSUE #4107] made fields final (#4158)
6cbb2d0f9 is described below
commit 6cbb2d0f9924f03fd052b3f61e0a9248b0f4b9d4
Author: dipanker <[email protected]>
AuthorDate: Tue Jun 27 15:20:31 2023 +0530
[ISSUE #4107] made fields final (#4158)
* #4107 made fields final
Signed-off-by: dipanker <[email protected]>
* #4107 moved the line to correct class
Signed-off-by: dipanker <[email protected]>
* #4107 replaced direct use with a getter
Signed-off-by: dipanker <[email protected]>
---------
Signed-off-by: dipanker <[email protected]>
---
.../protocol/tcp/client/session/push/DownStreamMsgContext.java | 8 ++++----
.../core/protocol/tcp/client/session/push/PushContext.java | 10 +++++-----
.../tcp/client/session/send/EventMeshTcpSendResult.java | 6 +++---
.../core/protocol/tcp/client/session/send/SessionSender.java | 10 +++++++---
.../protocol/tcp/client/session/send/UpStreamMsgContext.java | 2 +-
.../core/protocol/tcp/client/task/MessageTransferTask.java | 2 +-
6 files changed, 21 insertions(+), 17 deletions(-)
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/DownStreamMsgContext.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/DownStreamMsgContext.java
index 16a97d4cb..1f9cc2439 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/DownStreamMsgContext.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/DownStreamMsgContext.java
@@ -47,12 +47,12 @@ public class DownStreamMsgContext extends RetryContext {
@Setter
private Session session;
- private AbstractContext consumeConcurrentlyContext;
+ private final AbstractContext consumeConcurrentlyContext;
- private MQConsumerWrapper consumer;
+ private final MQConsumerWrapper consumer;
@Getter
- private SubscriptionItem subscriptionItem;
+ private final SubscriptionItem subscriptionItem;
private long lastPushTime;
@@ -60,7 +60,7 @@ public class DownStreamMsgContext extends RetryContext {
private final long expireTime;
- public boolean msgFromOtherEventMesh;
+ public final boolean msgFromOtherEventMesh;
public DownStreamMsgContext(CloudEvent event, Session session,
MQConsumerWrapper consumer,
AbstractContext consumeConcurrentlyContext, boolean
msgFromOtherEventMesh,
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/PushContext.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/PushContext.java
index 5937eebf5..ddc67a95c 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/PushContext.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/PushContext.java
@@ -31,15 +31,15 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class PushContext {
- private SessionPusher sessionPusher;
+ private final SessionPusher sessionPusher;
- public AtomicLong deliveredMsgsCount = new AtomicLong(0);
+ public final AtomicLong deliveredMsgsCount = new AtomicLong(0);
- public AtomicLong deliverFailMsgsCount = new AtomicLong(0);
+ public final AtomicLong deliverFailMsgsCount = new AtomicLong(0);
- private ConcurrentHashMap<String /** seq */, DownStreamMsgContext>
unAckMsg = new ConcurrentHashMap<String, DownStreamMsgContext>();
+ private final ConcurrentHashMap<String /* seq */, DownStreamMsgContext>
unAckMsg = new ConcurrentHashMap<>();
- private long createTime = System.currentTimeMillis();
+ private final long createTime = System.currentTimeMillis();
public PushContext(SessionPusher sessionPusher) {
this.sessionPusher = sessionPusher;
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/EventMeshTcpSendResult.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/EventMeshTcpSendResult.java
index a967cdc89..d9746c425 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/EventMeshTcpSendResult.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/EventMeshTcpSendResult.java
@@ -19,11 +19,11 @@ package
org.apache.eventmesh.runtime.core.protocol.tcp.client.session.send;
public class EventMeshTcpSendResult {
- private String seq;
+ private final String seq;
- private EventMeshTcpSendStatus sendStatus;
+ private final EventMeshTcpSendStatus sendStatus;
- private String detail;
+ private final String detail;
public EventMeshTcpSendResult(String seq, EventMeshTcpSendStatus
sendStatus, String detail) {
this.seq = seq;
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/SessionSender.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/SessionSender.java
index da61686aa..c226b4529 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/SessionSender.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/SessionSender.java
@@ -59,11 +59,11 @@ public class SessionSender {
private final transient Session session;
- public transient long createTime = System.currentTimeMillis();
+ public final transient long createTime = System.currentTimeMillis();
- public transient AtomicLong upMsgs = new AtomicLong(0);
+ public final transient AtomicLong upMsgs = new AtomicLong(0);
- public transient AtomicLong failMsgCount = new AtomicLong(0);
+ public final transient AtomicLong failMsgCount = new AtomicLong(0);
private static final int TRY_PERMIT_TIME_OUT = 5;
@@ -221,4 +221,8 @@ public class SessionSender {
}
};
}
+
+ public AtomicLong getFailMsgCount() {
+ return failMsgCount;
+ }
}
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/UpStreamMsgContext.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/UpStreamMsgContext.java
index 4ab4fd609..98a92d556 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/UpStreamMsgContext.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/send/UpStreamMsgContext.java
@@ -139,7 +139,7 @@ public class UpStreamMsgContext extends RetryContext {
retryContext.delay(10000);
Objects.requireNonNull(session.getClientGroupWrapper().get()).getEventMeshTcpRetryer().pushRetry(retryContext);
- session.getSender().failMsgCount.incrementAndGet();
+ session.getSender().getFailMsgCount().incrementAndGet();
log.error("upstreamMsg mq message error|user={}|callback
cost={}, errMsg={}", session.getClient(),
System.currentTimeMillis() - createTime, new
Exception(context.getException()));
msg.setHeader(new Header(replyCmd, OPStatus.FAIL.getCode(),
context.getException().toString(), seq));
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageTransferTask.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageTransferTask.java
index 62a97dc3f..9f5257992 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageTransferTask.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageTransferTask.java
@@ -253,7 +253,7 @@ public class MessageTransferTask extends AbstractTask {
session.getClientGroupWrapper().get()).getEventMeshTcpRetryer()
.pushRetry(upStreamMsgContext);
- session.getSender().failMsgCount.incrementAndGet();
+ session.getSender().getFailMsgCount().incrementAndGet();
MESSAGE_LOGGER
.error("upstreamMsg mq message error|user={}|callback
cost={}, errMsg={}",
session.getClient(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
