From 0923c899818bdd1aeaa9c3cf27ffe3fdb226043d Mon Sep 17 00:00:00 2001 From: mcilwain Date: Tue, 10 Apr 2018 10:00:25 -0700 Subject: [PATCH] Fix verb order in nomulus tool domain check commands This makes them consistent with every other command, which uses the format verb_noun. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=192301468 --- ...heckClaimsCommand.java => CheckDomainClaimsCommand.java} | 4 ++-- .../{DomainCheckCommand.java => CheckDomainCommand.java} | 4 ++-- ...omainCheckFeeCommand.java => CheckDomainFeeCommand.java} | 4 ++-- java/google/registry/tools/RegistryTool.java | 6 +++--- ...msCommandTest.java => CheckDomainClaimsCommandTest.java} | 6 +++--- ...ainCheckCommandTest.java => CheckDomainCommandTest.java} | 6 +++--- ...ckFeeCommandTest.java => CheckDomainFeeCommandTest.java} | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) rename java/google/registry/tools/{DomainCheckClaimsCommand.java => CheckDomainClaimsCommand.java} (93%) rename java/google/registry/tools/{DomainCheckCommand.java => CheckDomainCommand.java} (93%) rename java/google/registry/tools/{DomainCheckFeeCommand.java => CheckDomainFeeCommand.java} (93%) rename javatests/google/registry/tools/{DomainCheckClaimsCommandTest.java => CheckDomainClaimsCommandTest.java} (91%) rename javatests/google/registry/tools/{DomainCheckCommandTest.java => CheckDomainCommandTest.java} (92%) rename javatests/google/registry/tools/{DomainCheckFeeCommandTest.java => CheckDomainFeeCommandTest.java} (91%) diff --git a/java/google/registry/tools/DomainCheckClaimsCommand.java b/java/google/registry/tools/CheckDomainClaimsCommand.java similarity index 93% rename from java/google/registry/tools/DomainCheckClaimsCommand.java rename to java/google/registry/tools/CheckDomainClaimsCommand.java index 0536b42e4..799c1aa8b 100644 --- a/java/google/registry/tools/DomainCheckClaimsCommand.java +++ b/java/google/registry/tools/CheckDomainClaimsCommand.java @@ -1,4 +1,4 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. +// Copyright 2018 The Nomulus Authors. All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import java.util.List; /** A command to execute a domain check claims epp command. */ @Parameters(separators = " =", commandDescription = "Check claims on domain(s)") -final class DomainCheckClaimsCommand extends NonMutatingEppToolCommand { +final class CheckDomainClaimsCommand extends NonMutatingEppToolCommand { @Parameter( names = {"-c", "--client"}, diff --git a/java/google/registry/tools/DomainCheckCommand.java b/java/google/registry/tools/CheckDomainCommand.java similarity index 93% rename from java/google/registry/tools/DomainCheckCommand.java rename to java/google/registry/tools/CheckDomainCommand.java index 381511df2..9f5baf02f 100644 --- a/java/google/registry/tools/DomainCheckCommand.java +++ b/java/google/registry/tools/CheckDomainCommand.java @@ -1,4 +1,4 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. +// Copyright 2018 The Nomulus Authors. All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import java.util.List; /** A command to execute a domain check epp command. */ @Parameters(separators = " =", commandDescription = "Check domain availability") -final class DomainCheckCommand extends NonMutatingEppToolCommand { +final class CheckDomainCommand extends NonMutatingEppToolCommand { @Parameter( names = {"-c", "--client"}, diff --git a/java/google/registry/tools/DomainCheckFeeCommand.java b/java/google/registry/tools/CheckDomainFeeCommand.java similarity index 93% rename from java/google/registry/tools/DomainCheckFeeCommand.java rename to java/google/registry/tools/CheckDomainFeeCommand.java index 8f9182a26..743122732 100644 --- a/java/google/registry/tools/DomainCheckFeeCommand.java +++ b/java/google/registry/tools/CheckDomainFeeCommand.java @@ -1,4 +1,4 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. +// Copyright 2018 The Nomulus Authors. All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import java.util.List; /** A command to execute a domain check fees epp command. */ @Parameters(separators = " =", commandDescription = "Check domain fees (for a 1-year create)") -final class DomainCheckFeeCommand extends NonMutatingEppToolCommand { +final class CheckDomainFeeCommand extends NonMutatingEppToolCommand { @Parameter( names = {"-c", "--client"}, diff --git a/java/google/registry/tools/RegistryTool.java b/java/google/registry/tools/RegistryTool.java index 5fe576aa5..6ae5e3ae1 100644 --- a/java/google/registry/tools/RegistryTool.java +++ b/java/google/registry/tools/RegistryTool.java @@ -31,6 +31,9 @@ public final class RegistryTool { new ImmutableMap.Builder>() .put("allocate_domain", AllocateDomainCommand.class) .put("canonicalize_labels", CanonicalizeLabelsCommand.class) + .put("check_domain", CheckDomainCommand.class) + .put("check_domain_claims", CheckDomainClaimsCommand.class) + .put("check_domain_fee", CheckDomainFeeCommand.class) .put("check_snapshot", CheckSnapshotCommand.class) .put("convert_idn", ConvertIdnCommand.class) .put("create_anchor_tenant", CreateAnchorTenantCommand.class) @@ -56,9 +59,6 @@ public final class RegistryTool { .put("delete_tld", DeleteTldCommand.class) .put("deploy_invoicing_pipeline", DeployInvoicingPipelineCommand.class) .put("domain_application_info", DomainApplicationInfoCommand.class) - .put("domain_check", DomainCheckCommand.class) - .put("domain_check_claims", DomainCheckClaimsCommand.class) - .put("domain_check_fee", DomainCheckFeeCommand.class) .put("encrypt_escrow_deposit", EncryptEscrowDepositCommand.class) .put("execute_epp", ExecuteEppCommand.class) .put("generate_allocation_tokens", GenerateAllocationTokensCommand.class) diff --git a/javatests/google/registry/tools/DomainCheckClaimsCommandTest.java b/javatests/google/registry/tools/CheckDomainClaimsCommandTest.java similarity index 91% rename from javatests/google/registry/tools/DomainCheckClaimsCommandTest.java rename to javatests/google/registry/tools/CheckDomainClaimsCommandTest.java index f4d964662..32799e6ba 100644 --- a/javatests/google/registry/tools/DomainCheckClaimsCommandTest.java +++ b/javatests/google/registry/tools/CheckDomainClaimsCommandTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. +// Copyright 2018 The Nomulus Authors. All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ import static google.registry.testing.JUnitBackports.assertThrows; import com.beust.jcommander.ParameterException; import org.junit.Test; -/** Unit tests for {@link DomainCheckClaimsCommand}. */ -public class DomainCheckClaimsCommandTest extends EppToolCommandTestCase { +/** Unit tests for {@link CheckDomainClaimsCommand}. */ +public class CheckDomainClaimsCommandTest extends EppToolCommandTestCase { @Test public void testSuccess() throws Exception { diff --git a/javatests/google/registry/tools/DomainCheckCommandTest.java b/javatests/google/registry/tools/CheckDomainCommandTest.java similarity index 92% rename from javatests/google/registry/tools/DomainCheckCommandTest.java rename to javatests/google/registry/tools/CheckDomainCommandTest.java index 4e2918410..f0095edb7 100644 --- a/javatests/google/registry/tools/DomainCheckCommandTest.java +++ b/javatests/google/registry/tools/CheckDomainCommandTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. +// Copyright 2018 The Nomulus Authors. All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ import static google.registry.testing.JUnitBackports.assertThrows; import com.beust.jcommander.ParameterException; import org.junit.Test; -/** Unit tests for {@link DomainCheckCommand}. */ -public class DomainCheckCommandTest extends EppToolCommandTestCase { +/** Unit tests for {@link CheckDomainCommand}. */ +public class CheckDomainCommandTest extends EppToolCommandTestCase { @Test public void testSuccess() throws Exception { diff --git a/javatests/google/registry/tools/DomainCheckFeeCommandTest.java b/javatests/google/registry/tools/CheckDomainFeeCommandTest.java similarity index 91% rename from javatests/google/registry/tools/DomainCheckFeeCommandTest.java rename to javatests/google/registry/tools/CheckDomainFeeCommandTest.java index 53fb720fe..2a3fef9d5 100644 --- a/javatests/google/registry/tools/DomainCheckFeeCommandTest.java +++ b/javatests/google/registry/tools/CheckDomainFeeCommandTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. +// Copyright 2018 The Nomulus Authors. All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ import static google.registry.testing.JUnitBackports.assertThrows; import com.beust.jcommander.ParameterException; import org.junit.Test; -/** Unit tests for {@link DomainCheckFeeCommand}. */ -public class DomainCheckFeeCommandTest extends EppToolCommandTestCase { +/** Unit tests for {@link CheckDomainFeeCommand}. */ +public class CheckDomainFeeCommandTest extends EppToolCommandTestCase { @Test public void testSuccess() throws Exception {