commit 3e04e87fc571b0a66765550612e4fb7a23e1755f
author Edwin Kempin <ekempin@google.com> Mon Oct 12 10:33:42 2020 +0200
committer Edwin Kempin <ekempin@google.com> Mon Oct 12 10:33:42 2020 +0200
tree 5bf362f0def8be7d2756f29d9c7cd8590bfc97a9
parent 3a97e80eed8218e870878bfa39a9098eb127aee3

CodeOwnerApprovalCheck: Remove unneeded else ifs

This makes the code more readable.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ie8b659a6fbd360ec0831a5d775549d9b1d7f7bb1

java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java

diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java
index e7d6acd..4ed19ce 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java
@@ -391,7 +391,9 @@
           "%s was implicitly approved by the patch set uploader who is a project owner",
           absolutePath);
       return true;
-    } else if (globalCodeOwnerAccountIds.contains(patchSetUploader)) {
+    }
+
+    if (globalCodeOwnerAccountIds.contains(patchSetUploader)) {
       // If the uploader of the patch set is a global code owner, there is an implicit code owner
       // approval from the patch set uploader so that the path is automatically approved.
       logger.atFine().log(
@@ -399,6 +401,7 @@
           absolutePath);
       return true;
     }
+
     return false;
   }
 
@@ -411,12 +414,15 @@
       // At least one of the global code owners approved the change.
       logger.atFine().log("%s was approved by a global code owner", absolutePath);
       return true;
-    } else if (approverAccountIds.stream()
+    }
+
+    if (approverAccountIds.stream()
         .anyMatch(approverAccountId -> isProjectOwner(projectName, approverAccountId))) {
       // At least one of the approvers is a project owner and thus a code owner.
       logger.atFine().log("%s was approved by a project owner", absolutePath);
       return true;
     }
+
     return false;
   }
 
@@ -527,11 +533,14 @@
       // approval from the patch set uploader so that the path is automatically approved.
       logger.atFine().log("%s was implicitly approved by the patch set uploader", absolutePath);
       return true;
-    } else if (!Collections.disjoint(approverAccountIds, codeOwnerAccountIds)) {
+    }
+
+    if (!Collections.disjoint(approverAccountIds, codeOwnerAccountIds)) {
       // At least one of the global code owners approved the change.
       logger.atFine().log("%s was explicitly approved by a code owner", absolutePath);
       return true;
     }
+
     return false;
   }