This is an automated email from the ASF dual-hosted git repository.
lizhanhui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new e98653472 [ISSUE #5699] remove duplicate code definition of
UtilAll.isBlank (#5700)
e98653472 is described below
commit e98653472868555e3b6235861eb7c24fe61a50d3
Author: xiaoyifang <[email protected]>
AuthorDate: Thu Dec 29 15:17:58 2022 +0800
[ISSUE #5699] remove duplicate code definition of UtilAll.isBlank (#5700)
* [ISSUE #5699] remove duplicate code definition of UtilAll.isBlank
* [ISSUE #5699] remove duplicate code definition of UtilAll.isBlank
---
.../main/java/org/apache/rocketmq/common/UtilAll.java | 12 ++----------
.../rocketmq/remoting/protocol/RemotingCommand.java | 17 +++--------------
.../remoting/protocol/RocketMQSerializable.java | 13 -------------
.../remoting/protocol/RocketMQSerializableTest.java | 13 -------------
4 files changed, 5 insertions(+), 50 deletions(-)
diff --git a/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
b/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
index 8fcab1ddf..ce2f6a5e6 100644
--- a/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
+++ b/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
@@ -45,6 +45,7 @@ import java.util.zip.CRC32;
import java.util.zip.DeflaterOutputStream;
import java.util.zip.InflaterInputStream;
import org.apache.commons.lang3.JavaVersion;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemUtils;
import org.apache.commons.validator.routines.InetAddressValidator;
import org.apache.rocketmq.common.constant.LoggerName;
@@ -462,16 +463,7 @@ public class UtilAll {
}
public static boolean isBlank(String str) {
- int strLen;
- if (str == null || (strLen = str.length()) == 0) {
- return true;
- }
- for (int i = 0; i < strLen; i++) {
- if (!Character.isWhitespace(str.charAt(i))) {
- return false;
- }
- }
- return true;
+ return StringUtils.isBlank(str);
}
public static String jstack() {
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
index 032b5ed92..3f50f4a45 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
@@ -32,6 +32,8 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
import org.apache.rocketmq.remoting.CommandCustomHeader;
@@ -68,7 +70,7 @@ public class RemotingCommand {
static {
final String protocol = System.getProperty(SERIALIZE_TYPE_PROPERTY,
System.getenv(SERIALIZE_TYPE_ENV));
- if (!isBlank(protocol)) {
+ if (!StringUtils.isBlank(protocol)) {
try {
serializeTypeConfigInThisServer =
SerializeType.valueOf(protocol);
} catch (IllegalArgumentException e) {
@@ -237,19 +239,6 @@ public class RemotingCommand {
return serializeTypeConfigInThisServer;
}
- private static boolean isBlank(String str) {
- int strLen;
- if (str == null || (strLen = str.length()) == 0) {
- return true;
- }
- for (int i = 0; i < strLen; i++) {
- if (!Character.isWhitespace(str.charAt(i))) {
- return false;
- }
- }
- return true;
- }
-
public static int markProtocolType(int source, SerializeType type) {
return (type.getCode() << 24) | (source & 0x00FFFFFF);
}
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializable.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializable.java
index d1fcb0996..4cf031e78 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializable.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializable.java
@@ -241,17 +241,4 @@ public class RocketMQSerializable {
}
return map;
}
-
- public static boolean isBlank(String str) {
- int strLen;
- if (str == null || (strLen = str.length()) == 0) {
- return true;
- }
- for (int i = 0; i < strLen; i++) {
- if (!Character.isWhitespace(str.charAt(i))) {
- return false;
- }
- }
- return true;
- }
}
diff --git
a/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializableTest.java
b/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializableTest.java
index 424366972..7cf32d70c 100644
---
a/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializableTest.java
+++
b/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializableTest.java
@@ -154,19 +154,6 @@ public class RocketMQSerializableTest {
}
}
- @Test
- public void testIsBlank_NotBlank() {
- assertThat(RocketMQSerializable.isBlank("bar")).isFalse();
- assertThat(RocketMQSerializable.isBlank(" A ")).isFalse();
- }
-
- @Test
- public void testIsBlank_Blank() {
- assertThat(RocketMQSerializable.isBlank(null)).isTrue();
- assertThat(RocketMQSerializable.isBlank("")).isTrue();
- assertThat(RocketMQSerializable.isBlank(" ")).isTrue();
- }
-
private short parseToShort(byte[] array, int index) {
return (short) (array[index] * 256 + array[++index]);
}
