未验证 提交 44bdeeda 编写于 作者: G gorden5566 提交者: GitHub

[ISSUE 3203] Replace the class 'StringBuffer' by 'StringBuilder' (#3204)

上级 3a2b1726
...@@ -167,7 +167,7 @@ public class RemoteAddressStrategyFactory { ...@@ -167,7 +167,7 @@ public class RemoteAddressStrategyFactory {
String[] strArray = StringUtils.split(remoteAddr, "."); String[] strArray = StringUtils.split(remoteAddr, ".");
if (analysis(strArray, 1) || analysis(strArray, 2) || analysis(strArray, 3)) { if (analysis(strArray, 1) || analysis(strArray, 2) || analysis(strArray, 3)) {
AclUtils.verify(remoteAddr, index - 1); AclUtils.verify(remoteAddr, index - 1);
StringBuffer sb = new StringBuffer(); StringBuilder sb = new StringBuilder();
for (int j = 0; j < index; j++) { for (int j = 0; j < index; j++) {
sb.append(strArray[j].trim()).append("."); sb.append(strArray[j].trim()).append(".");
} }
......
...@@ -565,11 +565,11 @@ public class UtilAll { ...@@ -565,11 +565,11 @@ public class UtilAll {
if (list == null || list.size() == 0) { if (list == null || list.size() == 0) {
return null; return null;
} }
StringBuffer str = new StringBuffer(); StringBuilder str = new StringBuilder();
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
str.append(list.get(i)); str.append(list.get(i));
if (i == list.size() - 1) { if (i == list.size() - 1) {
continue; break;
} }
str.append(splitor); str.append(splitor);
} }
......
...@@ -43,11 +43,13 @@ public class Message implements Serializable { ...@@ -43,11 +43,13 @@ public class Message implements Serializable {
this.flag = flag; this.flag = flag;
this.body = body; this.body = body;
if (tags != null && tags.length() > 0) if (tags != null && tags.length() > 0) {
this.setTags(tags); this.setTags(tags);
}
if (keys != null && keys.length() > 0) if (keys != null && keys.length() > 0) {
this.setKeys(keys); this.setKeys(keys);
}
this.setWaitStoreMsgOK(waitStoreMsgOK); this.setWaitStoreMsgOK(waitStoreMsgOK);
} }
...@@ -127,7 +129,7 @@ public class Message implements Serializable { ...@@ -127,7 +129,7 @@ public class Message implements Serializable {
} }
public void setKeys(Collection<String> keys) { public void setKeys(Collection<String> keys) {
StringBuffer sb = new StringBuffer(); StringBuilder sb = new StringBuilder();
for (String k : keys) { for (String k : keys) {
sb.append(k); sb.append(k);
sb.append(MessageConst.KEY_SEPARATOR); sb.append(MessageConst.KEY_SEPARATOR);
...@@ -151,8 +153,9 @@ public class Message implements Serializable { ...@@ -151,8 +153,9 @@ public class Message implements Serializable {
public boolean isWaitStoreMsgOK() { public boolean isWaitStoreMsgOK() {
String result = this.getProperty(MessageConst.PROPERTY_WAIT_STORE_MSG_OK); String result = this.getProperty(MessageConst.PROPERTY_WAIT_STORE_MSG_OK);
if (null == result) if (null == result) {
return true; return true;
}
return Boolean.parseBoolean(result); return Boolean.parseBoolean(result);
} }
......
...@@ -120,7 +120,7 @@ public class NamespaceUtil { ...@@ -120,7 +120,7 @@ public class NamespaceUtil {
return null; return null;
} }
return new StringBuffer() return new StringBuilder()
.append(MixAll.RETRY_GROUP_TOPIC_PREFIX) .append(MixAll.RETRY_GROUP_TOPIC_PREFIX)
.append(wrapNamespace(namespace, consumerGroup)) .append(wrapNamespace(namespace, consumerGroup))
.toString(); .toString();
......
...@@ -19,11 +19,15 @@ package org.apache.rocketmq.common; ...@@ -19,11 +19,15 @@ package org.apache.rocketmq.common;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Properties; import java.util.Properties;
import org.junit.Test; import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.within; import static org.assertj.core.api.Assertions.within;
import static org.junit.Assert.assertEquals;
public class UtilAllTest { public class UtilAllTest {
...@@ -109,6 +113,15 @@ public class UtilAllTest { ...@@ -109,6 +113,15 @@ public class UtilAllTest {
assertThat(UtilAll.ipToIPv6Str(nonInternal.getAddress()).toUpperCase()).isEqualTo("2408:4004:0180:8100:3FAA:1DDE:2B3F:898A"); assertThat(UtilAll.ipToIPv6Str(nonInternal.getAddress()).toUpperCase()).isEqualTo("2408:4004:0180:8100:3FAA:1DDE:2B3F:898A");
} }
@Test
public void testList2String() {
List<String> list = Arrays.asList("groupA=DENY", "groupB=PUB|SUB", "groupC=SUB");
String comma = ",";
assertEquals("groupA=DENY,groupB=PUB|SUB,groupC=SUB", UtilAll.list2String(list, comma));
assertEquals(null, UtilAll.list2String(null, comma));
assertEquals(null, UtilAll.list2String(Collections.emptyList(), comma));
}
static class DemoConfig { static class DemoConfig {
private int demoWidth = 0; private int demoWidth = 0;
private int demoLength = 0; private int demoLength = 0;
......
...@@ -82,7 +82,7 @@ public class IOTinyUtilsTest { ...@@ -82,7 +82,7 @@ public class IOTinyUtilsTest {
@Test @Test
public void testReadLines() throws Exception { public void testReadLines() throws Exception {
StringBuffer sb = new StringBuffer(); StringBuilder sb = new StringBuilder();
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
sb.append("testReadLines").append("\n"); sb.append("testReadLines").append("\n");
} }
...@@ -95,7 +95,7 @@ public class IOTinyUtilsTest { ...@@ -95,7 +95,7 @@ public class IOTinyUtilsTest {
@Test @Test
public void testToBufferedReader() throws Exception { public void testToBufferedReader() throws Exception {
StringBuffer sb = new StringBuffer(); StringBuilder sb = new StringBuilder();
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
sb.append("testToBufferedReader").append("\n"); sb.append("testToBufferedReader").append("\n");
} }
......
...@@ -53,6 +53,7 @@ public abstract class UnaryExpression implements Expression { ...@@ -53,6 +53,7 @@ public abstract class UnaryExpression implements Expression {
public static Expression createNegate(Expression left) { public static Expression createNegate(Expression left) {
return new UnaryExpression(left, UnaryType.NEGATE) { return new UnaryExpression(left, UnaryType.NEGATE) {
@Override
public Object evaluate(EvaluationContext context) throws Exception { public Object evaluate(EvaluationContext context) throws Exception {
Object rvalue = right.evaluate(context); Object rvalue = right.evaluate(context);
if (rvalue == null) { if (rvalue == null) {
...@@ -64,6 +65,7 @@ public abstract class UnaryExpression implements Expression { ...@@ -64,6 +65,7 @@ public abstract class UnaryExpression implements Expression {
return null; return null;
} }
@Override
public String getExpressionSymbol() { public String getExpressionSymbol() {
return "-"; return "-";
} }
...@@ -85,6 +87,7 @@ public abstract class UnaryExpression implements Expression { ...@@ -85,6 +87,7 @@ public abstract class UnaryExpression implements Expression {
final Collection inList = t; final Collection inList = t;
return new UnaryInExpression(right, UnaryType.IN, inList, not) { return new UnaryInExpression(right, UnaryType.IN, inList, not) {
@Override
public Object evaluate(EvaluationContext context) throws Exception { public Object evaluate(EvaluationContext context) throws Exception {
Object rvalue = right.evaluate(context); Object rvalue = right.evaluate(context);
...@@ -103,8 +106,9 @@ public abstract class UnaryExpression implements Expression { ...@@ -103,8 +106,9 @@ public abstract class UnaryExpression implements Expression {
} }
@Override
public String toString() { public String toString() {
StringBuffer answer = new StringBuffer(); StringBuilder answer = new StringBuilder();
answer.append(right); answer.append(right);
answer.append(" "); answer.append(" ");
answer.append(getExpressionSymbol()); answer.append(getExpressionSymbol());
...@@ -124,6 +128,7 @@ public abstract class UnaryExpression implements Expression { ...@@ -124,6 +128,7 @@ public abstract class UnaryExpression implements Expression {
return answer.toString(); return answer.toString();
} }
@Override
public String getExpressionSymbol() { public String getExpressionSymbol() {
if (not) { if (not) {
return "NOT IN"; return "NOT IN";
...@@ -139,6 +144,7 @@ public abstract class UnaryExpression implements Expression { ...@@ -139,6 +144,7 @@ public abstract class UnaryExpression implements Expression {
super(left, unaryType); super(left, unaryType);
} }
@Override
public boolean matches(EvaluationContext context) throws Exception { public boolean matches(EvaluationContext context) throws Exception {
Object object = evaluate(context); Object object = evaluate(context);
return object != null && object == Boolean.TRUE; return object != null && object == Boolean.TRUE;
...@@ -147,6 +153,7 @@ public abstract class UnaryExpression implements Expression { ...@@ -147,6 +153,7 @@ public abstract class UnaryExpression implements Expression {
public static BooleanExpression createNOT(BooleanExpression left) { public static BooleanExpression createNOT(BooleanExpression left) {
return new BooleanUnaryExpression(left, UnaryType.NOT) { return new BooleanUnaryExpression(left, UnaryType.NOT) {
@Override
public Object evaluate(EvaluationContext context) throws Exception { public Object evaluate(EvaluationContext context) throws Exception {
Boolean lvalue = (Boolean) right.evaluate(context); Boolean lvalue = (Boolean) right.evaluate(context);
if (lvalue == null) { if (lvalue == null) {
...@@ -155,6 +162,7 @@ public abstract class UnaryExpression implements Expression { ...@@ -155,6 +162,7 @@ public abstract class UnaryExpression implements Expression {
return lvalue.booleanValue() ? Boolean.FALSE : Boolean.TRUE; return lvalue.booleanValue() ? Boolean.FALSE : Boolean.TRUE;
} }
@Override
public String getExpressionSymbol() { public String getExpressionSymbol() {
return "NOT"; return "NOT";
} }
...@@ -163,6 +171,7 @@ public abstract class UnaryExpression implements Expression { ...@@ -163,6 +171,7 @@ public abstract class UnaryExpression implements Expression {
public static BooleanExpression createBooleanCast(Expression left) { public static BooleanExpression createBooleanCast(Expression left) {
return new BooleanUnaryExpression(left, UnaryType.BOOLEANCAST) { return new BooleanUnaryExpression(left, UnaryType.BOOLEANCAST) {
@Override
public Object evaluate(EvaluationContext context) throws Exception { public Object evaluate(EvaluationContext context) throws Exception {
Object rvalue = right.evaluate(context); Object rvalue = right.evaluate(context);
if (rvalue == null) { if (rvalue == null) {
...@@ -174,10 +183,12 @@ public abstract class UnaryExpression implements Expression { ...@@ -174,10 +183,12 @@ public abstract class UnaryExpression implements Expression {
return ((Boolean) rvalue).booleanValue() ? Boolean.TRUE : Boolean.FALSE; return ((Boolean) rvalue).booleanValue() ? Boolean.TRUE : Boolean.FALSE;
} }
@Override
public String toString() { public String toString() {
return right.toString(); return right.toString();
} }
@Override
public String getExpressionSymbol() { public String getExpressionSymbol() {
return ""; return "";
} }
...@@ -233,6 +244,7 @@ public abstract class UnaryExpression implements Expression { ...@@ -233,6 +244,7 @@ public abstract class UnaryExpression implements Expression {
/** /**
* @see Object#toString() * @see Object#toString()
*/ */
@Override
public String toString() { public String toString() {
return "(" + getExpressionSymbol() + " " + right.toString() + ")"; return "(" + getExpressionSymbol() + " " + right.toString() + ")";
} }
...@@ -240,6 +252,7 @@ public abstract class UnaryExpression implements Expression { ...@@ -240,6 +252,7 @@ public abstract class UnaryExpression implements Expression {
/** /**
* @see Object#hashCode() * @see Object#hashCode()
*/ */
@Override
public int hashCode() { public int hashCode() {
return toString().hashCode(); return toString().hashCode();
} }
...@@ -247,6 +260,7 @@ public abstract class UnaryExpression implements Expression { ...@@ -247,6 +260,7 @@ public abstract class UnaryExpression implements Expression {
/** /**
* @see Object#equals(Object) * @see Object#equals(Object)
*/ */
@Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (o == null || !this.getClass().equals(o.getClass())) { if (o == null || !this.getClass().equals(o.getClass())) {
......
...@@ -106,7 +106,7 @@ public class ParseException extends Exception { ...@@ -106,7 +106,7 @@ public class ParseException extends Exception {
int[][] expectedTokenSequences, int[][] expectedTokenSequences,
String[] tokenImage) { String[] tokenImage) {
String eol = System.getProperty("line.separator", "\n"); String eol = System.getProperty("line.separator", "\n");
StringBuffer expected = new StringBuffer(); StringBuilder expected = new StringBuilder();
int maxSize = 0; int maxSize = 0;
for (int i = 0; i < expectedTokenSequences.length; i++) { for (int i = 0; i < expectedTokenSequences.length; i++) {
if (maxSize < expectedTokenSequences[i].length) { if (maxSize < expectedTokenSequences[i].length) {
...@@ -123,8 +123,9 @@ public class ParseException extends Exception { ...@@ -123,8 +123,9 @@ public class ParseException extends Exception {
String retval = "Encountered \""; String retval = "Encountered \"";
Token tok = currentToken.next; Token tok = currentToken.next;
for (int i = 0; i < maxSize; i++) { for (int i = 0; i < maxSize; i++) {
if (i != 0) if (i != 0) {
retval += " "; retval += " ";
}
if (tok.kind == 0) { if (tok.kind == 0) {
retval += tokenImage[0]; retval += tokenImage[0];
break; break;
...@@ -157,7 +158,7 @@ public class ParseException extends Exception { ...@@ -157,7 +158,7 @@ public class ParseException extends Exception {
* string literal. * string literal.
*/ */
static String add_escapes(String str) { static String add_escapes(String str) {
StringBuffer retval = new StringBuffer(); StringBuilder retval = new StringBuilder();
char ch; char ch;
for (int i = 0; i < str.length(); i++) { for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i)) { switch (str.charAt(i)) {
......
...@@ -66,7 +66,7 @@ public class TokenMgrError extends Error { ...@@ -66,7 +66,7 @@ public class TokenMgrError extends Error {
* equivalents in the given string * equivalents in the given string
*/ */
protected static final String addEscapes(String str) { protected static final String addEscapes(String str) {
StringBuffer retval = new StringBuffer(); StringBuilder retval = new StringBuilder();
char ch; char ch;
for (int i = 0; i < str.length(); i++) { for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i)) { switch (str.charAt(i)) {
...@@ -141,6 +141,7 @@ public class TokenMgrError extends Error { ...@@ -141,6 +141,7 @@ public class TokenMgrError extends Error {
* <p/> * <p/>
* from this method for such cases in the release version of your parser. * from this method for such cases in the release version of your parser.
*/ */
@Override
public String getMessage() { public String getMessage() {
return super.getMessage(); return super.getMessage();
} }
......
...@@ -84,7 +84,7 @@ public class ParserTest { ...@@ -84,7 +84,7 @@ public class ParserTest {
@Test @Test
public void testParse_floatOverFlow() { public void testParse_floatOverFlow() {
try { try {
StringBuffer sb = new StringBuffer(210000); StringBuilder sb = new StringBuilder(210000);
sb.append("1"); sb.append("1");
for (int i = 0; i < 2048; i ++) { for (int i = 0; i < 2048; i ++) {
sb.append("111111111111111111111111111111111111111111111111111"); sb.append("111111111111111111111111111111111111111111111111111");
......
...@@ -36,7 +36,7 @@ public class RemotingHelper { ...@@ -36,7 +36,7 @@ public class RemotingHelper {
private static final InternalLogger log = InternalLoggerFactory.getLogger(ROCKETMQ_REMOTING); private static final InternalLogger log = InternalLoggerFactory.getLogger(ROCKETMQ_REMOTING);
public static String exceptionSimpleDesc(final Throwable e) { public static String exceptionSimpleDesc(final Throwable e) {
StringBuffer sb = new StringBuffer(); StringBuilder sb = new StringBuilder();
if (e != null) { if (e != null) {
sb.append(e.toString()); sb.append(e.toString());
......
...@@ -159,7 +159,7 @@ public class BrokerStatsManager { ...@@ -159,7 +159,7 @@ public class BrokerStatsManager {
} }
public String buildStatsKey(String topic, String group) { public String buildStatsKey(String topic, String group) {
StringBuffer strBuilder = new StringBuffer(); StringBuilder strBuilder = new StringBuilder();
strBuilder.append(topic); strBuilder.append(topic);
strBuilder.append("@"); strBuilder.append("@");
strBuilder.append(group); strBuilder.append(group);
...@@ -217,7 +217,7 @@ public class BrokerStatsManager { ...@@ -217,7 +217,7 @@ public class BrokerStatsManager {
} }
public String buildCommercialStatsKey(String owner, String topic, String group, String type) { public String buildCommercialStatsKey(String owner, String topic, String group, String type) {
StringBuffer strBuilder = new StringBuffer(); StringBuilder strBuilder = new StringBuilder();
strBuilder.append(owner); strBuilder.append(owner);
strBuilder.append("@"); strBuilder.append("@");
strBuilder.append(topic); strBuilder.append(topic);
......
...@@ -114,7 +114,7 @@ public class QueryMsgByUniqueKeySubCommand implements SubCommand { ...@@ -114,7 +114,7 @@ public class QueryMsgByUniqueKeySubCommand implements SubCommand {
private static String createBodyFile(MessageExt msg, int index) throws IOException { private static String createBodyFile(MessageExt msg, int index) throws IOException {
DataOutputStream dos = null; DataOutputStream dos = null;
try { try {
StringBuffer bodyTmpFilePath = new StringBuffer("/tmp/rocketmq/msgbodys"); StringBuilder bodyTmpFilePath = new StringBuilder("/tmp/rocketmq/msgbodys");
File file = new File(bodyTmpFilePath.toString()); File file = new File(bodyTmpFilePath.toString());
if (!file.exists()) { if (!file.exists()) {
file.mkdirs(); file.mkdirs();
...@@ -127,8 +127,9 @@ public class QueryMsgByUniqueKeySubCommand implements SubCommand { ...@@ -127,8 +127,9 @@ public class QueryMsgByUniqueKeySubCommand implements SubCommand {
dos.write(msg.getBody()); dos.write(msg.getBody());
return bodyTmpFilePath.toString(); return bodyTmpFilePath.toString();
} finally { } finally {
if (dos != null) if (dos != null) {
dos.close(); dos.close();
}
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册