summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2019-02-04 08:50:39 +0900
committerDavid Pursehouse <dpursehouse@collab.net>2019-02-04 08:52:36 +0900
commit2109f3c35a247d41fea5af8cee5382476837082b (patch)
tree6d84796bedb3d0b88ff1c270a03ffd1fb6033fe6
parent6ac93d7ec6816da5f60f0086bb562e0ae734b79d (diff)
CommitValidators: Prefer using Splitter to String.split
Partial cherry-pick of commit 5174d2d done in order to make subsequent cherry-picks cleaner. Change-Id: I685ef2a3ac9ecd66aa32c6556aa1a70ba37704e1
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
index 541cbfa3fb..0eb781939e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
@@ -20,7 +20,9 @@ import static com.google.gerrit.reviewdb.client.RefNames.REFS_CONFIG;
import static java.util.stream.Collectors.toList;
import com.google.common.base.CharMatcher;
+import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
import com.google.gerrit.common.FooterConstants;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.PageLinks;
@@ -289,9 +291,7 @@ public class CommitValidators {
sb.append("ERROR: ").append(errMsg);
if (c.getFullMessage().indexOf(CHANGE_ID_PREFIX) >= 0) {
- String[] lines = c.getFullMessage().trim().split("\n");
- String lastLine = lines.length > 0 ? lines[lines.length - 1] : "";
-
+ String lastLine = Iterables.getLast(Splitter.on('\n').split(c.getFullMessage()), "");
if (lastLine.indexOf(CHANGE_ID_PREFIX) == -1) {
sb.append('\n');
sb.append('\n');