commit c1dc6217d2c1028bfa2ba76ecaf550cc1ecc44f5
author Daniele Sassoli <danielesassoli@gmail.com> Tue Nov 21 16:13:55 2023 -0800
committer Daniele Sassoli <danielesassoli@gmail.com> Tue Nov 21 16:26:06 2023 -0800
tree f032db8e093f5db7755002008a424160dfe510f3
parent 4e7efdf93fd1ddecba56438160d2527f618da364

Fix ordering of parameters for apply objects log

Log "from <host> for <project>:<ref>" rather than
"from <project> for <host>:ref", as we do elsewhere.

Change-Id: Ic049e19db32ea550c883ec3893032234e946ad0f

src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectAction.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectAction.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectAction.java
index d535ac9..9911070 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectAction.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectAction.java
@@ -67,8 +67,8 @@
     try {
       repLog.info(
           "Apply object API from {} for {}:{} - {}",
-          resource.getNameKey(),
           input.getLabel(),
+          resource.getNameKey(),
           input.getRefName(),
           input.getRevisionData());
 
@@ -76,8 +76,8 @@
         deleteRefCommand.deleteRef(resource.getNameKey(), input.getRefName(), input.getLabel());
         repLog.info(
             "Apply object API - REF DELETED - from {} for {}:{} - {}",
-            resource.getNameKey(),
             input.getLabel(),
+            resource.getNameKey(),
             input.getRefName(),
             input.getRevisionData());
         return Response.withStatusCode(HttpServletResponse.SC_NO_CONTENT, "");

src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectsAction.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectsAction.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectsAction.java
index 817ea00..ffd5bfc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectsAction.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectsAction.java
@@ -66,8 +66,8 @@
 
       repLog.info(
           "Apply object API from {} for {}:{} - {}",
-          resource.getNameKey(),
           input.getLabel(),
+          resource.getNameKey(),
           input.getRefName(),
           Arrays.toString(input.getRevisionsData()));
 
@@ -75,8 +75,8 @@
         deleteRefCommand.deleteRef(resource.getNameKey(), input.getRefName(), input.getLabel());
         repLog.info(
             "Apply object API - REF DELETED - from {} for {}:{}",
-            resource.getNameKey(),
             input.getLabel(),
+            resource.getNameKey(),
             input.getRefName());
         return Response.withStatusCode(HttpServletResponse.SC_NO_CONTENT, "");
       }