diff --git a/core/src/main/java/google/registry/batch/DeleteProberDataAction.java b/core/src/main/java/google/registry/batch/DeleteProberDataAction.java index 79a859cc2..de3bcd781 100644 --- a/core/src/main/java/google/registry/batch/DeleteProberDataAction.java +++ b/core/src/main/java/google/registry/batch/DeleteProberDataAction.java @@ -21,8 +21,8 @@ import static google.registry.config.RegistryEnvironment.PRODUCTION; import static google.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN; import static google.registry.model.ResourceTransferUtils.updateForeignKeyIndexDeletionTime; import static google.registry.model.ofy.ObjectifyService.auditedOfy; -import static google.registry.model.registry.Registries.getTldsOfType; import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_DELETE; +import static google.registry.model.tld.Registries.getTldsOfType; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.request.Action.Method.POST; import static google.registry.request.RequestParameters.PARAM_TLDS; @@ -47,8 +47,8 @@ import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainHistory; import google.registry.model.index.EppResourceIndex; import google.registry.model.index.ForeignKeyIndex; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; diff --git a/core/src/main/java/google/registry/batch/ExpandRecurringBillingEventsAction.java b/core/src/main/java/google/registry/batch/ExpandRecurringBillingEventsAction.java index d7af2f345..83dd4474f 100644 --- a/core/src/main/java/google/registry/batch/ExpandRecurringBillingEventsAction.java +++ b/core/src/main/java/google/registry/batch/ExpandRecurringBillingEventsAction.java @@ -52,9 +52,9 @@ import google.registry.model.common.Cursor; import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainHistory; import google.registry.model.domain.Period; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField; +import google.registry.model.tld.Registry; import google.registry.persistence.VKey; import google.registry.request.Action; import google.registry.request.Parameter; diff --git a/core/src/main/java/google/registry/batch/RelockDomainAction.java b/core/src/main/java/google/registry/batch/RelockDomainAction.java index 4947614e2..855945424 100644 --- a/core/src/main/java/google/registry/batch/RelockDomainAction.java +++ b/core/src/main/java/google/registry/batch/RelockDomainAction.java @@ -31,7 +31,7 @@ import google.registry.model.domain.DomainBase; import google.registry.model.eppcommon.StatusValue; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; -import google.registry.model.registry.RegistryLockDao; +import google.registry.model.tld.RegistryLockDao; import google.registry.persistence.VKey; import google.registry.request.Action; import google.registry.request.Parameter; diff --git a/core/src/main/java/google/registry/beam/initsql/InitSqlPipeline.java b/core/src/main/java/google/registry/beam/initsql/InitSqlPipeline.java index 8b94cb5dc..c4e32fbf7 100644 --- a/core/src/main/java/google/registry/beam/initsql/InitSqlPipeline.java +++ b/core/src/main/java/google/registry/beam/initsql/InitSqlPipeline.java @@ -32,8 +32,8 @@ import google.registry.model.host.HostResource; import google.registry.model.poll.PollMessage; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.persistence.PersistenceModule.TransactionIsolationLevel; import java.io.Serializable; import java.util.Collection; diff --git a/core/src/main/java/google/registry/beam/rde/RdeIO.java b/core/src/main/java/google/registry/beam/rde/RdeIO.java index a17c7f3e1..42bec477c 100644 --- a/core/src/main/java/google/registry/beam/rde/RdeIO.java +++ b/core/src/main/java/google/registry/beam/rde/RdeIO.java @@ -30,7 +30,7 @@ import google.registry.model.common.Cursor; import google.registry.model.rde.RdeMode; import google.registry.model.rde.RdeNamingUtils; import google.registry.model.rde.RdeRevision; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.rde.DepositFragment; import google.registry.rde.Ghostryde; import google.registry.rde.PendingDeposit; diff --git a/core/src/main/java/google/registry/config/RegistryConfig.java b/core/src/main/java/google/registry/config/RegistryConfig.java index 5e19522a1..b9c8f11c2 100644 --- a/core/src/main/java/google/registry/config/RegistryConfig.java +++ b/core/src/main/java/google/registry/config/RegistryConfig.java @@ -60,7 +60,7 @@ import org.joda.time.Duration; *

This class does not represent the total configuration of the Nomulus service. It's only * meant for settings that need to be configured once. Settings which may be subject to * change in the future, should instead be retrieved from Datastore. The {@link - * google.registry.model.registry.Registry Registry} class is one such example of this. + * google.registry.model.tld.Registry Registry} class is one such example of this. * *

