diff --git a/java/google/registry/tools/RegistrarContactCommand.java b/java/google/registry/tools/RegistrarContactCommand.java index 858336683..50d51a8b2 100644 --- a/java/google/registry/tools/RegistrarContactCommand.java +++ b/java/google/registry/tools/RegistrarContactCommand.java @@ -54,8 +54,6 @@ import javax.annotation.Nullable; commandDescription = "Create/read/update/delete the various contact lists for a Registrar.") final class RegistrarContactCommand extends MutatingCommand { - private enum Mode { LIST, CREATE, UPDATE, DELETE } - @Parameter( description = "Client identifier of the registrar account.", required = true) @@ -131,6 +129,11 @@ final class RegistrarContactCommand extends MutatingCommand { validateWith = PathParameter.OutputFile.class) private Path output = Paths.get("/dev/stdout"); + private enum Mode { LIST, CREATE, UPDATE, DELETE } + + private static final ImmutableSet MODES_REQUIRING_CONTACT_SYNC = + ImmutableSet.of(Mode.CREATE, Mode.UPDATE, Mode.DELETE); + @Nullable private Set contactTypes; @@ -178,7 +181,7 @@ final class RegistrarContactCommand extends MutatingCommand { default: throw new AssertionError(); } - if (mode == Mode.CREATE || mode == Mode.UPDATE || mode == Mode.DELETE) { + if (MODES_REQUIRING_CONTACT_SYNC.contains(mode)) { stageEntityChange(registrar, registrar.asBuilder().setContactsRequireSyncing(true).build()); } } diff --git a/javatests/google/registry/tools/RegistrarContactCommandTest.java b/javatests/google/registry/tools/RegistrarContactCommandTest.java index ba2cd219a..e70f2a55f 100644 --- a/javatests/google/registry/tools/RegistrarContactCommandTest.java +++ b/javatests/google/registry/tools/RegistrarContactCommandTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.model.registrar.RegistrarContact.Type.ABUSE; import static google.registry.model.registrar.RegistrarContact.Type.ADMIN; import static google.registry.model.registrar.RegistrarContact.Type.WHOIS; +import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.DatastoreHelper.persistSimpleResource; import static google.registry.testing.DatastoreHelper.persistSimpleResources; import static java.nio.charset.StandardCharsets.UTF_8; @@ -44,21 +45,24 @@ public class RegistrarContactCommandTest extends CommandTestCase