Always pass an Executor to Futures methods
Among the Futures methods that run user callbacks, those that don't take
an Executor will be deleted. This change migrates them to the
counterparts that take MoreExecutors.directExecutor() as such Executor
in the parameter list, exactly the way that the old method works.
PiperOrigin-RevId: 148985066
Change-Id: I38bb9f442cbbc795b2c66a023850d0d35d255aeb
diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java
index c7d9916..5c3183a 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java
@@ -14,6 +14,7 @@
package com.google.gerrit.lucene;
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import com.google.common.base.Joiner;
@@ -288,7 +289,8 @@
reopenThread.waitForGeneration(gen, 0);
return new NrtFuture(gen);
}
- });
+ },
+ directExecutor());
}
@Override
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterUpdate.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterUpdate.java
index 2b39d09..2f6f898 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterUpdate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterUpdate.java
@@ -14,6 +14,7 @@
package com.google.gerrit.server.index.change;
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static com.google.gerrit.server.query.change.ChangeData.asChanges;
import com.google.common.util.concurrent.FutureCallback;
@@ -92,7 +93,8 @@
public void onFailure(Throwable ignored) {
// Logged by {@link GetChanges#call()}.
}
- });
+ },
+ directExecutor());
}
private abstract class Task<V> implements Callable<V> {