Note: Only settings that are actually configurable belong in this file. It's not a catch-all * for anything widely used throughout the code base. @@ -1394,8 +1394,8 @@ public final class RegistryConfig { /** * Returns the amount of time a domain label list should be cached in memory before expiring. * - * @see google.registry.model.registry.label.ReservedList - * @see google.registry.model.registry.label.PremiumList + * @see google.registry.model.tld.label.ReservedList + * @see google.registry.model.tld.label.PremiumList */ public static Duration getDomainLabelListCacheDuration() { return Duration.standardSeconds(CONFIG_SETTINGS.get().caching.domainLabelCachingSeconds); diff --git a/core/src/main/java/google/registry/cron/TldFanoutAction.java b/core/src/main/java/google/registry/cron/TldFanoutAction.java index f957ea6dd..a2341b500 100644 --- a/core/src/main/java/google/registry/cron/TldFanoutAction.java +++ b/core/src/main/java/google/registry/cron/TldFanoutAction.java @@ -31,9 +31,9 @@ import static google.registry.cron.CronModule.FOR_EACH_TEST_TLD_PARAM; import static google.registry.cron.CronModule.JITTER_SECONDS_PARAM; import static google.registry.cron.CronModule.QUEUE_PARAM; import static google.registry.cron.CronModule.RUN_IN_EMPTY_PARAM; -import static google.registry.model.registry.Registries.getTldsOfType; -import static google.registry.model.registry.Registry.TldType.REAL; -import static google.registry.model.registry.Registry.TldType.TEST; +import static google.registry.model.tld.Registries.getTldsOfType; +import static google.registry.model.tld.Registry.TldType.REAL; +import static google.registry.model.tld.Registry.TldType.TEST; import static java.util.concurrent.TimeUnit.SECONDS; import com.google.appengine.api.taskqueue.Queue; diff --git a/core/src/main/java/google/registry/dns/DnsQueue.java b/core/src/main/java/google/registry/dns/DnsQueue.java index 26042d662..413f26d44 100644 --- a/core/src/main/java/google/registry/dns/DnsQueue.java +++ b/core/src/main/java/google/registry/dns/DnsQueue.java @@ -20,7 +20,7 @@ import static google.registry.dns.DnsConstants.DNS_PULL_QUEUE_NAME; import static google.registry.dns.DnsConstants.DNS_TARGET_CREATE_TIME_PARAM; import static google.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM; import static google.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM; -import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.model.tld.Registries.assertTldExists; import static google.registry.request.RequestParameters.PARAM_TLD; import static google.registry.util.DomainNameUtils.getTldFromDomainName; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -38,7 +38,7 @@ import com.google.common.flogger.FluentLogger; import com.google.common.net.InternetDomainName; import com.google.common.util.concurrent.RateLimiter; import google.registry.dns.DnsConstants.TargetType; -import google.registry.model.registry.Registries; +import google.registry.model.tld.Registries; import google.registry.util.Clock; import google.registry.util.NonFinalForTesting; import google.registry.util.SystemClock; diff --git a/core/src/main/java/google/registry/dns/DnsWriterProxy.java b/core/src/main/java/google/registry/dns/DnsWriterProxy.java index a4b5cc256..0e64f9b34 100644 --- a/core/src/main/java/google/registry/dns/DnsWriterProxy.java +++ b/core/src/main/java/google/registry/dns/DnsWriterProxy.java @@ -19,7 +19,7 @@ import static com.google.common.base.Preconditions.checkState; import com.google.common.collect.ImmutableMap; import com.google.common.flogger.FluentLogger; import google.registry.dns.writer.DnsWriter; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import java.util.Map; import javax.inject.Inject; diff --git a/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java b/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java index 27a380077..aa4e50f85 100644 --- a/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java +++ b/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java @@ -32,7 +32,7 @@ import google.registry.dns.DnsMetrics.ActionStatus; import google.registry.dns.DnsMetrics.CommitStatus; import google.registry.dns.DnsMetrics.PublishStatus; import google.registry.dns.writer.DnsWriter; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.request.Action; import google.registry.request.HttpException.ServiceUnavailableException; import google.registry.request.Parameter; diff --git a/core/src/main/java/google/registry/dns/ReadDnsQueueAction.java b/core/src/main/java/google/registry/dns/ReadDnsQueueAction.java index b4c436e9f..66446b24e 100644 --- a/core/src/main/java/google/registry/dns/ReadDnsQueueAction.java +++ b/core/src/main/java/google/registry/dns/ReadDnsQueueAction.java @@ -47,8 +47,8 @@ import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; import google.registry.config.RegistryConfig.Config; import google.registry.dns.DnsConstants.TargetType; -import google.registry.model.registry.Registries; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registries; +import google.registry.model.tld.Registry; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.auth.Auth; diff --git a/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java b/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java index a208d50b9..4120279b3 100644 --- a/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java +++ b/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java @@ -39,7 +39,7 @@ import google.registry.dns.writer.DnsWriterZone; import google.registry.model.domain.DomainBase; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.host.HostResource; -import google.registry.model.registry.Registries; +import google.registry.model.tld.Registries; import google.registry.util.Clock; import google.registry.util.Concurrent; import google.registry.util.Retrier; diff --git a/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java b/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java index 1f05a3ae8..a934cc4f0 100644 --- a/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java +++ b/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java @@ -30,7 +30,7 @@ import google.registry.dns.writer.DnsWriterZone; import google.registry.model.domain.DomainBase; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.host.HostResource; -import google.registry.model.registry.Registries; +import google.registry.model.tld.Registries; import google.registry.util.Clock; import java.io.IOException; import java.net.Inet4Address; diff --git a/core/src/main/java/google/registry/export/ExportDomainListsAction.java b/core/src/main/java/google/registry/export/ExportDomainListsAction.java index 9774323af..173dd1d18 100644 --- a/core/src/main/java/google/registry/export/ExportDomainListsAction.java +++ b/core/src/main/java/google/registry/export/ExportDomainListsAction.java @@ -17,7 +17,7 @@ package google.registry.export; import static com.google.common.base.Verify.verifyNotNull; import static google.registry.mapreduce.inputs.EppResourceInputs.createEntityInput; import static google.registry.model.EppResourceUtils.isActive; -import static google.registry.model.registry.Registries.getTldsOfType; +import static google.registry.model.tld.Registries.getTldsOfType; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.request.Action.Method.POST; @@ -38,8 +38,8 @@ import google.registry.config.RegistryConfig.Config; import google.registry.gcs.GcsUtils; import google.registry.mapreduce.MapreduceRunner; import google.registry.model.domain.DomainBase; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import google.registry.request.Action; import google.registry.request.Response; import google.registry.request.auth.Auth; diff --git a/core/src/main/java/google/registry/export/ExportPremiumTermsAction.java b/core/src/main/java/google/registry/export/ExportPremiumTermsAction.java index 2ad97c1b8..f3690ece2 100644 --- a/core/src/main/java/google/registry/export/ExportPremiumTermsAction.java +++ b/core/src/main/java/google/registry/export/ExportPremiumTermsAction.java @@ -30,14 +30,14 @@ import com.google.common.collect.Streams; import com.google.common.flogger.FluentLogger; import com.google.common.net.MediaType; import google.registry.config.RegistryConfig.Config; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.PremiumList.PremiumEntry; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.PremiumList.PremiumEntry; +import google.registry.model.tld.label.PremiumListDao; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.schema.tld.PremiumListDao; import google.registry.storage.drive.DriveConnection; import java.io.IOException; import java.util.Optional; diff --git a/core/src/main/java/google/registry/export/ExportReservedTermsAction.java b/core/src/main/java/google/registry/export/ExportReservedTermsAction.java index 0e51045b5..838bee48a 100644 --- a/core/src/main/java/google/registry/export/ExportReservedTermsAction.java +++ b/core/src/main/java/google/registry/export/ExportReservedTermsAction.java @@ -23,7 +23,7 @@ import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.flogger.FluentLogger; import com.google.common.net.MediaType; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.RequestParameters; diff --git a/core/src/main/java/google/registry/export/ExportUtils.java b/core/src/main/java/google/registry/export/ExportUtils.java index 7173b34d6..bf007843f 100644 --- a/core/src/main/java/google/registry/export/ExportUtils.java +++ b/core/src/main/java/google/registry/export/ExportUtils.java @@ -16,10 +16,10 @@ package google.registry.export; import com.google.common.base.Joiner; import google.registry.config.RegistryConfig.Config; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.ReservedList; -import google.registry.model.registry.label.ReservedList.ReservedListEntry; -import google.registry.model.registry.label.ReservedListDao; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.ReservedList; +import google.registry.model.tld.label.ReservedList.ReservedListEntry; +import google.registry.model.tld.label.ReservedListDao; import java.util.Set; import java.util.TreeSet; import javax.inject.Inject; diff --git a/core/src/main/java/google/registry/flows/CheckApiAction.java b/core/src/main/java/google/registry/flows/CheckApiAction.java index 842d27ffa..e2f9d0163 100644 --- a/core/src/main/java/google/registry/flows/CheckApiAction.java +++ b/core/src/main/java/google/registry/flows/CheckApiAction.java @@ -19,8 +19,8 @@ import static com.google.common.net.HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN; import static google.registry.flows.domain.DomainFlowUtils.validateDomainName; import static google.registry.flows.domain.DomainFlowUtils.validateDomainNameWithIdnTables; import static google.registry.flows.domain.DomainFlowUtils.verifyNotInPredelegation; -import static google.registry.model.registry.label.ReservationType.getTypeOfHighestSeverity; -import static google.registry.model.registry.label.ReservedList.getReservationTypes; +import static google.registry.model.tld.label.ReservationType.getTypeOfHighestSeverity; +import static google.registry.model.tld.label.ReservedList.getReservationTypes; import static google.registry.monitoring.whitebox.CheckApiMetric.Availability.AVAILABLE; import static google.registry.monitoring.whitebox.CheckApiMetric.Availability.REGISTERED; import static google.registry.monitoring.whitebox.CheckApiMetric.Availability.RESERVED; @@ -46,8 +46,8 @@ import google.registry.flows.domain.DomainFlowUtils.BadCommandForRegistryPhaseEx import google.registry.flows.domain.DomainFlowUtils.InvalidIdnDomainLabelException; import google.registry.model.domain.DomainBase; import google.registry.model.index.ForeignKeyIndex; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.ReservationType; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.ReservationType; import google.registry.monitoring.whitebox.CheckApiMetric; import google.registry.monitoring.whitebox.CheckApiMetric.Availability; import google.registry.request.Action; diff --git a/core/src/main/java/google/registry/flows/custom/DomainPricingCustomLogic.java b/core/src/main/java/google/registry/flows/custom/DomainPricingCustomLogic.java index 31f221f44..f77afe1b8 100644 --- a/core/src/main/java/google/registry/flows/custom/DomainPricingCustomLogic.java +++ b/core/src/main/java/google/registry/flows/custom/DomainPricingCustomLogic.java @@ -23,7 +23,7 @@ import google.registry.flows.domain.DomainPricingLogic; import google.registry.flows.domain.FeesAndCredits; import google.registry.model.ImmutableObject; import google.registry.model.eppinput.EppInput; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/domain/DomainCheckFlow.java b/core/src/main/java/google/registry/flows/domain/DomainCheckFlow.java index 2511cbbd4..38f08d9b7 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainCheckFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainCheckFlow.java @@ -28,8 +28,8 @@ import static google.registry.flows.domain.DomainFlowUtils.isValidReservedCreate import static google.registry.flows.domain.DomainFlowUtils.validateDomainName; import static google.registry.flows.domain.DomainFlowUtils.validateDomainNameWithIdnTables; import static google.registry.flows.domain.DomainFlowUtils.verifyNotInPredelegation; -import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE; -import static google.registry.model.registry.label.ReservationType.getTypeOfHighestSeverity; +import static google.registry.model.tld.Registry.TldState.START_DATE_SUNRISE; +import static google.registry.model.tld.label.ReservationType.getTypeOfHighestSeverity; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -67,10 +67,10 @@ import google.registry.model.eppoutput.CheckData.DomainCheckData; import google.registry.model.eppoutput.EppResponse; import google.registry.model.eppoutput.EppResponse.ResponseExtension; import google.registry.model.index.ForeignKeyIndex; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; -import google.registry.model.registry.label.ReservationType; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; +import google.registry.model.tld.label.ReservationType; import google.registry.persistence.VKey; import google.registry.util.Clock; import java.util.HashSet; diff --git a/core/src/main/java/google/registry/flows/domain/DomainClaimsCheckFlow.java b/core/src/main/java/google/registry/flows/domain/DomainClaimsCheckFlow.java index 87e7c5385..5ba0d323a 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainClaimsCheckFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainClaimsCheckFlow.java @@ -43,8 +43,8 @@ import google.registry.model.domain.token.AllocationTokenExtension; import google.registry.model.eppinput.EppInput; import google.registry.model.eppinput.ResourceCommand; import google.registry.model.eppoutput.EppResponse; -import google.registry.model.registry.Registry; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import google.registry.model.tld.Registry; import google.registry.model.tmch.ClaimsListDao; import google.registry.util.Clock; import java.util.HashSet; diff --git a/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java b/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java index 0c7221702..46415b94d 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java @@ -44,11 +44,11 @@ import static google.registry.flows.domain.DomainFlowUtils.verifyUnitIsYears; import static google.registry.model.EppResourceUtils.createDomainRepoId; import static google.registry.model.IdService.allocateId; import static google.registry.model.eppcommon.StatusValue.SERVER_HOLD; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; -import static google.registry.model.registry.Registry.TldState.QUIET_PERIOD; -import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE; -import static google.registry.model.registry.label.ReservationType.NAME_COLLISION; import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_CREATE; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.QUIET_PERIOD; +import static google.registry.model.tld.Registry.TldState.START_DATE_SUNRISE; +import static google.registry.model.tld.label.ReservationType.NAME_COLLISION; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.util.DateTimeUtils.END_OF_TIME; import static google.registry.util.DateTimeUtils.leapSafeAddYears; @@ -104,14 +104,14 @@ import google.registry.model.index.ForeignKeyIndex; import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; import google.registry.model.poll.PollMessage; import google.registry.model.poll.PollMessage.Autorenew; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; -import google.registry.model.registry.Registry.TldType; -import google.registry.model.registry.label.ReservationType; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField; import google.registry.model.reporting.HistoryEntry; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; +import google.registry.model.tld.Registry.TldType; +import google.registry.model.tld.label.ReservationType; import google.registry.tmch.LordnTaskUtils; import java.util.Optional; import javax.inject.Inject; diff --git a/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java b/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java index 379a3df86..822020fb5 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java @@ -85,11 +85,11 @@ import google.registry.model.eppinput.EppInput; import google.registry.model.eppoutput.EppResponse; import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import google.registry.model.transfer.TransferStatus; import java.util.Collections; import java.util.Optional; diff --git a/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java b/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java index fbac92738..2ada79a78 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java +++ b/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java @@ -27,17 +27,17 @@ import static com.google.common.collect.Sets.intersection; import static com.google.common.collect.Sets.union; import static google.registry.model.domain.DomainBase.MAX_REGISTRATION_YEARS; import static google.registry.model.ofy.ObjectifyService.auditedOfy; -import static google.registry.model.registry.Registries.findTldForName; -import static google.registry.model.registry.Registries.getTlds; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; -import static google.registry.model.registry.Registry.TldState.PREDELEGATION; -import static google.registry.model.registry.Registry.TldState.QUIET_PERIOD; -import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE; -import static google.registry.model.registry.label.ReservationType.ALLOWED_IN_SUNRISE; -import static google.registry.model.registry.label.ReservationType.FULLY_BLOCKED; -import static google.registry.model.registry.label.ReservationType.NAME_COLLISION; -import static google.registry.model.registry.label.ReservationType.RESERVED_FOR_ANCHOR_TENANT; -import static google.registry.model.registry.label.ReservationType.RESERVED_FOR_SPECIFIC_USE; +import static google.registry.model.tld.Registries.findTldForName; +import static google.registry.model.tld.Registries.getTlds; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.PREDELEGATION; +import static google.registry.model.tld.Registry.TldState.QUIET_PERIOD; +import static google.registry.model.tld.Registry.TldState.START_DATE_SUNRISE; +import static google.registry.model.tld.label.ReservationType.ALLOWED_IN_SUNRISE; +import static google.registry.model.tld.label.ReservationType.FULLY_BLOCKED; +import static google.registry.model.tld.label.ReservationType.NAME_COLLISION; +import static google.registry.model.tld.label.ReservationType.RESERVED_FOR_ANCHOR_TENANT; +import static google.registry.model.tld.label.ReservationType.RESERVED_FOR_SPECIFIC_USE; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.pricing.PricingEngineProxy.isDomainPremium; @@ -119,13 +119,13 @@ import google.registry.model.host.HostResource; import google.registry.model.poll.PollMessage; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar.State; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; -import google.registry.model.registry.label.ReservationType; -import google.registry.model.registry.label.ReservedList; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; +import google.registry.model.tld.label.ReservationType; +import google.registry.model.tld.label.ReservedList; import google.registry.model.tmch.ClaimsListDao; import google.registry.persistence.VKey; import google.registry.tldconfig.idn.IdnLabelValidator; diff --git a/core/src/main/java/google/registry/flows/domain/DomainPricingLogic.java b/core/src/main/java/google/registry/flows/domain/DomainPricingLogic.java index 15f8e9fde..afacf5b62 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainPricingLogic.java +++ b/core/src/main/java/google/registry/flows/domain/DomainPricingLogic.java @@ -32,7 +32,7 @@ import google.registry.model.domain.fee.BaseFee.FeeType; import google.registry.model.domain.fee.Fee; import google.registry.model.domain.token.AllocationToken; import google.registry.model.pricing.PremiumPricingEngine.DomainPrices; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.Optional; diff --git a/core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java b/core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java index a18cc7732..30dd31637 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java @@ -71,10 +71,10 @@ import google.registry.model.eppinput.EppInput; import google.registry.model.eppinput.ResourceCommand; import google.registry.model.eppoutput.EppResponse; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import google.registry.model.tld.Registry; import java.util.Optional; import javax.inject.Inject; import org.joda.money.Money; diff --git a/core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java b/core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java index bd4016f46..9aee758ea 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java @@ -64,10 +64,10 @@ import google.registry.model.eppinput.EppInput; import google.registry.model.eppinput.ResourceCommand; import google.registry.model.eppoutput.EppResponse; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import google.registry.model.tld.Registry; import java.util.Optional; import javax.inject.Inject; import org.joda.money.Money; diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java index 1d69e892e..97bc49838 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java @@ -57,9 +57,9 @@ import google.registry.model.domain.rgp.GracePeriodStatus; import google.registry.model.eppcommon.AuthInfo; import google.registry.model.eppoutput.EppResponse; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferStatus; import java.util.Optional; diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java index 22115af42..6dd611a63 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java @@ -45,9 +45,9 @@ import google.registry.model.domain.DomainHistory; import google.registry.model.domain.metadata.MetadataExtension; import google.registry.model.eppcommon.AuthInfo; import google.registry.model.eppoutput.EppResponse; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import google.registry.model.tld.Registry; import google.registry.model.transfer.TransferStatus; import java.util.Optional; import javax.inject.Inject; diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java index 84f5d7355..dcee1eb05 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java @@ -47,9 +47,9 @@ import google.registry.model.domain.DomainHistory; import google.registry.model.domain.metadata.MetadataExtension; import google.registry.model.eppcommon.AuthInfo; import google.registry.model.eppoutput.EppResponse; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import google.registry.model.tld.Registry; import google.registry.model.transfer.TransferStatus; import java.util.Optional; import javax.inject.Inject; diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java index ef083b927..6c3d59a0a 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java @@ -66,10 +66,10 @@ import google.registry.model.eppinput.EppInput; import google.registry.model.eppinput.ResourceCommand; import google.registry.model.eppoutput.EppResponse; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.model.transfer.TransferResponse.DomainTransferResponse; diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferUtils.java b/core/src/main/java/google/registry/flows/domain/DomainTransferUtils.java index 24c41b400..c2ea2d17b 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferUtils.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferUtils.java @@ -32,7 +32,7 @@ import google.registry.model.domain.rgp.GracePeriodStatus; import google.registry.model.eppcommon.Trid; import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; diff --git a/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java b/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java index 03b260243..37bf28142 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java @@ -76,8 +76,8 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppinput.EppInput; import google.registry.model.eppinput.ResourceCommand; import google.registry.model.eppoutput.EppResponse; -import google.registry.model.registry.Registry; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import google.registry.model.tld.Registry; import java.util.Optional; import javax.inject.Inject; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/flows/domain/token/AllocationTokenCustomLogic.java b/core/src/main/java/google/registry/flows/domain/token/AllocationTokenCustomLogic.java index 0e7eab0c9..9424b366c 100644 --- a/core/src/main/java/google/registry/flows/domain/token/AllocationTokenCustomLogic.java +++ b/core/src/main/java/google/registry/flows/domain/token/AllocationTokenCustomLogic.java @@ -21,7 +21,7 @@ import com.google.common.net.InternetDomainName; import google.registry.flows.EppException; import google.registry.model.domain.DomainCommand; import google.registry.model.domain.token.AllocationToken; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java b/core/src/main/java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java index 1282ce1bb..d302c91c0 100644 --- a/core/src/main/java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java +++ b/core/src/main/java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java @@ -31,8 +31,8 @@ import google.registry.model.domain.DomainCommand; import google.registry.model.domain.token.AllocationToken; import google.registry.model.domain.token.AllocationToken.TokenStatus; import google.registry.model.domain.token.AllocationToken.TokenType; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.persistence.VKey; import java.util.List; import java.util.Optional; diff --git a/core/src/main/java/google/registry/flows/host/HostFlowUtils.java b/core/src/main/java/google/registry/flows/host/HostFlowUtils.java index 9ffd7a146..b714cd8bd 100644 --- a/core/src/main/java/google/registry/flows/host/HostFlowUtils.java +++ b/core/src/main/java/google/registry/flows/host/HostFlowUtils.java @@ -16,7 +16,7 @@ package google.registry.flows.host; import static google.registry.model.EppResourceUtils.isActive; import static google.registry.model.EppResourceUtils.loadByForeignKey; -import static google.registry.model.registry.Registries.findTldForName; +import static google.registry.model.tld.Registries.findTldForName; import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import static java.util.stream.Collectors.joining; diff --git a/core/src/main/java/google/registry/model/EntityClasses.java b/core/src/main/java/google/registry/model/EntityClasses.java index dfb373c7c..dcdbad608 100644 --- a/core/src/main/java/google/registry/model/EntityClasses.java +++ b/core/src/main/java/google/registry/model/EntityClasses.java @@ -39,11 +39,11 @@ import google.registry.model.poll.PollMessage; import google.registry.model.rde.RdeRevision; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.ReservedList; import google.registry.model.reporting.HistoryEntry; import google.registry.model.server.Lock; import google.registry.model.server.ServerSecret; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.ReservedList; import google.registry.model.tmch.ClaimsList; import google.registry.model.tmch.ClaimsList.ClaimsListRevision; import google.registry.model.tmch.ClaimsList.ClaimsListSingleton; diff --git a/core/src/main/java/google/registry/model/EppResourceUtils.java b/core/src/main/java/google/registry/model/EppResourceUtils.java index 29a5dd7c3..d9054accb 100644 --- a/core/src/main/java/google/registry/model/EppResourceUtils.java +++ b/core/src/main/java/google/registry/model/EppResourceUtils.java @@ -40,9 +40,9 @@ import google.registry.model.host.HostResource; import google.registry.model.index.ForeignKeyIndex; import google.registry.model.ofy.CommitLogManifest; import google.registry.model.ofy.CommitLogMutation; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; import google.registry.model.reporting.HistoryEntryDao; +import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferStatus; diff --git a/core/src/main/java/google/registry/model/OteAccountBuilder.java b/core/src/main/java/google/registry/model/OteAccountBuilder.java index 86574c110..477cea41d 100644 --- a/core/src/main/java/google/registry/model/OteAccountBuilder.java +++ b/core/src/main/java/google/registry/model/OteAccountBuilder.java @@ -18,8 +18,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; -import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.START_DATE_SUNRISE; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.util.DateTimeUtils.START_OF_TIME; @@ -36,11 +36,11 @@ import google.registry.model.pricing.StaticPremiumListPricingEngine; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarAddress; import google.registry.model.registrar.RegistrarContact; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; -import google.registry.model.registry.label.PremiumList; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumListDao; import google.registry.persistence.VKey; -import google.registry.schema.tld.PremiumListDao; import google.registry.util.CidrAddressBlock; import java.util.Collection; import java.util.Optional; diff --git a/core/src/main/java/google/registry/model/common/Cursor.java b/core/src/main/java/google/registry/model/common/Cursor.java index 493c105cb..2dde5553f 100644 --- a/core/src/main/java/google/registry/model/common/Cursor.java +++ b/core/src/main/java/google/registry/model/common/Cursor.java @@ -30,7 +30,7 @@ import google.registry.model.ImmutableObject; import google.registry.model.UpdateAutoTimestamp; import google.registry.model.annotations.InCrossTld; import google.registry.model.common.Cursor.CursorId; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.persistence.VKey; import google.registry.schema.replay.DatastoreAndSqlEntity; import java.io.Serializable; diff --git a/core/src/main/java/google/registry/model/domain/DomainContent.java b/core/src/main/java/google/registry/model/domain/DomainContent.java index b5ef62d71..c9a8e7e64 100644 --- a/core/src/main/java/google/registry/model/domain/DomainContent.java +++ b/core/src/main/java/google/registry/model/domain/DomainContent.java @@ -62,8 +62,8 @@ import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferStatus; import google.registry.persistence.VKey; diff --git a/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java b/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java index 5418ba5f2..5ce94806d 100644 --- a/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java +++ b/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java @@ -18,8 +18,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import static google.registry.util.DomainNameUtils.getTldFromDomainName; import com.google.common.net.InternetDomainName; -import google.registry.model.registry.Registry; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.PremiumListDao; import java.util.Optional; import javax.inject.Inject; import org.joda.money.Money; diff --git a/core/src/main/java/google/registry/model/registrar/Registrar.java b/core/src/main/java/google/registry/model/registrar/Registrar.java index 8084c0de4..f084e364c 100644 --- a/core/src/main/java/google/registry/model/registrar/Registrar.java +++ b/core/src/main/java/google/registry/model/registrar/Registrar.java @@ -31,7 +31,7 @@ import static google.registry.config.RegistryConfig.getDefaultRegistrarWhoisServ import static google.registry.model.CacheUtils.memoizeWithShortExpiration; import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; import static google.registry.model.ofy.ObjectifyService.auditedOfy; -import static google.registry.model.registry.Registries.assertTldsExist; +import static google.registry.model.tld.Registries.assertTldsExist; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm; @@ -77,7 +77,7 @@ import google.registry.model.annotations.InCrossTld; import google.registry.model.annotations.ReportedOn; import google.registry.model.common.EntityGroupRoot; import google.registry.model.registrar.Registrar.BillingAccountEntry.CurrencyMapper; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.persistence.VKey; import google.registry.schema.replay.DatastoreAndSqlEntity; import google.registry.util.CidrAddressBlock; diff --git a/core/src/main/java/google/registry/model/registry/Registries.java b/core/src/main/java/google/registry/model/tld/Registries.java similarity index 98% rename from core/src/main/java/google/registry/model/registry/Registries.java rename to core/src/main/java/google/registry/model/tld/Registries.java index 5aaaeb726..98fbe6f9d 100644 --- a/core/src/main/java/google/registry/model/registry/Registries.java +++ b/core/src/main/java/google/registry/model/tld/Registries.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry; +package google.registry.model.tld; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Predicates.equalTo; @@ -36,7 +36,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Streams; import com.google.common.net.InternetDomainName; import com.googlecode.objectify.Key; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registry.TldType; import java.util.Optional; /** Utilities for finding and listing {@link Registry} entities. */ diff --git a/core/src/main/java/google/registry/model/registry/Registry.java b/core/src/main/java/google/registry/model/tld/Registry.java similarity index 99% rename from core/src/main/java/google/registry/model/registry/Registry.java rename to core/src/main/java/google/registry/model/tld/Registry.java index a89096e30..3928ae2f0 100644 --- a/core/src/main/java/google/registry/model/registry/Registry.java +++ b/core/src/main/java/google/registry/model/tld/Registry.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry; +package google.registry.model.tld; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -59,8 +59,8 @@ import google.registry.model.common.TimedTransitionProperty; import google.registry.model.common.TimedTransitionProperty.TimedTransition; import google.registry.model.domain.fee.BaseFee.FeeType; import google.registry.model.domain.fee.Fee; -import google.registry.model.registry.label.PremiumList; -import google.registry.model.registry.label.ReservedList; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.ReservedList; import google.registry.persistence.VKey; import google.registry.schema.replay.DatastoreAndSqlEntity; import google.registry.util.Idn; diff --git a/core/src/main/java/google/registry/model/registry/RegistryLockDao.java b/core/src/main/java/google/registry/model/tld/RegistryLockDao.java similarity index 99% rename from core/src/main/java/google/registry/model/registry/RegistryLockDao.java rename to core/src/main/java/google/registry/model/tld/RegistryLockDao.java index d69b8c324..318eadf66 100644 --- a/core/src/main/java/google/registry/model/registry/RegistryLockDao.java +++ b/core/src/main/java/google/registry/model/tld/RegistryLockDao.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry; +package google.registry.model.tld; import static com.google.common.base.Preconditions.checkNotNull; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/main/java/google/registry/model/registry/label/BaseDomainLabelList.java b/core/src/main/java/google/registry/model/tld/label/BaseDomainLabelList.java similarity index 97% rename from core/src/main/java/google/registry/model/registry/label/BaseDomainLabelList.java rename to core/src/main/java/google/registry/model/tld/label/BaseDomainLabelList.java index e2f9b2d6c..27ac2e957 100644 --- a/core/src/main/java/google/registry/model/registry/label/BaseDomainLabelList.java +++ b/core/src/main/java/google/registry/model/tld/label/BaseDomainLabelList.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry.label; +package google.registry.model.tld.label; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.collect.ImmutableSet.toImmutableSet; import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static google.registry.model.registry.Registries.getTlds; +import static google.registry.model.tld.Registries.getTlds; import com.google.common.cache.CacheLoader.InvalidCacheLoadException; import com.google.common.cache.LoadingCache; @@ -37,7 +37,7 @@ import google.registry.model.Buildable; import google.registry.model.ImmutableObject; import google.registry.model.annotations.InCrossTld; import google.registry.model.common.EntityGroupRoot; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/google/registry/model/registry/label/DomainLabelEntry.java b/core/src/main/java/google/registry/model/tld/label/DomainLabelEntry.java similarity index 98% rename from core/src/main/java/google/registry/model/registry/label/DomainLabelEntry.java rename to core/src/main/java/google/registry/model/tld/label/DomainLabelEntry.java index b8c7902cc..595ef72f3 100644 --- a/core/src/main/java/google/registry/model/registry/label/DomainLabelEntry.java +++ b/core/src/main/java/google/registry/model/tld/label/DomainLabelEntry.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry.label; +package google.registry.model.tld.label; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.emptyToNull; diff --git a/core/src/main/java/google/registry/model/registry/label/DomainLabelMetrics.java b/core/src/main/java/google/registry/model/tld/label/DomainLabelMetrics.java similarity index 99% rename from core/src/main/java/google/registry/model/registry/label/DomainLabelMetrics.java rename to core/src/main/java/google/registry/model/tld/label/DomainLabelMetrics.java index b92f10eca..a046cc694 100644 --- a/core/src/main/java/google/registry/model/registry/label/DomainLabelMetrics.java +++ b/core/src/main/java/google/registry/model/tld/label/DomainLabelMetrics.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry.label; +package google.registry.model.tld.label; import com.google.auto.value.AutoValue; import com.google.common.annotations.VisibleForTesting; diff --git a/core/src/main/java/google/registry/model/registry/label/PremiumList.java b/core/src/main/java/google/registry/model/tld/label/PremiumList.java similarity index 97% rename from core/src/main/java/google/registry/model/registry/label/PremiumList.java rename to core/src/main/java/google/registry/model/tld/label/PremiumList.java index 6d48aad4c..45c1be707 100644 --- a/core/src/main/java/google/registry/model/registry/label/PremiumList.java +++ b/core/src/main/java/google/registry/model/tld/label/PremiumList.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry.label; +package google.registry.model.tld.label; import static com.google.common.base.Charsets.US_ASCII; import static com.google.common.base.Preconditions.checkArgument; @@ -26,10 +26,9 @@ import com.google.common.hash.BloomFilter; import google.registry.model.Buildable; import google.registry.model.ImmutableObject; import google.registry.model.annotations.ReportedOn; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.PremiumList.PremiumEntry; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.PremiumList.PremiumEntry; import google.registry.schema.replay.SqlOnlyEntity; -import google.registry.schema.tld.PremiumListDao; import java.io.Serializable; import java.math.BigDecimal; import java.math.RoundingMode; @@ -216,7 +215,7 @@ public final class PremiumList extends BaseDomainLabelList { public Builder() {} diff --git a/core/src/main/java/google/registry/schema/tld/PremiumListDao.java b/core/src/main/java/google/registry/model/tld/label/PremiumListDao.java similarity index 98% rename from core/src/main/java/google/registry/schema/tld/PremiumListDao.java rename to core/src/main/java/google/registry/model/tld/label/PremiumListDao.java index 052c4a251..9cacb7ed8 100644 --- a/core/src/main/java/google/registry/schema/tld/PremiumListDao.java +++ b/core/src/main/java/google/registry/model/tld/label/PremiumListDao.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.tld; +package google.registry.model.tld.label; import static com.google.common.collect.ImmutableList.toImmutableList; import static google.registry.config.RegistryConfig.getDomainLabelListCacheDuration; @@ -28,8 +28,7 @@ import com.google.common.cache.CacheLoader.InvalidCacheLoadException; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Streams; -import google.registry.model.registry.label.PremiumList; -import google.registry.model.registry.label.PremiumList.PremiumEntry; +import google.registry.model.tld.label.PremiumList.PremiumEntry; import google.registry.util.NonFinalForTesting; import java.math.BigDecimal; import java.util.List; diff --git a/core/src/main/java/google/registry/schema/tld/PremiumListUtils.java b/core/src/main/java/google/registry/model/tld/label/PremiumListUtils.java similarity index 91% rename from core/src/main/java/google/registry/schema/tld/PremiumListUtils.java rename to core/src/main/java/google/registry/model/tld/label/PremiumListUtils.java index 41c22b01e..6fa8b26d1 100644 --- a/core/src/main/java/google/registry/schema/tld/PremiumListUtils.java +++ b/core/src/main/java/google/registry/model/tld/label/PremiumListUtils.java @@ -12,15 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.tld; +package google.registry.model.tld.label; import static com.google.common.base.Preconditions.checkArgument; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import google.registry.model.registry.label.PremiumList; -import google.registry.model.registry.label.PremiumList.PremiumEntry; +import google.registry.model.tld.label.PremiumList.PremiumEntry; import java.math.BigDecimal; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/google/registry/model/registry/label/ReservationType.java b/core/src/main/java/google/registry/model/tld/label/ReservationType.java similarity index 98% rename from core/src/main/java/google/registry/model/registry/label/ReservationType.java rename to core/src/main/java/google/registry/model/tld/label/ReservationType.java index 4e708d09e..c3ba711ef 100644 --- a/core/src/main/java/google/registry/model/registry/label/ReservationType.java +++ b/core/src/main/java/google/registry/model/tld/label/ReservationType.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry.label; +package google.registry.model.tld.label; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/core/src/main/java/google/registry/model/registry/label/ReservedList.java b/core/src/main/java/google/registry/model/tld/label/ReservedList.java similarity index 98% rename from core/src/main/java/google/registry/model/registry/label/ReservedList.java rename to core/src/main/java/google/registry/model/tld/label/ReservedList.java index 9a2313484..be5659364 100644 --- a/core/src/main/java/google/registry/model/registry/label/ReservedList.java +++ b/core/src/main/java/google/registry/model/tld/label/ReservedList.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry.label; +package google.registry.model.tld.label; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -20,7 +20,7 @@ import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.collect.ImmutableMap.toImmutableMap; import static com.google.common.collect.ImmutableSet.toImmutableSet; import static google.registry.config.RegistryConfig.getDomainLabelListCacheDuration; -import static google.registry.model.registry.label.ReservationType.FULLY_BLOCKED; +import static google.registry.model.tld.label.ReservationType.FULLY_BLOCKED; import static google.registry.persistence.transaction.QueryComposer.Comparator.EQ; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import static google.registry.util.CollectionUtils.nullToEmpty; @@ -39,8 +39,8 @@ import com.googlecode.objectify.annotation.Mapify; import com.googlecode.objectify.mapper.Mapper; import google.registry.model.Buildable; import google.registry.model.annotations.ReportedOn; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.DomainLabelMetrics.MetricsReservedListMatch; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.DomainLabelMetrics.MetricsReservedListMatch; import google.registry.schema.replay.NonReplicatedEntity; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/google/registry/model/registry/label/ReservedListDao.java b/core/src/main/java/google/registry/model/tld/label/ReservedListDao.java similarity index 98% rename from core/src/main/java/google/registry/model/registry/label/ReservedListDao.java rename to core/src/main/java/google/registry/model/tld/label/ReservedListDao.java index 7183636a7..0016f89a0 100644 --- a/core/src/main/java/google/registry/model/registry/label/ReservedListDao.java +++ b/core/src/main/java/google/registry/model/tld/label/ReservedListDao.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry.label; +package google.registry.model.tld.label; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; diff --git a/core/src/main/java/google/registry/model/registry/label/package-info.java b/core/src/main/java/google/registry/model/tld/label/package-info.java similarity index 93% rename from core/src/main/java/google/registry/model/registry/label/package-info.java rename to core/src/main/java/google/registry/model/tld/label/package-info.java index 434dcb3d8..9ec160665 100644 --- a/core/src/main/java/google/registry/model/registry/label/package-info.java +++ b/core/src/main/java/google/registry/model/tld/label/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package google.registry.model.registry.label; +package google.registry.model.tld.label; diff --git a/core/src/main/java/google/registry/model/tmch/ClaimsList.java b/core/src/main/java/google/registry/model/tmch/ClaimsList.java index 678ff5a74..34ad5179c 100644 --- a/core/src/main/java/google/registry/model/tmch/ClaimsList.java +++ b/core/src/main/java/google/registry/model/tmch/ClaimsList.java @@ -36,7 +36,7 @@ import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; import google.registry.model.annotations.VirtualEntity; import google.registry.model.common.CrossTldSingleton; -import google.registry.model.registry.label.ReservedList.ReservedListEntry; +import google.registry.model.tld.label.ReservedList.ReservedListEntry; import google.registry.schema.replay.DatastoreOnlyEntity; import google.registry.schema.replay.NonReplicatedEntity; import java.util.Map; diff --git a/core/src/main/java/google/registry/module/backend/BackendModule.java b/core/src/main/java/google/registry/module/backend/BackendModule.java index 4e09df026..7851b9f78 100644 --- a/core/src/main/java/google/registry/module/backend/BackendModule.java +++ b/core/src/main/java/google/registry/module/backend/BackendModule.java @@ -14,8 +14,8 @@ package google.registry.module.backend; -import static google.registry.model.registry.Registries.assertTldExists; -import static google.registry.model.registry.Registries.assertTldsExist; +import static google.registry.model.tld.Registries.assertTldExists; +import static google.registry.model.tld.Registries.assertTldsExist; import static google.registry.request.RequestParameters.extractOptionalDatetimeParameter; import static google.registry.request.RequestParameters.extractRequiredParameter; import static google.registry.request.RequestParameters.extractSetOfParameters; diff --git a/core/src/main/java/google/registry/monitoring/whitebox/EppMetric.java b/core/src/main/java/google/registry/monitoring/whitebox/EppMetric.java index d328e1d56..89228fb11 100644 --- a/core/src/main/java/google/registry/monitoring/whitebox/EppMetric.java +++ b/core/src/main/java/google/registry/monitoring/whitebox/EppMetric.java @@ -20,7 +20,7 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import google.registry.model.eppoutput.Result.Code; -import google.registry.model.registry.Registries; +import google.registry.model.tld.Registries; import google.registry.util.Clock; import java.util.Optional; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/persistence/converter/BillingCostTransitionConverter.java b/core/src/main/java/google/registry/persistence/converter/BillingCostTransitionConverter.java index a5a637daa..b15dc5b97 100644 --- a/core/src/main/java/google/registry/persistence/converter/BillingCostTransitionConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/BillingCostTransitionConverter.java @@ -15,7 +15,7 @@ package google.registry.persistence.converter; import avro.shaded.com.google.common.collect.Maps; -import google.registry.model.registry.Registry.BillingCostTransition; +import google.registry.model.tld.Registry.BillingCostTransition; import java.util.Map; import javax.persistence.Converter; import org.joda.money.Money; diff --git a/core/src/main/java/google/registry/persistence/converter/ReservedListKeySetConverter.java b/core/src/main/java/google/registry/persistence/converter/ReservedListKeySetConverter.java index 5c5f1c024..3a2d78aa9 100644 --- a/core/src/main/java/google/registry/persistence/converter/ReservedListKeySetConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/ReservedListKeySetConverter.java @@ -17,7 +17,7 @@ package google.registry.persistence.converter; import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; import com.googlecode.objectify.Key; -import google.registry.model.registry.label.ReservedList; +import google.registry.model.tld.label.ReservedList; import javax.persistence.Converter; /** JPA converter for a set of {@link Key} containing a {@link ReservedList} */ diff --git a/core/src/main/java/google/registry/persistence/converter/TldStateTransitionConverter.java b/core/src/main/java/google/registry/persistence/converter/TldStateTransitionConverter.java index bfc5796cc..076faebec 100644 --- a/core/src/main/java/google/registry/persistence/converter/TldStateTransitionConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/TldStateTransitionConverter.java @@ -15,8 +15,8 @@ package google.registry.persistence.converter; import com.google.common.collect.Maps; -import google.registry.model.registry.Registry.TldState; -import google.registry.model.registry.Registry.TldStateTransition; +import google.registry.model.tld.Registry.TldState; +import google.registry.model.tld.Registry.TldStateTransition; import java.util.Map; import javax.persistence.Converter; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/pricing/PricingEngineProxy.java b/core/src/main/java/google/registry/pricing/PricingEngineProxy.java index f3f9c258c..619e782c8 100644 --- a/core/src/main/java/google/registry/pricing/PricingEngineProxy.java +++ b/core/src/main/java/google/registry/pricing/PricingEngineProxy.java @@ -20,7 +20,7 @@ import static google.registry.util.DomainNameUtils.getTldFromDomainName; import google.registry.model.pricing.PremiumPricingEngine; import google.registry.model.pricing.PremiumPricingEngine.DomainPrices; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import java.util.Map; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java b/core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java index ec3c12a0a..32fa8d3e4 100644 --- a/core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java +++ b/core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java @@ -35,8 +35,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import google.registry.keyring.api.KeyModule; import google.registry.model.registrar.Registrar; -import google.registry.model.registry.Registries; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registries; +import google.registry.model.tld.Registry.TldType; import google.registry.request.Action; import google.registry.request.auth.Auth; import java.io.IOException; diff --git a/core/src/main/java/google/registry/rde/EscrowTaskRunner.java b/core/src/main/java/google/registry/rde/EscrowTaskRunner.java index e20c986ad..15dad12fe 100644 --- a/core/src/main/java/google/registry/rde/EscrowTaskRunner.java +++ b/core/src/main/java/google/registry/rde/EscrowTaskRunner.java @@ -20,7 +20,7 @@ import static google.registry.persistence.transaction.TransactionManagerUtil.tra import com.google.common.flogger.FluentLogger; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.request.HttpException.NoContentException; import google.registry.request.HttpException.ServiceUnavailableException; import google.registry.request.lock.LockHandler; diff --git a/core/src/main/java/google/registry/rde/PendingDepositChecker.java b/core/src/main/java/google/registry/rde/PendingDepositChecker.java index 5772efd92..e1a5fc823 100644 --- a/core/src/main/java/google/registry/rde/PendingDepositChecker.java +++ b/core/src/main/java/google/registry/rde/PendingDepositChecker.java @@ -24,9 +24,9 @@ import google.registry.config.RegistryConfig.Config; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.rde.RdeMode; -import google.registry.model.registry.Registries; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registries; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import google.registry.util.Clock; import java.util.Optional; import javax.inject.Inject; diff --git a/core/src/main/java/google/registry/rde/RdeReportAction.java b/core/src/main/java/google/registry/rde/RdeReportAction.java index 2897d341f..d6096eacb 100644 --- a/core/src/main/java/google/registry/rde/RdeReportAction.java +++ b/core/src/main/java/google/registry/rde/RdeReportAction.java @@ -33,7 +33,7 @@ import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.rde.RdeNamingUtils; import google.registry.model.rde.RdeRevision; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.rde.EscrowTaskRunner.EscrowTask; import google.registry.request.Action; import google.registry.request.HttpException.NoContentException; diff --git a/core/src/main/java/google/registry/rde/RdeStagingReducer.java b/core/src/main/java/google/registry/rde/RdeStagingReducer.java index f62c9ac46..9fadacbfd 100644 --- a/core/src/main/java/google/registry/rde/RdeStagingReducer.java +++ b/core/src/main/java/google/registry/rde/RdeStagingReducer.java @@ -35,7 +35,7 @@ import google.registry.model.common.Cursor; import google.registry.model.rde.RdeMode; import google.registry.model.rde.RdeNamingUtils; import google.registry.model.rde.RdeRevision; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.request.RequestParameters; import google.registry.request.lock.LockHandler; import google.registry.tldconfig.idn.IdnTableEnum; diff --git a/core/src/main/java/google/registry/rde/RdeUploadAction.java b/core/src/main/java/google/registry/rde/RdeUploadAction.java index fa88633e2..4a233e676 100644 --- a/core/src/main/java/google/registry/rde/RdeUploadAction.java +++ b/core/src/main/java/google/registry/rde/RdeUploadAction.java @@ -45,7 +45,7 @@ import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.rde.RdeNamingUtils; import google.registry.model.rde.RdeRevision; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.rde.EscrowTaskRunner.EscrowTask; import google.registry.rde.JSchSshSession.JSchSshSessionFactory; import google.registry.request.Action; diff --git a/core/src/main/java/google/registry/reporting/icann/IcannHttpReporter.java b/core/src/main/java/google/registry/reporting/icann/IcannHttpReporter.java index 95ee266eb..966569239 100644 --- a/core/src/main/java/google/registry/reporting/icann/IcannHttpReporter.java +++ b/core/src/main/java/google/registry/reporting/icann/IcannHttpReporter.java @@ -16,7 +16,7 @@ package google.registry.reporting.icann; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.net.MediaType.CSV_UTF_8; -import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.model.tld.Registries.assertTldExists; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.api.client.http.ByteArrayContent; diff --git a/core/src/main/java/google/registry/reporting/icann/IcannReportingUploadAction.java b/core/src/main/java/google/registry/reporting/icann/IcannReportingUploadAction.java index 353c0e368..d88c9e593 100644 --- a/core/src/main/java/google/registry/reporting/icann/IcannReportingUploadAction.java +++ b/core/src/main/java/google/registry/reporting/icann/IcannReportingUploadAction.java @@ -30,9 +30,9 @@ import google.registry.config.RegistryConfig.Config; import google.registry.gcs.GcsUtils; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; -import google.registry.model.registry.Registries; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registries; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import google.registry.persistence.VKey; import google.registry.request.Action; import google.registry.request.HttpException.ServiceUnavailableException; diff --git a/core/src/main/java/google/registry/tmch/LordnRequestInitializer.java b/core/src/main/java/google/registry/tmch/LordnRequestInitializer.java index 768e05143..8bedfce71 100644 --- a/core/src/main/java/google/registry/tmch/LordnRequestInitializer.java +++ b/core/src/main/java/google/registry/tmch/LordnRequestInitializer.java @@ -20,7 +20,7 @@ import static google.registry.util.UrlFetchUtils.setAuthorizationHeader; import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.common.flogger.FluentLogger; import google.registry.keyring.api.KeyModule.Key; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import java.util.Optional; import javax.inject.Inject; diff --git a/core/src/main/java/google/registry/tools/CountDomainsCommand.java b/core/src/main/java/google/registry/tools/CountDomainsCommand.java index d7274a534..45f50db33 100644 --- a/core/src/main/java/google/registry/tools/CountDomainsCommand.java +++ b/core/src/main/java/google/registry/tools/CountDomainsCommand.java @@ -14,7 +14,7 @@ package google.registry.tools; -import static google.registry.model.registry.Registries.assertTldsExist; +import static google.registry.model.tld.Registries.assertTldsExist; import static google.registry.persistence.transaction.QueryComposer.Comparator; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm; diff --git a/core/src/main/java/google/registry/tools/CreateAnchorTenantCommand.java b/core/src/main/java/google/registry/tools/CreateAnchorTenantCommand.java index e9d1e071a..9e2ef5b35 100644 --- a/core/src/main/java/google/registry/tools/CreateAnchorTenantCommand.java +++ b/core/src/main/java/google/registry/tools/CreateAnchorTenantCommand.java @@ -16,7 +16,7 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; -import static google.registry.model.registry.Registries.findTldForNameOrThrow; +import static google.registry.model.tld.Registries.findTldForNameOrThrow; import static google.registry.pricing.PricingEngineProxy.getDomainCreateCost; import static google.registry.util.StringGenerator.DEFAULT_PASSWORD_LENGTH; import static org.joda.time.DateTimeZone.UTC; diff --git a/core/src/main/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java index fd9ac3f48..41cfea318 100644 --- a/core/src/main/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java +++ b/core/src/main/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java @@ -16,7 +16,7 @@ package google.registry.tools; import com.beust.jcommander.Parameter; import com.google.common.flogger.FluentLogger; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.label.PremiumListDao; import google.registry.tools.params.PathParameter; import java.nio.file.Path; import java.util.List; diff --git a/core/src/main/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java index e2e304fc4..49108eae9 100644 --- a/core/src/main/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java +++ b/core/src/main/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java @@ -31,7 +31,7 @@ import com.google.common.collect.Sets; import google.registry.flows.certs.CertificateChecker; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarAddress; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.tools.params.KeyValueMapParameter.CurrencyUnitToStringMap; import google.registry.tools.params.OptionalLongParameter; import google.registry.tools.params.OptionalPhoneNumberParameter; diff --git a/core/src/main/java/google/registry/tools/CreateOrUpdateReservedListCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdateReservedListCommand.java index 2e5e187f2..5d81b3875 100644 --- a/core/src/main/java/google/registry/tools/CreateOrUpdateReservedListCommand.java +++ b/core/src/main/java/google/registry/tools/CreateOrUpdateReservedListCommand.java @@ -16,8 +16,8 @@ package google.registry.tools; import com.beust.jcommander.Parameter; import com.google.common.flogger.FluentLogger; -import google.registry.model.registry.label.ReservedList; -import google.registry.model.registry.label.ReservedListDao; +import google.registry.model.tld.label.ReservedList; +import google.registry.model.tld.label.ReservedListDao; import google.registry.tools.params.PathParameter; import java.nio.file.Path; import javax.annotation.Nullable; diff --git a/core/src/main/java/google/registry/tools/CreateOrUpdateTldCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdateTldCommand.java index fd5fdd612..4484aca5d 100644 --- a/core/src/main/java/google/registry/tools/CreateOrUpdateTldCommand.java +++ b/core/src/main/java/google/registry/tools/CreateOrUpdateTldCommand.java @@ -26,12 +26,12 @@ import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Sets; import google.registry.model.pricing.StaticPremiumListPricingEngine; -import google.registry.model.registry.Registries; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; -import google.registry.model.registry.Registry.TldType; -import google.registry.model.registry.label.PremiumList; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.Registries; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; +import google.registry.model.tld.Registry.TldType; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumListDao; import google.registry.tools.params.OptionalStringParameter; import google.registry.tools.params.TransitionListParameter.BillingCostTransitions; import google.registry.tools.params.TransitionListParameter.TldStateTransitions; diff --git a/core/src/main/java/google/registry/tools/CreatePremiumListCommand.java b/core/src/main/java/google/registry/tools/CreatePremiumListCommand.java index e72cda163..0f53b7f97 100644 --- a/core/src/main/java/google/registry/tools/CreatePremiumListCommand.java +++ b/core/src/main/java/google/registry/tools/CreatePremiumListCommand.java @@ -15,15 +15,15 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.model.tld.Registries.assertTldExists; import static google.registry.util.ListNamingUtils.convertFilePathToName; import static java.nio.charset.StandardCharsets.UTF_8; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.google.common.base.Strings; -import google.registry.model.registry.label.PremiumList; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumListDao; import java.nio.file.Files; import org.joda.money.CurrencyUnit; diff --git a/core/src/main/java/google/registry/tools/CreateReservedListCommand.java b/core/src/main/java/google/registry/tools/CreateReservedListCommand.java index 33c4550b2..b13e68f30 100644 --- a/core/src/main/java/google/registry/tools/CreateReservedListCommand.java +++ b/core/src/main/java/google/registry/tools/CreateReservedListCommand.java @@ -15,7 +15,7 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.model.tld.Registries.assertTldExists; import static google.registry.util.ListNamingUtils.convertFilePathToName; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; @@ -26,7 +26,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.googlecode.objectify.Key; -import google.registry.model.registry.label.ReservedList; +import google.registry.model.tld.label.ReservedList; import google.registry.persistence.VKey; import java.nio.file.Files; import java.util.List; diff --git a/core/src/main/java/google/registry/tools/CreateTldCommand.java b/core/src/main/java/google/registry/tools/CreateTldCommand.java index 88c35e9eb..440796816 100644 --- a/core/src/main/java/google/registry/tools/CreateTldCommand.java +++ b/core/src/main/java/google/registry/tools/CreateTldCommand.java @@ -16,7 +16,7 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import static google.registry.model.registry.Registries.getTlds; +import static google.registry.model.tld.Registries.getTlds; import static google.registry.util.CollectionUtils.nullToEmpty; import static google.registry.util.DateTimeUtils.START_OF_TIME; @@ -26,8 +26,8 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Maps; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; diff --git a/core/src/main/java/google/registry/tools/DeletePremiumListCommand.java b/core/src/main/java/google/registry/tools/DeletePremiumListCommand.java index 54481af5b..036598c15 100644 --- a/core/src/main/java/google/registry/tools/DeletePremiumListCommand.java +++ b/core/src/main/java/google/registry/tools/DeletePremiumListCommand.java @@ -20,8 +20,8 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; -import google.registry.model.registry.label.PremiumList; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumListDao; import javax.annotation.Nullable; /** diff --git a/core/src/main/java/google/registry/tools/DeleteReservedListCommand.java b/core/src/main/java/google/registry/tools/DeleteReservedListCommand.java index a130443ff..61d610273 100644 --- a/core/src/main/java/google/registry/tools/DeleteReservedListCommand.java +++ b/core/src/main/java/google/registry/tools/DeleteReservedListCommand.java @@ -20,8 +20,8 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; -import google.registry.model.registry.label.ReservedList; -import google.registry.model.registry.label.ReservedListDao; +import google.registry.model.tld.label.ReservedList; +import google.registry.model.tld.label.ReservedListDao; /** * Command to delete a {@link ReservedList} from the database. This command will fail if the diff --git a/core/src/main/java/google/registry/tools/DeleteTldCommand.java b/core/src/main/java/google/registry/tools/DeleteTldCommand.java index d7288b3db..0b79207f8 100644 --- a/core/src/main/java/google/registry/tools/DeleteTldCommand.java +++ b/core/src/main/java/google/registry/tools/DeleteTldCommand.java @@ -22,8 +22,8 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import google.registry.model.domain.DomainBase; import google.registry.model.registrar.Registrar; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import google.registry.persistence.transaction.QueryComposer.Comparator; /** diff --git a/core/src/main/java/google/registry/tools/DomainLockUtils.java b/core/src/main/java/google/registry/tools/DomainLockUtils.java index 5037b7396..292bd9eda 100644 --- a/core/src/main/java/google/registry/tools/DomainLockUtils.java +++ b/core/src/main/java/google/registry/tools/DomainLockUtils.java @@ -28,9 +28,9 @@ import google.registry.model.billing.BillingEvent; import google.registry.model.billing.BillingEvent.Reason; import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainHistory; -import google.registry.model.registry.Registry; -import google.registry.model.registry.RegistryLockDao; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; +import google.registry.model.tld.RegistryLockDao; import google.registry.schema.domain.RegistryLock; import google.registry.util.StringGenerator; import java.util.Optional; diff --git a/core/src/main/java/google/registry/tools/EppToolCommand.java b/core/src/main/java/google/registry/tools/EppToolCommand.java index 895124cbe..3082c81be 100644 --- a/core/src/main/java/google/registry/tools/EppToolCommand.java +++ b/core/src/main/java/google/registry/tools/EppToolCommand.java @@ -18,7 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Strings.nullToEmpty; import static com.google.common.collect.Maps.filterValues; import static com.google.common.io.Resources.getResource; -import static google.registry.model.registry.Registries.findTldForNameOrThrow; +import static google.registry.model.tld.Registries.findTldForNameOrThrow; import static google.registry.tools.CommandUtilities.addHeader; import static google.registry.util.PreconditionsUtils.checkArgumentPresent; import static google.registry.xml.XmlTransformer.prettyPrint; diff --git a/core/src/main/java/google/registry/tools/GenerateDnsReportCommand.java b/core/src/main/java/google/registry/tools/GenerateDnsReportCommand.java index 1c1fbf9f6..ace2497bb 100644 --- a/core/src/main/java/google/registry/tools/GenerateDnsReportCommand.java +++ b/core/src/main/java/google/registry/tools/GenerateDnsReportCommand.java @@ -16,7 +16,7 @@ package google.registry.tools; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.io.BaseEncoding.base16; -import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.model.tld.Registries.assertTldExists; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm; import static google.registry.util.DateTimeUtils.isBeforeOrAt; diff --git a/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java b/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java index a999affe5..3f4a2258e 100644 --- a/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java +++ b/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java @@ -15,7 +15,7 @@ package google.registry.tools; import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl; -import static google.registry.model.registry.Registries.assertTldsExist; +import static google.registry.model.tld.Registries.assertTldsExist; import static google.registry.rde.RdeModule.PARAM_DIRECTORY; import static google.registry.rde.RdeModule.PARAM_MANUAL; import static google.registry.rde.RdeModule.PARAM_MODE; diff --git a/core/src/main/java/google/registry/tools/GenerateZoneFilesCommand.java b/core/src/main/java/google/registry/tools/GenerateZoneFilesCommand.java index ce9d92826..0c2e3e62b 100644 --- a/core/src/main/java/google/registry/tools/GenerateZoneFilesCommand.java +++ b/core/src/main/java/google/registry/tools/GenerateZoneFilesCommand.java @@ -14,7 +14,7 @@ package google.registry.tools; -import static google.registry.model.registry.Registries.assertTldsExist; +import static google.registry.model.tld.Registries.assertTldsExist; import static org.joda.time.DateTimeZone.UTC; import static org.joda.time.Duration.standardMinutes; diff --git a/core/src/main/java/google/registry/tools/GetPremiumListCommand.java b/core/src/main/java/google/registry/tools/GetPremiumListCommand.java index da5aae594..45826a12c 100644 --- a/core/src/main/java/google/registry/tools/GetPremiumListCommand.java +++ b/core/src/main/java/google/registry/tools/GetPremiumListCommand.java @@ -17,9 +17,9 @@ package google.registry.tools; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.google.common.collect.Streams; -import google.registry.model.registry.label.PremiumList; -import google.registry.model.registry.label.PremiumList.PremiumEntry; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumList.PremiumEntry; +import google.registry.model.tld.label.PremiumListDao; import java.util.Comparator; import java.util.List; import java.util.Optional; diff --git a/core/src/main/java/google/registry/tools/GetReservedListCommand.java b/core/src/main/java/google/registry/tools/GetReservedListCommand.java index 3e94b3554..36995f4f7 100644 --- a/core/src/main/java/google/registry/tools/GetReservedListCommand.java +++ b/core/src/main/java/google/registry/tools/GetReservedListCommand.java @@ -17,8 +17,8 @@ package google.registry.tools; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.google.appengine.repackaged.com.google.common.collect.Streams; -import google.registry.model.registry.label.ReservedList.ReservedListEntry; -import google.registry.model.registry.label.ReservedListDao; +import google.registry.model.tld.label.ReservedList.ReservedListEntry; +import google.registry.model.tld.label.ReservedListDao; import java.util.Comparator; import java.util.stream.Collectors; diff --git a/core/src/main/java/google/registry/tools/GetTldCommand.java b/core/src/main/java/google/registry/tools/GetTldCommand.java index 2aa532d9a..572fe55db 100644 --- a/core/src/main/java/google/registry/tools/GetTldCommand.java +++ b/core/src/main/java/google/registry/tools/GetTldCommand.java @@ -14,11 +14,11 @@ package google.registry.tools; -import static google.registry.model.registry.Registries.assertTldsExist; +import static google.registry.model.tld.Registries.assertTldsExist; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import java.util.List; /** Command to show a TLD record. */ diff --git a/core/src/main/java/google/registry/tools/ListCursorsCommand.java b/core/src/main/java/google/registry/tools/ListCursorsCommand.java index 0dcc38b46..c157382c1 100644 --- a/core/src/main/java/google/registry/tools/ListCursorsCommand.java +++ b/core/src/main/java/google/registry/tools/ListCursorsCommand.java @@ -24,9 +24,9 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; -import google.registry.model.registry.Registries; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registries; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import google.registry.persistence.VKey; import java.util.Map; import java.util.Optional; diff --git a/core/src/main/java/google/registry/tools/ListDomainsCommand.java b/core/src/main/java/google/registry/tools/ListDomainsCommand.java index 7928c7579..91c3c1680 100644 --- a/core/src/main/java/google/registry/tools/ListDomainsCommand.java +++ b/core/src/main/java/google/registry/tools/ListDomainsCommand.java @@ -15,14 +15,14 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import static google.registry.model.registry.Registries.getTldsOfType; +import static google.registry.model.tld.Registries.getTldsOfType; import static google.registry.util.CollectionUtils.isNullOrEmpty; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registry.TldType; import google.registry.tools.server.ListDomainsAction; import java.util.List; diff --git a/core/src/main/java/google/registry/tools/LoadTestCommand.java b/core/src/main/java/google/registry/tools/LoadTestCommand.java index f61b26739..0dac8962a 100644 --- a/core/src/main/java/google/registry/tools/LoadTestCommand.java +++ b/core/src/main/java/google/registry/tools/LoadTestCommand.java @@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; import google.registry.loadtest.LoadTestAction; import google.registry.model.registrar.Registrar; -import google.registry.model.registry.Registries; +import google.registry.model.tld.Registries; /** Command to initiate a load-test. */ @Parameters(separators = " =", commandDescription = "Run a load test.") diff --git a/core/src/main/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java b/core/src/main/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java index f73dd08b5..0052492c6 100644 --- a/core/src/main/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java +++ b/core/src/main/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java @@ -23,7 +23,7 @@ import com.beust.jcommander.Parameters; import com.googlecode.objectify.Key; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; /** * Command to re-save all environment entities to ensure that they have valid commit logs. diff --git a/core/src/main/java/google/registry/tools/UpdateCursorsCommand.java b/core/src/main/java/google/registry/tools/UpdateCursorsCommand.java index de7dff015..e53d57152 100644 --- a/core/src/main/java/google/registry/tools/UpdateCursorsCommand.java +++ b/core/src/main/java/google/registry/tools/UpdateCursorsCommand.java @@ -22,7 +22,7 @@ import com.beust.jcommander.Parameters; import com.google.common.collect.ImmutableList; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.tools.params.DateTimeParameter; import java.util.List; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/tools/UpdatePremiumListCommand.java b/core/src/main/java/google/registry/tools/UpdatePremiumListCommand.java index 77372ca51..f25d5e355 100644 --- a/core/src/main/java/google/registry/tools/UpdatePremiumListCommand.java +++ b/core/src/main/java/google/registry/tools/UpdatePremiumListCommand.java @@ -24,10 +24,10 @@ import com.beust.jcommander.Parameters; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Streams; -import google.registry.model.registry.label.PremiumList; -import google.registry.model.registry.label.PremiumList.PremiumEntry; -import google.registry.schema.tld.PremiumListDao; -import google.registry.schema.tld.PremiumListUtils; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumList.PremiumEntry; +import google.registry.model.tld.label.PremiumListDao; +import google.registry.model.tld.label.PremiumListUtils; import java.nio.file.Files; import java.util.List; import java.util.Optional; @@ -61,7 +61,7 @@ class UpdatePremiumListCommand extends CreateOrUpdatePremiumListCommand { To get premium list content as a set of string. This is a workaround to avoid dealing with Hibernate.LazyInitizationException error. It occurs when trying to access data of the latest revision of an existing premium list. - "Cannot evaluate google.registry.model.registry.label.PremiumList.toString()'". + "Cannot evaluate google.registry.model.tld.label.PremiumList.toString()'". Ideally, the following should be the way to verify info in latest revision of a premium list: PremiumList existingPremiumList = diff --git a/core/src/main/java/google/registry/tools/UpdateReservedListCommand.java b/core/src/main/java/google/registry/tools/UpdateReservedListCommand.java index 3e426c75b..c6e34f4c4 100644 --- a/core/src/main/java/google/registry/tools/UpdateReservedListCommand.java +++ b/core/src/main/java/google/registry/tools/UpdateReservedListCommand.java @@ -20,7 +20,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.beust.jcommander.Parameters; import com.google.common.base.Strings; import com.googlecode.objectify.Key; -import google.registry.model.registry.label.ReservedList; +import google.registry.model.tld.label.ReservedList; import google.registry.persistence.VKey; import java.nio.file.Files; import java.util.List; diff --git a/core/src/main/java/google/registry/tools/UpdateTldCommand.java b/core/src/main/java/google/registry/tools/UpdateTldCommand.java index 1f482dd53..045de6421 100644 --- a/core/src/main/java/google/registry/tools/UpdateTldCommand.java +++ b/core/src/main/java/google/registry/tools/UpdateTldCommand.java @@ -18,7 +18,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Sets.difference; import static com.google.common.collect.Sets.intersection; import static com.google.common.collect.Sets.union; -import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.model.tld.Registries.assertTldExists; import static google.registry.util.CollectionUtils.nullToEmpty; import com.beust.jcommander.Parameter; @@ -26,8 +26,8 @@ import com.beust.jcommander.Parameters; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import google.registry.config.RegistryEnvironment; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/core/src/main/java/google/registry/tools/javascrap/BackfillRegistryLocksCommand.java b/core/src/main/java/google/registry/tools/javascrap/BackfillRegistryLocksCommand.java index dba4c1b6c..d5d236cb8 100644 --- a/core/src/main/java/google/registry/tools/javascrap/BackfillRegistryLocksCommand.java +++ b/core/src/main/java/google/registry/tools/javascrap/BackfillRegistryLocksCommand.java @@ -30,9 +30,9 @@ import com.google.common.collect.Streams; import com.google.common.flogger.FluentLogger; import google.registry.config.RegistryConfig.Config; import google.registry.model.domain.DomainBase; -import google.registry.model.registry.RegistryLockDao; import google.registry.model.reporting.HistoryEntry; import google.registry.model.reporting.HistoryEntryDao; +import google.registry.model.tld.RegistryLockDao; import google.registry.persistence.VKey; import google.registry.schema.domain.RegistryLock; import google.registry.tools.CommandWithRemoteApi; diff --git a/core/src/main/java/google/registry/tools/javascrap/ResaveAllTldsCommand.java b/core/src/main/java/google/registry/tools/javascrap/ResaveAllTldsCommand.java index b912a453e..907afbcba 100644 --- a/core/src/main/java/google/registry/tools/javascrap/ResaveAllTldsCommand.java +++ b/core/src/main/java/google/registry/tools/javascrap/ResaveAllTldsCommand.java @@ -17,7 +17,7 @@ package google.registry.tools.javascrap; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import com.beust.jcommander.Parameters; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.tools.CommandWithRemoteApi; /** Scrap command to resave all Registry entities. */ diff --git a/core/src/main/java/google/registry/tools/params/TldStateParameter.java b/core/src/main/java/google/registry/tools/params/TldStateParameter.java index 7fc3e11b0..fab0bd444 100644 --- a/core/src/main/java/google/registry/tools/params/TldStateParameter.java +++ b/core/src/main/java/google/registry/tools/params/TldStateParameter.java @@ -14,7 +14,7 @@ package google.registry.tools.params; -import google.registry.model.registry.Registry.TldState; +import google.registry.model.tld.Registry.TldState; /** * {@link TldState} CLI parameter converter/validator. Required to support multi-value diff --git a/core/src/main/java/google/registry/tools/params/TransitionListParameter.java b/core/src/main/java/google/registry/tools/params/TransitionListParameter.java index 9a8018dc0..6cb27c261 100644 --- a/core/src/main/java/google/registry/tools/params/TransitionListParameter.java +++ b/core/src/main/java/google/registry/tools/params/TransitionListParameter.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Ordering; import google.registry.model.common.DatabaseMigrationStateSchedule.MigrationState; import google.registry.model.domain.token.AllocationToken.TokenStatus; -import google.registry.model.registry.Registry.TldState; +import google.registry.model.tld.Registry.TldState; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/tools/server/CreatePremiumListAction.java b/core/src/main/java/google/registry/tools/server/CreatePremiumListAction.java index e334d331e..45315ec05 100644 --- a/core/src/main/java/google/registry/tools/server/CreatePremiumListAction.java +++ b/core/src/main/java/google/registry/tools/server/CreatePremiumListAction.java @@ -15,16 +15,16 @@ package google.registry.tools.server; import static com.google.common.base.Preconditions.checkArgument; -import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.model.tld.Registries.assertTldExists; import static google.registry.request.Action.Method.POST; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import com.google.common.flogger.FluentLogger; +import google.registry.model.tld.label.PremiumListDao; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.auth.Auth; -import google.registry.schema.tld.PremiumListDao; import java.util.List; import javax.inject.Inject; import org.joda.money.CurrencyUnit; diff --git a/core/src/main/java/google/registry/tools/server/ListDomainsAction.java b/core/src/main/java/google/registry/tools/server/ListDomainsAction.java index 0d63f93bd..8936e2e4f 100644 --- a/core/src/main/java/google/registry/tools/server/ListDomainsAction.java +++ b/core/src/main/java/google/registry/tools/server/ListDomainsAction.java @@ -17,7 +17,7 @@ package google.registry.tools.server; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static google.registry.model.ofy.ObjectifyService.auditedOfy; -import static google.registry.model.registry.Registries.assertTldsExist; +import static google.registry.model.tld.Registries.assertTldsExist; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.request.Action.Method.GET; diff --git a/core/src/main/java/google/registry/tools/server/ListPremiumListsAction.java b/core/src/main/java/google/registry/tools/server/ListPremiumListsAction.java index fc5c475b8..dc7854daf 100644 --- a/core/src/main/java/google/registry/tools/server/ListPremiumListsAction.java +++ b/core/src/main/java/google/registry/tools/server/ListPremiumListsAction.java @@ -20,10 +20,10 @@ import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.POST; import com.google.common.collect.ImmutableSet; -import google.registry.model.registry.label.PremiumList; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumListDao; import google.registry.request.Action; import google.registry.request.auth.Auth; -import google.registry.schema.tld.PremiumListDao; import java.util.Comparator; import java.util.Optional; import javax.inject.Inject; diff --git a/core/src/main/java/google/registry/tools/server/ListReservedListsAction.java b/core/src/main/java/google/registry/tools/server/ListReservedListsAction.java index e43981733..b8f2ee826 100644 --- a/core/src/main/java/google/registry/tools/server/ListReservedListsAction.java +++ b/core/src/main/java/google/registry/tools/server/ListReservedListsAction.java @@ -20,8 +20,8 @@ import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.POST; import com.google.common.collect.ImmutableSet; -import google.registry.model.registry.label.ReservedList; -import google.registry.model.registry.label.ReservedListDao; +import google.registry.model.tld.label.ReservedList; +import google.registry.model.tld.label.ReservedListDao; import google.registry.request.Action; import google.registry.request.auth.Auth; import java.util.Comparator; diff --git a/core/src/main/java/google/registry/tools/server/ListTldsAction.java b/core/src/main/java/google/registry/tools/server/ListTldsAction.java index 05c3424f2..7d6eaff25 100644 --- a/core/src/main/java/google/registry/tools/server/ListTldsAction.java +++ b/core/src/main/java/google/registry/tools/server/ListTldsAction.java @@ -15,14 +15,14 @@ package google.registry.tools.server; import static com.google.common.collect.ImmutableSet.toImmutableSet; -import static google.registry.model.registry.Registries.getTlds; +import static google.registry.model.tld.Registries.getTlds; import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.POST; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.request.Action; import google.registry.request.auth.Auth; import google.registry.util.Clock; diff --git a/core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java b/core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java index fc77fedf5..289ed35c1 100644 --- a/core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java +++ b/core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java @@ -17,7 +17,7 @@ package google.registry.tools.server; import static com.google.common.base.Preconditions.checkArgument; import static google.registry.mapreduce.inputs.EppResourceInputs.createEntityInput; import static google.registry.model.EppResourceUtils.isActive; -import static google.registry.model.registry.Registries.assertTldsExist; +import static google.registry.model.tld.Registries.assertTldsExist; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.request.RequestParameters.PARAM_TLDS; diff --git a/core/src/main/java/google/registry/tools/server/UpdatePremiumListAction.java b/core/src/main/java/google/registry/tools/server/UpdatePremiumListAction.java index 93ac07608..d2fc664c5 100644 --- a/core/src/main/java/google/registry/tools/server/UpdatePremiumListAction.java +++ b/core/src/main/java/google/registry/tools/server/UpdatePremiumListAction.java @@ -20,10 +20,10 @@ import static google.registry.request.Action.Method.POST; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import com.google.common.flogger.FluentLogger; -import google.registry.model.registry.label.PremiumList; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumListDao; import google.registry.request.Action; import google.registry.request.auth.Auth; -import google.registry.schema.tld.PremiumListDao; import java.util.List; import java.util.Optional; import javax.inject.Inject; diff --git a/core/src/main/java/google/registry/ui/server/registrar/RegistryLockGetAction.java b/core/src/main/java/google/registry/ui/server/registrar/RegistryLockGetAction.java index ac047f4e6..87bd47186 100644 --- a/core/src/main/java/google/registry/ui/server/registrar/RegistryLockGetAction.java +++ b/core/src/main/java/google/registry/ui/server/registrar/RegistryLockGetAction.java @@ -31,7 +31,7 @@ import com.google.common.net.MediaType; import com.google.gson.Gson; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; -import google.registry.model.registry.RegistryLockDao; +import google.registry.model.tld.RegistryLockDao; import google.registry.request.Action; import google.registry.request.Action.Method; import google.registry.request.Parameter; diff --git a/core/src/main/java/google/registry/whois/DomainOrHostLookupCommand.java b/core/src/main/java/google/registry/whois/DomainOrHostLookupCommand.java index f97d46e30..b73ffb5bc 100644 --- a/core/src/main/java/google/registry/whois/DomainOrHostLookupCommand.java +++ b/core/src/main/java/google/registry/whois/DomainOrHostLookupCommand.java @@ -15,8 +15,8 @@ package google.registry.whois; import static com.google.common.base.Preconditions.checkNotNull; -import static google.registry.model.registry.Registries.findTldForName; -import static google.registry.model.registry.Registries.getTlds; +import static google.registry.model.tld.Registries.findTldForName; +import static google.registry.model.tld.Registries.getTlds; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.common.annotations.VisibleForTesting; diff --git a/core/src/main/java/google/registry/whois/NameserverLookupByIpCommand.java b/core/src/main/java/google/registry/whois/NameserverLookupByIpCommand.java index 8abfe9cd8..bb086de24 100644 --- a/core/src/main/java/google/registry/whois/NameserverLookupByIpCommand.java +++ b/core/src/main/java/google/registry/whois/NameserverLookupByIpCommand.java @@ -27,7 +27,7 @@ import com.google.common.collect.Streams; import com.google.common.net.InetAddresses; import com.google.common.net.InternetDomainName; import google.registry.model.host.HostResource; -import google.registry.model.registry.Registries; +import google.registry.model.tld.Registries; import java.net.InetAddress; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/whois/WhoisReader.java b/core/src/main/java/google/registry/whois/WhoisReader.java index 49038af24..d955d31c2 100644 --- a/core/src/main/java/google/registry/whois/WhoisReader.java +++ b/core/src/main/java/google/registry/whois/WhoisReader.java @@ -16,7 +16,7 @@ package google.registry.whois; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Strings.isNullOrEmpty; -import static google.registry.model.registry.Registries.findTldForName; +import static google.registry.model.tld.Registries.findTldForName; import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; diff --git a/core/src/main/resources/META-INF/persistence.xml b/core/src/main/resources/META-INF/persistence.xml index c897a0c51..6463928c9 100644 --- a/core/src/main/resources/META-INF/persistence.xml +++ b/core/src/main/resources/META-INF/persistence.xml @@ -59,11 +59,11 @@ google.registry.model.rde.RdeRevision google.registry.model.registrar.Registrar google.registry.model.registrar.RegistrarContact - google.registry.model.registry.label.PremiumList - google.registry.model.registry.label.PremiumList$PremiumEntry - google.registry.model.registry.label.ReservedList - google.registry.model.registry.label.ReservedList$ReservedListEntry - google.registry.model.registry.Registry + google.registry.model.tld.label.PremiumList + google.registry.model.tld.label.PremiumList$PremiumEntry + google.registry.model.tld.label.ReservedList + google.registry.model.tld.label.ReservedList$ReservedListEntry + google.registry.model.tld.Registry google.registry.model.reporting.DomainTransactionRecord google.registry.model.reporting.Spec11ThreatMatch google.registry.model.server.Lock diff --git a/core/src/test/java/google/registry/backup/CommitLogCheckpointStrategyTest.java b/core/src/test/java/google/registry/backup/CommitLogCheckpointStrategyTest.java index 769abeda7..9500f81f6 100644 --- a/core/src/test/java/google/registry/backup/CommitLogCheckpointStrategyTest.java +++ b/core/src/test/java/google/registry/backup/CommitLogCheckpointStrategyTest.java @@ -28,7 +28,7 @@ import google.registry.model.ofy.CommitLogBucket; import google.registry.model.ofy.CommitLogCheckpoint; import google.registry.model.ofy.DatastoreTransactionManager; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.persistence.transaction.TransactionManager; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; diff --git a/core/src/test/java/google/registry/backup/ReplayCommitLogsToSqlActionTest.java b/core/src/test/java/google/registry/backup/ReplayCommitLogsToSqlActionTest.java index b70991173..2664536aa 100644 --- a/core/src/test/java/google/registry/backup/ReplayCommitLogsToSqlActionTest.java +++ b/core/src/test/java/google/registry/backup/ReplayCommitLogsToSqlActionTest.java @@ -56,10 +56,10 @@ import google.registry.model.ofy.CommitLogBucket; import google.registry.model.ofy.CommitLogManifest; import google.registry.model.ofy.CommitLogMutation; import google.registry.model.registrar.RegistrarContact; -import google.registry.model.registry.label.PremiumList; -import google.registry.model.registry.label.PremiumList.PremiumEntry; -import google.registry.model.registry.label.ReservedList; import google.registry.model.server.Lock; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumList.PremiumEntry; +import google.registry.model.tld.label.ReservedList; import google.registry.model.tmch.ClaimsList; import google.registry.model.translators.VKeyTranslatorFactory; import google.registry.persistence.VKey; diff --git a/core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java b/core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java index f64fccb25..4102f9986 100644 --- a/core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java +++ b/core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java @@ -84,9 +84,9 @@ import google.registry.model.poll.PendingActionNotificationResponse.ContactPendi import google.registry.model.poll.PendingActionNotificationResponse.HostPendingActionNotificationResponse; import google.registry.model.poll.PollMessage; import google.registry.model.poll.PollMessage.OneTime; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; import google.registry.model.server.Lock; +import google.registry.model.tld.Registry; import google.registry.model.transfer.ContactTransferData; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferResponse; diff --git a/core/src/test/java/google/registry/batch/DeleteProberDataActionTest.java b/core/src/test/java/google/registry/batch/DeleteProberDataActionTest.java index be6bb6a12..a24c4fc39 100644 --- a/core/src/test/java/google/registry/batch/DeleteProberDataActionTest.java +++ b/core/src/test/java/google/registry/batch/DeleteProberDataActionTest.java @@ -43,9 +43,9 @@ import google.registry.model.domain.DomainHistory; import google.registry.model.index.EppResourceIndex; import google.registry.model.index.ForeignKeyIndex; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import google.registry.testing.FakeResponse; import google.registry.testing.SystemPropertyExtension; import google.registry.testing.mapreduce.MapreduceTestCase; diff --git a/core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java b/core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java index 6e8bb6739..fcf4c4836 100644 --- a/core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java +++ b/core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java @@ -49,10 +49,10 @@ import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainHistory; import google.registry.model.domain.Period; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.testing.DualDatabaseTest; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; diff --git a/core/src/test/java/google/registry/beam/common/RegistryJpaReadTest.java b/core/src/test/java/google/registry/beam/common/RegistryJpaReadTest.java index d74d54c02..632b56a71 100644 --- a/core/src/test/java/google/registry/beam/common/RegistryJpaReadTest.java +++ b/core/src/test/java/google/registry/beam/common/RegistryJpaReadTest.java @@ -36,7 +36,7 @@ import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.eppcommon.AuthInfo.PasswordAuth; import google.registry.model.eppcommon.StatusValue; import google.registry.model.registrar.Registrar; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.model.transfer.ContactTransferData; import google.registry.persistence.transaction.CriteriaQueryBuilder; import google.registry.persistence.transaction.JpaTestRules; diff --git a/core/src/test/java/google/registry/beam/initsql/BackupTestStoreTest.java b/core/src/test/java/google/registry/beam/initsql/BackupTestStoreTest.java index d99d80621..54db3badd 100644 --- a/core/src/test/java/google/registry/beam/initsql/BackupTestStoreTest.java +++ b/core/src/test/java/google/registry/beam/initsql/BackupTestStoreTest.java @@ -32,7 +32,7 @@ import google.registry.model.contact.ContactResource; import google.registry.model.domain.DesignatedContact; import google.registry.model.domain.DomainBase; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.persistence.VKey; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationTestExtension; diff --git a/core/src/test/java/google/registry/beam/initsql/CommitLogTransformsTest.java b/core/src/test/java/google/registry/beam/initsql/CommitLogTransformsTest.java index 15ea045c4..69c9a8a0c 100644 --- a/core/src/test/java/google/registry/beam/initsql/CommitLogTransformsTest.java +++ b/core/src/test/java/google/registry/beam/initsql/CommitLogTransformsTest.java @@ -25,7 +25,7 @@ import google.registry.beam.TestPipelineExtension; import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainBase; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationTestExtension; import google.registry.testing.DatastoreEntityExtension; diff --git a/core/src/test/java/google/registry/beam/initsql/ExportLoadingTransformsTest.java b/core/src/test/java/google/registry/beam/initsql/ExportLoadingTransformsTest.java index af659a1f9..794a0b8ed 100644 --- a/core/src/test/java/google/registry/beam/initsql/ExportLoadingTransformsTest.java +++ b/core/src/test/java/google/registry/beam/initsql/ExportLoadingTransformsTest.java @@ -26,7 +26,7 @@ import google.registry.beam.TestPipelineExtension; import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainBase; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationTestExtension; import google.registry.testing.DatastoreEntityExtension; diff --git a/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java b/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java index 6ca9a8694..c3d7e40cc 100644 --- a/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java +++ b/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java @@ -52,8 +52,8 @@ import google.registry.model.ofy.Ofy; import google.registry.model.poll.PollMessage; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferStatus; import google.registry.persistence.VKey; diff --git a/core/src/test/java/google/registry/beam/initsql/LoadDatastoreSnapshotTest.java b/core/src/test/java/google/registry/beam/initsql/LoadDatastoreSnapshotTest.java index 9eb72f23a..cde6d419e 100644 --- a/core/src/test/java/google/registry/beam/initsql/LoadDatastoreSnapshotTest.java +++ b/core/src/test/java/google/registry/beam/initsql/LoadDatastoreSnapshotTest.java @@ -28,7 +28,7 @@ import google.registry.model.domain.DomainAuthInfo; import google.registry.model.domain.DomainBase; import google.registry.model.eppcommon.AuthInfo.PasswordAuth; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationTestExtension; import google.registry.testing.DatastoreEntityExtension; diff --git a/core/src/test/java/google/registry/beam/invoicing/InvoicingPipelineTest.java b/core/src/test/java/google/registry/beam/invoicing/InvoicingPipelineTest.java index 0acc2be4e..bb7a4e14b 100644 --- a/core/src/test/java/google/registry/beam/invoicing/InvoicingPipelineTest.java +++ b/core/src/test/java/google/registry/beam/invoicing/InvoicingPipelineTest.java @@ -16,7 +16,7 @@ package google.registry.beam.invoicing; import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.truth.Truth.assertThat; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import static google.registry.persistence.transaction.TransactionManagerFactory.removeTmOverrideForTest; import static google.registry.persistence.transaction.TransactionManagerFactory.setTmForTest; @@ -41,8 +41,8 @@ import google.registry.model.billing.BillingEvent.Recurring; import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainHistory; import google.registry.model.registrar.Registrar; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationTestExtension; import google.registry.testing.DatastoreEntityExtension; diff --git a/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java b/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java index e5d88e341..233d8a319 100644 --- a/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java +++ b/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java @@ -60,7 +60,7 @@ import google.registry.model.rde.RdeRevision; import google.registry.model.rde.RdeRevision.RdeRevisionId; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar.State; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.persistence.VKey; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationTestExtension; diff --git a/core/src/test/java/google/registry/cron/TldFanoutActionTest.java b/core/src/test/java/google/registry/cron/TldFanoutActionTest.java index 4d771c6c4..1e38d16c3 100644 --- a/core/src/test/java/google/registry/cron/TldFanoutActionTest.java +++ b/core/src/test/java/google/registry/cron/TldFanoutActionTest.java @@ -29,8 +29,8 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableSet; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeResponse; import google.registry.testing.TaskQueueHelper.TaskMatcher; diff --git a/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java b/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java index de0961e86..1a21fbbad 100644 --- a/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java +++ b/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java @@ -35,7 +35,7 @@ import google.registry.dns.DnsMetrics.PublishStatus; import google.registry.dns.writer.DnsWriter; import google.registry.model.domain.DomainBase; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.request.HttpException.ServiceUnavailableException; import google.registry.request.lock.LockHandler; import google.registry.testing.AppEngineExtension; diff --git a/core/src/test/java/google/registry/dns/ReadDnsQueueActionTest.java b/core/src/test/java/google/registry/dns/ReadDnsQueueActionTest.java index 27d5ede13..26cce45d5 100644 --- a/core/src/test/java/google/registry/dns/ReadDnsQueueActionTest.java +++ b/core/src/test/java/google/registry/dns/ReadDnsQueueActionTest.java @@ -43,8 +43,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.hash.Hashing; import com.google.common.net.InternetDomainName; import google.registry.dns.DnsConstants.TargetType; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.TaskQueueHelper.TaskMatcher; diff --git a/core/src/test/java/google/registry/export/ExportDomainListsActionTest.java b/core/src/test/java/google/registry/export/ExportDomainListsActionTest.java index 7d5d5dddc..53f3d787a 100644 --- a/core/src/test/java/google/registry/export/ExportDomainListsActionTest.java +++ b/core/src/test/java/google/registry/export/ExportDomainListsActionTest.java @@ -35,8 +35,8 @@ import com.google.common.net.MediaType; import google.registry.export.ExportDomainListsAction.ExportDomainListsReducer; import google.registry.gcs.GcsUtils; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import google.registry.storage.drive.DriveConnection; import google.registry.testing.DualDatabaseTest; import google.registry.testing.FakeClock; diff --git a/core/src/test/java/google/registry/export/ExportPremiumTermsActionTest.java b/core/src/test/java/google/registry/export/ExportPremiumTermsActionTest.java index 29f0e7775..efeb17a45 100644 --- a/core/src/test/java/google/registry/export/ExportPremiumTermsActionTest.java +++ b/core/src/test/java/google/registry/export/ExportPremiumTermsActionTest.java @@ -36,10 +36,10 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; import com.google.common.net.MediaType; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.PremiumList; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumListDao; import google.registry.request.Response; -import google.registry.schema.tld.PremiumListDao; import google.registry.storage.drive.DriveConnection; import google.registry.testing.AppEngineExtension; import java.io.IOException; diff --git a/core/src/test/java/google/registry/export/ExportReservedTermsActionTest.java b/core/src/test/java/google/registry/export/ExportReservedTermsActionTest.java index da529909b..83ec241d0 100644 --- a/core/src/test/java/google/registry/export/ExportReservedTermsActionTest.java +++ b/core/src/test/java/google/registry/export/ExportReservedTermsActionTest.java @@ -32,8 +32,8 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableSet; import com.google.common.net.MediaType; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.ReservedList; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.ReservedList; import google.registry.request.Response; import google.registry.storage.drive.DriveConnection; import google.registry.testing.AppEngineExtension; diff --git a/core/src/test/java/google/registry/export/ExportUtilsTest.java b/core/src/test/java/google/registry/export/ExportUtilsTest.java index 9761a4aa9..149355e30 100644 --- a/core/src/test/java/google/registry/export/ExportUtilsTest.java +++ b/core/src/test/java/google/registry/export/ExportUtilsTest.java @@ -19,8 +19,8 @@ import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.persistReservedList; import static google.registry.testing.DatabaseHelper.persistResource; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.ReservedList; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.ReservedList; import google.registry.testing.AppEngineExtension; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/flows/CheckApiActionTest.java b/core/src/test/java/google/registry/flows/CheckApiActionTest.java index 85b4f4b9e..c520c4b88 100644 --- a/core/src/test/java/google/registry/flows/CheckApiActionTest.java +++ b/core/src/test/java/google/registry/flows/CheckApiActionTest.java @@ -16,7 +16,7 @@ package google.registry.flows; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; -import static google.registry.model.registry.Registry.TldState.PREDELEGATION; +import static google.registry.model.tld.Registry.TldState.PREDELEGATION; import static google.registry.monitoring.whitebox.CheckApiMetric.Availability.AVAILABLE; import static google.registry.monitoring.whitebox.CheckApiMetric.Availability.REGISTERED; import static google.registry.monitoring.whitebox.CheckApiMetric.Availability.RESERVED; @@ -28,7 +28,7 @@ import static google.registry.testing.DatabaseHelper.persistReservedList; import static google.registry.testing.DatabaseHelper.persistResource; import static org.mockito.Mockito.verify; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.monitoring.whitebox.CheckApiMetric; import google.registry.monitoring.whitebox.CheckApiMetric.Availability; import google.registry.monitoring.whitebox.CheckApiMetric.Status; diff --git a/core/src/test/java/google/registry/flows/EppLifecycleDomainTest.java b/core/src/test/java/google/registry/flows/EppLifecycleDomainTest.java index d0f099dd1..60e3f3da7 100644 --- a/core/src/test/java/google/registry/flows/EppLifecycleDomainTest.java +++ b/core/src/test/java/google/registry/flows/EppLifecycleDomainTest.java @@ -18,9 +18,9 @@ import static google.registry.model.EppResourceUtils.loadByForeignKey; import static google.registry.model.eppoutput.Result.Code.SUCCESS; import static google.registry.model.eppoutput.Result.Code.SUCCESS_AND_CLOSE; import static google.registry.model.eppoutput.Result.Code.SUCCESS_WITH_ACTION_PENDING; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; -import static google.registry.model.registry.Registry.TldState.PREDELEGATION; -import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.PREDELEGATION; +import static google.registry.model.tld.Registry.TldState.START_DATE_SUNRISE; import static google.registry.testing.DatabaseHelper.assertBillingEventsForResource; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.createTlds; @@ -43,9 +43,9 @@ import google.registry.model.billing.BillingEvent.OneTime; import google.registry.model.billing.BillingEvent.Reason; import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainHistory; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; import google.registry.model.reporting.HistoryEntry.Type; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; import google.registry.testing.AppEngineExtension; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; diff --git a/core/src/test/java/google/registry/flows/EppTestCase.java b/core/src/test/java/google/registry/flows/EppTestCase.java index 50e37623e..6331d68aa 100644 --- a/core/src/test/java/google/registry/flows/EppTestCase.java +++ b/core/src/test/java/google/registry/flows/EppTestCase.java @@ -38,8 +38,8 @@ import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainHistory; import google.registry.model.eppcommon.EppXmlTransformer; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry.Type; +import google.registry.model.tld.Registry; import google.registry.monitoring.whitebox.EppMetric; import google.registry.persistence.VKey; import google.registry.testing.FakeClock; diff --git a/core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java index d73a2eee8..6d1a64fb2 100644 --- a/core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java +++ b/core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java @@ -45,9 +45,9 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppcommon.Trid; import google.registry.model.poll.PendingActionNotificationResponse; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; import google.registry.model.reporting.HistoryEntry.Type; +import google.registry.model.tld.Registry; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferResponse; import google.registry.model.transfer.TransferStatus; diff --git a/core/src/test/java/google/registry/flows/contact/ContactTransferFlowTestCase.java b/core/src/test/java/google/registry/flows/contact/ContactTransferFlowTestCase.java index f17c223cf..f25bed74e 100644 --- a/core/src/test/java/google/registry/flows/contact/ContactTransferFlowTestCase.java +++ b/core/src/test/java/google/registry/flows/contact/ContactTransferFlowTestCase.java @@ -23,7 +23,7 @@ import google.registry.flows.Flow; import google.registry.flows.ResourceFlowTestCase; import google.registry.model.EppResource; import google.registry.model.contact.ContactResource; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.model.transfer.TransferStatus; import google.registry.testing.AppEngineExtension; import org.joda.time.DateTime; diff --git a/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java index 3b5e489b4..1a00c6f86 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java @@ -17,8 +17,8 @@ package google.registry.flows.domain; import static google.registry.model.domain.token.AllocationToken.TokenType.SINGLE_USE; import static google.registry.model.domain.token.AllocationToken.TokenType.UNLIMITED_USE; import static google.registry.model.eppoutput.CheckData.DomainCheck.create; -import static google.registry.model.registry.Registry.TldState.PREDELEGATION; -import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE; +import static google.registry.model.tld.Registry.TldState.PREDELEGATION; +import static google.registry.model.tld.Registry.TldState.START_DATE_SUNRISE; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.createTlds; import static google.registry.testing.DatabaseHelper.loadRegistrar; @@ -67,10 +67,10 @@ import google.registry.model.domain.DomainBase; import google.registry.model.domain.token.AllocationToken; import google.registry.model.domain.token.AllocationToken.TokenStatus; import google.registry.model.eppcommon.StatusValue; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; -import google.registry.model.registry.label.ReservedList; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; +import google.registry.model.tld.label.ReservedList; import google.registry.testing.DualDatabaseTest; import google.registry.testing.ReplayExtension; import google.registry.testing.SetClockExtension; diff --git a/core/src/test/java/google/registry/flows/domain/DomainClaimsCheckFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainClaimsCheckFlowTest.java index 18c765942..a480fc198 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainClaimsCheckFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainClaimsCheckFlowTest.java @@ -14,7 +14,7 @@ package google.registry.flows.domain; -import static google.registry.model.registry.Registry.TldState.PREDELEGATION; +import static google.registry.model.tld.Registry.TldState.PREDELEGATION; import static google.registry.testing.DatabaseHelper.assertNoBillingEvents; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.createTlds; @@ -34,8 +34,8 @@ import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException import google.registry.flows.domain.DomainFlowUtils.TldDoesNotExistException; import google.registry.flows.exceptions.TooManyResourceChecksException; import google.registry.model.domain.DomainBase; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; import google.registry.testing.DualDatabaseTest; import google.registry.testing.ReplayExtension; import google.registry.testing.TestOfyAndSql; diff --git a/core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java index f64178739..10335c4ec 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java @@ -26,10 +26,10 @@ import static google.registry.model.domain.token.AllocationToken.TokenType.SINGL import static google.registry.model.domain.token.AllocationToken.TokenType.UNLIMITED_USE; import static google.registry.model.eppcommon.StatusValue.PENDING_DELETE; import static google.registry.model.eppcommon.StatusValue.SERVER_HOLD; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; -import static google.registry.model.registry.Registry.TldState.PREDELEGATION; -import static google.registry.model.registry.Registry.TldState.QUIET_PERIOD; -import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.PREDELEGATION; +import static google.registry.model.tld.Registry.TldState.QUIET_PERIOD; +import static google.registry.model.tld.Registry.TldState.START_DATE_SUNRISE; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm; import static google.registry.pricing.PricingEngineProxy.isDomainPremium; @@ -156,12 +156,12 @@ import google.registry.model.poll.PendingActionNotificationResponse.DomainPendin import google.registry.model.poll.PollMessage; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar.State; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; -import google.registry.model.registry.Registry.TldType; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; +import google.registry.model.tld.Registry.TldType; import google.registry.monitoring.whitebox.EppMetric; import google.registry.persistence.VKey; import google.registry.testing.DualDatabaseTest; diff --git a/core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java index b44c5d4ca..abb2e97f0 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java @@ -23,7 +23,6 @@ import static google.registry.batch.AsyncTaskEnqueuer.PARAM_RESOURCE_KEY; import static google.registry.batch.AsyncTaskEnqueuer.QUEUE_ASYNC_ACTIONS; import static google.registry.flows.domain.DomainTransferFlowTestCase.persistWithPendingTransfer; import static google.registry.model.EppResourceUtils.loadByForeignKey; -import static google.registry.model.registry.Registry.TldState.PREDELEGATION; import static google.registry.model.reporting.DomainTransactionRecord.TransactionReportField.DELETED_DOMAINS_GRACE; import static google.registry.model.reporting.DomainTransactionRecord.TransactionReportField.DELETED_DOMAINS_NOGRACE; import static google.registry.model.reporting.DomainTransactionRecord.TransactionReportField.NET_ADDS_10_YR; @@ -33,6 +32,7 @@ import static google.registry.model.reporting.DomainTransactionRecord.Transactio import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_CREATE; import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_DELETE; import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_TRANSFER_REQUEST; +import static google.registry.model.tld.Registry.TldState.PREDELEGATION; import static google.registry.testing.DatabaseHelper.assertBillingEvents; import static google.registry.testing.DatabaseHelper.assertPollMessages; import static google.registry.testing.DatabaseHelper.createTld; @@ -94,10 +94,10 @@ import google.registry.model.host.HostResource; import google.registry.model.poll.PendingActionNotificationResponse; import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferResponse; import google.registry.model.transfer.TransferStatus; diff --git a/core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java index 7c6857d0f..63960e016 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java @@ -16,7 +16,7 @@ package google.registry.flows.domain; import static com.google.common.io.BaseEncoding.base16; import static com.google.common.truth.Truth.assertThat; -import static google.registry.model.registry.Registry.TldState.QUIET_PERIOD; +import static google.registry.model.tld.Registry.TldState.QUIET_PERIOD; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.DatabaseHelper.assertNoBillingEvents; import static google.registry.testing.DatabaseHelper.createTld; @@ -62,8 +62,8 @@ import google.registry.model.eppcommon.AuthInfo.PasswordAuth; import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; import google.registry.model.ofy.RequestCapturingAsyncDatastoreService; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.persistence.VKey; import google.registry.testing.AppEngineExtension; import google.registry.testing.DualDatabaseTest; diff --git a/core/src/test/java/google/registry/flows/domain/DomainRenewFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainRenewFlowTest.java index 3067060aa..c183dfadb 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainRenewFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainRenewFlowTest.java @@ -68,10 +68,10 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.poll.PollMessage; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar.State; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.testing.DualDatabaseTest; import google.registry.testing.ReplayExtension; import google.registry.testing.SetClockExtension; diff --git a/core/src/test/java/google/registry/flows/domain/DomainRestoreRequestFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainRestoreRequestFlowTest.java index 0d92a6459..aa4998883 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainRestoreRequestFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainRestoreRequestFlowTest.java @@ -68,10 +68,10 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.poll.PollMessage; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar.State; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.testing.DualDatabaseTest; import google.registry.testing.ReplayExtension; import google.registry.testing.TestOfyAndSql; diff --git a/core/src/test/java/google/registry/flows/domain/DomainTransferApproveFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainTransferApproveFlowTest.java index c43dc82f8..e4fec138a 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainTransferApproveFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainTransferApproveFlowTest.java @@ -65,9 +65,9 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppcommon.Trid; import google.registry.model.poll.PendingActionNotificationResponse; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferResponse.DomainTransferResponse; import google.registry.model.transfer.TransferStatus; diff --git a/core/src/test/java/google/registry/flows/domain/DomainTransferCancelFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainTransferCancelFlowTest.java index c5f2f6c9e..184208057 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainTransferCancelFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainTransferCancelFlowTest.java @@ -49,9 +49,9 @@ import google.registry.model.domain.DomainHistory; import google.registry.model.domain.GracePeriod; import google.registry.model.eppcommon.AuthInfo.PasswordAuth; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferResponse.DomainTransferResponse; import google.registry.model.transfer.TransferStatus; diff --git a/core/src/test/java/google/registry/flows/domain/DomainTransferFlowTestCase.java b/core/src/test/java/google/registry/flows/domain/DomainTransferFlowTestCase.java index fd313e3be..fc932c39e 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainTransferFlowTestCase.java +++ b/core/src/test/java/google/registry/flows/domain/DomainTransferFlowTestCase.java @@ -40,8 +40,8 @@ import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainHistory; import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferStatus; import google.registry.testing.AppEngineExtension; diff --git a/core/src/test/java/google/registry/flows/domain/DomainTransferRejectFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainTransferRejectFlowTest.java index 1e243f9bb..77d4c13ad 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainTransferRejectFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainTransferRejectFlowTest.java @@ -51,9 +51,9 @@ import google.registry.model.eppcommon.AuthInfo.PasswordAuth; import google.registry.model.eppcommon.Trid; import google.registry.model.poll.PendingActionNotificationResponse; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferResponse; import google.registry.model.transfer.TransferStatus; diff --git a/core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java index 559194ec8..eb8b7fae3 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java @@ -21,10 +21,10 @@ import static com.google.common.truth.Truth8.assertThat; import static google.registry.batch.AsyncTaskEnqueuer.PARAM_REQUESTED_TIME; import static google.registry.batch.AsyncTaskEnqueuer.PARAM_RESOURCE_KEY; import static google.registry.batch.AsyncTaskEnqueuer.QUEUE_ASYNC_ACTIONS; -import static google.registry.model.registry.Registry.TldState.QUIET_PERIOD; import static google.registry.model.reporting.DomainTransactionRecord.TransactionReportField.TRANSFER_SUCCESSFUL; import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_CREATE; import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_TRANSFER_REQUEST; +import static google.registry.model.tld.Registry.TldState.QUIET_PERIOD; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm; import static google.registry.testing.DatabaseHelper.assertBillingEvents; @@ -98,9 +98,9 @@ import google.registry.model.poll.PendingActionNotificationResponse; import google.registry.model.poll.PollMessage; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar.State; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferResponse; import google.registry.model.transfer.TransferStatus; diff --git a/core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java index 31afb7b23..a2be1060e 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java @@ -20,7 +20,7 @@ import static com.google.common.io.BaseEncoding.base16; import static com.google.common.truth.Truth.assertThat; import static google.registry.model.EppResourceUtils.loadByForeignKey; import static google.registry.model.eppcommon.StatusValue.SERVER_UPDATE_PROHIBITED; -import static google.registry.model.registry.Registry.TldState.QUIET_PERIOD; +import static google.registry.model.tld.Registry.TldState.QUIET_PERIOD; import static google.registry.testing.DatabaseHelper.assertBillingEvents; import static google.registry.testing.DatabaseHelper.assertNoBillingEvents; import static google.registry.testing.DatabaseHelper.createTld; @@ -88,8 +88,8 @@ import google.registry.model.domain.DomainHistory; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.persistence.VKey; import google.registry.testing.DualDatabaseTest; import google.registry.testing.ReplayExtension; diff --git a/core/src/test/java/google/registry/flows/domain/token/AllocationTokenFlowUtilsTest.java b/core/src/test/java/google/registry/flows/domain/token/AllocationTokenFlowUtilsTest.java index bca6177b3..ce8c7f929 100644 --- a/core/src/test/java/google/registry/flows/domain/token/AllocationTokenFlowUtilsTest.java +++ b/core/src/test/java/google/registry/flows/domain/token/AllocationTokenFlowUtilsTest.java @@ -47,8 +47,8 @@ import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainCommand; import google.registry.model.domain.token.AllocationToken; import google.registry.model.domain.token.AllocationToken.TokenStatus; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.testing.AppEngineExtension; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; diff --git a/core/src/test/java/google/registry/flows/host/HostDeleteFlowTest.java b/core/src/test/java/google/registry/flows/host/HostDeleteFlowTest.java index 4be556b73..a106ee2eb 100644 --- a/core/src/test/java/google/registry/flows/host/HostDeleteFlowTest.java +++ b/core/src/test/java/google/registry/flows/host/HostDeleteFlowTest.java @@ -47,8 +47,8 @@ import google.registry.model.domain.DomainBase; import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppcommon.Trid; import google.registry.model.host.HostResource; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry.Type; +import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferStatus; import google.registry.testing.DualDatabaseTest; diff --git a/core/src/test/java/google/registry/flows/host/HostUpdateFlowTest.java b/core/src/test/java/google/registry/flows/host/HostUpdateFlowTest.java index 90c4c2c29..03d45fdbb 100644 --- a/core/src/test/java/google/registry/flows/host/HostUpdateFlowTest.java +++ b/core/src/test/java/google/registry/flows/host/HostUpdateFlowTest.java @@ -74,8 +74,8 @@ import google.registry.model.domain.DomainBase; import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; import google.registry.model.index.ForeignKeyIndex; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferStatus; import google.registry.testing.DualDatabaseTest; diff --git a/core/src/test/java/google/registry/model/OteAccountBuilderTest.java b/core/src/test/java/google/registry/model/OteAccountBuilderTest.java index 009157547..fe7a2f7da 100644 --- a/core/src/test/java/google/registry/model/OteAccountBuilderTest.java +++ b/core/src/test/java/google/registry/model/OteAccountBuilderTest.java @@ -16,8 +16,8 @@ package google.registry.model; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; -import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.START_DATE_SUNRISE; import static google.registry.testing.AppEngineExtension.makeRegistrar1; import static google.registry.testing.CertificateSamples.SAMPLE_CERT; import static google.registry.testing.CertificateSamples.SAMPLE_CERT_HASH; @@ -31,8 +31,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.collect.ImmutableList; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; import google.registry.testing.AppEngineExtension; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; diff --git a/core/src/test/java/google/registry/model/common/CursorTest.java b/core/src/test/java/google/registry/model/common/CursorTest.java index 8de1b0271..f4f6c2109 100644 --- a/core/src/test/java/google/registry/model/common/CursorTest.java +++ b/core/src/test/java/google/registry/model/common/CursorTest.java @@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import google.registry.model.EntityTestCase; import google.registry.model.domain.DomainBase; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; import org.joda.time.DateTime; diff --git a/core/src/test/java/google/registry/model/domain/DomainBaseTest.java b/core/src/test/java/google/registry/model/domain/DomainBaseTest.java index 05b81ae8d..92cd9a332 100644 --- a/core/src/test/java/google/registry/model/domain/DomainBaseTest.java +++ b/core/src/test/java/google/registry/model/domain/DomainBaseTest.java @@ -52,8 +52,8 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppcommon.Trid; import google.registry.model.host.HostResource; import google.registry.model.poll.PollMessage; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferStatus; import google.registry.persistence.VKey; diff --git a/core/src/test/java/google/registry/model/history/DomainHistoryTest.java b/core/src/test/java/google/registry/model/history/DomainHistoryTest.java index 198b3c772..bfd757c9d 100644 --- a/core/src/test/java/google/registry/model/history/DomainHistoryTest.java +++ b/core/src/test/java/google/registry/model/history/DomainHistoryTest.java @@ -17,7 +17,7 @@ package google.registry.model.history; import static com.google.common.truth.Truth.assertThat; import static google.registry.model.ImmutableObjectSubject.assertAboutImmutableObjects; import static google.registry.model.ImmutableObjectSubject.immutableObjectCorrespondence; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.AppEngineExtension.makeRegistrar2; @@ -43,11 +43,11 @@ import google.registry.model.domain.rgp.GracePeriodStatus; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.eppcommon.Trid; import google.registry.model.host.HostResource; -import google.registry.model.registry.Registries; -import google.registry.model.registry.Registry; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registries; +import google.registry.model.tld.Registry; import google.registry.persistence.VKey; import google.registry.testing.DatabaseHelper; import google.registry.testing.DualDatabaseTest; diff --git a/core/src/test/java/google/registry/model/ofy/CommitLogMutationTest.java b/core/src/test/java/google/registry/model/ofy/CommitLogMutationTest.java index 1d1e5585c..4c0de274e 100644 --- a/core/src/test/java/google/registry/model/ofy/CommitLogMutationTest.java +++ b/core/src/test/java/google/registry/model/ofy/CommitLogMutationTest.java @@ -24,7 +24,7 @@ import com.google.appengine.api.datastore.EntityTranslator; import com.google.appengine.api.datastore.KeyFactory; import com.googlecode.objectify.Key; import google.registry.model.ImmutableObject; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.testing.AppEngineExtension; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/core/src/test/java/google/registry/model/registrar/RegistrarTest.java b/core/src/test/java/google/registry/model/registrar/RegistrarTest.java index 5cf2c05b7..572ae48b6 100644 --- a/core/src/test/java/google/registry/model/registrar/RegistrarTest.java +++ b/core/src/test/java/google/registry/model/registrar/RegistrarTest.java @@ -41,7 +41,7 @@ import google.registry.config.RegistryConfig; import google.registry.model.EntityTestCase; import google.registry.model.registrar.Registrar.State; import google.registry.model.registrar.Registrar.Type; -import google.registry.model.registry.Registries; +import google.registry.model.tld.Registries; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; import google.registry.testing.TestOfyOnly; diff --git a/core/src/test/java/google/registry/model/registry/RegistriesTest.java b/core/src/test/java/google/registry/model/tld/RegistriesTest.java similarity index 97% rename from core/src/test/java/google/registry/model/registry/RegistriesTest.java rename to core/src/test/java/google/registry/model/tld/RegistriesTest.java index 1adbc7a55..4173e4a1d 100644 --- a/core/src/test/java/google/registry/model/registry/RegistriesTest.java +++ b/core/src/test/java/google/registry/model/tld/RegistriesTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry; +package google.registry.model.tld; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; @@ -22,7 +22,7 @@ import static google.registry.testing.DatabaseHelper.persistResource; import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.net.InternetDomainName; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registry.TldType; import google.registry.testing.AppEngineExtension; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; diff --git a/core/src/test/java/google/registry/model/registry/RegistryLockDaoTest.java b/core/src/test/java/google/registry/model/tld/RegistryLockDaoTest.java similarity index 99% rename from core/src/test/java/google/registry/model/registry/RegistryLockDaoTest.java rename to core/src/test/java/google/registry/model/tld/RegistryLockDaoTest.java index 09a5725f5..2d8691b78 100644 --- a/core/src/test/java/google/registry/model/registry/RegistryLockDaoTest.java +++ b/core/src/test/java/google/registry/model/tld/RegistryLockDaoTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry; +package google.registry.model.tld; import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.truth.Truth.assertThat; diff --git a/core/src/test/java/google/registry/model/registry/RegistryTest.java b/core/src/test/java/google/registry/model/tld/RegistryTest.java similarity index 97% rename from core/src/test/java/google/registry/model/registry/RegistryTest.java rename to core/src/test/java/google/registry/model/tld/RegistryTest.java index 81b69e08c..c8185eed3 100644 --- a/core/src/test/java/google/registry/model/registry/RegistryTest.java +++ b/core/src/test/java/google/registry/model/tld/RegistryTest.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry; +package google.registry.model.tld; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; import static com.google.common.truth.Truth8.assertThat; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; -import static google.registry.model.registry.Registry.TldState.PREDELEGATION; -import static google.registry.model.registry.Registry.TldState.QUIET_PERIOD; -import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.PREDELEGATION; +import static google.registry.model.tld.Registry.TldState.QUIET_PERIOD; +import static google.registry.model.tld.Registry.TldState.START_DATE_SUNRISE; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.newRegistry; @@ -38,11 +38,11 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import google.registry.dns.writer.VoidDnsWriter; import google.registry.model.EntityTestCase; -import google.registry.model.registry.Registry.RegistryNotFoundException; -import google.registry.model.registry.Registry.TldState; -import google.registry.model.registry.label.PremiumList; -import google.registry.model.registry.label.ReservedList; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.Registry.RegistryNotFoundException; +import google.registry.model.tld.Registry.TldState; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumListDao; +import google.registry.model.tld.label.ReservedList; import google.registry.testing.DatabaseHelper; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; diff --git a/core/src/test/java/google/registry/model/registry/label/GenrulePremiumListTest.java b/core/src/test/java/google/registry/model/tld/label/GenrulePremiumListTest.java similarity index 98% rename from core/src/test/java/google/registry/model/registry/label/GenrulePremiumListTest.java rename to core/src/test/java/google/registry/model/tld/label/GenrulePremiumListTest.java index 3a3364b04..b116b56f2 100644 --- a/core/src/test/java/google/registry/model/registry/label/GenrulePremiumListTest.java +++ b/core/src/test/java/google/registry/model/tld/label/GenrulePremiumListTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry.label; +package google.registry.model.tld.label; import static com.google.common.truth.Truth.assertWithMessage; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/core/src/test/java/google/registry/model/registry/label/GenruleReservedListTest.java b/core/src/test/java/google/registry/model/tld/label/GenruleReservedListTest.java similarity index 98% rename from core/src/test/java/google/registry/model/registry/label/GenruleReservedListTest.java rename to core/src/test/java/google/registry/model/tld/label/GenruleReservedListTest.java index e478ac7e0..c468970c0 100644 --- a/core/src/test/java/google/registry/model/registry/label/GenruleReservedListTest.java +++ b/core/src/test/java/google/registry/model/tld/label/GenruleReservedListTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry.label; +package google.registry.model.tld.label; import static com.google.common.truth.Truth.assertWithMessage; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/core/src/test/java/google/registry/schema/tld/PremiumListDaoTest.java b/core/src/test/java/google/registry/model/tld/label/PremiumListDaoTest.java similarity index 97% rename from core/src/test/java/google/registry/schema/tld/PremiumListDaoTest.java rename to core/src/test/java/google/registry/model/tld/label/PremiumListDaoTest.java index 5c866f60d..d8b4787e5 100644 --- a/core/src/test/java/google/registry/schema/tld/PremiumListDaoTest.java +++ b/core/src/test/java/google/registry/model/tld/label/PremiumListDaoTest.java @@ -12,12 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.tld; +package google.registry.model.tld.label; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; -import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm; import static google.registry.testing.DatabaseHelper.newRegistry; import static google.registry.testing.DatabaseHelper.persistResource; import static org.joda.money.CurrencyUnit.JPY; @@ -26,7 +25,7 @@ import static org.joda.time.Duration.standardDays; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import google.registry.model.registry.label.PremiumList; +import google.registry.persistence.transaction.TransactionManagerUtil; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.TestCacheExtension; @@ -246,7 +245,8 @@ public class PremiumListDaoTest { PremiumListDao.save(testList); PremiumList pl = PremiumListDao.getLatestRevision("testname").get(); assertThat(PremiumListDao.premiumListCache.getIfPresent("testname").get()).isEqualTo(pl); - transactIfJpaTm(() -> PremiumListDao.save("testname", USD, ImmutableList.of("test,USD 1"))); + TransactionManagerUtil.transactIfJpaTm( + () -> PremiumListDao.save("testname", USD, ImmutableList.of("test,USD 1"))); assertThat(PremiumListDao.premiumListCache.getIfPresent("testname")).isNull(); } diff --git a/core/src/test/java/google/registry/model/registry/label/PremiumListTest.java b/core/src/test/java/google/registry/model/tld/label/PremiumListTest.java similarity index 96% rename from core/src/test/java/google/registry/model/registry/label/PremiumListTest.java rename to core/src/test/java/google/registry/model/tld/label/PremiumListTest.java index ee5ea03a1..5070ae10a 100644 --- a/core/src/test/java/google/registry/model/registry/label/PremiumListTest.java +++ b/core/src/test/java/google/registry/model/tld/label/PremiumListTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry.label; +package google.registry.model.tld.label; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; @@ -26,9 +26,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.collect.ImmutableList; import com.google.common.hash.BloomFilter; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.PremiumList.PremiumEntry; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.PremiumList.PremiumEntry; import google.registry.testing.AppEngineExtension; import java.math.BigDecimal; import org.joda.money.Money; diff --git a/core/src/test/java/google/registry/schema/tld/PremiumListUtilsTest.java b/core/src/test/java/google/registry/model/tld/label/PremiumListUtilsTest.java similarity index 92% rename from core/src/test/java/google/registry/schema/tld/PremiumListUtilsTest.java rename to core/src/test/java/google/registry/model/tld/label/PremiumListUtilsTest.java index 811a3df28..c25e7b3d2 100644 --- a/core/src/test/java/google/registry/schema/tld/PremiumListUtilsTest.java +++ b/core/src/test/java/google/registry/model/tld/label/PremiumListUtilsTest.java @@ -12,15 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.tld; +package google.registry.model.tld.label; import static com.google.common.truth.Truth.assertThat; -import static google.registry.schema.tld.PremiumListUtils.parseToPremiumList; +import static google.registry.model.tld.label.PremiumListUtils.parseToPremiumList; import static org.joda.money.CurrencyUnit.USD; import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.collect.ImmutableList; -import google.registry.model.registry.label.PremiumList; import google.registry.testing.AppEngineExtension; import java.math.BigDecimal; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/model/registry/label/ReservedListDaoTest.java b/core/src/test/java/google/registry/model/tld/label/ReservedListDaoTest.java similarity index 97% rename from core/src/test/java/google/registry/model/registry/label/ReservedListDaoTest.java rename to core/src/test/java/google/registry/model/tld/label/ReservedListDaoTest.java index 536a8ec0f..19168ce8d 100644 --- a/core/src/test/java/google/registry/model/registry/label/ReservedListDaoTest.java +++ b/core/src/test/java/google/registry/model/tld/label/ReservedListDaoTest.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry.label; +package google.registry.model.tld.label; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import com.google.common.collect.ImmutableMap; -import google.registry.model.registry.label.ReservedList.ReservedListEntry; +import google.registry.model.tld.label.ReservedList.ReservedListEntry; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationWithCoverageExtension; import google.registry.testing.DatastoreEntityExtension; diff --git a/core/src/test/java/google/registry/model/registry/label/ReservedListTest.java b/core/src/test/java/google/registry/model/tld/label/ReservedListTest.java similarity index 94% rename from core/src/test/java/google/registry/model/registry/label/ReservedListTest.java rename to core/src/test/java/google/registry/model/tld/label/ReservedListTest.java index 4e110133c..e8afc837b 100644 --- a/core/src/test/java/google/registry/model/registry/label/ReservedListTest.java +++ b/core/src/test/java/google/registry/model/tld/label/ReservedListTest.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.registry.label; +package google.registry.model.tld.label; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; import static com.google.monitoring.metrics.contrib.DistributionMetricSubject.assertThat; import static com.google.monitoring.metrics.contrib.LongMetricSubject.assertThat; -import static google.registry.model.registry.label.DomainLabelMetrics.reservedListChecks; -import static google.registry.model.registry.label.DomainLabelMetrics.reservedListHits; -import static google.registry.model.registry.label.DomainLabelMetrics.reservedListProcessingTime; -import static google.registry.model.registry.label.ReservationType.ALLOWED_IN_SUNRISE; -import static google.registry.model.registry.label.ReservationType.FULLY_BLOCKED; -import static google.registry.model.registry.label.ReservationType.NAME_COLLISION; -import static google.registry.model.registry.label.ReservedList.ReservedListEntry; -import static google.registry.model.registry.label.ReservedList.getReservationTypes; +import static google.registry.model.tld.label.DomainLabelMetrics.reservedListChecks; +import static google.registry.model.tld.label.DomainLabelMetrics.reservedListHits; +import static google.registry.model.tld.label.DomainLabelMetrics.reservedListProcessingTime; +import static google.registry.model.tld.label.ReservationType.ALLOWED_IN_SUNRISE; +import static google.registry.model.tld.label.ReservationType.FULLY_BLOCKED; +import static google.registry.model.tld.label.ReservationType.NAME_COLLISION; +import static google.registry.model.tld.label.ReservedList.ReservedListEntry; +import static google.registry.model.tld.label.ReservedList.getReservationTypes; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.persistReservedList; import static google.registry.testing.DatabaseHelper.persistResource; @@ -34,8 +34,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.PremiumList.PremiumEntry; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.PremiumList.PremiumEntry; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.InjectExtension; diff --git a/core/src/test/java/google/registry/persistence/converter/BillingCostTransitionConverterTest.java b/core/src/test/java/google/registry/persistence/converter/BillingCostTransitionConverterTest.java index 7cda38f57..6091dbd67 100644 --- a/core/src/test/java/google/registry/persistence/converter/BillingCostTransitionConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/BillingCostTransitionConverterTest.java @@ -22,7 +22,7 @@ import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableSortedMap; import google.registry.model.ImmutableObject; import google.registry.model.common.TimedTransitionProperty; -import google.registry.model.registry.Registry.BillingCostTransition; +import google.registry.model.tld.Registry.BillingCostTransition; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaUnitTestExtension; import javax.persistence.Entity; diff --git a/core/src/test/java/google/registry/persistence/converter/ReservedListKeySetConverterTest.java b/core/src/test/java/google/registry/persistence/converter/ReservedListKeySetConverterTest.java index fbbf5ccb6..e59399d16 100644 --- a/core/src/test/java/google/registry/persistence/converter/ReservedListKeySetConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/ReservedListKeySetConverterTest.java @@ -20,7 +20,7 @@ import static google.registry.persistence.transaction.TransactionManagerFactory. import com.googlecode.objectify.Key; import google.registry.model.ImmutableObject; -import google.registry.model.registry.label.ReservedList; +import google.registry.model.tld.label.ReservedList; import google.registry.testing.AppEngineExtension; import java.util.Set; import javax.persistence.Entity; diff --git a/core/src/test/java/google/registry/persistence/converter/TldStateTransitionConverterTest.java b/core/src/test/java/google/registry/persistence/converter/TldStateTransitionConverterTest.java index be90533e7..b78bbdf12 100644 --- a/core/src/test/java/google/registry/persistence/converter/TldStateTransitionConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/TldStateTransitionConverterTest.java @@ -21,8 +21,8 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableSortedMap; import google.registry.model.ImmutableObject; import google.registry.model.common.TimedTransitionProperty; -import google.registry.model.registry.Registry.TldState; -import google.registry.model.registry.Registry.TldStateTransition; +import google.registry.model.tld.Registry.TldState; +import google.registry.model.tld.Registry.TldStateTransition; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaUnitTestExtension; import javax.persistence.Entity; diff --git a/core/src/test/java/google/registry/pricing/PricingEngineProxyTest.java b/core/src/test/java/google/registry/pricing/PricingEngineProxyTest.java index eca2bd4e8..6fa74cdd6 100644 --- a/core/src/test/java/google/registry/pricing/PricingEngineProxyTest.java +++ b/core/src/test/java/google/registry/pricing/PricingEngineProxyTest.java @@ -26,8 +26,8 @@ import static org.joda.money.CurrencyUnit.USD; import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.collect.ImmutableSortedMap; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.PremiumList; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.PremiumList; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.util.Clock; diff --git a/core/src/test/java/google/registry/rdap/RdapDomainActionTest.java b/core/src/test/java/google/registry/rdap/RdapDomainActionTest.java index b438f2bad..a601aee88 100644 --- a/core/src/test/java/google/registry/rdap/RdapDomainActionTest.java +++ b/core/src/test/java/google/registry/rdap/RdapDomainActionTest.java @@ -33,8 +33,8 @@ import google.registry.model.domain.DomainBase; import google.registry.model.domain.Period; import google.registry.model.host.HostResource; import google.registry.model.registrar.Registrar; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.rdap.RdapMetrics.EndpointType; import google.registry.rdap.RdapMetrics.SearchType; import google.registry.rdap.RdapMetrics.WildcardType; diff --git a/core/src/test/java/google/registry/rdap/RdapDomainSearchActionTest.java b/core/src/test/java/google/registry/rdap/RdapDomainSearchActionTest.java index 1f5adc222..dfc845908 100644 --- a/core/src/test/java/google/registry/rdap/RdapDomainSearchActionTest.java +++ b/core/src/test/java/google/registry/rdap/RdapDomainSearchActionTest.java @@ -42,8 +42,8 @@ import google.registry.model.domain.DomainBase; import google.registry.model.domain.Period; import google.registry.model.host.HostResource; import google.registry.model.registrar.Registrar; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.persistence.VKey; import google.registry.rdap.RdapMetrics.EndpointType; import google.registry.rdap.RdapMetrics.SearchType; diff --git a/core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java b/core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java index 79b68e0b0..6f8843937 100644 --- a/core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java +++ b/core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java @@ -32,8 +32,8 @@ import com.google.common.collect.ImmutableSet; import com.google.gson.JsonSyntaxException; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarAddress; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import google.registry.testing.AppEngineExtension; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; diff --git a/core/src/test/java/google/registry/rde/EscrowTaskRunnerTest.java b/core/src/test/java/google/registry/rde/EscrowTaskRunnerTest.java index 79ac7149f..eb4ad7d69 100644 --- a/core/src/test/java/google/registry/rde/EscrowTaskRunnerTest.java +++ b/core/src/test/java/google/registry/rde/EscrowTaskRunnerTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.verify; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.rde.EscrowTaskRunner.EscrowTask; import google.registry.request.HttpException.NoContentException; import google.registry.request.HttpException.ServiceUnavailableException; diff --git a/core/src/test/java/google/registry/rde/PendingDepositCheckerTest.java b/core/src/test/java/google/registry/rde/PendingDepositCheckerTest.java index 504253bd6..14d1b6e64 100644 --- a/core/src/test/java/google/registry/rde/PendingDepositCheckerTest.java +++ b/core/src/test/java/google/registry/rde/PendingDepositCheckerTest.java @@ -32,7 +32,7 @@ import com.google.common.truth.Truth8; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.testing.AppEngineExtension; import google.registry.testing.DualDatabaseTest; import google.registry.testing.FakeClock; diff --git a/core/src/test/java/google/registry/rde/RdeReportActionTest.java b/core/src/test/java/google/registry/rde/RdeReportActionTest.java index 9de36c171..297e73a41 100644 --- a/core/src/test/java/google/registry/rde/RdeReportActionTest.java +++ b/core/src/test/java/google/registry/rde/RdeReportActionTest.java @@ -47,7 +47,7 @@ import com.google.common.io.ByteSource; import google.registry.gcs.GcsUtils; import google.registry.model.common.Cursor; import google.registry.model.rde.RdeRevision; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.request.HttpException.InternalServerErrorException; import google.registry.request.HttpException.NoContentException; import google.registry.testing.AppEngineExtension; diff --git a/core/src/test/java/google/registry/rde/RdeStagingActionTest.java b/core/src/test/java/google/registry/rde/RdeStagingActionTest.java index 826338a0a..de2e04404 100644 --- a/core/src/test/java/google/registry/rde/RdeStagingActionTest.java +++ b/core/src/test/java/google/registry/rde/RdeStagingActionTest.java @@ -47,7 +47,7 @@ import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.host.HostResource; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.request.HttpException.BadRequestException; import google.registry.request.RequestParameters; import google.registry.testing.FakeClock; diff --git a/core/src/test/java/google/registry/rde/RdeStagingReducerTest.java b/core/src/test/java/google/registry/rde/RdeStagingReducerTest.java index 283f36a8e..4829ab876 100644 --- a/core/src/test/java/google/registry/rde/RdeStagingReducerTest.java +++ b/core/src/test/java/google/registry/rde/RdeStagingReducerTest.java @@ -38,7 +38,7 @@ import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.rde.RdeMode; import google.registry.model.rde.RdeRevision; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.request.RequestParameters; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; diff --git a/core/src/test/java/google/registry/rde/RdeUploadActionTest.java b/core/src/test/java/google/registry/rde/RdeUploadActionTest.java index a16d102d9..5ab4e5f4c 100644 --- a/core/src/test/java/google/registry/rde/RdeUploadActionTest.java +++ b/core/src/test/java/google/registry/rde/RdeUploadActionTest.java @@ -56,7 +56,7 @@ import google.registry.keyring.api.Keyring; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.rde.RdeRevision; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.rde.JSchSshSession.JSchSshSessionFactory; import google.registry.request.HttpException.NoContentException; import google.registry.request.RequestParameters; diff --git a/core/src/test/java/google/registry/reporting/icann/IcannReportingUploadActionTest.java b/core/src/test/java/google/registry/reporting/icann/IcannReportingUploadActionTest.java index 3a9e32d92..44b3434fa 100644 --- a/core/src/test/java/google/registry/reporting/icann/IcannReportingUploadActionTest.java +++ b/core/src/test/java/google/registry/reporting/icann/IcannReportingUploadActionTest.java @@ -34,7 +34,7 @@ import com.google.common.testing.TestLogHandler; import google.registry.gcs.GcsUtils; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.request.HttpException.ServiceUnavailableException; import google.registry.testing.AppEngineExtension; import google.registry.testing.DualDatabaseTest; diff --git a/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java b/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java index 37e751182..b912d1be0 100644 --- a/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java +++ b/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java @@ -26,13 +26,14 @@ import google.registry.model.history.DomainHistoryTest; import google.registry.model.history.HostHistoryTest; import google.registry.model.poll.PollMessageTest; import google.registry.model.rde.RdeRevisionTest; -import google.registry.model.registry.RegistryLockDaoTest; -import google.registry.model.registry.RegistryTest; -import google.registry.model.registry.label.ReservedListDaoTest; import google.registry.model.reporting.Spec11ThreatMatchTest; import google.registry.model.server.LockTest; import google.registry.model.server.ServerSecretTest; import google.registry.model.smd.SignedMarkRevocationListDaoTest; +import google.registry.model.tld.RegistryLockDaoTest; +import google.registry.model.tld.RegistryTest; +import google.registry.model.tld.label.PremiumListDaoTest; +import google.registry.model.tld.label.ReservedListDaoTest; import google.registry.model.tmch.ClaimsListDaoTest; import google.registry.model.tmch.TmchCrlTest; import google.registry.persistence.transaction.JpaEntityCoverageExtension; @@ -41,7 +42,6 @@ import google.registry.schema.integration.SqlIntegrationTestSuite.AfterSuiteTest import google.registry.schema.integration.SqlIntegrationTestSuite.BeforeSuiteTest; import google.registry.schema.registrar.RegistrarDaoTest; import google.registry.schema.replay.SqlReplayCheckpointTest; -import google.registry.schema.tld.PremiumListDaoTest; import google.registry.testing.AppEngineExtension; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/core/src/test/java/google/registry/schema/tld/PremiumListTest.java b/core/src/test/java/google/registry/schema/tld/PremiumListTest.java deleted file mode 100644 index 67059368b..000000000 --- a/core/src/test/java/google/registry/schema/tld/PremiumListTest.java +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright 2019 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. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.schema.tld; - -import static com.google.common.truth.Truth.assertThat; - -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.hash.BloomFilter; -import google.registry.model.registry.label.PremiumList; -import google.registry.testing.DatastoreEntityExtension; -import java.math.BigDecimal; -import org.joda.money.CurrencyUnit; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; - -/** Unit tests for {@link PremiumList}. */ -class PremiumListTest { - - @RegisterExtension - DatastoreEntityExtension datastoreEntityExtension = new DatastoreEntityExtension(); - - private static final ImmutableMap TEST_PRICES = - ImmutableMap.of( - "silver", - BigDecimal.valueOf(10.23), - "gold", - BigDecimal.valueOf(1305.47), - "palladium", - BigDecimal.valueOf(1552.78)); - - @Test - void bloomFilter_worksCorrectly() { - BloomFilter bloomFilter = - new PremiumList.Builder() - .setName("testname") - .setCurrency(CurrencyUnit.USD) - .setLabelsToPrices(TEST_PRICES) - .build() - .getBloomFilter(); - ImmutableSet.of("silver", "gold", "palladium") - .forEach(l -> assertThat(bloomFilter.mightContain(l)).isTrue()); - ImmutableSet.of("dirt", "pyrite", "zirconia") - .forEach(l -> assertThat(bloomFilter.mightContain(l)).isFalse()); - } -} diff --git a/core/src/test/java/google/registry/testing/DatabaseHelper.java b/core/src/test/java/google/registry/testing/DatabaseHelper.java index 1089403e3..839701909 100644 --- a/core/src/test/java/google/registry/testing/DatabaseHelper.java +++ b/core/src/test/java/google/registry/testing/DatabaseHelper.java @@ -33,7 +33,7 @@ import static google.registry.model.ImmutableObjectSubject.assertAboutImmutableO import static google.registry.model.ImmutableObjectSubject.immutableObjectCorrespondence; import static google.registry.model.ResourceTransferUtils.createTransferResponse; import static google.registry.model.ofy.ObjectifyService.auditedOfy; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import static google.registry.persistence.transaction.TransactionManagerFactory.ofyTm; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; @@ -97,21 +97,21 @@ import google.registry.model.poll.PollMessage; import google.registry.model.pricing.StaticPremiumListPricingEngine; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarAddress; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; -import google.registry.model.registry.Registry.TldType; -import google.registry.model.registry.label.PremiumList; -import google.registry.model.registry.label.PremiumList.PremiumEntry; -import google.registry.model.registry.label.ReservedList; -import google.registry.model.registry.label.ReservedListDao; import google.registry.model.reporting.HistoryEntry; import google.registry.model.reporting.HistoryEntryDao; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; +import google.registry.model.tld.Registry.TldType; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumList.PremiumEntry; +import google.registry.model.tld.label.PremiumListDao; +import google.registry.model.tld.label.ReservedList; +import google.registry.model.tld.label.ReservedListDao; import google.registry.model.transfer.ContactTransferData; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferStatus; import google.registry.persistence.VKey; -import google.registry.schema.tld.PremiumListDao; import google.registry.tmch.LordnTaskUtils; import java.util.Arrays; import java.util.List; diff --git a/core/src/test/java/google/registry/testing/SqlHelper.java b/core/src/test/java/google/registry/testing/SqlHelper.java index 777db495e..104271207 100644 --- a/core/src/test/java/google/registry/testing/SqlHelper.java +++ b/core/src/test/java/google/registry/testing/SqlHelper.java @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import google.registry.model.registrar.Registrar; -import google.registry.model.registry.RegistryLockDao; +import google.registry.model.tld.RegistryLockDao; import google.registry.schema.domain.RegistryLock; import java.sql.SQLException; import java.util.Optional; diff --git a/core/src/test/java/google/registry/testing/TestCacheExtension.java b/core/src/test/java/google/registry/testing/TestCacheExtension.java index 0bce2e0d2..969764c90 100644 --- a/core/src/test/java/google/registry/testing/TestCacheExtension.java +++ b/core/src/test/java/google/registry/testing/TestCacheExtension.java @@ -18,7 +18,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; import google.registry.model.EppResource; import google.registry.model.index.ForeignKeyIndex; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.label.PremiumListDao; import java.util.Map; import java.util.Optional; import org.joda.time.Duration; diff --git a/core/src/test/java/google/registry/tmch/NordnUploadActionTest.java b/core/src/test/java/google/registry/tmch/NordnUploadActionTest.java index 6439b299e..dc74eb286 100644 --- a/core/src/test/java/google/registry/tmch/NordnUploadActionTest.java +++ b/core/src/test/java/google/registry/tmch/NordnUploadActionTest.java @@ -53,7 +53,7 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.DomainBase; import google.registry.model.domain.launch.LaunchNotice; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.FakeSleeper; diff --git a/core/src/test/java/google/registry/tmch/NordnVerifyActionTest.java b/core/src/test/java/google/registry/tmch/NordnVerifyActionTest.java index 3a1903830..30bfc5c78 100644 --- a/core/src/test/java/google/registry/tmch/NordnVerifyActionTest.java +++ b/core/src/test/java/google/registry/tmch/NordnVerifyActionTest.java @@ -32,7 +32,7 @@ import static org.mockito.Mockito.when; import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.request.HttpException.ConflictException; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeResponse; diff --git a/core/src/test/java/google/registry/tools/CreateAnchorTenantCommandTest.java b/core/src/test/java/google/registry/tools/CreateAnchorTenantCommandTest.java index 8e82f5123..279f28c6a 100644 --- a/core/src/test/java/google/registry/tools/CreateAnchorTenantCommandTest.java +++ b/core/src/test/java/google/registry/tools/CreateAnchorTenantCommandTest.java @@ -21,7 +21,7 @@ import static org.joda.money.CurrencyUnit.JPY; import static org.junit.jupiter.api.Assertions.assertThrows; import com.beust.jcommander.ParameterException; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.testing.DeterministicStringGenerator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/tools/CreateDomainCommandTest.java b/core/src/test/java/google/registry/tools/CreateDomainCommandTest.java index c9932377a..3cc1006b2 100644 --- a/core/src/test/java/google/registry/tools/CreateDomainCommandTest.java +++ b/core/src/test/java/google/registry/tools/CreateDomainCommandTest.java @@ -26,8 +26,8 @@ import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableSet; import google.registry.dns.writer.VoidDnsWriter; import google.registry.model.pricing.StaticPremiumListPricingEngine; -import google.registry.model.registry.Registry; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.PremiumListDao; import google.registry.testing.DeterministicStringGenerator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java b/core/src/test/java/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java index c60288bfe..90e1b8c12 100644 --- a/core/src/test/java/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java +++ b/core/src/test/java/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java @@ -14,7 +14,7 @@ package google.registry.tools; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.DatabaseHelper.newRegistry; import static google.registry.testing.DatabaseHelper.persistPremiumList; @@ -28,8 +28,8 @@ import com.google.common.collect.ImmutableSortedMap; import com.google.common.io.Files; import google.registry.dns.writer.VoidDnsWriter; import google.registry.model.pricing.StaticPremiumListPricingEngine; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldType; import java.io.File; import java.io.IOException; import org.joda.money.CurrencyUnit; diff --git a/core/src/test/java/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java b/core/src/test/java/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java index 7bd5f154b..ea32f0f6c 100644 --- a/core/src/test/java/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java +++ b/core/src/test/java/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java @@ -15,7 +15,7 @@ package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static google.registry.model.registry.label.ReservationType.FULLY_BLOCKED; +import static google.registry.model.tld.label.ReservationType.FULLY_BLOCKED; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import static google.registry.testing.TestDataHelper.loadFile; import static java.nio.charset.StandardCharsets.UTF_8; @@ -25,9 +25,9 @@ import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; import com.google.common.truth.Truth8; -import google.registry.model.registry.label.ReservedList; -import google.registry.model.registry.label.ReservedList.ReservedListEntry; -import google.registry.model.registry.label.ReservedListDao; +import google.registry.model.tld.label.ReservedList; +import google.registry.model.tld.label.ReservedList.ReservedListEntry; +import google.registry.model.tld.label.ReservedListDao; import java.io.File; import java.io.IOException; import org.joda.time.DateTime; diff --git a/core/src/test/java/google/registry/tools/CreatePremiumListCommandTest.java b/core/src/test/java/google/registry/tools/CreatePremiumListCommandTest.java index ee067fd27..c7ea2a8d9 100644 --- a/core/src/test/java/google/registry/tools/CreatePremiumListCommandTest.java +++ b/core/src/test/java/google/registry/tools/CreatePremiumListCommandTest.java @@ -19,8 +19,8 @@ import static google.registry.testing.DatabaseHelper.createTld; import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.io.Files; -import google.registry.model.registry.Registry; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.PremiumListDao; import java.nio.file.Path; import java.nio.file.Paths; import org.junit.jupiter.api.BeforeEach; diff --git a/core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java b/core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java index 52a38e473..c6f545874 100644 --- a/core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java +++ b/core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java @@ -16,7 +16,7 @@ package google.registry.tools; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; -import static google.registry.model.registry.label.ReservationType.FULLY_BLOCKED; +import static google.registry.model.tld.label.ReservationType.FULLY_BLOCKED; import static google.registry.testing.DatabaseHelper.createTlds; import static google.registry.testing.DatabaseHelper.persistReservedList; import static google.registry.testing.DatabaseHelper.persistResource; @@ -24,8 +24,8 @@ import static google.registry.tools.CreateReservedListCommand.INVALID_FORMAT_ERR import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.io.Files; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.ReservedList; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.ReservedList; import java.nio.file.Path; import java.nio.file.Paths; import org.junit.jupiter.api.BeforeEach; diff --git a/core/src/test/java/google/registry/tools/CreateTldCommandTest.java b/core/src/test/java/google/registry/tools/CreateTldCommandTest.java index 761a1096e..60deb80f4 100644 --- a/core/src/test/java/google/registry/tools/CreateTldCommandTest.java +++ b/core/src/test/java/google/registry/tools/CreateTldCommandTest.java @@ -16,8 +16,8 @@ package google.registry.tools; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; -import static google.registry.model.registry.Registry.TldState.PREDELEGATION; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.PREDELEGATION; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.persistPremiumList; import static google.registry.testing.DatabaseHelper.persistReservedList; @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import java.math.BigDecimal; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/core/src/test/java/google/registry/tools/DeletePremiumListCommandTest.java b/core/src/test/java/google/registry/tools/DeletePremiumListCommandTest.java index 79a1257b2..bc0806865 100644 --- a/core/src/test/java/google/registry/tools/DeletePremiumListCommandTest.java +++ b/core/src/test/java/google/registry/tools/DeletePremiumListCommandTest.java @@ -23,9 +23,9 @@ import static google.registry.testing.DatabaseHelper.persistResource; import static org.joda.money.CurrencyUnit.USD; import static org.junit.jupiter.api.Assertions.assertThrows; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.PremiumList; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumListDao; import org.junit.jupiter.api.Test; /** Unit tests for {@link DeletePremiumListCommand}. */ diff --git a/core/src/test/java/google/registry/tools/DeleteReservedListCommandTest.java b/core/src/test/java/google/registry/tools/DeleteReservedListCommandTest.java index 194947ba1..fdb13b076 100644 --- a/core/src/test/java/google/registry/tools/DeleteReservedListCommandTest.java +++ b/core/src/test/java/google/registry/tools/DeleteReservedListCommandTest.java @@ -21,9 +21,9 @@ import static google.registry.testing.DatabaseHelper.persistReservedList; import static google.registry.testing.DatabaseHelper.persistResource; import static org.junit.jupiter.api.Assertions.assertThrows; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.ReservedList; -import google.registry.model.registry.label.ReservedListDao; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.ReservedList; +import google.registry.model.tld.label.ReservedListDao; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/tools/DeleteTldCommandTest.java b/core/src/test/java/google/registry/tools/DeleteTldCommandTest.java index 7d73ca891..184ce3195 100644 --- a/core/src/test/java/google/registry/tools/DeleteTldCommandTest.java +++ b/core/src/test/java/google/registry/tools/DeleteTldCommandTest.java @@ -14,7 +14,7 @@ package google.registry.tools; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; import static google.registry.testing.DatabaseHelper.allowRegistrarAccess; import static google.registry.testing.DatabaseHelper.newRegistry; import static google.registry.testing.DatabaseHelper.persistDeletedDomain; @@ -24,9 +24,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.base.Ascii; import com.google.common.collect.ImmutableSortedMap; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.RegistryNotFoundException; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.RegistryNotFoundException; +import google.registry.model.tld.Registry.TldType; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; import org.joda.time.DateTime; diff --git a/core/src/test/java/google/registry/tools/DomainLockUtilsTest.java b/core/src/test/java/google/registry/tools/DomainLockUtilsTest.java index 32d28ba10..a09d14041 100644 --- a/core/src/test/java/google/registry/tools/DomainLockUtilsTest.java +++ b/core/src/test/java/google/registry/tools/DomainLockUtilsTest.java @@ -43,8 +43,8 @@ import google.registry.model.billing.BillingEvent.Reason; import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainHistory; import google.registry.model.host.HostResource; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.schema.domain.RegistryLock; import google.registry.testing.AppEngineExtension; import google.registry.testing.DatabaseHelper; diff --git a/core/src/test/java/google/registry/tools/ListCursorsCommandTest.java b/core/src/test/java/google/registry/tools/ListCursorsCommandTest.java index 982ac4ee1..770026564 100644 --- a/core/src/test/java/google/registry/tools/ListCursorsCommandTest.java +++ b/core/src/test/java/google/registry/tools/ListCursorsCommandTest.java @@ -23,7 +23,7 @@ import com.beust.jcommander.ParameterException; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.ofy.Ofy; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.testing.DualDatabaseTest; import google.registry.testing.InjectExtension; import google.registry.testing.TestOfyAndSql; diff --git a/core/src/test/java/google/registry/tools/ListDomainsCommandTest.java b/core/src/test/java/google/registry/tools/ListDomainsCommandTest.java index ddecd1887..3315cd4f9 100644 --- a/core/src/test/java/google/registry/tools/ListDomainsCommandTest.java +++ b/core/src/test/java/google/registry/tools/ListDomainsCommandTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.verify; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; -import google.registry.model.registry.Registry.TldType; +import google.registry.model.tld.Registry.TldType; import google.registry.tools.server.ListDomainsAction; import org.junit.jupiter.api.Test; import org.mockito.junit.jupiter.MockitoSettings; diff --git a/core/src/test/java/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java b/core/src/test/java/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java index af3485791..271c2f7a1 100644 --- a/core/src/test/java/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java +++ b/core/src/test/java/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java @@ -27,7 +27,7 @@ import google.registry.model.ofy.CommitLogManifest; import google.registry.model.ofy.CommitLogMutation; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import org.junit.jupiter.api.Test; /** Unit tests for {@link ResaveEnvironmentEntitiesCommand}. */ diff --git a/core/src/test/java/google/registry/tools/SetupOteCommandTest.java b/core/src/test/java/google/registry/tools/SetupOteCommandTest.java index b9e878683..309cf80f1 100644 --- a/core/src/test/java/google/registry/tools/SetupOteCommandTest.java +++ b/core/src/test/java/google/registry/tools/SetupOteCommandTest.java @@ -17,8 +17,8 @@ package google.registry.tools; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; import static google.registry.model.registrar.Registrar.State.ACTIVE; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; -import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.START_DATE_SUNRISE; import static google.registry.testing.CertificateSamples.SAMPLE_CERT_HASH; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.loadRegistrar; @@ -34,8 +34,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.TldState; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.TldState; import google.registry.testing.DeterministicStringGenerator; import google.registry.testing.FakeClock; import google.registry.util.CidrAddressBlock; diff --git a/core/src/test/java/google/registry/tools/UpdateCursorsCommandTest.java b/core/src/test/java/google/registry/tools/UpdateCursorsCommandTest.java index 17185ac05..6c42f12e5 100644 --- a/core/src/test/java/google/registry/tools/UpdateCursorsCommandTest.java +++ b/core/src/test/java/google/registry/tools/UpdateCursorsCommandTest.java @@ -25,8 +25,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.beust.jcommander.ParameterException; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; -import google.registry.model.registry.Registry; -import google.registry.model.registry.Registry.RegistryNotFoundException; +import google.registry.model.tld.Registry; +import google.registry.model.tld.Registry.RegistryNotFoundException; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; import org.joda.time.DateTime; diff --git a/core/src/test/java/google/registry/tools/UpdatePremiumListCommandTest.java b/core/src/test/java/google/registry/tools/UpdatePremiumListCommandTest.java index 6bde3f0cb..a7d5c3661 100644 --- a/core/src/test/java/google/registry/tools/UpdatePremiumListCommandTest.java +++ b/core/src/test/java/google/registry/tools/UpdatePremiumListCommandTest.java @@ -21,9 +21,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.collect.ImmutableSet; import com.google.common.io.Files; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.PremiumList; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumListDao; import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java b/core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java index ac33218cb..68291c13d 100644 --- a/core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java +++ b/core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java @@ -16,7 +16,7 @@ package google.registry.tools; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; -import static google.registry.model.registry.label.ReservationType.FULLY_BLOCKED; +import static google.registry.model.tld.label.ReservationType.FULLY_BLOCKED; import static google.registry.testing.DatabaseHelper.persistReservedList; import static google.registry.testing.TestDataHelper.loadFile; import static google.registry.util.DateTimeUtils.START_OF_TIME; @@ -26,9 +26,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; -import google.registry.model.registry.label.ReservedList; -import google.registry.model.registry.label.ReservedList.ReservedListEntry; -import google.registry.model.registry.label.ReservedListDao; +import google.registry.model.tld.label.ReservedList; +import google.registry.model.tld.label.ReservedList.ReservedListEntry; +import google.registry.model.tld.label.ReservedListDao; import java.io.File; import java.nio.file.Paths; import org.junit.jupiter.api.BeforeEach; diff --git a/core/src/test/java/google/registry/tools/UpdateTldCommandTest.java b/core/src/test/java/google/registry/tools/UpdateTldCommandTest.java index c9d709882..5b552455e 100644 --- a/core/src/test/java/google/registry/tools/UpdateTldCommandTest.java +++ b/core/src/test/java/google/registry/tools/UpdateTldCommandTest.java @@ -16,10 +16,10 @@ package google.registry.tools; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; -import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY; -import static google.registry.model.registry.Registry.TldState.PREDELEGATION; -import static google.registry.model.registry.Registry.TldState.QUIET_PERIOD; -import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE; +import static google.registry.model.tld.Registry.TldState.GENERAL_AVAILABILITY; +import static google.registry.model.tld.Registry.TldState.PREDELEGATION; +import static google.registry.model.tld.Registry.TldState.QUIET_PERIOD; +import static google.registry.model.tld.Registry.TldState.START_DATE_SUNRISE; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.persistPremiumList; import static google.registry.testing.DatabaseHelper.persistReservedList; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import java.util.Optional; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/core/src/test/java/google/registry/tools/params/EnumParameterTest.java b/core/src/test/java/google/registry/tools/params/EnumParameterTest.java index 0cadee0f9..ceeaaabb0 100644 --- a/core/src/test/java/google/registry/tools/params/EnumParameterTest.java +++ b/core/src/test/java/google/registry/tools/params/EnumParameterTest.java @@ -17,7 +17,7 @@ package google.registry.tools.params; import static com.google.common.truth.Truth.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -import google.registry.model.registry.Registry.TldState; +import google.registry.model.tld.Registry.TldState; import org.junit.jupiter.api.Test; /** Unit tests for {@link EnumParameter}. */ @@ -38,7 +38,6 @@ class EnumParameterTest { assertThrows(IllegalArgumentException.class, () -> instance.convert("FREE_DOMAINS")); assertThat(thrown) .hasMessageThat() - .contains( - "No enum constant google.registry.model.registry.Registry.TldState.FREE_DOMAINS"); + .contains("No enum constant google.registry.model.tld.Registry.TldState.FREE_DOMAINS"); } } diff --git a/core/src/test/java/google/registry/tools/server/CreatePremiumListActionTest.java b/core/src/test/java/google/registry/tools/server/CreatePremiumListActionTest.java index 02de5a176..69fe52b91 100644 --- a/core/src/test/java/google/registry/tools/server/CreatePremiumListActionTest.java +++ b/core/src/test/java/google/registry/tools/server/CreatePremiumListActionTest.java @@ -21,8 +21,8 @@ import static google.registry.testing.DatabaseHelper.loadPremiumEntries; import static javax.servlet.http.HttpServletResponse.SC_OK; import static org.joda.money.CurrencyUnit.USD; -import google.registry.model.registry.label.PremiumList; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumListDao; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeJsonResponse; import org.joda.money.Money; diff --git a/core/src/test/java/google/registry/tools/server/DeleteEntityActionTest.java b/core/src/test/java/google/registry/tools/server/DeleteEntityActionTest.java index b9b29d2d0..0b8d8f2e1 100644 --- a/core/src/test/java/google/registry/tools/server/DeleteEntityActionTest.java +++ b/core/src/test/java/google/registry/tools/server/DeleteEntityActionTest.java @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.appengine.api.datastore.Entity; import com.google.appengine.api.datastore.KeyFactory; -import google.registry.model.registry.label.ReservedList; +import google.registry.model.tld.label.ReservedList; import google.registry.request.HttpException.BadRequestException; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeResponse; diff --git a/core/src/test/java/google/registry/tools/server/ListReservedListsActionTest.java b/core/src/test/java/google/registry/tools/server/ListReservedListsActionTest.java index 6f56d4cc7..dcb99686b 100644 --- a/core/src/test/java/google/registry/tools/server/ListReservedListsActionTest.java +++ b/core/src/test/java/google/registry/tools/server/ListReservedListsActionTest.java @@ -18,8 +18,8 @@ import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.persistReservedList; import static google.registry.testing.DatabaseHelper.persistResource; -import google.registry.model.registry.Registry; -import google.registry.model.registry.label.ReservedList; +import google.registry.model.tld.Registry; +import google.registry.model.tld.label.ReservedList; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; import java.util.Optional; diff --git a/core/src/test/java/google/registry/tools/server/UpdatePremiumListActionTest.java b/core/src/test/java/google/registry/tools/server/UpdatePremiumListActionTest.java index 00b3373bd..7aa6b8fe1 100644 --- a/core/src/test/java/google/registry/tools/server/UpdatePremiumListActionTest.java +++ b/core/src/test/java/google/registry/tools/server/UpdatePremiumListActionTest.java @@ -24,8 +24,8 @@ import static org.joda.money.CurrencyUnit.USD; import com.google.common.base.Splitter; import com.google.common.truth.Truth8; -import google.registry.model.registry.label.PremiumList; -import google.registry.schema.tld.PremiumListDao; +import google.registry.model.tld.label.PremiumList; +import google.registry.model.tld.label.PremiumListDao; import google.registry.testing.AppEngineExtension; import google.registry.testing.DatabaseHelper; import google.registry.testing.FakeJsonResponse; diff --git a/core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java index c867f548e..72d818ce3 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java @@ -31,7 +31,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSetMultimap; import google.registry.config.RegistryEnvironment; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.request.Action.Method; import google.registry.request.auth.AuthLevel; import google.registry.request.auth.AuthResult; diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java index 2c5f2d902..2e5ba67c3 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java @@ -39,8 +39,8 @@ import google.registry.model.billing.BillingEvent.Reason; import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainHistory; import google.registry.model.host.HostResource; -import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.tld.Registry; import google.registry.request.auth.AuthLevel; import google.registry.request.auth.AuthResult; import google.registry.request.auth.UserAuthInfo; diff --git a/core/src/test/java/google/registry/whois/WhoisActionTest.java b/core/src/test/java/google/registry/whois/WhoisActionTest.java index 676a8e60e..e077a874a 100644 --- a/core/src/test/java/google/registry/whois/WhoisActionTest.java +++ b/core/src/test/java/google/registry/whois/WhoisActionTest.java @@ -19,7 +19,7 @@ import static com.google.common.truth.Truth8.assertThat; import static google.registry.model.EppResourceUtils.loadByForeignKeyCached; import static google.registry.model.registrar.Registrar.State.ACTIVE; import static google.registry.model.registrar.Registrar.Type.PDT; -import static google.registry.model.registry.Registries.getTlds; +import static google.registry.model.tld.Registries.getTlds; import static google.registry.testing.DatabaseHelper.createTlds; import static google.registry.testing.DatabaseHelper.loadRegistrar; import static google.registry.testing.DatabaseHelper.persistActiveDomain; @@ -50,7 +50,7 @@ import google.registry.model.eppcommon.Trid; import google.registry.model.host.HostResource; import google.registry.model.ofy.Ofy; import google.registry.model.registrar.Registrar; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferStatus; import google.registry.testing.AppEngineExtension; diff --git a/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java b/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java index c0e9c52f0..7bc30eb59 100644 --- a/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java +++ b/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.when; import google.registry.model.contact.ContactResource; import google.registry.model.ofy.Ofy; import google.registry.model.registrar.Registrar; -import google.registry.model.registry.Registry; +import google.registry.model.tld.Registry; import google.registry.testing.AppEngineExtension; import google.registry.testing.DualDatabaseTest; import google.registry.testing.FakeClock; diff --git a/core/src/test/resources/google/registry/model/schema.txt b/core/src/test/resources/google/registry/model/schema.txt index 016987225..c953145f7 100644 --- a/core/src/test/resources/google/registry/model/schema.txt +++ b/core/src/test/resources/google/registry/model/schema.txt @@ -654,83 +654,6 @@ enum google.registry.model.registrar.RegistrarContact$Type { TECH; WHOIS; } -class google.registry.model.registry.Registry { - @Id java.lang.String tldStrId; - @Parent com.googlecode.objectify.Key parent; - boolean dnsPaused; - boolean escrowEnabled; - boolean invoicingEnabled; - google.registry.model.CreateAutoTimestamp creationTime; - google.registry.model.common.TimedTransitionProperty tldStateTransitions; - google.registry.model.common.TimedTransitionProperty eapFeeSchedule; - google.registry.model.common.TimedTransitionProperty renewBillingCostTransitions; - google.registry.model.registry.Registry$TldType tldType; - int numDnsPublishLocks; - java.lang.String driveFolderId; - java.lang.String lordnUsername; - java.lang.String premiumListName; - java.lang.String pricingEngineClassName; - java.lang.String roidSuffix; - java.lang.String tldStr; - java.lang.String tldUnicode; - java.util.Set allowedFullyQualifiedHostNames; - java.util.Set allowedRegistrantContactIds; - java.util.Set dnsWriters; - java.util.Set reservedListNames; - org.joda.money.CurrencyUnit currency; - org.joda.money.Money createBillingCost; - org.joda.money.Money registryLockOrUnlockBillingCost; - org.joda.money.Money restoreBillingCost; - org.joda.money.Money serverStatusChangeBillingCost; - org.joda.time.DateTime claimsPeriodEnd; - org.joda.time.Duration addGracePeriodLength; - org.joda.time.Duration anchorTenantAddGracePeriodLength; - org.joda.time.Duration autoRenewGracePeriodLength; - org.joda.time.Duration automaticTransferLength; - org.joda.time.Duration pendingDeleteLength; - org.joda.time.Duration redemptionGracePeriodLength; - org.joda.time.Duration renewGracePeriodLength; - org.joda.time.Duration transferGracePeriodLength; -} -class google.registry.model.registry.Registry$BillingCostTransition { - org.joda.money.Money billingCost; - org.joda.time.DateTime transitionTime; -} -enum google.registry.model.registry.Registry$TldState { - GENERAL_AVAILABILITY; - PDT; - PREDELEGATION; - QUIET_PERIOD; - START_DATE_SUNRISE; -} -class google.registry.model.registry.Registry$TldStateTransition { - google.registry.model.registry.Registry$TldState tldState; - org.joda.time.DateTime transitionTime; -} -enum google.registry.model.registry.Registry$TldType { - REAL; - TEST; -} -enum google.registry.model.registry.label.ReservationType { - ALLOWED_IN_SUNRISE; - FULLY_BLOCKED; - NAME_COLLISION; - RESERVED_FOR_ANCHOR_TENANT; - RESERVED_FOR_SPECIFIC_USE; -} -class google.registry.model.registry.label.ReservedList { - @Id java.lang.String name; - @Parent com.googlecode.objectify.Key parent; - boolean shouldPublish; - java.util.Map reservedListMap; - org.joda.time.DateTime creationTimestamp; -} -class google.registry.model.registry.label.ReservedList$ReservedListEntry { - @Id java.lang.String domainLabel; - google.registry.model.registry.label.ReservationType reservationType; - java.lang.Long revisionId; - java.lang.String comment; -} class google.registry.model.reporting.DomainTransactionRecord { google.registry.model.reporting.DomainTransactionRecord$TransactionReportField reportField; java.lang.Integer reportAmount; @@ -822,6 +745,83 @@ class google.registry.model.server.ServerSecret { long leastSignificant; long mostSignificant; } +class google.registry.model.tld.Registry { + @Id java.lang.String tldStrId; + @Parent com.googlecode.objectify.Key parent; + boolean dnsPaused; + boolean escrowEnabled; + boolean invoicingEnabled; + google.registry.model.CreateAutoTimestamp creationTime; + google.registry.model.common.TimedTransitionProperty tldStateTransitions; + google.registry.model.common.TimedTransitionProperty eapFeeSchedule; + google.registry.model.common.TimedTransitionProperty renewBillingCostTransitions; + google.registry.model.tld.Registry$TldType tldType; + int numDnsPublishLocks; + java.lang.String driveFolderId; + java.lang.String lordnUsername; + java.lang.String premiumListName; + java.lang.String pricingEngineClassName; + java.lang.String roidSuffix; + java.lang.String tldStr; + java.lang.String tldUnicode; + java.util.Set allowedFullyQualifiedHostNames; + java.util.Set allowedRegistrantContactIds; + java.util.Set dnsWriters; + java.util.Set reservedListNames; + org.joda.money.CurrencyUnit currency; + org.joda.money.Money createBillingCost; + org.joda.money.Money registryLockOrUnlockBillingCost; + org.joda.money.Money restoreBillingCost; + org.joda.money.Money serverStatusChangeBillingCost; + org.joda.time.DateTime claimsPeriodEnd; + org.joda.time.Duration addGracePeriodLength; + org.joda.time.Duration anchorTenantAddGracePeriodLength; + org.joda.time.Duration autoRenewGracePeriodLength; + org.joda.time.Duration automaticTransferLength; + org.joda.time.Duration pendingDeleteLength; + org.joda.time.Duration redemptionGracePeriodLength; + org.joda.time.Duration renewGracePeriodLength; + org.joda.time.Duration transferGracePeriodLength; +} +class google.registry.model.tld.Registry$BillingCostTransition { + org.joda.money.Money billingCost; + org.joda.time.DateTime transitionTime; +} +enum google.registry.model.tld.Registry$TldState { + GENERAL_AVAILABILITY; + PDT; + PREDELEGATION; + QUIET_PERIOD; + START_DATE_SUNRISE; +} +class google.registry.model.tld.Registry$TldStateTransition { + google.registry.model.tld.Registry$TldState tldState; + org.joda.time.DateTime transitionTime; +} +enum google.registry.model.tld.Registry$TldType { + REAL; + TEST; +} +enum google.registry.model.tld.label.ReservationType { + ALLOWED_IN_SUNRISE; + FULLY_BLOCKED; + NAME_COLLISION; + RESERVED_FOR_ANCHOR_TENANT; + RESERVED_FOR_SPECIFIC_USE; +} +class google.registry.model.tld.label.ReservedList { + @Id java.lang.String name; + @Parent com.googlecode.objectify.Key parent; + boolean shouldPublish; + java.util.Map reservedListMap; + org.joda.time.DateTime creationTimestamp; +} +class google.registry.model.tld.label.ReservedList$ReservedListEntry { + @Id java.lang.String domainLabel; + google.registry.model.tld.label.ReservationType reservationType; + java.lang.Long revisionId; + java.lang.String comment; +} class google.registry.model.tmch.ClaimsList { @Id long id; @Parent com.googlecode.objectify.Key parent; diff --git a/util/src/main/java/google/registry/util/DomainNameUtils.java b/util/src/main/java/google/registry/util/DomainNameUtils.java index 6a380642e..846636ad8 100644 --- a/util/src/main/java/google/registry/util/DomainNameUtils.java +++ b/util/src/main/java/google/registry/util/DomainNameUtils.java @@ -57,8 +57,8 @@ public final class DomainNameUtils { * *

This function is compatible with multi-part tlds, e.g. {@code co.uk}. This function will * also work on domains for which the registry is not authoritative. If you are certain that the - * input will be under a TLD this registry controls, then it is preferable to use - * {@link google.registry.model.registry.Registries#findTldForName(InternetDomainName) + * input will be under a TLD this registry controls, then it is preferable to use {@link + * google.registry.model.tld.Registries#findTldForName(InternetDomainName) * Registries#findTldForName}, which will work on hostnames in addition to domains. * * @param fullyQualifiedDomainName must be a punycode SLD (not a host or unicode)