Merge "Format Java files with google-java-format"
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CookieBase64.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CookieBase64.java
index 14ef324..52cfde7 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CookieBase64.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CookieBase64.java
@@ -52,8 +52,7 @@
return out.toString();
}
- private static void encode3to4(
- StringBuilder out, byte[] in, int inOffset, int numSigBytes) {
+ private static void encode3to4(StringBuilder out, byte[] in, int inOffset, int numSigBytes) {
// 1 2 3
// 01234567890123456789012345678901 Bit position
// --------000000001111111122222222 Array position from threeBytes
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java
index 5791367..eb77a30 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java
@@ -52,8 +52,7 @@
this.audit = audit;
}
- protected void doLogout(HttpServletRequest req, HttpServletResponse rsp)
- throws IOException {
+ protected void doLogout(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
webSession.get().logout();
if (logoutUrl != null) {
rsp.sendRedirect(logoutUrl);
@@ -73,8 +72,7 @@
}
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse rsp)
- throws IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
final String sid = webSession.get().getSessionId();
final CurrentUser currentUser = webSession.get().getUser();
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java
index c8cb2e6..6e02796 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java
@@ -48,9 +48,7 @@
@Inject
RequestContextFilter(
- Provider<RequestCleanup> r,
- Provider<HttpRequestContext> c,
- ThreadLocalRequestContext l) {
+ Provider<RequestCleanup> r, Provider<HttpRequestContext> c, ThreadLocalRequestContext l) {
cleanup = r;
requestContext = c;
local = l;
@@ -63,8 +61,7 @@
public void destroy() {}
@Override
- public void doFilter(
- ServletRequest request, ServletResponse response, FilterChain chain)
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
RequestContext old = local.setContext(requestContext.get());
try {
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java
index 1db2f84..d8e6f84 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java
@@ -63,8 +63,7 @@
public void destroy() {}
@Override
- public void doFilter(
- ServletRequest request, ServletResponse response, FilterChain chain)
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
final HttpServletRequest req = (HttpServletRequest) request;
final HttpServletResponse rsp = (HttpServletResponse) response;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java
index 6a5c66c..29570a7 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java
@@ -146,8 +146,7 @@
return currentUser.get().newCommitterIdent(now, tz);
}
- private static String buildCommitMessage(
- List<ObjectId> bannedCommits, String reason) {
+ private static String buildCommitMessage(List<ObjectId> bannedCommits, String reason) {
final StringBuilder commitMsg = new StringBuilder();
commitMsg.append("Banning ");
commitMsg.append(bannedCommits.size());
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/LargeObjectException.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/LargeObjectException.java
index a61a83a..04db42c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/LargeObjectException.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/LargeObjectException.java
@@ -25,8 +25,7 @@
private static final long serialVersionUID = 1L;
- public LargeObjectException(
- String message, org.eclipse.jgit.errors.LargeObjectException cause) {
+ public LargeObjectException(String message, org.eclipse.jgit.errors.LargeObjectException cause) {
super(message, cause);
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java
index bd8ce5b..2b9cad1 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java
@@ -154,10 +154,7 @@
* @param maxIntervalUnit time unit for progress interval.
*/
public MultiProgressMonitor(
- OutputStream out,
- String taskName,
- long maxIntervalTime,
- TimeUnit maxIntervalUnit) {
+ OutputStream out, String taskName, long maxIntervalTime, TimeUnit maxIntervalUnit) {
this.out = out;
this.taskName = taskName;
maxIntervalNanos = NANOSECONDS.convert(maxIntervalTime, maxIntervalUnit);
@@ -186,8 +183,7 @@
* @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(
- Future<?> workerFuture, long timeoutTime, TimeUnit timeoutUnit)
+ public void waitFor(Future<?> workerFuture, long timeoutTime, TimeUnit timeoutUnit)
throws ExecutionException {
long overallStart = System.nanoTime();
long deadline;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java
index 04e1313..44d6a4f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java
@@ -88,8 +88,7 @@
}
@Override
- public List<ReflogEntryInfo> apply(BranchResource rsrc)
- throws RestApiException, IOException {
+ public List<ReflogEntryInfo> apply(BranchResource rsrc) throws RestApiException, IOException {
if (!rsrc.getControl().isOwner()) {
throw new AuthException("not project owner");
}
