Revert "Fix ref updated event on change deletion" This reverts commit eefe1b85c540be7e0634a3621466bd0e4f52527c. Reason for revert: Issue 6265 has not been really resolved but just avoided. Change-Id: Ic548e8b51be31fe46d135383950a2f7ffcb9bd4a
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractor.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractor.java index f9c589d..2ea5198 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractor.java +++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractor.java
@@ -21,7 +21,6 @@ import com.google.gerrit.server.data.ApprovalAttribute; import com.google.gerrit.server.data.ChangeAttribute; import com.google.gerrit.server.data.PatchSetAttribute; -import com.google.gerrit.server.data.RefUpdateAttribute; import com.google.gerrit.server.events.ChangeAbandonedEvent; import com.google.gerrit.server.events.ChangeEvent; import com.google.gerrit.server.events.ChangeMergedEvent; @@ -34,10 +33,8 @@ import com.google.gerrit.server.events.RefUpdatedEvent; import com.google.inject.Inject; import com.googlesource.gerrit.plugins.its.base.workflow.Property; -import java.util.Collections; import java.util.Map; import java.util.Set; -import org.eclipse.jgit.lib.ObjectId; /** Extractor to translate an {@link ChangeEvent} to {@link Property Properties}. */ public class PropertyExtractor { @@ -113,11 +110,8 @@ common.addAll(propertyAttributeExtractor.extractFrom(event.submitter.get(), "submitter")); } common.addAll(propertyAttributeExtractor.extractFrom(event.refUpdate.get())); - RefUpdateAttribute refUpdated = event.refUpdate.get(); - if (ObjectId.zeroId().name().equals(refUpdated.newRev)) { - return Collections.emptyMap(); - } - return issueExtractor.getIssueIds(event.getProjectNameKey().get(), refUpdated.newRev); + return issueExtractor.getIssueIds( + event.getProjectNameKey().get(), event.refUpdate.get().newRev); } private Map<String, Set<String>> extractFrom(PatchSetCreatedEvent event, Set<Property> common) {