1129: [REDO] The mlbridge bot occasionally posts the same comments tw…

…ice on Github

Reviewed-by: kcr

bots/bridgekeeper/src/main/java/org/openjdk/skara/bots/bridgekeeper/PullRequestCloserBot.java

@@ -86,10 +86,7 @@ public boolean concurrentWith(WorkItem other) {
             return true;
         }
         PullRequestCloserBotWorkItem otherItem = (PullRequestCloserBotWorkItem)other;
-        if (!pr.id().equals(otherItem.pr.id())) {
-            return true;
-        }
-        if (!repository.name().equals(otherItem.repository.name())) {
+        if (!pr.isSame(otherItem.pr)) {
             return true;
         }
         return false;

bots/bridgekeeper/src/main/java/org/openjdk/skara/bots/bridgekeeper/PullRequestPrunerBot.java

@@ -49,10 +49,7 @@ public boolean concurrentWith(WorkItem other) {
             return true;
         }
         PullRequestPrunerBotWorkItem otherItem = (PullRequestPrunerBotWorkItem) other;
-        if (!pr.id().equals(otherItem.pr.id())) {
-            return true;
-        }
-        if (!pr.repository().name().equals(otherItem.pr.repository().name())) {
+        if (!pr.isSame(otherItem.pr)) {
             return true;
         }
         return false;

bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveWorkItem.java

@@ -70,10 +70,7 @@ public boolean concurrentWith(WorkItem other) {
             }
             return false;
         }
-        if (!pr.id().equals(otherArchiveItem.pr.id())) {
-            return true;
-        }
-        if (!bot.codeRepo().name().equals(otherArchiveItem.bot.codeRepo().name())) {
+        if (!pr.isSame(otherArchiveItem.pr)) {
             return true;
         }
         return false;

bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/CommentPosterWorkItem.java

@@ -55,7 +55,7 @@ public boolean concurrentWith(WorkItem other) {
             return true;
         }
         CommentPosterWorkItem otherItem = (CommentPosterWorkItem) other;
-        if (!pr.equals(otherItem.pr)) {
+        if (!pr.isSame(otherItem.pr)) {
             return true;
         }
         var otherItemIds = otherItem.newMessages.stream()

bots/notify/src/main/java/org/openjdk/skara/bots/notify/PullRequestWorkItem.java

@@ -160,10 +160,7 @@ public boolean concurrentWith(WorkItem other) {
             return true;
         }
         PullRequestWorkItem otherItem = (PullRequestWorkItem)other;
-        if (!pr.id().equals(otherItem.pr.id())) {
-            return true;
-        }
-        if (!pr.repository().name().equals(otherItem.pr.repository().name())) {
+        if (!pr.isSame(otherItem.pr)) {
             return true;
         }
         return false;

bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestWorkItem.java

@@ -44,10 +44,7 @@ public final boolean concurrentWith(WorkItem other) {
             return true;
         }
         PullRequestWorkItem otherItem = (PullRequestWorkItem)other;
-        if (!pr.id().equals(otherItem.pr.id())) {
-            return true;
-        }
-        if (!pr.repository().name().equals(otherItem.pr.repository().name())) {
+        if (!pr.isSame(otherItem.pr)) {
             return true;
         }
         return false;

bots/submit/src/main/java/org/openjdk/skara/bots/submit/SubmitBotWorkItem.java

@@ -58,10 +58,7 @@ public boolean concurrentWith(WorkItem other) {
         if (!executor.checkName().equals(otherItem.executor.checkName())) {
             return true;
         }
-        if (!pr.id().equals(otherItem.pr.id())) {
-            return true;
-        }
-        if (!bot.repository().name().equals(otherItem.bot.repository().name())) {
+        if (!pr.isSame(otherItem.pr)) {
             return true;
         }
         return false;

bots/tester/src/main/java/org/openjdk/skara/bots/tester/TestUpdateNeededWorkItem.java

@@ -54,10 +54,10 @@ public boolean concurrentWith(WorkItem other) {
             return true;
         }
         var o = (TestUpdateNeededWorkItem) other;
-        if (!pr.repository().url().equals(o.pr.repository().url())) {
+        if (!pr.isSame(o.pr)) {
             return true;
         }
-        return !pr.id().equals(o.pr.id());
+        return false;
     }
 
     @Override

bots/tester/src/main/java/org/openjdk/skara/bots/tester/TestWorkItem.java

@@ -71,10 +71,10 @@ public boolean concurrentWith(WorkItem other) {
             return true;
         }
         var o = (TestWorkItem) other;
-        if (!repository.url().equals(o.repository.url())) {
+        if (!pr.isSame(o.pr)) {
             return true;
         }
-        return !pr.id().equals(o.pr.id());
+        return false;
     }
 
 

forge/src/main/java/org/openjdk/skara/forge/PullRequest.java

@@ -163,4 +163,13 @@ public interface PullRequest extends Issue {
     void setTargetRef(String targetRef);
 
     URI filesUrl(Hash hash);
+
+    /**
+     * Returns true if this PullRequest represents the same pull request as the other.
+     */
+    default boolean isSame(PullRequest other) {
+        return id().equals(other.id())
+                && repository().name().equals(other.repository().name())
+                && repository().forge().name().equals(other.repository().forge().name());
+    }
 }