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
@@ -25,16 +25,13 @@ import com.google.gerrit.server.util.ManualRequestContext;
|
||||
import com.google.gerrit.server.util.OneOffRequestContext;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/** Runnable to enable scheduling change cleanups to run periodically */
|
||||
public class ChangeCleanupRunner implements Runnable {
|
||||
private static final Logger log = LoggerFactory
|
||||
.getLogger(ChangeCleanupRunner.class);
|
||||
private static final Logger log = LoggerFactory.getLogger(ChangeCleanupRunner.class);
|
||||
|
||||
public static class Module extends LifecycleModule {
|
||||
@Override
|
||||
@@ -49,9 +46,7 @@ public class ChangeCleanupRunner implements Runnable {
|
||||
private final ChangeCleanupConfig cfg;
|
||||
|
||||
@Inject
|
||||
Lifecycle(WorkQueue queue,
|
||||
ChangeCleanupRunner runner,
|
||||
ChangeCleanupConfig cfg) {
|
||||
Lifecycle(WorkQueue queue, ChangeCleanupRunner runner, ChangeCleanupConfig cfg) {
|
||||
this.queue = queue;
|
||||
this.runner = runner;
|
||||
this.cfg = cfg;
|
||||
@@ -65,12 +60,11 @@ public class ChangeCleanupRunner implements Runnable {
|
||||
if (delay == MISSING_CONFIG && interval == MISSING_CONFIG) {
|
||||
log.info("Ignoring missing changeCleanup schedule configuration");
|
||||
} else if (delay < 0 || interval <= 0) {
|
||||
log.warn(String.format(
|
||||
"Ignoring invalid changeCleanup schedule configuration: %s",
|
||||
scheduleConfig));
|
||||
log.warn(
|
||||
String.format(
|
||||
"Ignoring invalid changeCleanup schedule configuration: %s", scheduleConfig));
|
||||
} else {
|
||||
queue.getDefaultQueue().scheduleAtFixedRate(runner, delay,
|
||||
interval, TimeUnit.MILLISECONDS);
|
||||
queue.getDefaultQueue().scheduleAtFixedRate(runner, delay, interval, TimeUnit.MILLISECONDS);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,9 +78,7 @@ public class ChangeCleanupRunner implements Runnable {
|
||||
private final AbandonUtil abandonUtil;
|
||||
|
||||
@Inject
|
||||
ChangeCleanupRunner(
|
||||
OneOffRequestContext oneOffRequestContext,
|
||||
AbandonUtil abandonUtil) {
|
||||
ChangeCleanupRunner(OneOffRequestContext oneOffRequestContext, AbandonUtil abandonUtil) {
|
||||
this.oneOffRequestContext = oneOffRequestContext;
|
||||
this.abandonUtil = abandonUtil;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user