From 7347dbf762a5b259997a83e214fc339a5f9fe6b7 Mon Sep 17 00:00:00 2001
From: Ben McIlwain <mcilwain@google.com>
Date: Fri, 24 Jul 2026 10:26:34 -0400
Subject: [PATCH] Add arity to registrar_request boolean flags (#3168)

Define arity 1 on requestedByRegistrar options in BulkDomainTransferCommand
and DeleteDomainCommand to accept explicit false arguments without parsing
failures. Up-to-date tests verify space-separated and equals argument syntax.

BUG= http://b/537308816
---
 .../tools/BulkDomainTransferCommand.java      |  3 +-
 .../registry/tools/DeleteDomainCommand.java   |  3 +-
 .../tools/BulkDomainTransferCommandTest.java  | 28 +++++++++++++++++++
 .../tools/DeleteDomainCommandTest.java        | 12 +++++++-
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/google/registry/tools/BulkDomainTransferCommand.java b/core/src/main/java/google/registry/tools/BulkDomainTransferCommand.java
index a2b00ee9e..bf0300090 100644
--- a/core/src/main/java/google/registry/tools/BulkDomainTransferCommand.java
+++ b/core/src/main/java/google/registry/tools/BulkDomainTransferCommand.java
@@ -88,7 +88,8 @@ public class BulkDomainTransferCommand extends ConfirmingCommand implements Comm
 
   @Parameter(
       names = {"--registrar_request"},
-      description = "Whether the change was requested by a registrar.")
+      description = "Whether the change was requested by a registrar.",
+      arity = 1)
   private boolean requestedByRegistrar = false;
 
   @Parameter(
diff --git a/core/src/main/java/google/registry/tools/DeleteDomainCommand.java b/core/src/main/java/google/registry/tools/DeleteDomainCommand.java
index 4be16bd1e..d988fc26c 100644
--- a/core/src/main/java/google/registry/tools/DeleteDomainCommand.java
+++ b/core/src/main/java/google/registry/tools/DeleteDomainCommand.java
@@ -52,7 +52,8 @@ final class DeleteDomainCommand extends MutatingEppToolCommand {
 
   @Parameter(
       names = {"--registrar_request"},
-      description = "Whether the change was requested by a registrar.")
+      description = "Whether the change was requested by a registrar.",
+      arity = 1)
   private boolean requestedByRegistrar = false;
 
   @Override
diff --git a/core/src/test/java/google/registry/tools/BulkDomainTransferCommandTest.java b/core/src/test/java/google/registry/tools/BulkDomainTransferCommandTest.java
index f77799802..76c41efec 100644
--- a/core/src/test/java/google/registry/tools/BulkDomainTransferCommandTest.java
+++ b/core/src/test/java/google/registry/tools/BulkDomainTransferCommandTest.java
@@ -165,4 +165,32 @@ public class BulkDomainTransferCommandTest extends CommandTestCase<BulkDomainTra
         .isEqualTo(
             "Must specify exactly one input method, either --domains or --domain_names_file");
   }
+
+  @Test
+  void testSuccess_registrarRequestExplicit() throws Exception {
+    runCommandForced(
+        "--gaining_registrar_id",
+        "NewRegistrar",
+        "--losing_registrar_id",
+        "TheRegistrar",
+        "--reason",
+        "someReason",
+        "--domains",
+        "foo.tld,bar.tld",
+        "--registrar_request=false");
+    verify(connection)
+        .sendPostRequest(
+            "/_dr/task/bulkDomainTransfer",
+            ImmutableMap.of(
+                "gainingRegistrarId",
+                "NewRegistrar",
+                "losingRegistrarId",
+                "TheRegistrar",
+                "requestedByRegistrar",
+                false,
+                "reason",
+                "someReason"),
+            MediaType.PLAIN_TEXT_UTF_8,
+            "[\"foo.tld\",\"bar.tld\"]".getBytes(UTF_8));
+  }
 }
diff --git a/core/src/test/java/google/registry/tools/DeleteDomainCommandTest.java b/core/src/test/java/google/registry/tools/DeleteDomainCommandTest.java
index 4dcca19f5..573c27089 100644
--- a/core/src/test/java/google/registry/tools/DeleteDomainCommandTest.java
+++ b/core/src/test/java/google/registry/tools/DeleteDomainCommandTest.java
@@ -53,10 +53,20 @@ class DeleteDomainCommandTest extends EppToolCommandTestCase<DeleteDomainCommand
         "--client=NewRegistrar",
         "--domain_name=example.tld",
         "--reason=Test",
-        "--registrar_request");
+        "--registrar_request=true");
     eppVerifier.verifySent("domain_delete_by_registrar.xml");
   }
 
+  @Test
+  void testSuccess_requestedByRegistrarExplicitFalse() throws Exception {
+    runCommandForced(
+        "--client=NewRegistrar",
+        "--domain_name=example.tld",
+        "--reason=Test",
+        "--registrar_request=false");
+    eppVerifier.verifySent("domain_delete.xml");
+  }
+
   @Test
   void testFailure_noReason() {
     assertThrows(