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
@@ -23,10 +23,8 @@ import com.google.inject.Injector;
|
||||
import com.google.inject.Provider;
|
||||
import com.google.inject.TypeLiteral;
|
||||
import com.google.inject.util.Providers;
|
||||
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.List;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/** Tracks and executes registered {@link LifecycleListener}s. */
|
||||
public class LifecycleManager {
|
||||
@@ -36,34 +34,38 @@ public class LifecycleManager {
|
||||
/** Index of the last listener to start successfully; -1 when not started. */
|
||||
private int startedIndex = -1;
|
||||
|
||||
/** Add a handle that must be cleared during stop.
|
||||
/**
|
||||
* Add a handle that must be cleared during stop.
|
||||
*
|
||||
* @param handle the handle to add.
|
||||
**/
|
||||
*/
|
||||
public void add(RegistrationHandle handle) {
|
||||
handles.add(handle);
|
||||
}
|
||||
|
||||
/** Add a single listener.
|
||||
/**
|
||||
* Add a single listener.
|
||||
*
|
||||
* @param listener the listener to add.
|
||||
**/
|
||||
*/
|
||||
public void add(LifecycleListener listener) {
|
||||
listeners.add(Providers.of(listener));
|
||||
}
|
||||
|
||||
/** Add a single listener.
|
||||
/**
|
||||
* Add a single listener.
|
||||
*
|
||||
* @param listener the listener to add.
|
||||
**/
|
||||
*/
|
||||
public void add(Provider<LifecycleListener> listener) {
|
||||
listeners.add(listener);
|
||||
}
|
||||
|
||||
/** Add all {@link LifecycleListener}s registered in the Injector.
|
||||
/**
|
||||
* Add all {@link LifecycleListener}s registered in the Injector.
|
||||
*
|
||||
* @param injector the injector to add.
|
||||
**/
|
||||
*/
|
||||
public void add(Injector injector) {
|
||||
Preconditions.checkState(startedIndex < 0, "Already started");
|
||||
for (Binding<LifecycleListener> binding : get(injector)) {
|
||||
@@ -71,10 +73,11 @@ public class LifecycleManager {
|
||||
}
|
||||
}
|
||||
|
||||
/** Add all {@link LifecycleListener}s registered in the Injectors.
|
||||
/**
|
||||
* Add all {@link LifecycleListener}s registered in the Injectors.
|
||||
*
|
||||
* @param injectors the injectors to add.
|
||||
**/
|
||||
*/
|
||||
public void add(Injector... injectors) {
|
||||
for (Injector i : injectors) {
|
||||
add(i);
|
||||
|
||||
@@ -5,22 +5,18 @@ import com.google.gerrit.extensions.events.LifecycleListener;
|
||||
import com.google.inject.Singleton;
|
||||
import com.google.inject.binder.LinkedBindingBuilder;
|
||||
import com.google.inject.internal.UniqueAnnotations;
|
||||
|
||||
import java.lang.annotation.Annotation;
|
||||
|
||||
/** Module to support registering a unique LifecyleListener. */
|
||||
public abstract class LifecycleModule extends FactoryModule {
|
||||
/**
|
||||
* @return a unique listener binding.
|
||||
* <p>
|
||||
* To create a listener binding use:
|
||||
*
|
||||
* <pre>
|
||||
* <p>To create a listener binding use:
|
||||
* <pre>
|
||||
* listener().to(MyListener.class);
|
||||
* </pre>
|
||||
*
|
||||
* where {@code MyListener} is a {@link Singleton} implementing the
|
||||
* {@link LifecycleListener} interface.
|
||||
* where {@code MyListener} is a {@link Singleton} implementing the {@link LifecycleListener}
|
||||
* interface.
|
||||
*/
|
||||
protected LinkedBindingBuilder<LifecycleListener> listener() {
|
||||
final Annotation id = UniqueAnnotations.create();
|
||||
|
||||
Reference in New Issue
Block a user