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 f0fed3533 [ISSUE #3654] Code reuse is extracted as a
method.[EventMeshTestUtils] (#3691)
f0fed3533 is described below
commit f0fed3533648b5445dc7fa31c42753582aa2bcbd
Author: monish-byte <[email protected]>
AuthorDate: Fri May 5 07:27:48 2023 +0530
[ISSUE #3654] Code reuse is extracted as a method.[EventMeshTestUtils]
(#3691)
* reusable code extracted as method
* removed two imports, space given, system1-
* Update EventMeshTestUtils.java
* changed EventMeshMessage to getEventMeshMessage
* checkstyles checked
* Update EventMeshTestUtils.java
---------
Co-authored-by: mike_xwm <[email protected]>
---
.../eventmesh/tcp/common/EventMeshTestUtils.java | 134 +++++++++------------
1 file changed, 56 insertions(+), 78 deletions(-)
diff --git
a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/common/EventMeshTestUtils.java
b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/common/EventMeshTestUtils.java
index d72a8efd0..5df2d7171 100644
---
a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/common/EventMeshTestUtils.java
+++
b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/common/EventMeshTestUtils.java
@@ -38,6 +38,8 @@ import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
+
+
import io.cloudevents.CloudEvent;
import io.cloudevents.core.builder.CloudEventBuilder;
@@ -49,120 +51,96 @@ public class EventMeshTestUtils {
private static final String DEFAULT_TTL_MS = "30000";
+
+ private static UserAgent getUserAgent(Integer port, String subsystem,
Integer pid) {
+ return UserAgent.builder()
+ .env(UtilsConstants.ENV)
+ .host(UtilsConstants.HOST)
+ .password(generateRandomString(UtilsConstants.PASSWORD_LENGTH))
+ .username(UtilsConstants.USER_NAME)
+ .group(UtilsConstants.GROUP)
+ .path(UtilsConstants.PATH)
+ .port(port)
+ .subsystem(subsystem)
+ .pid(pid)
+ .version(UtilsConstants.VERSION)
+ .idc(UtilsConstants.IDC)
+ .build();
+ }
+
+
// generate pub-client
public static UserAgent generateClient1() {
- final UserAgent agent = UserAgent.builder()
- .env(UtilsConstants.ENV)
- .host(UtilsConstants.HOST)
- .password(generateRandomString(UtilsConstants.PASSWORD_LENGTH))
- .username(UtilsConstants.USER_NAME)
- .group(UtilsConstants.GROUP)
- .path(UtilsConstants.PATH)
- .port(UtilsConstants.PORT_1)
- .subsystem(UtilsConstants.SUB_SYSTEM_1)
- .pid(UtilsConstants.PID_1)
- .version(UtilsConstants.VERSION)
- .idc(UtilsConstants.IDC)
- .build();
+ final UserAgent agent = getUserAgent(UtilsConstants.PORT_1,
UtilsConstants.SUB_SYSTEM_1, UtilsConstants.PID_1);
return MessageUtils.generatePubClient(agent);
}
// generate sub-client
public static UserAgent generateClient2() {
- final UserAgent agent = UserAgent.builder()
- .env(UtilsConstants.ENV)
- .host(UtilsConstants.HOST)
- .password(generateRandomString(UtilsConstants.PASSWORD_LENGTH))
- .username(UtilsConstants.USER_NAME)
- .group(UtilsConstants.GROUP)
- .path(UtilsConstants.PATH)
- .port(UtilsConstants.PORT_2)
- .subsystem(UtilsConstants.SUB_SYSTEM_2)
- .pid(UtilsConstants.PID_2)
- .version(UtilsConstants.VERSION)
- .idc(UtilsConstants.IDC)
- .build();
+ final UserAgent agent = getUserAgent(UtilsConstants.PORT_2,
UtilsConstants.SUB_SYSTEM_2, UtilsConstants.PID_2);
return MessageUtils.generateSubClient(agent);
}
- public static Package syncRR() {
+ private static Package getPackageMsg(Command requestToServer,
EventMeshMessage eventMeshMessage) {
final Package msg = new Package();
- msg.setHeader(new Header(Command.REQUEST_TO_SERVER, 0, null,
generateRandomString(SEQ_LENGTH)));
- msg.setBody(generateSyncRRMqMsg());
+ msg.setHeader(new Header(requestToServer, 0, null,
generateRandomString(SEQ_LENGTH)));
+ msg.setBody(eventMeshMessage);
return msg;
}
+ public static Package syncRR() {
+ return getPackageMsg(Command.REQUEST_TO_SERVER, generateSyncRRMqMsg());
+ }
+
public static Package asyncRR() {
- final Package msg = new Package();
- msg.setHeader(new Header(Command.REQUEST_TO_SERVER, 0, null,
generateRandomString(SEQ_LENGTH)));
- msg.setBody(generateAsyncRRMqMsg());
- return msg;
+ return getPackageMsg(Command.REQUEST_TO_SERVER,
generateAsyncRRMqMsg());
}
public static Package asyncMessage() {
- final Package msg = new Package();
- msg.setHeader(new Header(Command.ASYNC_MESSAGE_TO_SERVER, 0, null,
generateRandomString(SEQ_LENGTH)));
- msg.setBody(generateAsyncEventMqMsg());
- return msg;
+ return getPackageMsg(Command.ASYNC_MESSAGE_TO_SERVER,
generateAsyncEventMqMsg());
}
public static Package broadcastMessage() {
- final Package msg = new Package();
- msg.setHeader(new Header(Command.BROADCAST_MESSAGE_TO_SERVER, 0, null,
generateRandomString(SEQ_LENGTH)));
- msg.setBody(generateBroadcastMqMsg());
- return msg;
+ return getPackageMsg(Command.BROADCAST_MESSAGE_TO_SERVER,
generateBroadcastMqMsg());
}
public static Package rrResponse(final EventMeshMessage request) {
- final Package msg = new Package();
- msg.setHeader(new Header(RESPONSE_TO_SERVER, 0, null,
generateRandomString(SEQ_LENGTH)));
- msg.setBody(request);
- return msg;
+ return getPackageMsg(RESPONSE_TO_SERVER, request);
}
+ public static EventMeshMessage getEventMeshMessage(String
eventMeshTcpSyncTestTopic, String msgType, String msg,
+ String keys, String
keyMsg, String testMessage) {
+ final EventMeshMessage mqmsg = new EventMeshMessage();
+ mqmsg.setTopic(eventMeshTcpSyncTestTopic);
+ mqmsg.getProperties().put(msgType, msg);
+ mqmsg.getProperties().put(UtilsConstants.TTL, DEFAULT_TTL_MS);
+ mqmsg.getProperties().put(keys, keyMsg);
+ mqmsg.getHeaders().put(Constants.DATA_CONTENT_TYPE, "text/plain");
+ mqmsg.setBody(testMessage);
+ return mqmsg;
+ }
+
public static EventMeshMessage generateSyncRRMqMsg() {
- final EventMeshMessage mqMsg = new EventMeshMessage();
- mqMsg.setTopic(ExampleConstants.EVENTMESH_TCP_SYNC_TEST_TOPIC);
- mqMsg.getProperties().put(UtilsConstants.MSG_TYPE, "persistent");
- mqMsg.getProperties().put(UtilsConstants.TTL, DEFAULT_TTL_MS);
- mqMsg.getProperties().put(UtilsConstants.KEYS,
generateRandomString(16));
- mqMsg.getHeaders().put(Constants.DATA_CONTENT_TYPE, "text/plain");
- mqMsg.setBody("testSyncRR");
- return mqMsg;
+ return
getEventMeshMessage(ExampleConstants.EVENTMESH_TCP_SYNC_TEST_TOPIC,
UtilsConstants.MSG_TYPE,
+ "persistent", UtilsConstants.KEYS,
generateRandomString(16), "testSyncRR");
}
-
private static EventMeshMessage generateAsyncRRMqMsg() {
- final EventMeshMessage mqMsg = new EventMeshMessage();
- mqMsg.setTopic(ExampleConstants.EVENTMESH_TCP_SYNC_TEST_TOPIC);
- mqMsg.getProperties().put(UtilsConstants.REPLY_TO,
"localhost@ProducerGroup-producerPool-9-access#V1_4_0#CI");
- mqMsg.getProperties().put(UtilsConstants.TTL, DEFAULT_TTL_MS);
- mqMsg.getProperties().put(UtilsConstants.PROPERTY_MESSAGE_REPLY_TO,
"notnull");
- mqMsg.getHeaders().put(Constants.DATA_CONTENT_TYPE, "text/plain");
- mqMsg.setBody("testAsyncRR");
- return mqMsg;
+ return
getEventMeshMessage(ExampleConstants.EVENTMESH_TCP_SYNC_TEST_TOPIC,
UtilsConstants.REPLY_TO,
+
"localhost@ProducerGroup-producerPool-9-access#V1_4_0#CI",
UtilsConstants.PROPERTY_MESSAGE_REPLY_TO,
+ "notnull", "testAsyncRR");
}
public static EventMeshMessage generateAsyncEventMqMsg() {
- final EventMeshMessage mqMsg = new EventMeshMessage();
- mqMsg.setTopic(ExampleConstants.EVENTMESH_TCP_ASYNC_TEST_TOPIC);
- mqMsg.getProperties().put(UtilsConstants.REPLY_TO,
"localhost@ProducerGroup-producerPool-9-access#V1_4_0#CI");
- mqMsg.getProperties().put(UtilsConstants.TTL, DEFAULT_TTL_MS);
- mqMsg.getProperties().put(UtilsConstants.PROPERTY_MESSAGE_REPLY_TO,
"notnull");
- mqMsg.getHeaders().put(Constants.DATA_CONTENT_TYPE, "text/plain");
- mqMsg.setBody(ASYNC_MSG_BODY);
- return mqMsg;
+ return
getEventMeshMessage(ExampleConstants.EVENTMESH_TCP_ASYNC_TEST_TOPIC,
UtilsConstants.REPLY_TO,
+
"localhost@ProducerGroup-producerPool-9-access#V1_4_0#CI",
UtilsConstants.PROPERTY_MESSAGE_REPLY_TO,
+ "notnull", ASYNC_MSG_BODY);
}
public static EventMeshMessage generateBroadcastMqMsg() {
- final EventMeshMessage mqMsg = new EventMeshMessage();
- mqMsg.setTopic(ExampleConstants.EVENTMESH_TCP_ASYNC_TEST_TOPIC);
- mqMsg.getProperties().put(UtilsConstants.REPLY_TO,
"localhost@ProducerGroup-producerPool-9-access#V1_4_0#CI");
- mqMsg.getProperties().put(UtilsConstants.TTL, DEFAULT_TTL_MS);
- mqMsg.getProperties().put(UtilsConstants.PROPERTY_MESSAGE_REPLY_TO,
"notnull");
- mqMsg.getHeaders().put(Constants.DATA_CONTENT_TYPE, "text/plain");
- mqMsg.setBody(ASYNC_MSG_BODY);
- return mqMsg;
+ return
getEventMeshMessage(ExampleConstants.EVENTMESH_TCP_ASYNC_TEST_TOPIC,
UtilsConstants.REPLY_TO,
+
"localhost@ProducerGroup-producerPool-9-access#V1_4_0#CI",
UtilsConstants.PROPERTY_MESSAGE_REPLY_TO,
+ "notnull", ASYNC_MSG_BODY);
}
private static String generateRandomString(final int length) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
