Merge "Format Java files with google-java-format"

gerrit-httpd/src/main/java/com/google/gerrit/httpd/CookieBase64.java

@@ -52,8 +52,7 @@ class CookieBase64 {
     return out.toString();
   }
 
-  private static void encode3to4(
+  private static void encode3to4(StringBuilder out, byte[] in, int inOffset, int numSigBytes) {
-      StringBuilder out, byte[] in, int inOffset, int numSigBytes) {
     //           1         2         3
     // 01234567890123456789012345678901 Bit position
     // --------000000001111111122222222 Array position from threeBytes

gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java

@@ -52,8 +52,7 @@ public class HttpLogoutServlet extends HttpServlet {
     this.audit = audit;
   }
 
-  protected void doLogout(HttpServletRequest req, HttpServletResponse rsp)
+  protected void doLogout(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
-      throws IOException {
     webSession.get().logout();
     if (logoutUrl != null) {
       rsp.sendRedirect(logoutUrl);
@@ -73,8 +72,7 @@ public class HttpLogoutServlet extends HttpServlet {
   }
 
   @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse rsp)
+  protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
-      throws IOException {
 
     final String sid = webSession.get().getSessionId();
     final CurrentUser currentUser = webSession.get().getUser();

gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java

@@ -48,9 +48,7 @@ public class RequestContextFilter implements Filter {
 
   @Inject
   RequestContextFilter(
-      Provider<RequestCleanup> r,
+      Provider<RequestCleanup> r, Provider<HttpRequestContext> c, ThreadLocalRequestContext l) {
-      Provider<HttpRequestContext> c,
-      ThreadLocalRequestContext l) {
     cleanup = r;
     requestContext = c;
     local = l;
@@ -63,8 +61,7 @@ public class RequestContextFilter implements Filter {
   public void destroy() {}
 
   @Override
-  public void doFilter(
+  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-      ServletRequest request, ServletResponse response, FilterChain chain)
       throws IOException, ServletException {
     RequestContext old = local.setContext(requestContext.get());
     try {

gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java

@@ -63,8 +63,7 @@ public class RequireSslFilter implements Filter {
   public void destroy() {}
 
   @Override
-  public void doFilter(
+  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-      ServletRequest request, ServletResponse response, FilterChain chain)
       throws IOException, ServletException {
     final HttpServletRequest req = (HttpServletRequest) request;
     final HttpServletResponse rsp = (HttpServletResponse) response;

gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java

@@ -146,8 +146,7 @@ public class BanCommit {
     return currentUser.get().newCommitterIdent(now, tz);
   }
 
-  private static String buildCommitMessage(
+  private static String buildCommitMessage(List<ObjectId> bannedCommits, String reason) {
-      List<ObjectId> bannedCommits, String reason) {
     final StringBuilder commitMsg = new StringBuilder();
     commitMsg.append("Banning ");
     commitMsg.append(bannedCommits.size());

gerrit-server/src/main/java/com/google/gerrit/server/git/LargeObjectException.java

@@ -25,8 +25,7 @@ public class LargeObjectException extends Exception {
 
   private static final long serialVersionUID = 1L;
 
-  public LargeObjectException(
+  public LargeObjectException(String message, org.eclipse.jgit.errors.LargeObjectException cause) {
-      String message, org.eclipse.jgit.errors.LargeObjectException cause) {
     super(message, cause);
   }
 }

gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java

@@ -154,10 +154,7 @@ public class MultiProgressMonitor {
    * @param maxIntervalUnit time unit for progress interval.
    */
   public MultiProgressMonitor(
-      OutputStream out,
+      OutputStream out, String taskName, long maxIntervalTime, TimeUnit maxIntervalUnit) {
-      String taskName,
-      long maxIntervalTime,
-      TimeUnit maxIntervalUnit) {
     this.out = out;
     this.taskName = taskName;
     maxIntervalNanos = NANOSECONDS.convert(maxIntervalTime, maxIntervalUnit);
@@ -186,8 +183,7 @@ public class MultiProgressMonitor {
    * @throws ExecutionException if this thread or a worker thread was interrupted, the worker was
    *     cancelled, or timed out waiting for a worker to call {@link #end()}.
    */
-  public void waitFor(
+  public void waitFor(Future<?> workerFuture, long timeoutTime, TimeUnit timeoutUnit)
-      Future<?> workerFuture, long timeoutTime, TimeUnit timeoutUnit)
       throws ExecutionException {
     long overallStart = System.nanoTime();
     long deadline;

gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java

@@ -88,8 +88,7 @@ public class GetReflog implements RestReadView<BranchResource> {
   }
 
   @Override
-  public List<ReflogEntryInfo> apply(BranchResource rsrc)
+  public List<ReflogEntryInfo> apply(BranchResource rsrc) throws RestApiException, IOException {
-      throws RestApiException, IOException {
     if (!rsrc.getControl().isOwner()) {
       throw new AuthException("not project owner");
     }