Merge branch 'stable-2.10'
* stable-2.10:
Update version in pom to 2.10
Conflicts:
pom.xml
Change-Id: I226c0333b197b462d73b17853ebcee9dea9e2a09
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
diff --git a/pom.xml b/pom.xml
index 22cb26d..eae3261 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<groupId>com.googlesource.gerrit.plugins.reviewersbyblame</groupId>
<artifactId>reviewersbyblame</artifactId>
<packaging>jar</packaging>
- <version>2.10</version>
+ <version>2.11-SNAPSHOT</version>
<name>reviewersbyblame</name>
<properties>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java
index 36aec15..1e6263e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java
@@ -26,7 +26,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.gerrit.common.ChangeListener;
+import com.google.gerrit.common.EventListener;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
@@ -35,7 +35,7 @@
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.config.PluginConfigFactory;
-import com.google.gerrit.server.events.ChangeEvent;
+import com.google.gerrit.server.events.Event;
import com.google.gerrit.server.events.PatchSetCreatedEvent;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.WorkQueue;
@@ -48,7 +48,7 @@
import com.google.inject.Provider;
import com.google.inject.ProvisionException;
-class ChangeUpdatedListener implements ChangeListener {
+class ChangeUpdatedListener implements EventListener {
private static final Logger log = LoggerFactory
.getLogger(ChangeUpdatedListener.class);
@@ -82,7 +82,7 @@
}
@Override
- public void onChangeEvent(ChangeEvent event) {
+ public void onEvent(Event event) {
if (!(event instanceof PatchSetCreatedEvent)) {
return;
}
@@ -140,6 +140,7 @@
reviewersByBlameFactory.create(commit, change, ps, maxReviewers, git);
workQueue.getDefaultQueue().submit(new Runnable() {
+ @Override
public void run() {
RequestContext old = tl.setContext(new RequestContext() {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ReviewersByBlame.java b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ReviewersByBlame.java
index 8bf16f8..2143299 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ReviewersByBlame.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ReviewersByBlame.java
@@ -47,7 +47,6 @@
import com.google.gerrit.server.patch.PatchListCache;
import com.google.gerrit.server.patch.PatchListEntry;
import com.google.gerrit.server.patch.PatchListNotAvailableException;
-import com.google.gerrit.server.project.ProjectCache;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted;
@@ -80,7 +79,7 @@
final AccountCache accountCache,
final ChangesCollection changes,
final Provider<PostReviewers> reviewersProvider,
- final PatchListCache patchListCache, final ProjectCache projectCache,
+ final PatchListCache patchListCache,
@Assisted final RevCommit commit, @Assisted final Change change,
@Assisted final PatchSet ps, @Assisted final int maxReviewers,
@Assisted final Repository repo) {
@@ -158,6 +157,7 @@
Set<Account.Id> topReviewers = Sets.newHashSet();
List<Entry<Account, Integer>> entries =
Ordering.from(new Comparator<Entry<Account, Integer>>() {
+ @Override
public int compare(Entry<Account, Integer> first,
Entry<Account, Integer> second) {
return first.getValue() - second.getValue();
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ReviewersByBlameModule.java b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ReviewersByBlameModule.java
index ea05a46..9ef5390 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ReviewersByBlameModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ReviewersByBlameModule.java
@@ -14,7 +14,7 @@
package com.googlesource.gerrit.plugins.reviewersbyblame;
-import com.google.gerrit.common.ChangeListener;
+import com.google.gerrit.common.EventListener;
import com.google.gerrit.extensions.annotations.Exports;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.server.config.FactoryModule;
@@ -23,7 +23,7 @@
public class ReviewersByBlameModule extends FactoryModule {
@Override
protected void configure() {
- DynamicSet.bind(binder(), ChangeListener.class).to(
+ DynamicSet.bind(binder(), EventListener.class).to(
ChangeUpdatedListener.class);
factory(ReviewersByBlame.Factory.class);
bind(ProjectConfigEntry.class)
