Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Extend ServletModule instead of HttpPluginModule
Change-Id: Iaedd17246e07b9b57e742a19f7de836e374c85a2
diff --git a/.gitignore b/.gitignore
index 0f6afe5..11f5ae1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/bazel-testlogs
/bazel-high-availability
/eclipse-out/
+/.apt_generated/
diff --git a/WORKSPACE b/WORKSPACE
index 1be8deb..f4ba4a3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "f4fcc606a6afa8ce27a013bcf62e495a5ec2505c",
+ commit = "5c1e201c6835e56a69a980c72206431e2a9d7d80",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/AccountReindexRunnable.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/AccountReindexRunnable.java
index 487f3da..da52555 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/AccountReindexRunnable.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/AccountReindexRunnable.java
@@ -19,6 +19,7 @@
import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.AbstractIndexRestApiServlet;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.account.AccountState;
import com.google.gerrit.server.account.Accounts;
import com.google.gerrit.server.util.OneOffRequestContext;
import com.google.gwtorm.server.OrmException;
@@ -29,7 +30,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class AccountReindexRunnable extends ReindexRunnable<Account> {
+public class AccountReindexRunnable extends ReindexRunnable<AccountState> {
private static final Logger log = LoggerFactory.getLogger(AccountReindexRunnable.class);
private final ForwardedIndexAccountHandler accountIdx;
@@ -48,13 +49,14 @@
}
@Override
- protected Iterable<Account> fetchItems(ReviewDb db) throws Exception {
+ protected Iterable<AccountState> fetchItems(ReviewDb db) throws Exception {
return accounts.all();
}
@Override
- protected Optional<Timestamp> indexIfNeeded(ReviewDb db, Account a, Timestamp sinceTs) {
+ protected Optional<Timestamp> indexIfNeeded(ReviewDb db, AccountState as, Timestamp sinceTs) {
try {
+ Account a = as.getAccount();
Timestamp accountTs = a.getRegisteredOn();
if (accountTs.after(sinceTs)) {
log.info("Index {}/{}/{}/{}", a.getId(), a.getFullName(), a.getPreferredEmail(), accountTs);
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/AutoReindexScheduler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/AutoReindexScheduler.java
index c0d90d1..1f7477a 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/AutoReindexScheduler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/AutoReindexScheduler.java
@@ -34,6 +34,7 @@
private final ChangeReindexRunnable changeReindex;
private final AccountReindexRunnable accountReindex;
private final GroupReindexRunnable groupReindex;
+ private final ProjectReindexRunnable projectReindex;
private final ScheduledExecutorService executor;
private final List<Future<?>> futureTasks = new ArrayList<>();
@@ -43,11 +44,13 @@
WorkQueue workQueue,
ChangeReindexRunnable changeReindex,
AccountReindexRunnable accountReindex,
- GroupReindexRunnable groupReindex) {
+ GroupReindexRunnable groupReindex,
+ ProjectReindexRunnable projectReindex) {
this.cfg = cfg.autoReindex();
this.changeReindex = changeReindex;
this.accountReindex = accountReindex;
this.groupReindex = groupReindex;
+ this.projectReindex = projectReindex;
this.executor = workQueue.createQueue(1, "HighAvailability-AutoReindex");
}
@@ -64,11 +67,15 @@
futureTasks.add(
executor.scheduleAtFixedRate(
groupReindex, cfg.delaySec(), cfg.pollSec(), TimeUnit.SECONDS));
+ futureTasks.add(
+ executor.scheduleAtFixedRate(
+ projectReindex, cfg.delaySec(), cfg.pollSec(), TimeUnit.SECONDS));
} else {
log.info("Scheduling auto-reindex after {}s", cfg.delaySec());
futureTasks.add(executor.schedule(changeReindex, cfg.delaySec(), TimeUnit.SECONDS));
futureTasks.add(executor.schedule(accountReindex, cfg.delaySec(), TimeUnit.SECONDS));
futureTasks.add(executor.schedule(groupReindex, cfg.delaySec(), TimeUnit.SECONDS));
+ futureTasks.add(executor.schedule(projectReindex, cfg.delaySec(), TimeUnit.SECONDS));
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/GroupReindexRunnable.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/GroupReindexRunnable.java
index 640457d..71a0280 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/GroupReindexRunnable.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/GroupReindexRunnable.java
@@ -14,74 +14,32 @@
package com.ericsson.gerrit.plugins.highavailability.autoreindex;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.ForwardedIndexGroupHandler;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.ForwardedIndexingHandler.Operation;
import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.AbstractIndexRestApiServlet;
-import com.google.common.collect.Streams;
-import com.google.gerrit.reviewdb.client.AccountGroup;
-import com.google.gerrit.reviewdb.client.AccountGroup.Id;
-import com.google.gerrit.reviewdb.client.AccountGroupByIdAud;
-import com.google.gerrit.reviewdb.client.AccountGroupMemberAudit;
+import com.google.gerrit.common.data.GroupReference;
import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.group.db.Groups;
import com.google.gerrit.server.util.OneOffRequestContext;
-import com.google.gwtorm.server.OrmException;
-import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject;
-import java.io.IOException;
import java.sql.Timestamp;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
import java.util.Optional;
-import java.util.stream.Stream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class GroupReindexRunnable extends ReindexRunnable<AccountGroup> {
- private static final Logger log = LoggerFactory.getLogger(GroupReindexRunnable.class);
+public class GroupReindexRunnable extends ReindexRunnable<GroupReference> {
- private final ForwardedIndexGroupHandler indexer;
+ private final Groups groups;
@Inject
- public GroupReindexRunnable(
- ForwardedIndexGroupHandler indexer, IndexTs indexTs, OneOffRequestContext ctx) {
+ public GroupReindexRunnable(IndexTs indexTs, OneOffRequestContext ctx, Groups groups) {
super(AbstractIndexRestApiServlet.IndexName.GROUP, indexTs, ctx);
- this.indexer = indexer;
+ this.groups = groups;
}
@Override
- protected ResultSet<AccountGroup> fetchItems(ReviewDb db) throws OrmException {
- return db.accountGroups().all();
+ protected Iterable<GroupReference> fetchItems(ReviewDb db) throws Exception {
+ return groups.getAllGroupReferences()::iterator;
}
@Override
- protected Optional<Timestamp> indexIfNeeded(ReviewDb db, AccountGroup g, Timestamp sinceTs) {
- try {
- Id groupId = g.getId();
- Stream<Timestamp> groupIdAudTs =
- db.accountGroupByIdAud().byGroup(g.getId()).toList().stream()
- .map(AccountGroupByIdAud::getRemovedOn)
- .filter(Objects::nonNull);
- List<AccountGroupMemberAudit> groupMembersAud =
- db.accountGroupMembersAudit().byGroup(groupId).toList();
- Stream<Timestamp> groupMemberAudAddedTs =
- groupMembersAud.stream().map(ga -> ga.getKey().getAddedOn()).filter(Objects::nonNull);
- Stream<Timestamp> groupMemberAudRemovedTs =
- groupMembersAud.stream()
- .map(AccountGroupMemberAudit::getRemovedOn)
- .filter(Objects::nonNull);
- Optional<Timestamp> groupLastTs =
- Streams.concat(groupIdAudTs, groupMemberAudAddedTs, groupMemberAudRemovedTs)
- .max(Comparator.naturalOrder());
-
- if (groupLastTs.isPresent() && groupLastTs.get().after(sinceTs)) {
- log.info("Index {}/{}/{}", g.getGroupUUID(), g.getName(), groupLastTs.get());
- indexer.index(g.getGroupUUID(), Operation.INDEX, Optional.empty());
- return groupLastTs;
- }
- } catch (OrmException | IOException e) {
- log.error("Reindex failed", e);
- }
+ protected Optional<Timestamp> indexIfNeeded(ReviewDb db, GroupReference g, Timestamp sinceTs) {
return Optional.empty();
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/IndexTs.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/IndexTs.java
index 387c7ad..b36c309 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/IndexTs.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/IndexTs.java
@@ -20,8 +20,9 @@
import com.google.gerrit.extensions.events.AccountIndexedListener;
import com.google.gerrit.extensions.events.ChangeIndexedListener;
import com.google.gerrit.extensions.events.GroupIndexedListener;
+import com.google.gerrit.extensions.events.ProjectIndexedListener;
import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.server.ChangeFinder;
+import com.google.gerrit.server.change.ChangeFinder;
import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gwtorm.server.SchemaFactory;
@@ -40,7 +41,10 @@
@Singleton
public class IndexTs
- implements ChangeIndexedListener, AccountIndexedListener, GroupIndexedListener {
+ implements ChangeIndexedListener,
+ AccountIndexedListener,
+ GroupIndexedListener,
+ ProjectIndexedListener {
private static final Logger log = LoggerFactory.getLogger(IndexTs.class);
private static final DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE_TIME;
@@ -53,6 +57,7 @@
private volatile LocalDateTime changeTs;
private volatile LocalDateTime accountTs;
private volatile LocalDateTime groupTs;
+ private volatile LocalDateTime projectTs;
class FlusherRunner implements Runnable {
@@ -61,6 +66,7 @@
store(AbstractIndexRestApiServlet.IndexName.CHANGE, changeTs);
store(AbstractIndexRestApiServlet.IndexName.ACCOUNT, accountTs);
store(AbstractIndexRestApiServlet.IndexName.GROUP, groupTs);
+ store(AbstractIndexRestApiServlet.IndexName.PROJECT, projectTs);
}
private void store(AbstractIndexRestApiServlet.IndexName index, LocalDateTime latestTs) {
@@ -90,6 +96,11 @@
}
@Override
+ public void onProjectIndexed(String project) {
+ update(IndexName.PROJECT, LocalDateTime.now());
+ }
+
+ @Override
public void onGroupIndexed(String uuid) {
update(IndexName.GROUP, LocalDateTime.now());
}
@@ -142,6 +153,9 @@
case GROUP:
groupTs = dateTime;
break;
+ case PROJECT:
+ projectTs = dateTime;
+ break;
default:
throw new IllegalArgumentException("Unsupported index " + index);
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/ProjectReindexRunnable.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/ProjectReindexRunnable.java
new file mode 100644
index 0000000..582227d
--- /dev/null
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/ProjectReindexRunnable.java
@@ -0,0 +1,46 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.ericsson.gerrit.plugins.highavailability.autoreindex;
+
+import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.AbstractIndexRestApiServlet;
+import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.project.ProjectCache;
+import com.google.gerrit.server.util.OneOffRequestContext;
+import com.google.inject.Inject;
+import java.sql.Timestamp;
+import java.util.Optional;
+
+public class ProjectReindexRunnable extends ReindexRunnable<Project.NameKey> {
+
+ private final ProjectCache projectCache;
+
+ @Inject
+ public ProjectReindexRunnable(
+ IndexTs indexTs, OneOffRequestContext ctx, ProjectCache projectCache) {
+ super(AbstractIndexRestApiServlet.IndexName.PROJECT, indexTs, ctx);
+ this.projectCache = projectCache;
+ }
+
+ @Override
+ protected Iterable<Project.NameKey> fetchItems(ReviewDb db) {
+ return projectCache.all();
+ }
+
+ @Override
+ protected Optional<Timestamp> indexIfNeeded(ReviewDb db, Project.NameKey g, Timestamp sinceTs) {
+ return Optional.empty();
+ }
+}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandler.java
index f42d115..025115c 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandler.java
@@ -16,9 +16,9 @@
import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
-import com.google.gerrit.common.EventListener;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.server.events.Event;
+import com.google.gerrit.server.events.EventListener;
import com.google.gerrit.server.events.ProjectEvent;
import com.google.inject.Inject;
import java.util.concurrent.Executor;
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventModule.java
index a848c20..28a9e8e 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventModule.java
@@ -14,9 +14,9 @@
package com.ericsson.gerrit.plugins.highavailability.event;
-import com.google.gerrit.common.EventListener;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.lifecycle.LifecycleModule;
+import com.google.gerrit.server.events.EventListener;
import java.util.concurrent.Executor;
public class EventModule extends LifecycleModule {
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedAwareEventBroker.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedAwareEventBroker.java
index b3696fb..3d9fd60 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedAwareEventBroker.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedAwareEventBroker.java
@@ -14,14 +14,14 @@
package com.ericsson.gerrit.plugins.highavailability.forwarder;
-import com.google.gerrit.common.EventBroker;
-import com.google.gerrit.common.EventListener;
-import com.google.gerrit.common.UserScopedEventListener;
-import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.events.Event;
+import com.google.gerrit.server.events.EventBroker;
+import com.google.gerrit.server.events.EventListener;
+import com.google.gerrit.server.events.UserScopedEventListener;
import com.google.gerrit.server.notedb.ChangeNotes.Factory;
import com.google.gerrit.server.permissions.PermissionBackend;
+import com.google.gerrit.server.plugincontext.PluginSetContext;
import com.google.gerrit.server.project.ProjectCache;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -30,8 +30,8 @@
@Inject
ForwardedAwareEventBroker(
- DynamicSet<UserScopedEventListener> listeners,
- DynamicSet<EventListener> unrestrictedListeners,
+ PluginSetContext<UserScopedEventListener> listeners,
+ PluginSetContext<EventListener> unrestrictedListeners,
PermissionBackend permissionBackend,
ProjectCache projectCache,
Factory notesFactory,
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandler.java
index 4e01abf..b19db9a 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandler.java
@@ -14,8 +14,8 @@
package com.ericsson.gerrit.plugins.highavailability.forwarder;
-import com.google.gerrit.common.EventDispatcher;
import com.google.gerrit.server.events.Event;
+import com.google.gerrit.server.events.EventDispatcher;
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexProjectHandler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexProjectHandler.java
new file mode 100644
index 0000000..d690f5d
--- /dev/null
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexProjectHandler.java
@@ -0,0 +1,52 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.ericsson.gerrit.plugins.highavailability.forwarder;
+
+import com.ericsson.gerrit.plugins.highavailability.Configuration;
+import com.google.gerrit.index.project.ProjectIndexer;
+import com.google.gerrit.reviewdb.client.Project;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import java.io.IOException;
+import java.util.Optional;
+
+/**
+ * Index a project using {@link ProjectIndexer}. This class is meant to be used on the receiving
+ * side of the {@link Forwarder} since it will prevent indexed project to be forwarded again causing
+ * an infinite forwarding loop between the 2 nodes. It will also make sure no concurrent indexing is
+ * done for the same project name.
+ */
+@Singleton
+public class ForwardedIndexProjectHandler extends ForwardedIndexingHandler<Project.NameKey> {
+ private final ProjectIndexer indexer;
+
+ @Inject
+ ForwardedIndexProjectHandler(ProjectIndexer indexer, Configuration config) {
+ super(config.index());
+ this.indexer = indexer;
+ }
+
+ @Override
+ protected void doIndex(Project.NameKey projectName, Optional<IndexEvent> indexEvent)
+ throws IOException {
+ indexer.index(projectName);
+ log.debug("Project {} successfully indexed", projectName);
+ }
+
+ @Override
+ protected void doDelete(Project.NameKey projectName, Optional<IndexEvent> indexEvent) {
+ throw new UnsupportedOperationException("Delete from project index not supported");
+ }
+}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedProjectListUpdateHandler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedProjectListUpdateHandler.java
index 93e1186..094c3ec 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedProjectListUpdateHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedProjectListUpdateHandler.java
@@ -18,6 +18,7 @@
import com.google.gerrit.server.project.ProjectCache;
import com.google.inject.Inject;
import com.google.inject.Singleton;
+import java.io.IOException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,8 +44,9 @@
*
* @param projectName the name of the project to add or remove.
* @param remove true to remove, false to add project.
+ * @throws IOException
*/
- public void update(String projectName, boolean remove) {
+ public void update(String projectName, boolean remove) throws IOException {
Project.NameKey projectKey = new Project.NameKey(projectName);
try {
Context.setForwardedEvent(true);
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Forwarder.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Forwarder.java
index b156563..49cdc8b 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Forwarder.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Forwarder.java
@@ -57,6 +57,15 @@
boolean indexGroup(String uuid, IndexEvent indexEvent);
/**
+ * Forward a project indexing event to the other master.
+ *
+ * @param projectName the project to index.
+ * @param indexEvent the details of the index event.
+ * @return true if successful, otherwise false.
+ */
+ boolean indexProject(String projectName, IndexEvent indexEvent);
+
+ /**
* Forward a stream event to the other master.
*
* @param event the event to forward.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwarderModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwarderModule.java
index 15fdcfd..99a820e 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwarderModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwarderModule.java
@@ -14,8 +14,8 @@
package com.ericsson.gerrit.plugins.highavailability.forwarder;
-import com.google.gerrit.common.EventDispatcher;
import com.google.gerrit.extensions.registration.DynamicItem;
+import com.google.gerrit.server.events.EventDispatcher;
import com.google.inject.AbstractModule;
public class ForwarderModule extends AbstractModule {
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/AbstractIndexRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/AbstractIndexRestApiServlet.java
index 8c429de..d5de0c4 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/AbstractIndexRestApiServlet.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/AbstractIndexRestApiServlet.java
@@ -43,7 +43,8 @@
public enum IndexName {
CHANGE,
ACCOUNT,
- GROUP;
+ GROUP,
+ PROJECT;
@Override
public String toString() {
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexProjectRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexProjectRestApiServlet.java
new file mode 100644
index 0000000..cc87442
--- /dev/null
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexProjectRestApiServlet.java
@@ -0,0 +1,36 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.ericsson.gerrit.plugins.highavailability.forwarder.rest;
+
+import com.ericsson.gerrit.plugins.highavailability.forwarder.ForwardedIndexProjectHandler;
+import com.google.gerrit.extensions.restapi.Url;
+import com.google.gerrit.reviewdb.client.Project;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+@Singleton
+class IndexProjectRestApiServlet extends AbstractIndexRestApiServlet<Project.NameKey> {
+ private static final long serialVersionUID = -1L;
+
+ @Inject
+ IndexProjectRestApiServlet(ForwardedIndexProjectHandler handler) {
+ super(handler, IndexName.PROJECT);
+ }
+
+ @Override
+ Project.NameKey parse(String projectName) {
+ return new Project.NameKey(Url.decode(projectName));
+ }
+}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ProjectListApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ProjectListApiServlet.java
index e781a10..39138e3 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ProjectListApiServlet.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ProjectListApiServlet.java
@@ -14,12 +14,14 @@
package com.ericsson.gerrit.plugins.highavailability.forwarder.rest;
+import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import com.ericsson.gerrit.plugins.highavailability.forwarder.ForwardedProjectListUpdateHandler;
import com.google.gerrit.extensions.restapi.Url;
import com.google.inject.Inject;
import com.google.inject.Singleton;
+import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -48,7 +50,12 @@
setHeaders(rsp);
String requestURI = req.getRequestURI();
String projectName = requestURI.substring(requestURI.lastIndexOf('/') + 1);
- forwardedProjectListUpdateHandler.update(Url.decode(projectName), delete);
- rsp.setStatus(SC_NO_CONTENT);
+ try {
+ forwardedProjectListUpdateHandler.update(Url.decode(projectName), delete);
+ rsp.setStatus(SC_NO_CONTENT);
+ } catch (IOException e) {
+ log.error("Unable to update project list", e);
+ sendError(rsp, SC_BAD_REQUEST, e.getMessage());
+ }
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
index dc59117..a6acbc0 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
@@ -98,6 +98,12 @@
}
@Override
+ public boolean indexProject(String projectName, IndexEvent event) {
+ return execute(
+ RequestMethod.POST, "index project", "index/project", Url.encode(projectName), event);
+ }
+
+ @Override
public boolean send(final Event event) {
return execute(RequestMethod.POST, "send event", "event", event.type, event);
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java
index 184157d..589bbef 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java
@@ -22,6 +22,7 @@
serveRegex("/index/account/\\d+$").with(IndexAccountRestApiServlet.class);
serveRegex("/index/change/.*$").with(IndexChangeRestApiServlet.class);
serveRegex("/index/group/\\w+$").with(IndexGroupRestApiServlet.class);
+ serveRegex("/index/project/.*$").with(IndexProjectRestApiServlet.class);
serve("/event/*").with(EventRestApiServlet.class);
serve("/cache/project_list/*").with(ProjectListApiServlet.class);
serve("/cache/*").with(CacheRestApiServlet.class);
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java
index 9dca6dd..75f3086 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java
@@ -18,8 +18,8 @@
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Comment;
import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.server.ChangeFinder;
import com.google.gerrit.server.CommentsUtil;
+import com.google.gerrit.server.change.ChangeFinder;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.util.ManualRequestContext;
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/DisabledReviewDb.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/DisabledReviewDb.java
index 192ee8c..25ec6e8 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/DisabledReviewDb.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/DisabledReviewDb.java
@@ -17,12 +17,6 @@
import com.google.common.util.concurrent.CheckedFuture;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Change.Id;
-import com.google.gerrit.reviewdb.server.AccountGroupAccess;
-import com.google.gerrit.reviewdb.server.AccountGroupByIdAccess;
-import com.google.gerrit.reviewdb.server.AccountGroupByIdAudAccess;
-import com.google.gerrit.reviewdb.server.AccountGroupMemberAccess;
-import com.google.gerrit.reviewdb.server.AccountGroupMemberAuditAccess;
-import com.google.gerrit.reviewdb.server.AccountGroupNameAccess;
import com.google.gerrit.reviewdb.server.ChangeAccess;
import com.google.gerrit.reviewdb.server.ChangeMessageAccess;
import com.google.gerrit.reviewdb.server.PatchLineCommentAccess;
@@ -30,7 +24,6 @@
import com.google.gerrit.reviewdb.server.PatchSetApprovalAccess;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.reviewdb.server.SchemaVersionAccess;
-import com.google.gerrit.reviewdb.server.SystemConfigAccess;
import com.google.gwtorm.server.Access;
import com.google.gwtorm.server.AtomicUpdate;
import com.google.gwtorm.server.OrmException;
@@ -168,31 +161,6 @@
}
@Override
- public SystemConfigAccess systemConfig() {
- throw new Disabled();
- }
-
- @Override
- public AccountGroupAccess accountGroups() {
- throw new Disabled();
- }
-
- @Override
- public AccountGroupNameAccess accountGroupNames() {
- throw new Disabled();
- }
-
- @Override
- public AccountGroupMemberAccess accountGroupMembers() {
- throw new Disabled();
- }
-
- @Override
- public AccountGroupMemberAuditAccess accountGroupMembersAudit() {
- throw new Disabled();
- }
-
- @Override
public ChangeAccess changes() {
return new DisabledChangeAccess();
}
@@ -218,16 +186,6 @@
}
@Override
- public AccountGroupByIdAccess accountGroupById() {
- throw new Disabled();
- }
-
- @Override
- public AccountGroupByIdAudAccess accountGroupByIdAud() {
- throw new Disabled();
- }
-
- @Override
public int nextAccountId() {
throw new Disabled();
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java
index 3922f54..89ff353 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java
@@ -22,6 +22,7 @@
import com.google.gerrit.extensions.events.AccountIndexedListener;
import com.google.gerrit.extensions.events.ChangeIndexedListener;
import com.google.gerrit.extensions.events.GroupIndexedListener;
+import com.google.gerrit.extensions.events.ProjectIndexedListener;
import com.google.inject.Inject;
import java.util.Collections;
import java.util.Set;
@@ -31,7 +32,10 @@
import org.slf4j.LoggerFactory;
class IndexEventHandler
- implements ChangeIndexedListener, AccountIndexedListener, GroupIndexedListener {
+ implements ChangeIndexedListener,
+ AccountIndexedListener,
+ GroupIndexedListener,
+ ProjectIndexedListener {
private static final Logger log = LoggerFactory.getLogger(IndexEventHandler.class);
private final Executor executor;
private final Forwarder forwarder;
@@ -93,6 +97,16 @@
}
@Override
+ public void onProjectIndexed(String projectName) {
+ if (!Context.isForwardedEvent()) {
+ IndexProjectTask task = new IndexProjectTask(projectName);
+ if (queuedTasks.add(task)) {
+ executor.execute(task);
+ }
+ }
+ }
+
+ @Override
public void onGroupIndexed(String groupUUID) {
if (!Context.isForwardedEvent()) {
IndexGroupTask task = new IndexGroupTask(groupUUID);
@@ -253,4 +267,36 @@
return String.format("[%s] Index group %s in target instance", pluginName, groupUUID);
}
}
+
+ class IndexProjectTask extends IndexTask {
+ private final String projectName;
+
+ IndexProjectTask(String projectName) {
+ this.projectName = projectName;
+ }
+
+ @Override
+ public void execute() {
+ forwarder.indexProject(projectName, indexEvent);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(IndexProjectTask.class, projectName);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof IndexProjectTask)) {
+ return false;
+ }
+ IndexProjectTask other = (IndexProjectTask) obj;
+ return projectName.equals(other.projectName);
+ }
+
+ @Override
+ public String toString() {
+ return String.format("[%s] Index project %s in target instance", pluginName, projectName);
+ }
+ }
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexModule.java
index ebf8fdf..c17731f 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexModule.java
@@ -17,6 +17,7 @@
import com.google.gerrit.extensions.events.AccountIndexedListener;
import com.google.gerrit.extensions.events.ChangeIndexedListener;
import com.google.gerrit.extensions.events.GroupIndexedListener;
+import com.google.gerrit.extensions.events.ProjectIndexedListener;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.lifecycle.LifecycleModule;
import com.google.inject.assistedinject.FactoryModuleBuilder;
@@ -35,6 +36,7 @@
DynamicSet.bind(binder(), ChangeIndexedListener.class).to(IndexEventHandler.class);
DynamicSet.bind(binder(), AccountIndexedListener.class).to(IndexEventHandler.class);
DynamicSet.bind(binder(), GroupIndexedListener.class).to(IndexEventHandler.class);
+ DynamicSet.bind(binder(), ProjectIndexedListener.class).to(IndexEventHandler.class);
install(
new FactoryModuleBuilder()
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java
index 01af1a3..a3c8412 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java
@@ -50,9 +50,9 @@
@Rule public WireMockRule wireMockRule = new WireMockRule(options().port(PORT));
@Override
- public void setUp() throws Exception {
+ public void setUpTestPlugin() throws Exception {
givenThat(any(anyUrl()).willReturn(aResponse().withStatus(HttpStatus.SC_NO_CONTENT)));
- super.setUp();
+ super.setUpTestPlugin();
}
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/ProjectListIT.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/ProjectListIT.java
index 9d08f15..22ef89e 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/ProjectListIT.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/ProjectListIT.java
@@ -49,9 +49,9 @@
@Rule public WireMockRule wireMockRule = new WireMockRule(options().port(PORT));
@Override
- public void setUp() throws Exception {
+ public void setUpTestPlugin() throws Exception {
givenThat(any(anyUrl()).willReturn(aResponse().withStatus(HttpStatus.SC_NO_CONTENT)));
- super.setUp();
+ super.setUpTestPlugin();
}
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedAwareEventBrokerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedAwareEventBrokerTest.java
index 02b4a47..ec5b1de 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedAwareEventBrokerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedAwareEventBrokerTest.java
@@ -18,9 +18,11 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
-import com.google.gerrit.common.EventListener;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.server.events.Event;
+import com.google.gerrit.server.events.EventListener;
+import com.google.gerrit.server.plugincontext.PluginContext.PluginMetrics;
+import com.google.gerrit.server.plugincontext.PluginSetContext;
import org.junit.Before;
import org.junit.Test;
@@ -32,9 +34,11 @@
@Before
public void setUp() {
+ PluginMetrics mockMetrics = mock(PluginMetrics.class);
listenerMock = mock(EventListener.class);
- DynamicSet<EventListener> listeners = DynamicSet.emptySet();
- listeners.add(listenerMock);
+ DynamicSet<EventListener> set = DynamicSet.emptySet();
+ set.add("high-availability", listenerMock);
+ PluginSetContext<EventListener> listeners = new PluginSetContext<>(set, mockMetrics);
broker = new ForwardedAwareEventBroker(null, listeners, null, null, null, null);
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandlerTest.java
index ecb976e..9d0b73c 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandlerTest.java
@@ -19,8 +19,8 @@
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.verify;
-import com.google.gerrit.common.EventDispatcher;
import com.google.gerrit.server.events.Event;
+import com.google.gerrit.server.events.EventDispatcher;
import com.google.gerrit.server.events.ProjectCreatedEvent;
import com.google.gwtorm.server.OrmException;
import org.junit.Before;
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandlerTest.java
index 8bfe47d..6bfc58b 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandlerTest.java
@@ -28,12 +28,12 @@
import com.ericsson.gerrit.plugins.highavailability.index.ChangeChecker;
import com.ericsson.gerrit.plugins.highavailability.index.ChangeCheckerImpl;
import com.ericsson.gerrit.plugins.highavailability.index.ChangeDb;
-import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.index.change.ChangeIndexer;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.util.OneOffRequestContext;
+import com.google.gerrit.server.util.time.TimeUtil;
import com.google.gwtorm.server.OrmException;
import java.io.IOException;
import java.util.Optional;
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexProjectHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexProjectHandlerTest.java
new file mode 100644
index 0000000..ea64d71
--- /dev/null
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexProjectHandlerTest.java
@@ -0,0 +1,111 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.ericsson.gerrit.plugins.highavailability.forwarder;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.ericsson.gerrit.plugins.highavailability.Configuration;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.ForwardedIndexingHandler.Operation;
+import com.google.gerrit.index.project.ProjectIndexer;
+import com.google.gerrit.reviewdb.client.Project;
+import java.io.IOException;
+import java.util.Optional;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.stubbing.Answer;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ForwardedIndexProjectHandlerTest {
+
+ @Rule public ExpectedException exception = ExpectedException.none();
+ @Mock private ProjectIndexer indexerMock;
+ @Mock private Configuration configMock;
+ @Mock private Configuration.Index indexMock;
+ private ForwardedIndexProjectHandler handler;
+ private Project.NameKey nameKey;
+
+ @Before
+ public void setUp() {
+ when(configMock.index()).thenReturn(indexMock);
+ when(indexMock.numStripedLocks()).thenReturn(10);
+ handler = new ForwardedIndexProjectHandler(indexerMock, configMock);
+ nameKey = new Project.NameKey("project/name");
+ }
+
+ @Test
+ public void testSuccessfulIndexing() throws Exception {
+ handler.index(nameKey, Operation.INDEX, Optional.empty());
+ verify(indexerMock).index(nameKey);
+ }
+
+ @Test
+ public void deleteIsNotSupported() throws Exception {
+ exception.expect(UnsupportedOperationException.class);
+ exception.expectMessage("Delete from project index not supported");
+ handler.index(nameKey, Operation.DELETE, Optional.empty());
+ }
+
+ @Test
+ public void shouldSetAndUnsetForwardedContext() throws Exception {
+ // this doAnswer is to allow to assert that context is set to forwarded
+ // while cache eviction is called.
+ doAnswer(
+ (Answer<Void>)
+ invocation -> {
+ assertThat(Context.isForwardedEvent()).isTrue();
+ return null;
+ })
+ .when(indexerMock)
+ .index(nameKey);
+
+ assertThat(Context.isForwardedEvent()).isFalse();
+ handler.index(nameKey, Operation.INDEX, Optional.empty());
+ assertThat(Context.isForwardedEvent()).isFalse();
+
+ verify(indexerMock).index(nameKey);
+ }
+
+ @Test
+ public void shouldSetAndUnsetForwardedContextEvenIfExceptionIsThrown() throws Exception {
+ doAnswer(
+ (Answer<Void>)
+ invocation -> {
+ assertThat(Context.isForwardedEvent()).isTrue();
+ throw new IOException("someMessage");
+ })
+ .when(indexerMock)
+ .index(nameKey);
+
+ assertThat(Context.isForwardedEvent()).isFalse();
+ try {
+ handler.index(nameKey, Operation.INDEX, Optional.empty());
+ fail("should have thrown an IOException");
+ } catch (IOException e) {
+ assertThat(e.getMessage()).isEqualTo("someMessage");
+ }
+ assertThat(Context.isForwardedEvent()).isFalse();
+
+ verify(indexerMock).index(nameKey);
+ }
+}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexProjectRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexProjectRestApiServletTest.java
new file mode 100644
index 0000000..83420b9
--- /dev/null
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexProjectRestApiServletTest.java
@@ -0,0 +1,91 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.ericsson.gerrit.plugins.highavailability.forwarder.rest;
+
+import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
+import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;
+import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.ericsson.gerrit.plugins.highavailability.forwarder.ForwardedIndexProjectHandler;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.ForwardedIndexingHandler.Operation;
+import com.google.gerrit.extensions.restapi.Url;
+import com.google.gerrit.reviewdb.client.Project;
+import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class IndexProjectRestApiServletTest {
+ private static final String IO_ERROR = "io-error";
+ private static final String PROJECT_NAME = "test/project";
+
+ @Mock private ForwardedIndexProjectHandler handlerMock;
+ @Mock private HttpServletRequest requestMock;
+ @Mock private HttpServletResponse responseMock;
+
+ private Project.NameKey nameKey;
+ private IndexProjectRestApiServlet servlet;
+
+ @Before
+ public void setUpMocks() {
+ servlet = new IndexProjectRestApiServlet(handlerMock);
+ nameKey = new Project.NameKey(PROJECT_NAME);
+ when(requestMock.getRequestURI())
+ .thenReturn("http://gerrit.com/index/project/" + Url.encode(nameKey.get()));
+ }
+
+ @Test
+ public void projectIsIndexed() throws Exception {
+ servlet.doPost(requestMock, responseMock);
+ verify(handlerMock, times(1)).index(eq(nameKey), eq(Operation.INDEX), any());
+ verify(responseMock).setStatus(SC_NO_CONTENT);
+ }
+
+ @Test
+ public void cannotDeleteProject() throws Exception {
+ servlet.doDelete(requestMock, responseMock);
+ verify(responseMock).sendError(SC_METHOD_NOT_ALLOWED, "cannot delete project from index");
+ }
+
+ @Test
+ public void indexerThrowsIOExceptionTryingToIndexProject() throws Exception {
+ doThrow(new IOException(IO_ERROR))
+ .when(handlerMock)
+ .index(eq(nameKey), eq(Operation.INDEX), any());
+ servlet.doPost(requestMock, responseMock);
+ verify(responseMock).sendError(SC_CONFLICT, IO_ERROR);
+ }
+
+ @Test
+ public void sendErrorThrowsIOException() throws Exception {
+ doThrow(new IOException(IO_ERROR))
+ .when(handlerMock)
+ .index(eq(nameKey), eq(Operation.INDEX), any());
+ doThrow(new IOException("someError")).when(responseMock).sendError(SC_CONFLICT, IO_ERROR);
+ servlet.doPost(requestMock, responseMock);
+ verify(responseMock).sendError(SC_CONFLICT, IO_ERROR);
+ }
+}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/AbstractIndexForwardingIT.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/AbstractIndexForwardingIT.java
index 2eee205..af4637e 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/AbstractIndexForwardingIT.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/AbstractIndexForwardingIT.java
@@ -51,10 +51,10 @@
@Rule public WireMockRule wireMockRule = new WireMockRule(options().port(PORT));
@Override
- public void setUp() throws Exception {
+ public void setUpTestPlugin() throws Exception {
givenThat(any(anyUrl()).willReturn(aResponse().withStatus(HttpStatus.SC_NO_CONTENT)));
beforeAction();
- super.setUp();
+ super.setUpTestPlugin();
}
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/ProjectIndexForwardingIT.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/ProjectIndexForwardingIT.java
new file mode 100644
index 0000000..951e4f6
--- /dev/null
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/ProjectIndexForwardingIT.java
@@ -0,0 +1,36 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.ericsson.gerrit.plugins.highavailability.index;
+
+import com.google.gerrit.extensions.restapi.Url;
+
+public class ProjectIndexForwardingIT extends AbstractIndexForwardingIT {
+ private String someProjectName;
+
+ @Override
+ public void beforeAction() throws Exception {
+ someProjectName = gApi.projects().create("someProject").get().name;
+ }
+
+ @Override
+ public String getExpectedRequest() {
+ return "/plugins/high-availability/index/project/" + Url.encode(someProjectName);
+ }
+
+ @Override
+ public void doAction() throws Exception {
+ gApi.projects().name(someProjectName).index(false);
+ }
+}