opendev/gerrit
Code Issues Proposed changes

Improve String operations

Browse Source 
- Don't call #toString on strings.
- Don't use + in StringBuilder#append-s methods.

Change-Id: I4e0f99ea417aabb72ecaaab170c66eb434d3ad37
This commit is contained in:
Maxime Guerreiro
2018-04-27 13:31:26 +00:00
committed by David Pursehouse
parent 505fa92b0c
commit 34de18130e
6 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/extensions/common/GitPerson.java
View File

@@ -51,6 +51,6 @@ public class GitPerson {
+ date + date
+ ", tz=" + ", tz="
+ tz + tz
+ "}".toString(); + "}";
} }
} }

2
java/com/google/gerrit/extensions/common/WebLinkInfo.java
View File

@@ -62,6 +62,6 @@ public class WebLinkInfo {
+ url + url
+ ", target" + ", target"
+ target + target
+ "}".toString(); + "}";
} }
} }

2
java/com/google/gerrit/server/git/MergeUtil.java
View File

@@ -298,7 +298,7 @@ public class MergeUtil {
public static String createConflictMessage(List<String> conflicts) { public static String createConflictMessage(List<String> conflicts) {
StringBuilder sb = new StringBuilder("merge conflict(s)"); StringBuilder sb = new StringBuilder("merge conflict(s)");
for (String c : conflicts) { for (String c : conflicts) {
sb.append('\n' + c); sb.append('\n').append(c);
} }
return sb.toString(); return sb.toString();
} }

2
java/com/google/gerrit/sshd/commands/StreamEvents.java
View File

@@ -110,7 +110,7 @@ final class StreamEvents extends BaseCommand {
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
b.append("Stream Events"); b.append("Stream Events");
if (currentUser.getUserName().isPresent()) { if (currentUser.getUserName().isPresent()) {
b.append(" (" + currentUser.getUserName().get() + ")"); b.append(" (").append(currentUser.getUserName().get()).append(")");
} }
return b.toString(); return b.toString();
} }

2
javatests/com/google/gerrit/acceptance/git/AbstractSubmoduleSubscription.java
View File

@@ -273,7 +273,7 @@ public abstract class AbstractSubmoduleSubscription extends AbstractDaemonTest {
.commit() .commit()
.insertChangeId() .insertChangeId()
.message("subject: adding new subscription") .message("subject: adding new subscription")
.add(".gitmodules", config.toText().toString()) .add(".gitmodules", config.toText())
.create(); .create();
repo.git() repo.git()

34
javatests/com/google/gerrit/server/mail/receive/MailHeaderParserTest.java
View File

@@ -65,11 +65,12 @@ public class MailHeaderParserTest {
b.subject(""); b.subject("");
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(MailHeader.CHANGE_NUMBER.withDelimiter() + "123\r\n"); stringBuilder.append(MailHeader.CHANGE_NUMBER.withDelimiter()).append("123\r\n");
stringBuilder.append("> " + MailHeader.PATCH_SET.withDelimiter() + "1\n"); stringBuilder.append("> ").append(MailHeader.PATCH_SET.withDelimiter()).append("1\n");
stringBuilder.append(MailHeader.MESSAGE_TYPE.withDelimiter() + "comment\n"); stringBuilder.append(MailHeader.MESSAGE_TYPE.withDelimiter()).append("comment\n");
stringBuilder.append( stringBuilder
MailHeader.COMMENT_DATE.withDelimiter() + "Tue, 25 Oct 2016 02:11:35 -0700\r\n"); .append(MailHeader.COMMENT_DATE.withDelimiter())
.append("Tue, 25 Oct 2016 02:11:35 -0700\r\n");
b.textContent(stringBuilder.toString()); b.textContent(stringBuilder.toString());
Address author = new Address("Diffy", "test@gerritcodereview.com"); Address author = new Address("Diffy", "test@gerritcodereview.com");
@@ -97,15 +98,20 @@ public class MailHeaderParserTest {
b.subject(""); b.subject("");
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append( stringBuilder
"<div id\"someid\">" + MailHeader.CHANGE_NUMBER.withDelimiter() + "123</div>"); .append("<div id\"someid\">")
stringBuilder.append("<div>" + MailHeader.PATCH_SET.withDelimiter() + "1</div>"); .append(MailHeader.CHANGE_NUMBER.withDelimiter())
stringBuilder.append("<div>" + MailHeader.MESSAGE_TYPE.withDelimiter() + "comment</div>"); .append("123</div>");
stringBuilder.append( stringBuilder.append("<div>").append(MailHeader.PATCH_SET.withDelimiter()).append("1</div>");
"<div>" stringBuilder
+ MailHeader.COMMENT_DATE.withDelimiter() .append("<div>")
+ "Tue, 25 Oct 2016 02:11:35 -0700" .append(MailHeader.MESSAGE_TYPE.withDelimiter())
+ "</div>"); .append("comment</div>");
stringBuilder
.append("<div>")
.append(MailHeader.COMMENT_DATE.withDelimiter())
.append("Tue, 25 Oct 2016 02:11:35 -0700")
.append("</div>");
b.htmlContent(stringBuilder.toString()); b.htmlContent(stringBuilder.toString());
Address author = new Address("Diffy", "test@gerritcodereview.com"); Address author = new Address("Diffy", "test@gerritcodereview.com");