diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GerritServer.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GerritServer.java index 08977f0a14..c4e636b6b7 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GerritServer.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GerritServer.java @@ -151,7 +151,7 @@ public class GerritServer { public Void call() throws Exception { int rc = daemon.main(new String[] { "-d", site.getPath(), - "--headless", "--console-log", "--show-stack-trace"}); + "--headless", "--console-log", "--show-stack-trace",}); if (rc != 0) { System.err.println("Failed to start Gerrit daemon"); serverStarted.reset(); @@ -172,7 +172,7 @@ public class GerritServer { Init init = new Init(); int rc = init.main(new String[] { "-d", tmp.getPath(), "--batch", "--no-auto-start", - "--skip-plugins"}); + "--skip-plugins",}); if (rc != 0) { throw new RuntimeException("Couldn't initialize site"); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Actions.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Actions.java index 033a3a81af..36107eebf6 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Actions.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Actions.java @@ -37,7 +37,7 @@ import java.util.TreeSet; class Actions extends Composite { private static final String[] CORE = { "abandon", "cherrypick", "followup", "hashtags", "publish", - "rebase", "restore", "revert", "submit", "topic", "/"}; + "rebase", "restore", "revert", "submit", "topic", "/",}; interface Binder extends UiBinder {} private static final Binder uiBinder = GWT.create(Binder.class); diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/Vim.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/Vim.java index f1dee69f3e..c3d58c9ba3 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/lib/Vim.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/Vim.java @@ -32,7 +32,7 @@ public class Vim extends JavaScriptObject { } for (String key : new String[] { "Ctrl-C", "Ctrl-O", "Ctrl-P", "Ctrl-S", - "Ctrl-F", "Ctrl-B", "Ctrl-R"}) { + "Ctrl-F", "Ctrl-B", "Ctrl-R",}) { km.propagate(key); } for (int i = 0; i <= 9; i++) { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java index 38dd118217..3ff060c738 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java @@ -212,7 +212,7 @@ class ProjectDigestFilter implements Filter { private static final char[] LHEX = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', // - 'a', 'b', 'c', 'd', 'e', 'f'}; + 'a', 'b', 'c', 'd', 'e', 'f',}; private static String LHEX(byte[] bin) { StringBuilder r = new StringBuilder(bin.length * 2); diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/JythonShell.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/JythonShell.java index d3643f3f8c..b09278421c 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/JythonShell.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/JythonShell.java @@ -134,7 +134,7 @@ public class JythonShell { new Class[] { String.class, pyObject }, new Object[] { getDefaultBanner() + " running for Gerrit " + com.google.gerrit.common.Version.getVersion(), - null }); + null, }); } public void set(String key, Object content) { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java index bdebd6ca43..cb4439acc9 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java @@ -105,22 +105,22 @@ class InitSshd implements InitStep { System.err.print(" rsa..."); System.err.flush(); - Runtime.getRuntime().exec(new String[] {"ssh-keygen", // - "-q" /* quiet */, // - "-t", "rsa", // - "-P", "", // - "-C", comment, // - "-f", site.ssh_rsa.toAbsolutePath().toString() // + Runtime.getRuntime().exec(new String[] {"ssh-keygen", + "-q" /* quiet */, + "-t", "rsa", + "-P", "", + "-C", comment, + "-f", site.ssh_rsa.toAbsolutePath().toString(), }).waitFor(); System.err.print(" dsa..."); System.err.flush(); - Runtime.getRuntime().exec(new String[] {"ssh-keygen", // - "-q" /* quiet */, // - "-t", "dsa", // - "-P", "", // - "-C", comment, // - "-f", site.ssh_dsa.toAbsolutePath().toString() // + Runtime.getRuntime().exec(new String[] {"ssh-keygen", + "-q" /* quiet */, + "-t", "dsa", + "-P", "", + "-C", comment, + "-f", site.ssh_dsa.toAbsolutePath().toString(), }).waitFor(); } else { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java index 2133dfbf12..0aef9e9970 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java @@ -26,7 +26,7 @@ public class StringUtil { { "\\x00", "\\x01", "\\x02", "\\x03", "\\x04", "\\x05", "\\x06", "\\a", "\\b", "\\t", "\\n", "\\v", "\\f", "\\r", "\\x0e", "\\x0f", "\\x10", "\\x11", "\\x12", "\\x13", "\\x14", "\\x15", "\\x16", "\\x17", - "\\x18", "\\x19", "\\x1a", "\\x1b", "\\x1c", "\\x1d", "\\x1e", "\\x1f" }; + "\\x18", "\\x19", "\\x1a", "\\x1b", "\\x1c", "\\x1d", "\\x1e", "\\x1f", }; /** * Escapes the input string so that all non-printable characters diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebCgiConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebCgiConfig.java index 4a58f73996..830579ff01 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebCgiConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebCgiConfig.java @@ -53,8 +53,12 @@ public class GitwebCgiConfig { String cfgCgi = cfg.getString("gitweb", null, "cgi"); Path pkgCgi = Paths.get("/usr/lib/cgi-bin/gitweb.cgi"); - String[] resourcePaths = {"/usr/share/gitweb/static", "/usr/share/gitweb", - "/var/www/static", "/var/www"}; + String[] resourcePaths = { + "/usr/share/gitweb/static", + "/usr/share/gitweb", + "/var/www/static", + "/var/www", + }; Path cgi; if (cfgCgi != null) { diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/IdentifiedUserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/IdentifiedUserTest.java index 6349be2114..390a4c1115 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/IdentifiedUserTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/IdentifiedUserTest.java @@ -60,7 +60,7 @@ public class IdentifiedUserTest { private static final String[] TEST_CASES = { "", "FirstName.LastName@Corporation.com", - "!#$%&'+-/=.?^`{|}~@[IPv6:0123:4567:89AB:CDEF:0123:4567:89AB:CDEF]" + "!#$%&'+-/=.?^`{|}~@[IPv6:0123:4567:89AB:CDEF:0123:4567:89AB:CDEF]", }; @Before diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java index b4d6e96818..0646eef0a3 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java @@ -51,7 +51,7 @@ public class StringUtilTest { "string with 'quotes'", "string with 'quotes'", "C:\\Program Files\\MyProgram", "C:\\\\Program Files\\\\MyProgram", "string\nwith\nnewlines", "string\\nwith\\nnewlines", - "string\twith\ttabs", "string\\twith\\ttabs" }; + "string\twith\ttabs", "string\\twith\\ttabs", }; for (int i = 0; i < testPairs.length; i += 2) { assertEquals(StringUtil.escapeString(testPairs[i]), testPairs[i + 1]); } diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java index dbc8f02fd8..f6bdeac5ca 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java @@ -156,6 +156,6 @@ public class BasicSerializationTest { private static byte[] b(int a, int b, int c, int d, int e, int f, int g, int h) { return new byte[] {(byte) a, (byte) b, (byte) c, (byte) d, // - (byte) e, (byte) f, (byte) g, (byte) h}; + (byte) e, (byte) f, (byte) g, (byte) h,}; } } diff --git a/tools/checkstyle.xml b/tools/checkstyle.xml index 6a8cfa993b..cb24e8f73b 100644 --- a/tools/checkstyle.xml +++ b/tools/checkstyle.xml @@ -96,6 +96,7 @@ edited to remove noisy warnings. +