opendev/gerrit
Code Issues Proposed changes

Merge "Merge branch 'stable-2.14'"

Browse Source
This commit is contained in:
David Pursehouse
2017-04-25 05:22:24 +00:00
committed by Gerrit Code Review
parent f92c3ac7a1 0571f16880
commit 153a469b6e
4 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
View File

@@ -31,6 +31,7 @@ import com.google.gerrit.extensions.config.DownloadCommand;
import com.google.gerrit.extensions.config.DownloadScheme;
import com.google.gerrit.extensions.config.ExternalIncludedIn;
import com.google.gerrit.extensions.config.FactoryModule;
import com.google.gerrit.extensions.events.AccountIndexedListener;
import com.google.gerrit.extensions.events.AgreementSignupListener;
import com.google.gerrit.extensions.events.AssigneeChangedListener;
import com.google.gerrit.extensions.events.ChangeAbandonedListener;
@@ -327,6 +328,7 @@ public class GerritGlobalModule extends FactoryModule {
DynamicSet.setOf(binder(), PostReceiveHook.class);
DynamicSet.setOf(binder(), PreUploadHook.class);
DynamicSet.setOf(binder(), PostUploadHook.class);
DynamicSet.setOf(binder(), AccountIndexedListener.class);
DynamicSet.setOf(binder(), ChangeIndexedListener.class);
DynamicSet.setOf(binder(), NewProjectCreatedListener.class);
DynamicSet.setOf(binder(), ProjectDeletedListener.class);

22
gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexerImpl.java
View File

@@ -16,6 +16,8 @@ package com.google.gerrit.server.index.account;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.events.AccountIndexedListener;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountState;
@@ -34,19 +36,28 @@ public class AccountIndexerImpl implements AccountIndexer {
}
private final AccountCache byIdCache;
private final DynamicSet<AccountIndexedListener> indexedListener;
private final AccountIndexCollection indexes;
private final AccountIndex index;
@AssistedInject
AccountIndexerImpl(AccountCache byIdCache, @Assisted AccountIndexCollection indexes) {
AccountIndexerImpl(
AccountCache byIdCache,
DynamicSet<AccountIndexedListener> indexedListener,
@Assisted AccountIndexCollection indexes) {
this.byIdCache = byIdCache;
this.indexedListener = indexedListener;
this.indexes = indexes;
this.index = null;
}
@AssistedInject
AccountIndexerImpl(AccountCache byIdCache, @Assisted AccountIndex index) {
AccountIndexerImpl(
AccountCache byIdCache,
DynamicSet<AccountIndexedListener> indexedListener,
@Assisted AccountIndex index) {
this.byIdCache = byIdCache;
this.indexedListener = indexedListener;
this.indexes = null;
this.index = index;
}
@@ -56,6 +67,13 @@ public class AccountIndexerImpl implements AccountIndexer {
for (Index<?, AccountState> i : getWriteIndexes()) {
i.replace(byIdCache.get(id));
}
fireAccountIndexedEvent(id.get());
}
private void fireAccountIndexedEvent(int id) {
for (AccountIndexedListener listener : indexedListener) {
listener.onAccountIndexed(id);
}
}
private Collection<AccountIndex> getWriteIndexes() {