diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountDestinations.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountDestinations.java
index d928becb7b..5e65acd5dc 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountDestinations.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountDestinations.java
@@ -17,6 +17,7 @@ package com.google.gerrit.server.account;
 import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.reviewdb.client.RefNames;
 import com.google.gerrit.server.git.DestinationList;
+import com.google.gerrit.server.git.TabFile;
 import com.google.gerrit.server.git.ValidationError;
 import com.google.gerrit.server.git.VersionedMetaData;
 
@@ -61,7 +62,7 @@ public class VersionedAccountDestinations extends VersionedMetaData {
         String path = p.path;
         if (path.startsWith(prefix)) {
           String label = path.substring(prefix.length());
-          ValidationError.Sink errors = destinations.createLoggerSink(path, log);
+          ValidationError.Sink errors = TabFile.createLoggerSink(path, log);
           destinations.parseLabel(label, readUTF8(path), errors);
         }
       }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/TabFile.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/TabFile.java
index 87f9a23879..3cbac3ba26 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/TabFile.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/TabFile.java
@@ -32,11 +32,11 @@ public class TabFile {
   }
 
   public static Parser TRIM = new Parser() {
-        public String parse(String str) {
-           return str.trim();
-        }
-      };
-
+    @Override
+    public String parse(String str) {
+       return str.trim();
+    }
+  };
 
   protected static class Row {
     public String left;
@@ -50,7 +50,7 @@ public class TabFile {
 
   protected static List<Row> parse(String text, String filename, Parser left,
       Parser right, ValidationError.Sink errors) throws IOException {
-    List<Row> rows = new ArrayList<Row>();
+    List<Row> rows = new ArrayList<>();
     BufferedReader br = new BufferedReader(new StringReader(text));
     String s;
     for (int lineNumber = 1; (s = br.readLine()) != null; lineNumber++) {