commit d9f7a80cf9f5502757eebaa1a8f99c7941463fbf
author Edwin Kempin <edwin.kempin@gmail.com> Tue Oct 06 15:29:36 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 06 15:29:36 2015 +0000
tree 4e09f14460cbec2543848337d9c0fdf1505ed86e
parent 74cf4b30ba6d4049c3c0062d515a3794aa1baada
parent d66feee4e3cbc5f2193b1a4f21a979b4d742ed8a

Merge "PushCertificateChecker: Refactor to use Joiner in signature check"

gerrit-gpg/src/main/java/com/google/gerrit/gpg/PushCertificateChecker.java

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 5044c62..c0498c7 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 @@
 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 @@
     }
     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()));
     }
   }
 }