From d66feee4e3cbc5f2193b1a4f21a979b4d742ed8a Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 10 Sep 2015 10:55:02 +0900 Subject: [PATCH] PushCertificateChecker: Refactor to use Joiner in signature check Change-Id: I6eca2fe4a4dc1bef70dd5b631318bf432f92944a --- .../google/gerrit/gpg/PushCertificateChecker.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gerrit-gpg/src/main/java/com/google/gerrit/gpg/PushCertificateChecker.java b/gerrit-gpg/src/main/java/com/google/gerrit/gpg/PushCertificateChecker.java index 5044c62bea..c0498c784f 100644 --- a/gerrit-gpg/src/main/java/com/google/gerrit/gpg/PushCertificateChecker.java +++ b/gerrit-gpg/src/main/java/com/google/gerrit/gpg/PushCertificateChecker.java @@ -17,6 +17,8 @@ package com.google.gerrit.gpg; import static com.google.gerrit.gpg.PublicKeyStore.keyIdToString; import static com.google.gerrit.gpg.PublicKeyStore.keyToString; +import com.google.common.base.Joiner; + import org.bouncycastle.bcpg.ArmoredInputStream; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPObjectFactory; @@ -145,13 +147,10 @@ public abstract class PushCertificateChecker { } CheckResult result = publicKeyChecker.check(signer, store); if (!result.isOk()) { - StringBuilder err = new StringBuilder("Invalid public key ") - .append(keyToString(signer)) - .append(":"); - for (String problem : result.getProblems()) { - err.append("\n ").append(problem); - } - problems.add(err.toString()); + problems.add("Invalid public key " + + keyToString(signer) + + ":\n " + + Joiner.on("\n ").join(result.getProblems())); } } }