Remove GtechCommand and other vestiges of gtech_tool

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=134836647
This commit is contained in:
nickfelt 2016-09-30 15:42:39 -07:00 committed by Ben McIlwain
parent aca4d569bd
commit 730cca257d
93 changed files with 92 additions and 144 deletions

View file

@ -35,7 +35,6 @@ import com.google.common.net.InternetDomainName;
import com.googlecode.objectify.Work;
import google.registry.model.contact.ContactResource;
import google.registry.model.domain.DomainApplication;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import google.registry.tools.params.PathParameter;
import java.nio.file.Files;
@ -45,7 +44,7 @@ import java.util.List;
/** Command to check the status of domain applications. */
@Parameters(separators = " =", commandDescription = "Check auction status")
final class AuctionStatusCommand implements RemoteApiCommand, GtechCommand {
final class AuctionStatusCommand implements RemoteApiCommand {
@Parameter(
description = "Domains(s) to check",

View file

@ -22,7 +22,6 @@ import com.beust.jcommander.Parameters;
import com.google.common.base.Joiner;
import com.google.common.io.CharStreams;
import com.google.common.io.Files;
import google.registry.tools.Command.GtechCommand;
import google.registry.util.DomainNameUtils;
import google.registry.util.Idn;
import google.registry.util.NonFinalForTesting;
@ -36,7 +35,7 @@ import java.util.TreeSet;
/** Command to clean up a set of labels and turn them into punycode. */
@Parameters(commandDescription = "Canonicalize domain labels")
final class CanonicalizeLabelsCommand implements Command, GtechCommand {
final class CanonicalizeLabelsCommand implements Command {
@Parameter(
description = "Filename of file containing domain labels, one per line",

View file

@ -27,9 +27,4 @@ public interface Command {
* install it as needed.
*/
public interface RemoteApiCommand extends Command {}
/**
* Marker interface for commands that are gTech safe.
*/
public interface GtechCommand extends Command {}
}

View file

@ -20,14 +20,13 @@ import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.base.Ascii;
import google.registry.tools.Command.GtechCommand;
import google.registry.util.Idn;
import java.io.IOException;
import java.util.List;
/** Command to convert IDN labels to/from punycode. */
@Parameters(commandDescription = "Convert IDNs to/from punycode")
final class ConvertIdnCommand implements Command, GtechCommand {
final class ConvertIdnCommand implements Command {
@Parameter(
description = "Labels to convert",

View file

@ -24,7 +24,6 @@ import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.net.InternetDomainName;
import com.google.template.soy.data.SoyMapData;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.soy.CreateAnchorTenantSoyInfo;
import javax.inject.Inject;
import org.joda.money.Money;
@ -32,7 +31,7 @@ import org.joda.time.DateTime;
/** A command to create a new anchor tenant domain. */
@Parameters(separators = " =", commandDescription = "Provision a domain for an anchor tenant.")
final class CreateAnchorTenantCommand extends MutatingEppToolCommand implements GtechCommand {
final class CreateAnchorTenantCommand extends MutatingEppToolCommand {
private static final int PASSWORD_LENGTH = 16;
private static final int DEFAULT_ANCHOR_TENANT_PERIOD_YEARS = 2;

View file

@ -20,7 +20,6 @@ import static com.google.common.base.Strings.isNullOrEmpty;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.template.soy.data.SoyMapData;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.params.PhoneNumberParameter;
import google.registry.tools.soy.ContactCreateSoyInfo;
import java.util.List;
@ -28,7 +27,7 @@ import javax.inject.Inject;
/** A command to create a new contact via EPP. */
@Parameters(separators = " =", commandDescription = "Create a new contact via EPP.")
final class CreateContactCommand extends MutatingEppToolCommand implements GtechCommand {
final class CreateContactCommand extends MutatingEppToolCommand {
// TODO(b/19016175): Expand to allow full suite of contact flows.
@Parameter(

View file

@ -22,14 +22,13 @@ import com.beust.jcommander.Parameters;
import google.registry.model.billing.RegistrarCredit;
import google.registry.model.billing.RegistrarCreditBalance;
import google.registry.model.registrar.Registrar;
import google.registry.tools.Command.GtechCommand;
import google.registry.util.SystemClock;
import org.joda.money.Money;
import org.joda.time.DateTime;
/** Command for creating a new balance for a registrar credit. */
@Parameters(separators = " =", commandDescription = "Create a new registrar credit balance")
final class CreateCreditBalanceCommand extends MutatingCommand implements GtechCommand {
final class CreateCreditBalanceCommand extends MutatingCommand {
@Parameter(
names = "--registrar",

View file

@ -23,14 +23,13 @@ import google.registry.model.billing.RegistrarCredit;
import google.registry.model.billing.RegistrarCredit.CreditType;
import google.registry.model.billing.RegistrarCreditBalance;
import google.registry.model.registrar.Registrar;
import google.registry.tools.Command.GtechCommand;
import javax.annotation.Nullable;
import org.joda.money.Money;
import org.joda.time.DateTime;
/** Command for creating a registrar credit object with an initial balance. */
@Parameters(separators = " =", commandDescription = "Create a new registrar credit")
final class CreateCreditCommand extends MutatingCommand implements GtechCommand {
final class CreateCreditCommand extends MutatingCommand {
@Parameter(
names = "--registrar",

View file

@ -20,14 +20,13 @@ import static com.google.common.base.Strings.isNullOrEmpty;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.template.soy.data.SoyMapData;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.soy.DomainCreateSoyInfo;
import java.util.List;
import javax.inject.Inject;
/** A command to create a new domain via EPP. */
@Parameters(separators = " =", commandDescription = "Create a new domain via EPP.")
final class CreateDomainCommand extends MutatingEppToolCommand implements GtechCommand {
final class CreateDomainCommand extends MutatingEppToolCommand {
@Parameter(
names = {"-c", "--client"},

View file

@ -21,7 +21,6 @@ import com.beust.jcommander.Parameters;
import com.google.common.collect.ImmutableList;
import com.google.common.net.InetAddresses;
import com.google.template.soy.data.SoyMapData;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.soy.HostCreateSoyInfo;
import java.net.Inet4Address;
import java.net.Inet6Address;
@ -30,7 +29,7 @@ import java.util.List;
/** A command to create a new host via EPP. */
@Parameters(separators = " =", commandDescription = "Create a new host via EPP.")
final class CreateHostCommand extends MutatingEppToolCommand implements GtechCommand {
final class CreateHostCommand extends MutatingEppToolCommand {
@Parameter(
names = {"-c", "--client"},

View file

@ -32,7 +32,6 @@ import com.google.common.io.LineReader;
import com.googlecode.objectify.Key;
import com.googlecode.objectify.Work;
import google.registry.model.domain.LrpToken;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import google.registry.tools.params.PathParameter;
import java.io.StringReader;
@ -50,7 +49,7 @@ import javax.inject.Inject;
+ " file of assignees for bulk token creation (using -i). Assignee/token pairs are printed"
+ " to stdout, and should be piped to a file for distribution to assignees or for cleanup"
+ " in the event of a command interruption.")
public final class CreateLrpTokensCommand implements RemoteApiCommand, GtechCommand {
public final class CreateLrpTokensCommand implements RemoteApiCommand {
@Parameter(
names = {"-a", "--assignee"},

View file

@ -34,14 +34,13 @@ import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableSet;
import google.registry.model.registrar.Registrar;
import google.registry.tools.Command.GtechCommand;
import java.util.List;
import javax.annotation.Nullable;
/** Command to create a Registrar. */
@Parameters(separators = " =", commandDescription = "Create new registrar account(s)")
final class CreateRegistrarCommand extends CreateOrUpdateRegistrarCommand
implements GtechCommand, ServerSideCommand {
implements ServerSideCommand {
private static final ImmutableSet<RegistryToolEnvironment> ENVIRONMENTS_ALLOWING_GROUP_CREATION =
ImmutableSet.of(PRODUCTION, SANDBOX, UNITTEST);

View file

@ -24,7 +24,6 @@ import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.common.net.MediaType;
import google.registry.model.registrar.Registrar;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.server.CreateGroupsAction;
import java.io.IOException;
import java.util.ArrayList;
@ -35,7 +34,7 @@ import java.util.List;
*/
@Parameters(separators = " =", commandDescription = "Create groups for a registrar.")
public class CreateRegistrarGroupsCommand extends ConfirmingCommand
implements ServerSideCommand, GtechCommand {
implements ServerSideCommand {
@Parameter(
description = "Client identifier(s) of the registrar(s) to create groups for",

View file

@ -17,12 +17,11 @@ package google.registry.tools;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.template.soy.data.SoyMapData;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.soy.DeleteDomainSoyInfo;
/** A command to delete a domain via EPP. */
@Parameters(separators = " =", commandDescription = "Delete domain")
final class DeleteDomainCommand extends MutatingEppToolCommand implements GtechCommand {
final class DeleteDomainCommand extends MutatingEppToolCommand {
@Parameter(
names = {"-c", "--client"},

View file

@ -21,12 +21,11 @@ import com.beust.jcommander.Parameters;
import com.google.common.base.Ascii;
import com.google.template.soy.data.SoyMapData;
import google.registry.model.domain.launch.LaunchPhase;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.soy.DomainApplicationInfoSoyInfo;
/** A command to execute a domain application info EPP command. */
@Parameters(separators = " =", commandDescription = "Get domain application EPP info")
final class DomainApplicationInfoCommand extends EppToolCommand implements GtechCommand {
final class DomainApplicationInfoCommand extends EppToolCommand {
@Parameter(
names = {"-c", "--client"},

View file

@ -18,14 +18,13 @@ import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.collect.Multimap;
import com.google.template.soy.data.SoyMapData;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.soy.DomainCheckClaimsSoyInfo;
import java.util.Collection;
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 EppToolCommand implements GtechCommand {
final class DomainCheckClaimsCommand extends EppToolCommand {
@Parameter(
names = {"-c", "--client"},

View file

@ -18,14 +18,13 @@ import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.collect.Multimap;
import com.google.template.soy.data.SoyMapData;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.soy.DomainCheckSoyInfo;
import java.util.Collection;
import java.util.List;
/** A command to execute a domain check epp command. */
@Parameters(separators = " =", commandDescription = "Check domain availability")
final class DomainCheckCommand extends EppToolCommand implements GtechCommand {
final class DomainCheckCommand extends EppToolCommand {
@Parameter(
names = {"-c", "--client"},

View file

@ -18,14 +18,13 @@ import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.collect.Multimap;
import com.google.template.soy.data.SoyMapData;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.soy.DomainCheckFeeSoyInfo;
import java.util.Collection;
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 EppToolCommand implements GtechCommand {
final class DomainCheckFeeCommand extends EppToolCommand {
@Parameter(
names = {"-c", "--client"},

View file

@ -37,7 +37,6 @@ import google.registry.model.smd.SignedMark;
import google.registry.model.smd.SignedMarkRevocationList;
import google.registry.model.tmch.ClaimsListShard;
import google.registry.tmch.TmchXmlSignature;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import google.registry.tools.params.PathParameter;
import google.registry.util.Clock;
@ -53,7 +52,7 @@ import org.joda.time.DateTime;
/** Command to generate a report of all domain applications. */
@Parameters(separators = " =", commandDescription = "Generate report of all domain applications.")
final class GenerateApplicationsReportCommand implements RemoteApiCommand, GtechCommand {
final class GenerateApplicationsReportCommand implements RemoteApiCommand {
@Parameter(
names = {"-t", "--tld"},

View file

@ -44,7 +44,6 @@ import google.registry.model.domain.launch.ApplicationStatus;
import google.registry.model.registrar.Registrar;
import google.registry.model.registrar.RegistrarAddress;
import google.registry.model.registrar.RegistrarContact;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import google.registry.tools.params.PathParameter;
import java.nio.file.Files;
@ -64,7 +63,7 @@ import org.joda.time.format.DateTimeFormatter;
/** Command to generate the auction data for a TLD. */
@Parameters(separators = " =", commandDescription = "Generate auction data")
final class GenerateAuctionDataCommand implements RemoteApiCommand, GtechCommand {
final class GenerateAuctionDataCommand implements RemoteApiCommand {
@Parameter(
description = "TLD(s) to generate auction data for",

View file

@ -30,7 +30,6 @@ import com.google.common.collect.Ordering;
import google.registry.model.domain.DomainResource;
import google.registry.model.domain.secdns.DelegationSignerData;
import google.registry.model.host.HostResource;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import google.registry.tools.params.PathParameter;
import google.registry.util.Clock;
@ -45,7 +44,7 @@ import org.json.simple.JSONValue;
/** Command to generate a report of all DNS data. */
@Parameters(separators = " =", commandDescription = "Generate report of all DNS data in a TLD.")
final class GenerateDnsReportCommand implements RemoteApiCommand, GtechCommand {
final class GenerateDnsReportCommand implements RemoteApiCommand {
@Parameter(
names = {"-t", "--tld"},

View file

@ -18,12 +18,11 @@ import static google.registry.model.EppResourceUtils.loadDomainApplication;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import google.registry.tools.Command.GtechCommand;
import java.util.List;
/** Command to show a domain application. */
@Parameters(separators = " =", commandDescription = "Show domain application resource(s)")
final class GetApplicationCommand extends GetEppResourceCommand implements GtechCommand {
final class GetApplicationCommand extends GetEppResourceCommand {
@Parameter(
description = "Domain application id(s)",

View file

@ -24,7 +24,6 @@ import com.beust.jcommander.Parameters;
import com.google.common.collect.ImmutableList;
import com.google.common.net.InternetDomainName;
import google.registry.model.domain.DomainApplication;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import java.util.List;
import org.joda.time.DateTime;
@ -32,7 +31,7 @@ import org.joda.time.DateTime;
/** Command to generate a list of all applications for a given domain name(s). */
@Parameters(separators = " =",
commandDescription = "Generate list of application IDs and sponsors for given domain name(s)")
final class GetApplicationIdsCommand implements RemoteApiCommand, GtechCommand {
final class GetApplicationIdsCommand implements RemoteApiCommand {
@Parameter(
description = "Fully qualified domain name(s)",

View file

@ -26,7 +26,6 @@ import com.beust.jcommander.internal.Sets;
import com.googlecode.objectify.Work;
import google.registry.model.domain.DomainApplication;
import google.registry.model.domain.launch.ApplicationStatus;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import google.registry.tools.params.PathParameter;
import google.registry.util.Idn;
@ -40,7 +39,7 @@ import org.joda.time.DateTime;
/** Command to generate a list of all slds in a tld that have open applications. */
@Parameters(separators = " =", commandDescription = "Generate applied-for domains list")
final class GetAppliedLabelsCommand implements RemoteApiCommand, GtechCommand {
final class GetAppliedLabelsCommand implements RemoteApiCommand {
@Parameter(
names = {"-t", "--tld"},

View file

@ -19,12 +19,11 @@ import static google.registry.model.EppResourceUtils.loadByForeignKey;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import google.registry.model.contact.ContactResource;
import google.registry.tools.Command.GtechCommand;
import java.util.List;
/** Command to show one or more contacts. */
@Parameters(separators = " =", commandDescription = "Show contact resource(s)")
final class GetContactCommand extends GetEppResourceCommand implements GtechCommand {
final class GetContactCommand extends GetEppResourceCommand {
@Parameter(
description = "Contact id(s)",

View file

@ -19,12 +19,11 @@ import static google.registry.model.EppResourceUtils.loadByForeignKey;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import google.registry.model.domain.DomainResource;
import google.registry.tools.Command.GtechCommand;
import java.util.List;
/** Command to show a domain resource. */
@Parameters(separators = " =", commandDescription = "Show domain resource(s)")
final class GetDomainCommand extends GetEppResourceCommand implements GtechCommand {
final class GetDomainCommand extends GetEppResourceCommand {
@Parameter(
description = "Fully qualified domain name(s)",

View file

@ -21,7 +21,6 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import google.registry.model.reporting.HistoryEntry;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import google.registry.xml.XmlTransformer;
import org.joda.time.DateTime;
@ -29,7 +28,7 @@ import org.joda.time.DateTime;
/** Command to show history entries. */
@Parameters(separators = " =",
commandDescription = "Show history entries that occurred in a given time range")
final class GetHistoryEntriesCommand implements RemoteApiCommand, GtechCommand {
final class GetHistoryEntriesCommand implements RemoteApiCommand {
@Parameter(
names = {"-a", "--after"},

View file

@ -19,12 +19,11 @@ import static google.registry.model.EppResourceUtils.loadByForeignKey;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import google.registry.model.host.HostResource;
import google.registry.tools.Command.GtechCommand;
import java.util.List;
/** Command to show one or more host resources. */
@Parameters(separators = " =", commandDescription = "Show host resource(s)")
final class GetHostCommand extends GetEppResourceCommand implements GtechCommand {
final class GetHostCommand extends GetEppResourceCommand {
@Parameter(
description = "Fully qualified host name(s)",

View file

@ -22,7 +22,6 @@ import com.beust.jcommander.Parameters;
import com.google.common.collect.ImmutableSet;
import com.googlecode.objectify.Key;
import google.registry.model.domain.LrpToken;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
/** Command to show token information for LRP participants. */
@ -30,7 +29,7 @@ import google.registry.tools.Command.RemoteApiCommand;
separators = " =",
commandDescription = "Show token information for LRP participants by matching on a "
+ "known token or a unique ID (assignee).")
public final class GetLrpTokenCommand implements RemoteApiCommand, GtechCommand {
public final class GetLrpTokenCommand implements RemoteApiCommand {
@Parameter(
names = {"-t", "--token"},

View file

@ -19,13 +19,12 @@ import static com.google.common.base.Preconditions.checkState;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import google.registry.model.registrar.Registrar;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import java.util.List;
/** Command to show a registrar record. */
@Parameters(separators = " =", commandDescription = "Show registrar record(s)")
final class GetRegistrarCommand implements RemoteApiCommand, GtechCommand {
final class GetRegistrarCommand implements RemoteApiCommand {
@Parameter(
description = "Client identifier of the registrar account(s)",

View file

@ -16,11 +16,10 @@ package google.registry.tools;
import com.beust.jcommander.Parameters;
import google.registry.model.SchemaVersion;
import google.registry.tools.Command.GtechCommand;
/** Generates the schema file used for model versioning. */
@Parameters(commandDescription = "Generate a model schema file")
final class GetSchemaCommand implements GtechCommand {
final class GetSchemaCommand implements Command {
@Override
public void run() throws Exception {
System.out.println(SchemaVersion.getSchema());

View file

@ -31,7 +31,6 @@ import com.googlecode.objectify.annotation.Parent;
import google.registry.model.BackupGroupRoot;
import google.registry.model.annotations.NotBackedUp;
import google.registry.model.annotations.VirtualEntity;
import google.registry.tools.Command.GtechCommand;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.ParameterizedType;
@ -42,7 +41,7 @@ import java.util.Set;
/** Visualizes the schema parentage tree. */
@Parameters(commandDescription = "Generate a model schema file")
final class GetSchemaTreeCommand implements GtechCommand {
final class GetSchemaTreeCommand implements Command {
/** Mapping from parent classes in the Datastore sense to child classes. */
private final Multimap<Class<?>, Class<?>> hierarchy =

View file

@ -19,13 +19,12 @@ import static google.registry.model.registry.Registries.assertTldExists;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import google.registry.model.registry.Registry;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import java.util.List;
/** Command to show a TLD record. */
@Parameters(separators = " =", commandDescription = "Show TLD record(s)")
final class GetTldCommand implements RemoteApiCommand, GtechCommand {
final class GetTldCommand implements RemoteApiCommand {
@Parameter(
description = "TLD(s) to show",

View file

@ -21,7 +21,6 @@ import static google.registry.util.X509Utils.loadCertificate;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.base.Joiner;
import google.registry.tools.Command.GtechCommand;
import java.io.IOException;
import java.nio.file.Paths;
import java.security.cert.CertificateParsingException;
@ -30,7 +29,7 @@ import java.util.List;
/** Command to hash a client certificate. */
@Parameters(commandDescription = "Hash a client certificate")
final class HashCertificateCommand implements GtechCommand {
final class HashCertificateCommand implements Command {
@Parameter(description = "Certificate filename")
List<String> mainParameters = new ArrayList<>();

View file

@ -25,13 +25,12 @@ import com.googlecode.objectify.Work;
import google.registry.model.billing.RegistrarCredit;
import google.registry.model.billing.RegistrarCreditBalance.BalanceMap;
import google.registry.model.registrar.Registrar;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import org.joda.money.Money;
/** Command to list registrar credits and balances. */
@Parameters(commandDescription = "List registrar credits and balances")
final class ListCreditsCommand implements RemoteApiCommand, GtechCommand {
final class ListCreditsCommand implements RemoteApiCommand {
@Parameter(
names = {"-a", "--all"},

View file

@ -15,12 +15,11 @@
package google.registry.tools;
import com.beust.jcommander.Parameters;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.server.ListRegistrarsAction;
/** Command to list all registrars. */
@Parameters(separators = " =", commandDescription = "List all registrars.")
final class ListRegistrarsCommand extends ListObjectsCommand implements GtechCommand {
final class ListRegistrarsCommand extends ListObjectsCommand {
@Override
String getCommandPath() {

View file

@ -15,12 +15,11 @@
package google.registry.tools;
import com.beust.jcommander.Parameters;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.server.ListTldsAction;
/** Command to list all top-level domains. */
@Parameters(separators = " =", commandDescription = "List all top-level domains.")
final class ListTldsCommand extends ListObjectsCommand implements GtechCommand {
final class ListTldsCommand extends ListObjectsCommand {
@Override
String getCommandPath() {

View file

@ -21,7 +21,6 @@ import com.beust.jcommander.Parameters;
import com.google.common.collect.ImmutableMap;
import google.registry.export.PublishDetailReportAction;
import google.registry.model.registrar.Registrar;
import google.registry.tools.Command.GtechCommand;
import java.util.Map;
/**
@ -29,7 +28,7 @@ import java.util.Map;
*/
@Parameters(separators = " =", commandDescription = "Publish detail report for a registrar")
public class PublishDetailReportCommand extends ConfirmingCommand
implements ServerSideCommand, GtechCommand {
implements ServerSideCommand {
@Parameter(
names = "--registrar_id",

View file

@ -26,7 +26,6 @@ import com.google.api.services.bigquery.model.JobConfigurationExtract;
import com.google.api.services.bigquery.model.JobConfigurationQuery;
import com.google.common.collect.ImmutableList;
import google.registry.bigquery.BigqueryConnection;
import google.registry.tools.Command.GtechCommand;
import google.registry.util.SqlTemplate;
import java.nio.file.Path;
import org.joda.time.DateTime;
@ -35,7 +34,7 @@ import org.joda.time.format.DateTimeFormatter;
/** Command for creating a registrar activity report and saving it to cloud storage. */
@Parameters(separators = " =", commandDescription = "Generates a registrar activity report.")
final class RegistrarActivityReportCommand implements GtechCommand {
final class RegistrarActivityReportCommand implements Command {
@ParametersDelegate
private final BigqueryParameters bigqueryParameters = new BigqueryParameters();

View file

@ -34,7 +34,6 @@ import google.registry.model.common.GaeUserIdConverter;
import google.registry.model.registrar.Registrar;
import google.registry.model.registrar.RegistrarContact;
import google.registry.model.registrar.RegistrarContact.Builder;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.params.OptionalPhoneNumberParameter;
import google.registry.tools.params.PathParameter;
import java.io.IOException;
@ -53,7 +52,7 @@ import javax.annotation.Nullable;
@Parameters(
separators = " =",
commandDescription = "Create/read/update/delete the various contact lists for a Registrar.")
final class RegistrarContactCommand extends MutatingCommand implements GtechCommand {
final class RegistrarContactCommand extends MutatingCommand {
private enum Mode { LIST, CREATE, UPDATE, DELETE }

View file

@ -26,7 +26,6 @@ import com.google.re2j.Pattern;
import google.registry.config.RegistryEnvironment;
import google.registry.model.registrar.Registrar;
import google.registry.model.registry.Registry.TldState;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import google.registry.tools.params.PathParameter;
import java.nio.file.Path;
@ -39,7 +38,7 @@ import org.joda.time.Duration;
@Parameters(
separators = " =",
commandDescription = "Set up OT&E TLDs and registrars")
final class SetupOteCommand extends ConfirmingCommand implements RemoteApiCommand, GtechCommand {
final class SetupOteCommand extends ConfirmingCommand implements RemoteApiCommand {
// Regex: 3-14 alphanumeric characters or hyphens, the first of which must be a letter.
private static final Pattern REGISTRAR_PATTERN = Pattern.compile("^[a-z][-a-z0-9]{2,13}$");

View file

@ -33,7 +33,6 @@ import google.registry.model.domain.DomainResource;
import google.registry.model.domain.secdns.DelegationSignerData;
import google.registry.model.eppcommon.StatusValue;
import google.registry.model.host.HostResource;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.soy.UniformRapidSuspensionSoyInfo;
import java.util.ArrayList;
import java.util.List;
@ -48,7 +47,7 @@ import org.json.simple.parser.ParseException;
/** A command to suspend a domain for the Uniform Rapid Suspension process. */
@Parameters(separators = " =",
commandDescription = "Suspend a domain for Uniform Rapid Suspension.")
final class UniformRapidSuspensionCommand extends MutatingEppToolCommand implements GtechCommand {
final class UniformRapidSuspensionCommand extends MutatingEppToolCommand {
private static final ImmutableSet<String> URS_LOCKS = ImmutableSet.of(
StatusValue.SERVER_DELETE_PROHIBITED.getXmlName(),

View file

@ -18,12 +18,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
import com.beust.jcommander.Parameters;
import google.registry.model.registrar.Registrar;
import google.registry.tools.Command.GtechCommand;
/** Command to update a Registrar. */
@Parameters(separators = " =", commandDescription = "Update registrar account(s)")
final class UpdateRegistrarCommand extends CreateOrUpdateRegistrarCommand
implements GtechCommand {
final class UpdateRegistrarCommand extends CreateOrUpdateRegistrarCommand {
@Override
Registrar getOldRegistrar(String clientId) {

View file

@ -25,7 +25,6 @@ import com.beust.jcommander.Parameters;
import com.google.common.collect.ImmutableSet;
import com.google.template.soy.data.SoyMapData;
import google.registry.model.eppcommon.StatusValue;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.soy.UpdateServerLocksSoyInfo;
import java.util.ArrayList;
import java.util.List;
@ -34,7 +33,7 @@ import java.util.Set;
/** A command to execute a domain check claims epp command. */
@Parameters(separators = " =",
commandDescription = "Toggle server locks on a domain.")
final class UpdateServerLocksCommand extends MutatingEppToolCommand implements GtechCommand {
final class UpdateServerLocksCommand extends MutatingEppToolCommand {
@Parameter(
names = {"-c", "--client"},

View file

@ -26,7 +26,6 @@ import com.beust.jcommander.Parameters;
import com.google.common.base.Optional;
import google.registry.flows.TlsCredentials;
import google.registry.model.registrar.Registrar;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import google.registry.tools.params.PathParameter;
import java.nio.file.Files;
@ -35,7 +34,7 @@ import javax.annotation.Nullable;
/** A command to test registrar login credentials. */
@Parameters(separators = " =", commandDescription = "Test registrar login credentials")
final class ValidateLoginCredentialsCommand implements RemoteApiCommand, GtechCommand {
final class ValidateLoginCredentialsCommand implements RemoteApiCommand {
@Parameter(
names = {"-c", "--client"},

View file

@ -27,7 +27,6 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import google.registry.config.RegistryEnvironment;
import google.registry.model.registrar.Registrar;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.server.VerifyOteAction;
import java.io.IOException;
import java.util.ArrayList;
@ -40,7 +39,7 @@ import java.util.Map.Entry;
@Parameters(
separators = " =",
commandDescription = "Verify passage of OT&E for specified (or all) registrars")
final class VerifyOteCommand implements ServerSideCommand, GtechCommand {
final class VerifyOteCommand implements ServerSideCommand {
@Parameter(
description = "List of registrar names to check; must be the same names as the ones used "

View file

@ -17,7 +17,6 @@ package google.registry.tools;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.base.Joiner;
import google.registry.tools.Command.GtechCommand;
import google.registry.tools.Command.RemoteApiCommand;
import google.registry.whois.Whois;
import java.util.List;
@ -25,7 +24,7 @@ import javax.inject.Inject;
/** Command to execute a WHOIS query. */
@Parameters(separators = " =", commandDescription = "Manually perform a WHOIS query")
final class WhoisQueryCommand implements RemoteApiCommand, GtechCommand {
final class WhoisQueryCommand implements RemoteApiCommand {
@Parameter(
description = "WHOIS query string",

View file

@ -80,7 +80,7 @@
</contact:authInfo>
</contact:create>
</create>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>
{/template}

View file

@ -56,7 +56,7 @@
</fee:create>
{/if}
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>
{/template}

View file

@ -36,7 +36,7 @@
<metadata:requestedByRegistrar>{$requestedByRegistrar}</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>
{/template}

View file

@ -37,7 +37,7 @@
<launch:applicationID>{$id}</launch:applicationID>
</launch:info>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>
{/template}

View file

@ -29,7 +29,7 @@
{/foreach}
</domain:check>
</check>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>
{/template}

View file

@ -36,7 +36,7 @@
<launch:phase>claims</launch:phase>
</launch:check>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>
{/template}

View file

@ -40,7 +40,7 @@
{/foreach}
</fee:check>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>
{/template}

View file

@ -49,7 +49,7 @@
</domain:authInfo>
</domain:create>
</create>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>
{/template}

View file

@ -39,7 +39,7 @@
{/if}
</host:create>
</create>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>
{/template}

View file

@ -80,7 +80,7 @@
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>
{/template}

View file

@ -50,7 +50,7 @@
<metadata:requestedByRegistrar>{$requestedByRegistrar}</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>
{/template}

View file

@ -26,6 +26,6 @@
</contact:authInfo>
</contact:create>
</create>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -13,6 +13,6 @@
</contact:authInfo>
</contact:create>
</create>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -6,6 +6,6 @@
<domain:name>example.tld</domain:name>
</domain:check>
</check>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -12,6 +12,6 @@
<launch:phase>claims</launch:phase>
</launch:check>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -14,6 +14,6 @@
<launch:phase>claims</launch:phase>
</launch:check>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -12,6 +12,6 @@
<launch:phase>claims</launch:phase>
</launch:check>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -15,6 +15,6 @@
</fee:domain>
</fee:check>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -27,6 +27,6 @@
</fee:domain>
</fee:check>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -15,6 +15,6 @@
</fee:domain>
</fee:check>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -8,6 +8,6 @@
<domain:name>example3.tld</domain:name>
</domain:check>
</check>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -6,6 +6,6 @@
<domain:name>example.tld2</domain:name>
</domain:check>
</check>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -20,6 +20,6 @@
<metadata:anchorTenant>true</metadata:anchorTenant>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -24,6 +24,6 @@
<fee:fee>40000</fee:fee>
</fee:create>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -24,6 +24,6 @@
<fee:fee>26.00</fee:fee>
</fee:create>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -20,6 +20,6 @@
<metadata:anchorTenant>true</metadata:anchorTenant>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -19,6 +19,6 @@
<metadata:anchorTenant>true</metadata:anchorTenant>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -20,6 +20,6 @@
<metadata:anchorTenant>true</metadata:anchorTenant>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -20,6 +20,6 @@
</domain:authInfo>
</domain:create>
</create>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -13,6 +13,6 @@
</domain:authInfo>
</domain:create>
</create>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -12,6 +12,6 @@
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -12,6 +12,6 @@
<metadata:requestedByRegistrar>true</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -12,6 +12,6 @@
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -14,6 +14,6 @@
<launch:applicationID>123</launch:applicationID>
</launch:info>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -14,6 +14,6 @@
<launch:applicationID>123</launch:applicationID>
</launch:info>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -8,6 +8,6 @@
<host:addr ip="v6">2001:0db8:85a3:0000:0000:8a2e:0370:7334</host:addr>
</host:create>
</create>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -5,6 +5,6 @@
<host:name>notours.external</host:name>
</host:create>
</create>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -40,6 +40,6 @@
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -30,6 +30,6 @@
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -32,6 +32,6 @@
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -31,6 +31,6 @@
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -20,6 +20,6 @@
<metadata:requestedByRegistrar>true</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -16,6 +16,6 @@
<metadata:requestedByRegistrar>true</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -16,6 +16,6 @@
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -20,6 +20,6 @@
<metadata:requestedByRegistrar>true</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>

View file

@ -16,6 +16,6 @@
<metadata:requestedByRegistrar>true</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>GTechTool</clTRID>
<clTRID>RegistryTool</clTRID>
</command>
</epp>