Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Documentation: Refactor footer to match with other plugins Documentation: Refactor to match other plugin documentation Documentation: Add missing alternative for plugin in-tree testing Upgrade bazlets to latest stable-2.16 Change-Id: I85e1757202886a85a310f862e5bf0550d7ffd1bf
diff --git a/WORKSPACE b/WORKSPACE index 676ab2f..1f3201c 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "8ac9d00b8f12b7f61ff360c47a5bd87d7f75f4b5", + commit = "968b97fa03a9d2afd760f2e8ede3d5643da390d2", #local_path = "/home/<user>/projects/bazlets", )
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java index 1717570..71144f0 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
@@ -23,10 +23,10 @@ import com.ericsson.gerrit.plugins.eventslog.EventsLogException; import com.ericsson.gerrit.plugins.eventslog.ServiceUnavailableException; import com.google.common.flogger.FluentLogger; +import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.annotations.PluginName; import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.extensions.restapi.AuthException; -import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.events.ProjectEvent; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; @@ -120,7 +120,7 @@ try { permissionBackend .currentUser() - .project(new Project.NameKey(projectName)) + .project(Project.nameKey(projectName)) .check(ProjectPermission.ACCESS); entries.addAll(entry.getValue()); } catch (AuthException e) {
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java index 89448e4..325954a 100644 --- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java +++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
@@ -29,7 +29,7 @@ import com.ericsson.gerrit.plugins.eventslog.ServiceUnavailableException; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.reviewdb.client.Project; +import com.google.gerrit.entities.Project; import com.google.gerrit.server.events.ProjectEvent; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; @@ -474,7 +474,7 @@ @Override public Project.NameKey getProjectNameKey() { - return new Project.NameKey(project); + return Project.nameKey(project); } }