This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
The following commit(s) were added to refs/heads/develop by this push:
new 106ca96 [ISSUE #505]remove all RandomStringUtils. (#510)
106ca96 is described below
commit 106ca96b5b4e4ad0107c6cd68ce46ff7819533f3
Author: YuDong Tang <[email protected]>
AuthorDate: Wed Aug 25 19:46:27 2021 +0800
[ISSUE #505]remove all RandomStringUtils. (#510)
* remove all RandomStringUtils.
* remove all RandomStringUtils.
---
.../apache/eventmesh/common/RandomStringUtil.java | 31 ++++++++++++++++++++++
.../protocol/http/push/AsyncHTTPPushRequest.java | 10 +++----
.../eventmesh/runtime/util/EventMeshUtil.java | 6 ++---
.../client/http/demo/AsyncPublishInstance.java | 6 ++---
.../client/http/demo/AsyncSyncRequestInstance.java | 6 ++---
.../client/http/demo/SyncRequestInstance.java | 6 ++---
.../eventmesh/http/demo/AsyncPublishInstance.java | 6 ++---
.../http/demo/AsyncSyncRequestInstance.java | 6 ++---
.../eventmesh/http/demo/SyncRequestInstance.java | 6 ++---
9 files changed, 54 insertions(+), 29 deletions(-)
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/RandomStringUtil.java
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/RandomStringUtil.java
new file mode 100644
index 0000000..802c3a6
--- /dev/null
+++
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/RandomStringUtil.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.eventmesh.common;
+
+import org.apache.commons.text.RandomStringGenerator;
+
+public class RandomStringUtil {
+
+ private final static RandomStringGenerator randomNumGenerator = new
RandomStringGenerator.Builder()
+ .withinRange('0', '9').build();
+
+ public static String generateNum(int length) {
+ return randomNumGenerator.generate(length);
+ }
+
+}
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/AsyncHTTPPushRequest.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/AsyncHTTPPushRequest.java
index 3ab5649..47c9e5f 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/AsyncHTTPPushRequest.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/AsyncHTTPPushRequest.java
@@ -32,9 +32,9 @@ import com.google.common.collect.Sets;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
-import org.apache.commons.text.RandomStringGenerator;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.IPUtil;
+import org.apache.eventmesh.common.RandomStringUtil;
import org.apache.eventmesh.common.protocol.SubcriptionType;
import
org.apache.eventmesh.common.protocol.http.body.message.PushMessageRequestBody;
import org.apache.eventmesh.common.protocol.http.common.ClientRetCode;
@@ -43,7 +43,6 @@ import
org.apache.eventmesh.common.protocol.http.common.ProtocolVersion;
import org.apache.eventmesh.common.protocol.http.common.RequestCode;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import
org.apache.eventmesh.runtime.core.protocol.http.consumer.HandleMsgContext;
-import org.apache.eventmesh.runtime.util.EventMeshUtil;
import org.apache.eventmesh.runtime.util.OMSUtil;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
@@ -68,9 +67,6 @@ public class AsyncHTTPPushRequest extends
AbstractHTTPPushRequest {
public String currPushUrl;
- private final static RandomStringGenerator randomGenerator = new
RandomStringGenerator.Builder()
- .withinRange('0', '9').build();
-
public AsyncHTTPPushRequest(HandleMsgContext handleMsgContext, Map<String,
Set<AbstractHTTPPushRequest>> waitingRequests) {
super(handleMsgContext);
this.waitingRequests = waitingRequests;
@@ -115,12 +111,12 @@ public class AsyncHTTPPushRequest extends
AbstractHTTPPushRequest {
List<NameValuePair> body = new ArrayList<NameValuePair>();
body.add(new BasicNameValuePair(PushMessageRequestBody.CONTENT,
content));
if (StringUtils.isBlank(handleMsgContext.getBizSeqNo())) {
- body.add(new BasicNameValuePair(PushMessageRequestBody.BIZSEQNO,
randomGenerator.generate(20)));
+ body.add(new BasicNameValuePair(PushMessageRequestBody.BIZSEQNO,
RandomStringUtil.generateNum(20)));
} else {
body.add(new BasicNameValuePair(PushMessageRequestBody.BIZSEQNO,
handleMsgContext.getBizSeqNo()));
}
if (StringUtils.isBlank(handleMsgContext.getUniqueId())) {
- body.add(new BasicNameValuePair(PushMessageRequestBody.UNIQUEID,
randomGenerator.generate(20)));
+ body.add(new BasicNameValuePair(PushMessageRequestBody.UNIQUEID,
RandomStringUtil.generateNum(20)));
} else {
body.add(new BasicNameValuePair(PushMessageRequestBody.UNIQUEID,
handleMsgContext.getUniqueId()));
}
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java
index 970ef82..eaa7be5 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java
@@ -42,8 +42,8 @@ import com.fasterxml.jackson.databind.SerializationFeature;
import io.openmessaging.api.Message;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.text.RandomStringGenerator;
import org.apache.eventmesh.common.Constants;
+import org.apache.eventmesh.common.RandomStringUtil;
import org.apache.eventmesh.common.ThreadUtil;
import org.apache.eventmesh.common.protocol.tcp.EventMeshMessage;
import org.apache.eventmesh.common.protocol.tcp.UserAgent;
@@ -56,12 +56,10 @@ public class EventMeshUtil {
public static Logger logger = LoggerFactory.getLogger(EventMeshUtil.class);
- private static final RandomStringGenerator RANDOM_GENERATOR = new
RandomStringGenerator.Builder().withinRange('0', '9').build();
-
private final static Logger tcpLogger =
LoggerFactory.getLogger("tcpMonitor");
public static String buildPushMsgSeqNo() {
- return
StringUtils.rightPad(String.valueOf(System.currentTimeMillis()), 6) +
RANDOM_GENERATOR.generate(4);
+ return
StringUtils.rightPad(String.valueOf(System.currentTimeMillis()), 6) +
RandomStringUtil.generateNum(4);
}
public static String buildMeshClientID(String clientGroup, String
meshCluster) {
diff --git
a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncPublishInstance.java
b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncPublishInstance.java
index e1598d8..c3447aa 100644
---
a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncPublishInstance.java
+++
b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncPublishInstance.java
@@ -17,13 +17,13 @@
package org.apache.eventmesh.client.http.demo;
-import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.eventmesh.client.http.conf.LiteClientConfig;
import org.apache.eventmesh.client.http.producer.LiteProducer;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.IPUtil;
import org.apache.eventmesh.common.LiteMessage;
+import org.apache.eventmesh.common.RandomStringUtil;
import org.apache.eventmesh.common.ThreadUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,11 +58,11 @@ public class AsyncPublishInstance {
liteProducer.start();
for (int i = 0; i < 1; i++) {
LiteMessage liteMessage = new LiteMessage();
- liteMessage.setBizSeqNo(RandomStringUtils.randomNumeric(30))
+ liteMessage.setBizSeqNo(RandomStringUtil.generateNum(30))
// .setContent("contentStr with special protocal")
.setContent("testPublishMessage")
.setTopic(topic)
- .setUniqueId(RandomStringUtils.randomNumeric(30))
+ .setUniqueId(RandomStringUtil.generateNum(30))
.addProp(Constants.EVENTMESH_MESSAGE_CONST_TTL,
String.valueOf(4 * 1000));
boolean flag = liteProducer.publish(liteMessage);
diff --git
a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncSyncRequestInstance.java
b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncSyncRequestInstance.java
index 596bf95..d9888eb 100644
---
a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncSyncRequestInstance.java
+++
b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncSyncRequestInstance.java
@@ -18,13 +18,13 @@
package org.apache.eventmesh.client.http.demo;
-import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.eventmesh.client.http.conf.LiteClientConfig;
import org.apache.eventmesh.client.http.producer.LiteProducer;
import org.apache.eventmesh.client.http.producer.RRCallback;
import org.apache.eventmesh.common.IPUtil;
import org.apache.eventmesh.common.LiteMessage;
+import org.apache.eventmesh.common.RandomStringUtil;
import org.apache.eventmesh.common.ThreadUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,10 +59,10 @@ public class AsyncSyncRequestInstance {
final long startTime = System.currentTimeMillis();
final LiteMessage liteMessage = new LiteMessage();
- liteMessage.setBizSeqNo(RandomStringUtils.randomNumeric(30))
+ liteMessage.setBizSeqNo(RandomStringUtil.generateNum(30))
.setContent("testAsyncMessage")
.setTopic(topic)
- .setUniqueId(RandomStringUtils.randomNumeric(30));
+ .setUniqueId(RandomStringUtil.generateNum(30));
liteProducer.request(liteMessage, new RRCallback() {
@Override
diff --git
a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/SyncRequestInstance.java
b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/SyncRequestInstance.java
index b62d294..2b16cde 100644
---
a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/SyncRequestInstance.java
+++
b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/SyncRequestInstance.java
@@ -17,12 +17,12 @@
package org.apache.eventmesh.client.http.demo;
-import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.eventmesh.client.http.conf.LiteClientConfig;
import org.apache.eventmesh.client.http.producer.LiteProducer;
import org.apache.eventmesh.common.IPUtil;
import org.apache.eventmesh.common.LiteMessage;
+import org.apache.eventmesh.common.RandomStringUtil;
import org.apache.eventmesh.common.ThreadUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,10 +58,10 @@ public class SyncRequestInstance {
long startTime = System.currentTimeMillis();
LiteMessage liteMessage = new LiteMessage();
- liteMessage.setBizSeqNo(RandomStringUtils.randomNumeric(30))
+ liteMessage.setBizSeqNo(RandomStringUtil.generateNum(30))
.setContent("contentStr with special protocal")
.setTopic(topic)
- .setUniqueId(RandomStringUtils.randomNumeric(30));
+ .setUniqueId(RandomStringUtil.generateNum(30));
LiteMessage rsp = liteProducer.request(liteMessage, 10000);
if (logger.isDebugEnabled()) {
diff --git
a/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/AsyncPublishInstance.java
b/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/AsyncPublishInstance.java
index c58c7bf..b867885 100644
---
a/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/AsyncPublishInstance.java
+++
b/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/AsyncPublishInstance.java
@@ -19,13 +19,13 @@ package org.apache.eventmesh.http.demo;
import java.util.Properties;
-import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.eventmesh.client.http.conf.LiteClientConfig;
import org.apache.eventmesh.client.http.producer.LiteProducer;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.IPUtil;
import org.apache.eventmesh.common.LiteMessage;
+import org.apache.eventmesh.common.RandomStringUtil;
import org.apache.eventmesh.common.ThreadUtil;
import org.apache.eventmesh.util.Utils;
import org.slf4j.Logger;
@@ -67,11 +67,11 @@ public class AsyncPublishInstance {
liteProducer.start();
for (int i = 0; i < messageSize; i++) {
LiteMessage liteMessage = new LiteMessage();
- liteMessage.setBizSeqNo(RandomStringUtils.randomNumeric(30))
+ liteMessage.setBizSeqNo(RandomStringUtil.generateNum(30))
// .setContent("contentStr with special protocal")
.setContent("testPublishMessage")
.setTopic(topic)
- .setUniqueId(RandomStringUtils.randomNumeric(30))
+ .setUniqueId(RandomStringUtil.generateNum(30))
.addProp(Constants.EVENTMESH_MESSAGE_CONST_TTL,
String.valueOf(4 * 1000));
boolean flag = liteProducer.publish(liteMessage);
diff --git
a/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/AsyncSyncRequestInstance.java
b/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/AsyncSyncRequestInstance.java
index cc8a536..ba2d99c 100644
---
a/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/AsyncSyncRequestInstance.java
+++
b/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/AsyncSyncRequestInstance.java
@@ -19,13 +19,13 @@ package org.apache.eventmesh.http.demo;
import java.util.Properties;
-import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.eventmesh.client.http.conf.LiteClientConfig;
import org.apache.eventmesh.client.http.producer.LiteProducer;
import org.apache.eventmesh.client.http.producer.RRCallback;
import org.apache.eventmesh.common.IPUtil;
import org.apache.eventmesh.common.LiteMessage;
+import org.apache.eventmesh.common.RandomStringUtil;
import org.apache.eventmesh.common.ThreadUtil;
import org.apache.eventmesh.util.Utils;
import org.slf4j.Logger;
@@ -65,10 +65,10 @@ public class AsyncSyncRequestInstance {
final long startTime = System.currentTimeMillis();
final LiteMessage liteMessage = new LiteMessage();
- liteMessage.setBizSeqNo(RandomStringUtils.randomNumeric(30))
+ liteMessage.setBizSeqNo(RandomStringUtil.generateNum(30))
.setContent("testAsyncMessage")
.setTopic(topic)
- .setUniqueId(RandomStringUtils.randomNumeric(30));
+ .setUniqueId(RandomStringUtil.generateNum(30));
liteProducer.request(liteMessage, new RRCallback() {
@Override
diff --git
a/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/SyncRequestInstance.java
b/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/SyncRequestInstance.java
index 329f2bc..a88396b 100644
---
a/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/SyncRequestInstance.java
+++
b/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/SyncRequestInstance.java
@@ -17,12 +17,12 @@
package org.apache.eventmesh.http.demo;
-import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.eventmesh.client.http.conf.LiteClientConfig;
import org.apache.eventmesh.client.http.producer.LiteProducer;
import org.apache.eventmesh.common.IPUtil;
import org.apache.eventmesh.common.LiteMessage;
+import org.apache.eventmesh.common.RandomStringUtil;
import org.apache.eventmesh.common.ThreadUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,10 +63,10 @@ public class SyncRequestInstance {
long startTime = System.currentTimeMillis();
LiteMessage liteMessage = new LiteMessage();
- liteMessage.setBizSeqNo(RandomStringUtils.randomNumeric(30))
+ liteMessage.setBizSeqNo(RandomStringUtil.generateNum(30))
.setContent("contentStr with special protocal")
.setTopic(topic)
- .setUniqueId(RandomStringUtils.randomNumeric(30));
+ .setUniqueId(RandomStringUtil.generateNum(30));
LiteMessage rsp = liteProducer.request(liteMessage, 10000);
if (logger.isDebugEnabled()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
