opendev/gerrit
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Edwin Kempin 2017-06-14 07:27:24 +00:00 committed by Gerrit Code Review
commit 0cca74b78a
8 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-httpd/src/main/java/com/google/gerrit/httpd/CookieBase64.java
View File

@ -52,8 +52,7 @@ class CookieBase64 {
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

6
gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java
View File

@ -52,8 +52,7 @@ public class HttpLogoutServlet extends HttpServlet {
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 @@ public class HttpLogoutServlet extends HttpServlet {
}
@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();

7
gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java
View File

@ -48,9 +48,7 @@ public class RequestContextFilter implements Filter {
@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 class RequestContextFilter implements Filter {
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 {

3
gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java
View File

@ -63,8 +63,7 @@ public class RequireSslFilter implements Filter {
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;

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

@ -146,8 +146,7 @@ public class BanCommit {
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());

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

@ -25,8 +25,7 @@ public class LargeObjectException extends Exception {
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);
}
}

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

@ -154,10 +154,7 @@ public class MultiProgressMonitor {
* @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 @@ 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(
Future<?> workerFuture, long timeoutTime, TimeUnit timeoutUnit)
public void waitFor(Future<?> workerFuture, long timeoutTime, TimeUnit timeoutUnit)
throws ExecutionException {
long overallStart = System.nanoTime();
long deadline;

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

@ -88,8 +88,7 @@ public class GetReflog implements RestReadView<BranchResource> {
}
@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");
}