commit 85771e0cf58fbd427163418832bdbf1813e7f67a
author Edwin Kempin <ekempin@google.com> Wed Feb 10 13:10:50 2021 +0100
committer Edwin Kempin <ekempin@google.com> Wed Feb 10 14:51:36 2021 +0100
tree 28ba2064dbb6947d8f534b906076912930d6a71f
parent 432ae1380056036d314c8be3a92c8431d9c420a0

Move functionality to format a CodeOwnerConfig.Key into the Key class

This way this functionality can be reused from other places.

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

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

diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfig.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfig.java
index d01c4a3..fc78ab8 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfig.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfig.java
@@ -306,6 +306,11 @@
       return folderPath().resolve(fileName().orElse(defaultCodeOwnerConfigFileName));
     }
 
+    /** User-readable string representing of this code owner config key. */
+    public String format(CodeOwners codeOwners) {
+      return String.format("%s:%s:%s", project(), shortBranchName(), codeOwners.getFilePath(this));
+    }
+
     /**
      * Creates a builder from this code owner config key.
      *

java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwner.java

diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwner.java b/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwner.java
index 7b43770..de2e10f 100644
--- a/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwner.java
+++ b/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwner.java
@@ -131,13 +131,9 @@
         ObjectId.fromString(branchResource.getRevision()),
         absolutePath,
         codeOwnerConfig -> {
-          Path codeOwnerConfigFilePath = codeOwners.getFilePath(codeOwnerConfig.key());
           messages.add(
               String.format(
-                  "checking code owner config file %s:%s:%s",
-                  codeOwnerConfig.key().project(),
-                  codeOwnerConfig.key().shortBranchName(),
-                  codeOwnerConfigFilePath));
+                  "checking code owner config file %s", codeOwnerConfig.key().format(codeOwners)));
           OptionalResultWithMessages<PathCodeOwnersResult> pathCodeOwnersResult =
               pathCodeOwnersFactory.create(codeOwnerConfig, absolutePath).resolveCodeOwnerConfig();
           messages.addAll(pathCodeOwnersResult.messages());
@@ -160,6 +156,7 @@
                       "found email %s as code owner in default code owner config", email));
               isDefaultCodeOwner.set(true);
             } else {
+              Path codeOwnerConfigFilePath = codeOwners.getFilePath(codeOwnerConfig.key());
               messages.add(
                   String.format(
                       "found email %s as code owner in %s", email, codeOwnerConfigFilePath));