Format all Java files with google-java-format
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:
committed by
David Pursehouse
parent
6723b6d0fa
commit
292fa154c1
@@ -30,7 +30,10 @@ import com.google.gerrit.server.query.change.InternalChangeQuery;
|
||||
import com.google.gerrit.server.util.MagicBranch;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import org.eclipse.jgit.lib.ObjectId;
|
||||
import org.eclipse.jgit.lib.Ref;
|
||||
import org.eclipse.jgit.transport.AdvertiseRefsHook;
|
||||
@@ -40,20 +43,15 @@ import org.eclipse.jgit.transport.UploadPack;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/** Exposes only the non refs/changes/ reference names. */
|
||||
public class ReceiveCommitsAdvertiseRefsHook implements AdvertiseRefsHook {
|
||||
private static final Logger log = LoggerFactory
|
||||
.getLogger(ReceiveCommitsAdvertiseRefsHook.class);
|
||||
private static final Logger log = LoggerFactory.getLogger(ReceiveCommitsAdvertiseRefsHook.class);
|
||||
|
||||
@VisibleForTesting
|
||||
@AutoValue
|
||||
public abstract static class Result {
|
||||
public abstract Map<String, Ref> allRefs();
|
||||
|
||||
public abstract Set<ObjectId> additionalHaves();
|
||||
}
|
||||
|
||||
@@ -61,8 +59,7 @@ public class ReceiveCommitsAdvertiseRefsHook implements AdvertiseRefsHook {
|
||||
private final Project.NameKey projectName;
|
||||
|
||||
public ReceiveCommitsAdvertiseRefsHook(
|
||||
Provider<InternalChangeQuery> queryProvider,
|
||||
Project.NameKey projectName) {
|
||||
Provider<InternalChangeQuery> queryProvider, Project.NameKey projectName) {
|
||||
this.queryProvider = queryProvider;
|
||||
this.projectName = projectName;
|
||||
}
|
||||
@@ -74,8 +71,7 @@ public class ReceiveCommitsAdvertiseRefsHook implements AdvertiseRefsHook {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void advertiseRefs(BaseReceivePack rp)
|
||||
throws ServiceMayNotContinueException {
|
||||
public void advertiseRefs(BaseReceivePack rp) throws ServiceMayNotContinueException {
|
||||
Map<String, Ref> oldRefs = rp.getAdvertisedRefs();
|
||||
if (oldRefs == null) {
|
||||
try {
|
||||
@@ -121,11 +117,13 @@ public class ReceiveCommitsAdvertiseRefsHook implements AdvertiseRefsHook {
|
||||
int limit = 32;
|
||||
try {
|
||||
Set<ObjectId> r = Sets.newHashSetWithExpectedSize(limit);
|
||||
for (ChangeData cd : queryProvider.get()
|
||||
.setRequestedFields(OPEN_CHANGES_FIELDS)
|
||||
.enforceVisibility(true)
|
||||
.setLimit(limit)
|
||||
.byProjectOpen(projectName)) {
|
||||
for (ChangeData cd :
|
||||
queryProvider
|
||||
.get()
|
||||
.setRequestedFields(OPEN_CHANGES_FIELDS)
|
||||
.enforceVisibility(true)
|
||||
.setLimit(limit)
|
||||
.byProjectOpen(projectName)) {
|
||||
PatchSet ps = cd.currentPatchSet();
|
||||
if (ps != null) {
|
||||
ObjectId id = ObjectId.fromString(ps.getRevision().get());
|
||||
|
||||
Reference in New Issue
Block a user