Merge branch 'stable-2.14'
* stable-2.14:
CacheEvictionIT: Re-enable and adapt to use @GlobalPluginConfig
Migrate plugin config to own configuration file
Disallow DELETE when index does not support delete
Factor common code out of Index*RestApiServlet classes
Forward group indexing event
Index{Account,Change}RestApiServlet: Use UTF_8 constant
Revert "Ignore flaky CacheEvictionIT"
Ignore flaky CacheEvictionIT
IndexAccountRestApiServlet: Remove unnecessary semicolon
Change-Id: If56525eae31484d17cf59b2eb0ff324b7e8524be
diff --git a/WORKSPACE b/WORKSPACE
index 50b3f72..2d2c629 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -2,7 +2,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "74b31c8fae3a92c6c3e46a046b57cf1d8a6549d4",
+ commit = "763b6626d7e8de51c20dc144b691a049b3c90262",
#local_path = "/home/ehugare/workspaces/bazlets",
)
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBroker.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBroker.java
index 0a87503..2f0c074 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBroker.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBroker.java
@@ -22,6 +22,7 @@
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.events.Event;
import com.google.gerrit.server.notedb.ChangeNotes.Factory;
+import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.project.ProjectCache;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -32,10 +33,17 @@
ForwardedAwareEventBroker(
DynamicSet<UserScopedEventListener> listeners,
DynamicSet<EventListener> unrestrictedListeners,
+ PermissionBackend permissionBackend,
ProjectCache projectCache,
Factory notesFactory,
Provider<ReviewDb> dbProvider) {
- super(listeners, unrestrictedListeners, projectCache, notesFactory, dbProvider);
+ super(
+ listeners,
+ unrestrictedListeners,
+ permissionBackend,
+ projectCache,
+ notesFactory,
+ dbProvider);
}
@Override
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBrokerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBrokerTest.java
index c4d4802..1b2d345 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBrokerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBrokerTest.java
@@ -36,7 +36,7 @@
listenerMock = mock(EventListener.class);
DynamicSet<EventListener> listeners = DynamicSet.emptySet();
listeners.add(listenerMock);
- broker = new ForwardedAwareEventBroker(null, listeners, null, null, null);
+ broker = new ForwardedAwareEventBroker(null, listeners, null, null, null, null);
}
@Test
