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 99bcf6788 [ISSUE #4093]Repeat code extraction as method.[MessageUtils]
(#4315)
99bcf6788 is described below
commit 99bcf6788c679a9dd2c2bfa321d60690570b398b
Author: ruhshan <[email protected]>
AuthorDate: Wed Aug 2 15:51:22 2023 +0600
[ISSUE #4093]Repeat code extraction as method.[MessageUtils] (#4315)
* [ISSUE #4093]: Refactor package building chunks to reusable method
* [ISSUE #4093]: Refactor user agent building chunks to reusable method
---
.../eventmesh/client/tcp/common/MessageUtils.java | 109 +++++++++------------
1 file changed, 47 insertions(+), 62 deletions(-)
diff --git
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/MessageUtils.java
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/MessageUtils.java
index 17c911b56..05b69670e 100644
---
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/MessageUtils.java
+++
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/MessageUtils.java
@@ -46,54 +46,40 @@ public class MessageUtils {
private static final int SEQ_LENGTH = 10;
public static Package hello(UserAgent user) {
- final Package msg = new Package();
- msg.setHeader(new Header(Command.HELLO_REQUEST, 0, null,
generateRandomString()));
+ final Package msg = getPackage(Command.HELLO_REQUEST);
msg.setBody(user);
return msg;
}
public static Package heartBeat() {
- final Package msg = new Package();
- msg.setHeader(new Header(Command.HEARTBEAT_REQUEST, 0, null,
generateRandomString()));
- return msg;
+ return getPackage(Command.HEARTBEAT_REQUEST);
}
public static Package goodbye() {
- final Package msg = new Package();
- msg.setHeader(new Header(Command.CLIENT_GOODBYE_REQUEST, 0, null,
generateRandomString()));
- return msg;
+ return getPackage(Command.CLIENT_GOODBYE_REQUEST);
}
public static Package listen() {
- final Package msg = new Package();
- msg.setHeader(new Header(Command.LISTEN_REQUEST, 0, null,
generateRandomString()));
- return msg;
+ return getPackage(Command.LISTEN_REQUEST);
}
public static Package subscribe(String topic, SubscriptionMode
subscriptionMode,
SubscriptionType subscriptionType) {
- Package msg = new Package();
- msg.setHeader(new Header(Command.SUBSCRIBE_REQUEST, 0, null,
generateRandomString()));
+ Package msg = getPackage(Command.SUBSCRIBE_REQUEST);
msg.setBody(generateSubscription(topic, subscriptionMode,
subscriptionType));
return msg;
}
public static Package unsubscribe() {
- final Package msg = new Package();
- msg.setHeader(new Header(Command.UNSUBSCRIBE_REQUEST, 0, null,
generateRandomString()));
- return msg;
+ return getPackage(Command.UNSUBSCRIBE_REQUEST);
}
public static Package asyncMessageAck(Package in) {
- final Package msg = new Package();
- msg.setHeader(new Header(Command.ASYNC_MESSAGE_TO_CLIENT_ACK, 0, null,
in.getHeader().getSeq()));
- msg.setBody(in.getBody());
- return msg;
+ return getPackage(Command.ASYNC_MESSAGE_TO_CLIENT_ACK, in);
}
public static Package buildPackage(Object message, Command command) {
- final Package msg = new Package();
- msg.setHeader(new Header(command, 0, null, generateRandomString()));
+ final Package msg = getPackage(command);
if (message instanceof CloudEvent) {
final CloudEvent cloudEvent = (CloudEvent) message;
Preconditions.checkNotNull(cloudEvent.getDataContentType(),
"DateContentType cannot be null");
@@ -122,58 +108,23 @@ public class MessageUtils {
}
public static Package broadcastMessageAck(Package in) {
- final Package msg = new Package();
- msg.setHeader(new Header(Command.BROADCAST_MESSAGE_TO_CLIENT_ACK, 0,
null, in.getHeader().getSeq()));
- msg.setBody(in.getBody());
- return msg;
+ return getPackage(Command.BROADCAST_MESSAGE_TO_CLIENT_ACK, in);
}
public static Package requestToClientAck(Package in) {
- Package msg = new Package();
- msg.setHeader(new Header(Command.REQUEST_TO_CLIENT_ACK, 0, null,
in.getHeader().getSeq()));
- msg.setBody(in.getBody());
- return msg;
+ return getPackage(Command.REQUEST_TO_CLIENT_ACK, in);
}
public static Package responseToClientAck(Package in) {
- final Package msg = new Package();
- msg.setHeader(new Header(Command.RESPONSE_TO_CLIENT_ACK, 0, null,
in.getHeader().getSeq()));
- msg.setBody(in.getBody());
- return msg;
+ return getPackage(Command.RESPONSE_TO_CLIENT_ACK, in);
}
public static UserAgent generateSubClient(UserAgent agent) {
- return UserAgent.builder()
- .env(agent.getEnv())
- .host(agent.getHost())
- .password(agent.getPassword())
- .username(agent.getUsername())
- .path(agent.getPath())
- .port(agent.getPort())
- .subsystem(agent.getSubsystem())
- .pid(agent.getPid())
- .version(agent.getVersion())
- .idc(agent.getIdc())
- .group(agent.getGroup())
- .purpose(EventMeshCommon.USER_AGENT_PURPOSE_SUB)
- .build();
+ return getUserAgent(agent, EventMeshCommon.USER_AGENT_PURPOSE_SUB);
}
public static UserAgent generatePubClient(UserAgent agent) {
- return UserAgent.builder()
- .env(agent.getEnv())
- .host(agent.getHost())
- .password(agent.getPassword())
- .username(agent.getUsername())
- .path(agent.getPath())
- .port(agent.getPort())
- .subsystem(agent.getSubsystem())
- .pid(agent.getPid())
- .version(agent.getVersion())
- .idc(agent.getIdc())
- .group(agent.getGroup())
- .purpose(EventMeshCommon.USER_AGENT_PURPOSE_PUB)
- .build();
+ return getUserAgent(agent, EventMeshCommon.USER_AGENT_PURPOSE_PUB);
}
private static Subscription generateSubscription(String topic,
SubscriptionMode subscriptionMode,
@@ -191,4 +142,38 @@ public class MessageUtils {
return builder.toString();
}
+
+ private static Package getPackage(Command command) {
+ final Package msg = new Package();
+ msg.setHeader(new Header(command, 0, null, generateRandomString()));
+ return msg;
+ }
+
+ private static Package getPackage(Command command, String seq, Object
body) {
+ final Package msg = new Package();
+ msg.setHeader(new Header(command, 0, null, seq));
+ msg.setBody(body);
+ return msg;
+ }
+
+ private static Package getPackage(Command command, Package in) {
+ return getPackage(command, in.getHeader().getSeq(), in.getBody());
+ }
+
+ private static UserAgent getUserAgent(UserAgent agent, String purpose) {
+ return UserAgent.builder()
+ .env(agent.getEnv())
+ .host(agent.getHost())
+ .password(agent.getPassword())
+ .username(agent.getUsername())
+ .path(agent.getPath())
+ .port(agent.getPort())
+ .subsystem(agent.getSubsystem())
+ .pid(agent.getPid())
+ .version(agent.getVersion())
+ .idc(agent.getIdc())
+ .group(agent.getGroup())
+ .purpose(purpose)
+ .build();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
