opendev/gerrit
Code Issues Proposed changes

Format all Java files with google-java-format

Browse Source 
Having a standard tool for formatting saves reviewers' valuable time.
google-java-format is Google's standard formatter and is somewhat
inspired by gofmt[1]. This commit formats everything using
google-java-format version 1.2.

The downside of this one-off formatting is breaking blame. This can be
somewhat hacked around with a tool like git-hyper-blame[2], but it's
definitely not optimal until/unless this kind of feature makes its way
to git core.

Not in this change:
* Tool support, e.g. Eclipse. The command must be run manually [3].
* Documentation of best practice, e.g. new 100-column default.

[1] https://talks.golang.org/2015/gofmt-en.slide#3
[2] https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/git-hyper-blame.html
[3] git ls-files | grep java$ | xargs google-java-format -i

Change-Id: Id5f3c6de95ce0b68b41f0a478b5c99a93675aaa3
Signed-off-by: David Pursehouse <dpursehouse@collab.net>
This commit is contained in:
Dave Borowitz
2016-11-13 09:56:32 -08:00
committed by David Pursehouse
parent 6723b6d0fa
commit 292fa154c1
2443 changed files with 54816 additions and 57825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java
View File

@@ -14,10 +14,9 @@
package com.google.gerrit.prettify.common;
import org.eclipse.jgit.diff.Edit;
import java.util.Iterator;
import java.util.List;
import org.eclipse.jgit.diff.Edit;
public class EditList {
private final List<Edit> edits;
@@ -25,8 +24,8 @@ public class EditList {
private final int aSize;
private final int bSize;
public EditList(final List<Edit> edits, final int contextLines,
final int aSize, final int bSize) {
public EditList(
final List<Edit> edits, final int contextLines, final int aSize, final int bSize) {
this.edits = edits;
this.context = contextLines;
this.aSize = aSize;

7
gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/SparseFileContent.java
View File

@@ -14,11 +14,9 @@
package com.google.gerrit.prettify.common;
import org.eclipse.jgit.diff.Edit;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jgit.diff.Edit;
public class SparseFileContent {
protected String path;
@@ -282,8 +280,7 @@ public class SparseFileContent {
lines = new ArrayList<>();
}
protected Range() {
}
protected Range() {}
private String get(final int i) {
return lines.get(i - base);