Adapt to change in Gerrit core Change Id769ae946 moved PluginPushOption into another package and changed the signature of the PluginPushOption.isOptionEnabled method. Bug: Google b/279897514 Change-Id: I113bea170dce3abfcecfecaff485e18f79b41dea Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/java/com/google/gerrit/plugins/codeowners/validation/SkipCodeOwnerConfigValidationPushOption.java b/java/com/google/gerrit/plugins/codeowners/validation/SkipCodeOwnerConfigValidationPushOption.java index b11bd61..2917a90 100644 --- a/java/com/google/gerrit/plugins/codeowners/validation/SkipCodeOwnerConfigValidationPushOption.java +++ b/java/com/google/gerrit/plugins/codeowners/validation/SkipCodeOwnerConfigValidationPushOption.java
@@ -18,11 +18,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; -import com.google.gerrit.entities.Change; import com.google.gerrit.extensions.annotations.PluginName; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; -import com.google.gerrit.server.git.receive.PluginPushOption; +import com.google.gerrit.server.PluginPushOption; +import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.inject.Inject; @@ -62,10 +62,10 @@ } @Override - public boolean isOptionEnabled(Change change) { + public boolean isOptionEnabled(ChangeNotes changeNotes) { return !codeOwnersPluginConfiguration - .getProjectConfig(change.getProject()) - .isDisabled(change.getDest().branch()) + .getProjectConfig(changeNotes.getProjectName()) + .isDisabled(changeNotes.getChange().getDest().branch()) && canSkipCodeOwnerConfigValidation(); }
diff --git a/java/com/google/gerrit/plugins/codeowners/validation/ValidationModule.java b/java/com/google/gerrit/plugins/codeowners/validation/ValidationModule.java index 6f5ee08..36cf81a 100644 --- a/java/com/google/gerrit/plugins/codeowners/validation/ValidationModule.java +++ b/java/com/google/gerrit/plugins/codeowners/validation/ValidationModule.java
@@ -17,7 +17,7 @@ import com.google.gerrit.extensions.annotations.Exports; import com.google.gerrit.extensions.config.CapabilityDefinition; import com.google.gerrit.extensions.registration.DynamicSet; -import com.google.gerrit.server.git.receive.PluginPushOption; +import com.google.gerrit.server.PluginPushOption; import com.google.gerrit.server.git.validators.CommitValidationListener; import com.google.gerrit.server.git.validators.MergeValidationListener; import com.google.gerrit.server.git.validators.RefOperationValidationListener;