diff --git a/core/src/main/java/google/registry/backup/ReplayCommitLogsToSqlAction.java b/core/src/main/java/google/registry/backup/ReplayCommitLogsToSqlAction.java index 9e419df19..b2870d6bc 100644 --- a/core/src/main/java/google/registry/backup/ReplayCommitLogsToSqlAction.java +++ b/core/src/main/java/google/registry/backup/ReplayCommitLogsToSqlAction.java @@ -36,6 +36,11 @@ import google.registry.gcs.GcsUtils; import google.registry.model.common.DatabaseMigrationStateSchedule; import google.registry.model.common.DatabaseMigrationStateSchedule.MigrationState; import google.registry.model.common.DatabaseMigrationStateSchedule.ReplayDirection; +import google.registry.model.replay.DatastoreEntity; +import google.registry.model.replay.DatastoreOnlyEntity; +import google.registry.model.replay.NonReplicatedEntity; +import google.registry.model.replay.ReplaySpecializer; +import google.registry.model.replay.SqlReplayCheckpoint; import google.registry.model.server.Lock; import google.registry.model.translators.VKeyTranslatorFactory; import google.registry.persistence.VKey; @@ -44,11 +49,6 @@ import google.registry.request.Action.Method; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.schema.replay.DatastoreEntity; -import google.registry.schema.replay.DatastoreOnlyEntity; -import google.registry.schema.replay.NonReplicatedEntity; -import google.registry.schema.replay.ReplaySpecializer; -import google.registry.schema.replay.SqlReplayCheckpoint; import google.registry.util.Clock; import google.registry.util.RequestStatusChecker; import java.io.IOException; diff --git a/core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java b/core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java index 95e267726..604eb9d74 100644 --- a/core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java +++ b/core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java @@ -28,10 +28,10 @@ import com.googlecode.objectify.Key; import google.registry.config.RegistryConfig.Config; import google.registry.model.EppResource; import google.registry.model.ImmutableObject; +import google.registry.model.domain.RegistryLock; import google.registry.model.eppcommon.Trid; import google.registry.model.host.HostResource; import google.registry.persistence.VKey; -import google.registry.schema.domain.RegistryLock; import google.registry.util.AppEngineServiceUtils; import google.registry.util.Retrier; import javax.inject.Inject; diff --git a/core/src/main/java/google/registry/batch/RelockDomainAction.java b/core/src/main/java/google/registry/batch/RelockDomainAction.java index 855945424..17b32ef89 100644 --- a/core/src/main/java/google/registry/batch/RelockDomainAction.java +++ b/core/src/main/java/google/registry/batch/RelockDomainAction.java @@ -28,6 +28,7 @@ import com.google.common.flogger.FluentLogger; import com.google.common.net.MediaType; import google.registry.config.RegistryConfig.Config; import google.registry.model.domain.DomainBase; +import google.registry.model.domain.RegistryLock; import google.registry.model.eppcommon.StatusValue; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; @@ -37,7 +38,6 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.schema.domain.RegistryLock; import google.registry.tools.DomainLockUtils; import google.registry.util.DateTimeUtils; import google.registry.util.EmailMessage; diff --git a/core/src/main/java/google/registry/beam/initsql/Transforms.java b/core/src/main/java/google/registry/beam/initsql/Transforms.java index e18e6dc24..45914a5d6 100644 --- a/core/src/main/java/google/registry/beam/initsql/Transforms.java +++ b/core/src/main/java/google/registry/beam/initsql/Transforms.java @@ -39,9 +39,9 @@ import google.registry.backup.VersionedEntity; import google.registry.model.billing.BillingEvent.Flag; import google.registry.model.billing.BillingEvent.Reason; import google.registry.model.domain.DomainBase; +import google.registry.model.replay.DatastoreAndSqlEntity; +import google.registry.model.replay.SqlEntity; import google.registry.model.reporting.HistoryEntry; -import google.registry.schema.replay.DatastoreAndSqlEntity; -import google.registry.schema.replay.SqlEntity; import google.registry.tools.LevelDbLogReader; import java.io.Serializable; import java.util.Collection; diff --git a/core/src/main/java/google/registry/model/EntityClasses.java b/core/src/main/java/google/registry/model/EntityClasses.java index dcdbad608..5600701ca 100644 --- a/core/src/main/java/google/registry/model/EntityClasses.java +++ b/core/src/main/java/google/registry/model/EntityClasses.java @@ -39,6 +39,7 @@ 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.replay.LastSqlTransaction; import google.registry.model.reporting.HistoryEntry; import google.registry.model.server.Lock; import google.registry.model.server.ServerSecret; @@ -48,7 +49,6 @@ import google.registry.model.tmch.ClaimsList; import google.registry.model.tmch.ClaimsList.ClaimsListRevision; import google.registry.model.tmch.ClaimsList.ClaimsListSingleton; import google.registry.model.tmch.TmchCrl; -import google.registry.schema.replay.LastSqlTransaction; /** Sets of classes of the Objectify-registered entities in use throughout the model. */ public final class EntityClasses { diff --git a/core/src/main/java/google/registry/model/billing/BillingEvent.java b/core/src/main/java/google/registry/model/billing/BillingEvent.java index 714ec63dc..bbb9f7a76 100644 --- a/core/src/main/java/google/registry/model/billing/BillingEvent.java +++ b/core/src/main/java/google/registry/model/billing/BillingEvent.java @@ -46,13 +46,13 @@ import google.registry.model.domain.DomainHistory; import google.registry.model.domain.GracePeriod; import google.registry.model.domain.rgp.GracePeriodStatus; import google.registry.model.domain.token.AllocationToken; +import google.registry.model.replay.DatastoreAndSqlEntity; +import google.registry.model.replay.DatastoreOnlyEntity; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.persistence.BillingVKey.BillingEventVKey; import google.registry.persistence.BillingVKey.BillingRecurrenceVKey; import google.registry.persistence.VKey; import google.registry.persistence.WithLongVKey; -import google.registry.schema.replay.DatastoreAndSqlEntity; -import google.registry.schema.replay.DatastoreOnlyEntity; import java.util.Objects; import java.util.Optional; import java.util.Set; 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 2dde5553f..10e1a2074 100644 --- a/core/src/main/java/google/registry/model/common/Cursor.java +++ b/core/src/main/java/google/registry/model/common/Cursor.java @@ -30,9 +30,9 @@ 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.replay.DatastoreAndSqlEntity; import google.registry.model.tld.Registry; import google.registry.persistence.VKey; -import google.registry.schema.replay.DatastoreAndSqlEntity; import java.io.Serializable; import java.util.List; import java.util.Optional; diff --git a/core/src/main/java/google/registry/model/common/DatabaseMigrationStateSchedule.java b/core/src/main/java/google/registry/model/common/DatabaseMigrationStateSchedule.java index 6ef46bd12..94624db7d 100644 --- a/core/src/main/java/google/registry/model/common/DatabaseMigrationStateSchedule.java +++ b/core/src/main/java/google/registry/model/common/DatabaseMigrationStateSchedule.java @@ -33,7 +33,7 @@ import com.googlecode.objectify.annotation.Mapify; import google.registry.model.annotations.InCrossTld; import google.registry.model.common.TimedTransitionProperty.TimeMapper; import google.registry.model.common.TimedTransitionProperty.TimedTransition; -import google.registry.schema.replay.DatastoreOnlyEntity; +import google.registry.model.replay.DatastoreOnlyEntity; import java.time.Duration; import java.util.Optional; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/model/common/EntityGroupRoot.java b/core/src/main/java/google/registry/model/common/EntityGroupRoot.java index eb9699576..791432461 100644 --- a/core/src/main/java/google/registry/model/common/EntityGroupRoot.java +++ b/core/src/main/java/google/registry/model/common/EntityGroupRoot.java @@ -19,7 +19,7 @@ import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; import google.registry.model.BackupGroupRoot; -import google.registry.schema.replay.DatastoreOnlyEntity; +import google.registry.model.replay.DatastoreOnlyEntity; import javax.annotation.Nullable; /** diff --git a/core/src/main/java/google/registry/model/contact/ContactHistory.java b/core/src/main/java/google/registry/model/contact/ContactHistory.java index 970eee673..b7e606d81 100644 --- a/core/src/main/java/google/registry/model/contact/ContactHistory.java +++ b/core/src/main/java/google/registry/model/contact/ContactHistory.java @@ -21,10 +21,10 @@ import com.googlecode.objectify.annotation.EntitySubclass; import google.registry.model.EppResource; import google.registry.model.ImmutableObject; import google.registry.model.contact.ContactHistory.ContactHistoryId; +import google.registry.model.replay.DatastoreEntity; +import google.registry.model.replay.SqlEntity; import google.registry.model.reporting.HistoryEntry; import google.registry.persistence.VKey; -import google.registry.schema.replay.DatastoreEntity; -import google.registry.schema.replay.SqlEntity; import java.io.Serializable; import java.util.Optional; import javax.annotation.Nullable; diff --git a/core/src/main/java/google/registry/model/contact/ContactResource.java b/core/src/main/java/google/registry/model/contact/ContactResource.java index 8258202dc..79e505655 100644 --- a/core/src/main/java/google/registry/model/contact/ContactResource.java +++ b/core/src/main/java/google/registry/model/contact/ContactResource.java @@ -19,9 +19,9 @@ import com.googlecode.objectify.annotation.Entity; import google.registry.model.EppResource.ForeignKeyedEppResource; import google.registry.model.annotations.ExternalMessagingName; import google.registry.model.annotations.ReportedOn; +import google.registry.model.replay.DatastoreAndSqlEntity; import google.registry.persistence.VKey; import google.registry.persistence.WithStringVKey; -import google.registry.schema.replay.DatastoreAndSqlEntity; import javax.persistence.Access; import javax.persistence.AccessType; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/model/domain/DomainBase.java b/core/src/main/java/google/registry/model/domain/DomainBase.java index acdce32e7..c18160b5e 100644 --- a/core/src/main/java/google/registry/model/domain/DomainBase.java +++ b/core/src/main/java/google/registry/model/domain/DomainBase.java @@ -21,9 +21,9 @@ import google.registry.model.annotations.ExternalMessagingName; import google.registry.model.annotations.ReportedOn; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.host.HostResource; +import google.registry.model.replay.DatastoreAndSqlEntity; import google.registry.persistence.VKey; import google.registry.persistence.WithStringVKey; -import google.registry.schema.replay.DatastoreAndSqlEntity; import java.util.Set; import javax.persistence.Access; import javax.persistence.AccessType; 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 c9a8e7e64..c3f434433 100644 --- a/core/src/main/java/google/registry/model/domain/DomainContent.java +++ b/core/src/main/java/google/registry/model/domain/DomainContent.java @@ -62,6 +62,7 @@ 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.replay.ReplaySpecializer; import google.registry.model.reporting.HistoryEntry; import google.registry.model.tld.Registry; import google.registry.model.transfer.DomainTransferData; @@ -374,7 +375,7 @@ public class DomainContent extends EppResource /** * Callback to delete grace periods and DelegationSignerData records prior to domain delete. * - *

See {@link google.registry.schema.replay.ReplaySpecializer}. + *

See {@link ReplaySpecializer}. */ public static void beforeSqlDelete(VKey key) { // Delete all grace periods associated with the domain. diff --git a/core/src/main/java/google/registry/model/domain/DomainHistory.java b/core/src/main/java/google/registry/model/domain/DomainHistory.java index ff6b24a21..f9a03a753 100644 --- a/core/src/main/java/google/registry/model/domain/DomainHistory.java +++ b/core/src/main/java/google/registry/model/domain/DomainHistory.java @@ -28,11 +28,11 @@ import google.registry.model.domain.GracePeriod.GracePeriodHistory; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.domain.secdns.DomainDsDataHistory; import google.registry.model.host.HostResource; +import google.registry.model.replay.DatastoreEntity; +import google.registry.model.replay.SqlEntity; import google.registry.model.reporting.DomainTransactionRecord; import google.registry.model.reporting.HistoryEntry; import google.registry.persistence.VKey; -import google.registry.schema.replay.DatastoreEntity; -import google.registry.schema.replay.SqlEntity; import java.io.Serializable; import java.util.HashSet; import java.util.Optional; diff --git a/core/src/main/java/google/registry/model/domain/GracePeriod.java b/core/src/main/java/google/registry/model/domain/GracePeriod.java index 7200cc7cb..8a3a5f8f6 100644 --- a/core/src/main/java/google/registry/model/domain/GracePeriod.java +++ b/core/src/main/java/google/registry/model/domain/GracePeriod.java @@ -23,10 +23,10 @@ import com.googlecode.objectify.annotation.Embed; import google.registry.model.billing.BillingEvent; import google.registry.model.billing.BillingEvent.Recurring; import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.replay.DatastoreAndSqlEntity; import google.registry.persistence.BillingVKey.BillingEventVKey; import google.registry.persistence.BillingVKey.BillingRecurrenceVKey; import google.registry.persistence.VKey; -import google.registry.schema.replay.DatastoreAndSqlEntity; import javax.annotation.Nullable; import javax.persistence.Access; import javax.persistence.AccessType; diff --git a/core/src/main/java/google/registry/schema/domain/RegistryLock.java b/core/src/main/java/google/registry/model/domain/RegistryLock.java similarity index 98% rename from core/src/main/java/google/registry/schema/domain/RegistryLock.java rename to core/src/main/java/google/registry/model/domain/RegistryLock.java index 9bbdb1452..43856c304 100644 --- a/core/src/main/java/google/registry/schema/domain/RegistryLock.java +++ b/core/src/main/java/google/registry/model/domain/RegistryLock.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.domain; +package google.registry.model.domain; import static com.google.common.base.Preconditions.checkArgument; import static google.registry.util.DateTimeUtils.isBeforeOrAt; @@ -23,7 +23,7 @@ import google.registry.model.Buildable; import google.registry.model.CreateAutoTimestamp; import google.registry.model.ImmutableObject; import google.registry.model.UpdateAutoTimestamp; -import google.registry.schema.replay.SqlOnlyEntity; +import google.registry.model.replay.SqlOnlyEntity; import google.registry.util.DateTimeUtils; import java.time.ZonedDateTime; import java.util.Optional; @@ -232,7 +232,7 @@ public final class RegistryLock extends ImmutableObject implements Buildable, Sq return new Builder(clone(this)); } - /** Builder for {@link google.registry.schema.domain.RegistryLock}. */ + /** Builder for {@link RegistryLock}. */ public static class Builder extends Buildable.Builder { public Builder() {} diff --git a/core/src/main/java/google/registry/model/domain/secdns/DomainDsDataHistory.java b/core/src/main/java/google/registry/model/domain/secdns/DomainDsDataHistory.java index 9f7e257e0..cc5c76067 100644 --- a/core/src/main/java/google/registry/model/domain/secdns/DomainDsDataHistory.java +++ b/core/src/main/java/google/registry/model/domain/secdns/DomainDsDataHistory.java @@ -17,7 +17,7 @@ package google.registry.model.domain.secdns; import static google.registry.model.IdService.allocateId; import google.registry.model.domain.DomainHistory; -import google.registry.schema.replay.SqlOnlyEntity; +import google.registry.model.replay.SqlOnlyEntity; import javax.persistence.Access; import javax.persistence.AccessType; import javax.persistence.Column; diff --git a/core/src/main/java/google/registry/model/domain/token/AllocationToken.java b/core/src/main/java/google/registry/model/domain/token/AllocationToken.java index c3816ae1c..e3f20b028 100644 --- a/core/src/main/java/google/registry/model/domain/token/AllocationToken.java +++ b/core/src/main/java/google/registry/model/domain/token/AllocationToken.java @@ -46,11 +46,11 @@ import google.registry.model.annotations.ReportedOn; import google.registry.model.common.TimedTransitionProperty; import google.registry.model.common.TimedTransitionProperty.TimeMapper; import google.registry.model.common.TimedTransitionProperty.TimedTransition; +import google.registry.model.replay.DatastoreAndSqlEntity; import google.registry.model.reporting.HistoryEntry; import google.registry.persistence.DomainHistoryVKey; import google.registry.persistence.VKey; import google.registry.persistence.WithStringVKey; -import google.registry.schema.replay.DatastoreAndSqlEntity; import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; diff --git a/core/src/main/java/google/registry/model/host/HostHistory.java b/core/src/main/java/google/registry/model/host/HostHistory.java index 52592d69e..2ef1b1bb8 100644 --- a/core/src/main/java/google/registry/model/host/HostHistory.java +++ b/core/src/main/java/google/registry/model/host/HostHistory.java @@ -21,10 +21,10 @@ import com.googlecode.objectify.annotation.EntitySubclass; import google.registry.model.EppResource; import google.registry.model.ImmutableObject; import google.registry.model.host.HostHistory.HostHistoryId; +import google.registry.model.replay.DatastoreEntity; +import google.registry.model.replay.SqlEntity; import google.registry.model.reporting.HistoryEntry; import google.registry.persistence.VKey; -import google.registry.schema.replay.DatastoreEntity; -import google.registry.schema.replay.SqlEntity; import java.io.Serializable; import java.util.Optional; import javax.annotation.Nullable; diff --git a/core/src/main/java/google/registry/model/host/HostResource.java b/core/src/main/java/google/registry/model/host/HostResource.java index 185b3219d..5a40b9321 100644 --- a/core/src/main/java/google/registry/model/host/HostResource.java +++ b/core/src/main/java/google/registry/model/host/HostResource.java @@ -19,9 +19,9 @@ import com.googlecode.objectify.annotation.Entity; import google.registry.model.EppResource.ForeignKeyedEppResource; import google.registry.model.annotations.ExternalMessagingName; import google.registry.model.annotations.ReportedOn; +import google.registry.model.replay.DatastoreAndSqlEntity; import google.registry.persistence.VKey; import google.registry.persistence.WithStringVKey; -import google.registry.schema.replay.DatastoreAndSqlEntity; import javax.persistence.Access; import javax.persistence.AccessType; diff --git a/core/src/main/java/google/registry/model/index/EppResourceIndex.java b/core/src/main/java/google/registry/model/index/EppResourceIndex.java index 21f692ffc..3ea61aa34 100644 --- a/core/src/main/java/google/registry/model/index/EppResourceIndex.java +++ b/core/src/main/java/google/registry/model/index/EppResourceIndex.java @@ -25,7 +25,7 @@ import com.googlecode.objectify.annotation.Parent; import google.registry.model.BackupGroupRoot; import google.registry.model.EppResource; import google.registry.model.annotations.ReportedOn; -import google.registry.schema.replay.DatastoreOnlyEntity; +import google.registry.model.replay.DatastoreOnlyEntity; /** An index that allows for quick enumeration of all EppResource entities (e.g. via map reduce). */ @ReportedOn diff --git a/core/src/main/java/google/registry/model/index/EppResourceIndexBucket.java b/core/src/main/java/google/registry/model/index/EppResourceIndexBucket.java index 31d9665b5..6a228ba51 100644 --- a/core/src/main/java/google/registry/model/index/EppResourceIndexBucket.java +++ b/core/src/main/java/google/registry/model/index/EppResourceIndexBucket.java @@ -24,7 +24,7 @@ import com.googlecode.objectify.annotation.Id; import google.registry.model.EppResource; import google.registry.model.ImmutableObject; import google.registry.model.annotations.VirtualEntity; -import google.registry.schema.replay.DatastoreOnlyEntity; +import google.registry.model.replay.DatastoreOnlyEntity; /** A virtual entity to represent buckets to which EppResourceIndex objects are randomly added. */ @Entity diff --git a/core/src/main/java/google/registry/model/index/ForeignKeyIndex.java b/core/src/main/java/google/registry/model/index/ForeignKeyIndex.java index 9ed7960b7..8e44460ae 100644 --- a/core/src/main/java/google/registry/model/index/ForeignKeyIndex.java +++ b/core/src/main/java/google/registry/model/index/ForeignKeyIndex.java @@ -47,9 +47,9 @@ import google.registry.model.annotations.ReportedOn; import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainBase; import google.registry.model.host.HostResource; +import google.registry.model.replay.DatastoreOnlyEntity; import google.registry.persistence.VKey; import google.registry.persistence.transaction.CriteriaQueryBuilder; -import google.registry.schema.replay.DatastoreOnlyEntity; import google.registry.util.NonFinalForTesting; import java.util.Collection; import java.util.Comparator; diff --git a/core/src/main/java/google/registry/model/ofy/CommitLogBucket.java b/core/src/main/java/google/registry/model/ofy/CommitLogBucket.java index ac4821f1d..61b72f03a 100644 --- a/core/src/main/java/google/registry/model/ofy/CommitLogBucket.java +++ b/core/src/main/java/google/registry/model/ofy/CommitLogBucket.java @@ -33,7 +33,7 @@ import google.registry.model.Buildable; import google.registry.model.ImmutableObject; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; -import google.registry.schema.replay.DatastoreOnlyEntity; +import google.registry.model.replay.DatastoreOnlyEntity; import google.registry.util.NonFinalForTesting; import java.util.Random; import java.util.function.Supplier; diff --git a/core/src/main/java/google/registry/model/ofy/CommitLogCheckpoint.java b/core/src/main/java/google/registry/model/ofy/CommitLogCheckpoint.java index 8454fe782..08262a924 100644 --- a/core/src/main/java/google/registry/model/ofy/CommitLogCheckpoint.java +++ b/core/src/main/java/google/registry/model/ofy/CommitLogCheckpoint.java @@ -27,7 +27,7 @@ import com.googlecode.objectify.annotation.Parent; import google.registry.model.ImmutableObject; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; -import google.registry.schema.replay.DatastoreOnlyEntity; +import google.registry.model.replay.DatastoreOnlyEntity; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/core/src/main/java/google/registry/model/ofy/CommitLogCheckpointRoot.java b/core/src/main/java/google/registry/model/ofy/CommitLogCheckpointRoot.java index 96035974f..4f7a6eb78 100644 --- a/core/src/main/java/google/registry/model/ofy/CommitLogCheckpointRoot.java +++ b/core/src/main/java/google/registry/model/ofy/CommitLogCheckpointRoot.java @@ -23,7 +23,7 @@ import com.googlecode.objectify.annotation.Id; import google.registry.model.ImmutableObject; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; -import google.registry.schema.replay.DatastoreOnlyEntity; +import google.registry.model.replay.DatastoreOnlyEntity; import org.joda.time.DateTime; /** Singleton parent entity for all commit log checkpoints. */ diff --git a/core/src/main/java/google/registry/model/ofy/CommitLogManifest.java b/core/src/main/java/google/registry/model/ofy/CommitLogManifest.java index 4b2443d25..4df6cec3e 100644 --- a/core/src/main/java/google/registry/model/ofy/CommitLogManifest.java +++ b/core/src/main/java/google/registry/model/ofy/CommitLogManifest.java @@ -25,7 +25,7 @@ import com.googlecode.objectify.annotation.Parent; import google.registry.model.ImmutableObject; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; -import google.registry.schema.replay.DatastoreOnlyEntity; +import google.registry.model.replay.DatastoreOnlyEntity; import java.util.LinkedHashSet; import java.util.Set; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/model/ofy/CommitLogMutation.java b/core/src/main/java/google/registry/model/ofy/CommitLogMutation.java index 9057641cf..be59ba9ee 100644 --- a/core/src/main/java/google/registry/model/ofy/CommitLogMutation.java +++ b/core/src/main/java/google/registry/model/ofy/CommitLogMutation.java @@ -29,7 +29,7 @@ import com.googlecode.objectify.annotation.Parent; import google.registry.model.ImmutableObject; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; -import google.registry.schema.replay.DatastoreOnlyEntity; +import google.registry.model.replay.DatastoreOnlyEntity; /** Representation of a saved entity in a {@link CommitLogManifest} (not deletes). */ @Entity diff --git a/core/src/main/java/google/registry/model/ofy/DatastoreTransactionManager.java b/core/src/main/java/google/registry/model/ofy/DatastoreTransactionManager.java index c60eaecf2..b9503b70a 100644 --- a/core/src/main/java/google/registry/model/ofy/DatastoreTransactionManager.java +++ b/core/src/main/java/google/registry/model/ofy/DatastoreTransactionManager.java @@ -36,12 +36,12 @@ import google.registry.model.annotations.InCrossTld; import google.registry.model.contact.ContactHistory; import google.registry.model.domain.DomainHistory; import google.registry.model.host.HostHistory; +import google.registry.model.replay.DatastoreEntity; +import google.registry.model.replay.SqlEntity; import google.registry.model.reporting.HistoryEntry; import google.registry.persistence.VKey; import google.registry.persistence.transaction.QueryComposer; import google.registry.persistence.transaction.TransactionManager; -import google.registry.schema.replay.DatastoreEntity; -import google.registry.schema.replay.SqlEntity; import java.util.List; import java.util.NoSuchElementException; import java.util.Optional; diff --git a/core/src/main/java/google/registry/model/ofy/ReplayQueue.java b/core/src/main/java/google/registry/model/ofy/ReplayQueue.java index 1003a5cc1..62c89c50d 100644 --- a/core/src/main/java/google/registry/model/ofy/ReplayQueue.java +++ b/core/src/main/java/google/registry/model/ofy/ReplayQueue.java @@ -22,9 +22,9 @@ import com.google.common.collect.ImmutableMap; import com.googlecode.objectify.Key; import google.registry.config.RegistryEnvironment; import google.registry.model.UpdateAutoTimestamp; +import google.registry.model.replay.DatastoreEntity; +import google.registry.model.replay.ReplaySpecializer; import google.registry.persistence.VKey; -import google.registry.schema.replay.DatastoreEntity; -import google.registry.schema.replay.ReplaySpecializer; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/core/src/main/java/google/registry/model/poll/PollMessage.java b/core/src/main/java/google/registry/model/poll/PollMessage.java index 09cc6b01a..d4ba74770 100644 --- a/core/src/main/java/google/registry/model/poll/PollMessage.java +++ b/core/src/main/java/google/registry/model/poll/PollMessage.java @@ -43,6 +43,7 @@ import google.registry.model.host.HostResource; import google.registry.model.poll.PendingActionNotificationResponse.ContactPendingActionNotificationResponse; import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; import google.registry.model.poll.PendingActionNotificationResponse.HostPendingActionNotificationResponse; +import google.registry.model.replay.DatastoreAndSqlEntity; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.model.transfer.TransferResponse; @@ -50,7 +51,6 @@ import google.registry.model.transfer.TransferResponse.ContactTransferResponse; import google.registry.model.transfer.TransferResponse.DomainTransferResponse; import google.registry.persistence.VKey; import google.registry.persistence.WithLongVKey; -import google.registry.schema.replay.DatastoreAndSqlEntity; import java.util.List; import java.util.Optional; import javax.annotation.Nullable; diff --git a/core/src/main/java/google/registry/model/rde/RdeRevision.java b/core/src/main/java/google/registry/model/rde/RdeRevision.java index cd0675647..659c8ee48 100644 --- a/core/src/main/java/google/registry/model/rde/RdeRevision.java +++ b/core/src/main/java/google/registry/model/rde/RdeRevision.java @@ -27,9 +27,9 @@ import com.googlecode.objectify.annotation.Ignore; import google.registry.model.BackupGroupRoot; import google.registry.model.ImmutableObject; import google.registry.model.rde.RdeRevision.RdeRevisionId; +import google.registry.model.replay.NonReplicatedEntity; import google.registry.persistence.VKey; import google.registry.persistence.converter.LocalDateConverter; -import google.registry.schema.replay.NonReplicatedEntity; import java.io.Serializable; import java.util.Optional; import javax.persistence.Column; 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 f084e364c..fdcf70509 100644 --- a/core/src/main/java/google/registry/model/registrar/Registrar.java +++ b/core/src/main/java/google/registry/model/registrar/Registrar.java @@ -77,9 +77,9 @@ 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.replay.DatastoreAndSqlEntity; import google.registry.model.tld.Registry; import google.registry.persistence.VKey; -import google.registry.schema.replay.DatastoreAndSqlEntity; import google.registry.util.CidrAddressBlock; import java.security.cert.CertificateParsingException; import java.util.Comparator; diff --git a/core/src/main/java/google/registry/model/registrar/RegistrarContact.java b/core/src/main/java/google/registry/model/registrar/RegistrarContact.java index 3e344506b..810d67c52 100644 --- a/core/src/main/java/google/registry/model/registrar/RegistrarContact.java +++ b/core/src/main/java/google/registry/model/registrar/RegistrarContact.java @@ -48,8 +48,8 @@ import google.registry.model.Jsonifiable; import google.registry.model.annotations.InCrossTld; import google.registry.model.annotations.ReportedOn; import google.registry.model.registrar.RegistrarContact.RegistrarPocId; +import google.registry.model.replay.DatastoreAndSqlEntity; import google.registry.persistence.VKey; -import google.registry.schema.replay.DatastoreAndSqlEntity; import java.io.Serializable; import java.util.Arrays; import java.util.Map; diff --git a/core/src/main/java/google/registry/schema/replay/DatastoreAndSqlEntity.java b/core/src/main/java/google/registry/model/replay/DatastoreAndSqlEntity.java similarity index 96% rename from core/src/main/java/google/registry/schema/replay/DatastoreAndSqlEntity.java rename to core/src/main/java/google/registry/model/replay/DatastoreAndSqlEntity.java index d7968021d..eb6d54646 100644 --- a/core/src/main/java/google/registry/schema/replay/DatastoreAndSqlEntity.java +++ b/core/src/main/java/google/registry/model/replay/DatastoreAndSqlEntity.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.replay; +package google.registry.model.replay; import java.util.Optional; diff --git a/core/src/main/java/google/registry/schema/replay/DatastoreEntity.java b/core/src/main/java/google/registry/model/replay/DatastoreEntity.java similarity index 96% rename from core/src/main/java/google/registry/schema/replay/DatastoreEntity.java rename to core/src/main/java/google/registry/model/replay/DatastoreEntity.java index a1de6eef3..45f11fab0 100644 --- a/core/src/main/java/google/registry/schema/replay/DatastoreEntity.java +++ b/core/src/main/java/google/registry/model/replay/DatastoreEntity.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.replay; +package google.registry.model.replay; import java.util.Optional; diff --git a/core/src/main/java/google/registry/schema/replay/DatastoreOnlyEntity.java b/core/src/main/java/google/registry/model/replay/DatastoreOnlyEntity.java similarity index 95% rename from core/src/main/java/google/registry/schema/replay/DatastoreOnlyEntity.java rename to core/src/main/java/google/registry/model/replay/DatastoreOnlyEntity.java index 4a0c746d8..621d7cb37 100644 --- a/core/src/main/java/google/registry/schema/replay/DatastoreOnlyEntity.java +++ b/core/src/main/java/google/registry/model/replay/DatastoreOnlyEntity.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.replay; +package google.registry.model.replay; import java.util.Optional; diff --git a/core/src/main/java/google/registry/schema/replay/LastSqlTransaction.java b/core/src/main/java/google/registry/model/replay/LastSqlTransaction.java similarity index 98% rename from core/src/main/java/google/registry/schema/replay/LastSqlTransaction.java rename to core/src/main/java/google/registry/model/replay/LastSqlTransaction.java index e77a24e1b..6d2e90e72 100644 --- a/core/src/main/java/google/registry/schema/replay/LastSqlTransaction.java +++ b/core/src/main/java/google/registry/model/replay/LastSqlTransaction.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.replay; +package google.registry.model.replay; import static com.google.common.base.Preconditions.checkArgument; import static google.registry.model.ofy.ObjectifyService.auditedOfy; diff --git a/core/src/main/java/google/registry/schema/replay/NonReplicatedEntity.java b/core/src/main/java/google/registry/model/replay/NonReplicatedEntity.java similarity index 96% rename from core/src/main/java/google/registry/schema/replay/NonReplicatedEntity.java rename to core/src/main/java/google/registry/model/replay/NonReplicatedEntity.java index d8ea2ca5a..0059f560e 100644 --- a/core/src/main/java/google/registry/schema/replay/NonReplicatedEntity.java +++ b/core/src/main/java/google/registry/model/replay/NonReplicatedEntity.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.replay; +package google.registry.model.replay; import java.util.Optional; diff --git a/core/src/main/java/google/registry/schema/replay/ReplaySpecializer.java b/core/src/main/java/google/registry/model/replay/ReplaySpecializer.java similarity index 98% rename from core/src/main/java/google/registry/schema/replay/ReplaySpecializer.java rename to core/src/main/java/google/registry/model/replay/ReplaySpecializer.java index d780b9404..b09794772 100644 --- a/core/src/main/java/google/registry/schema/replay/ReplaySpecializer.java +++ b/core/src/main/java/google/registry/model/replay/ReplaySpecializer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.replay; +package google.registry.model.replay; import google.registry.persistence.VKey; import java.lang.reflect.InvocationTargetException; diff --git a/core/src/main/java/google/registry/schema/replay/ReplicateToDatastoreAction.java b/core/src/main/java/google/registry/model/replay/ReplicateToDatastoreAction.java similarity index 99% rename from core/src/main/java/google/registry/schema/replay/ReplicateToDatastoreAction.java rename to core/src/main/java/google/registry/model/replay/ReplicateToDatastoreAction.java index 5ec8a4866..ccb419f31 100644 --- a/core/src/main/java/google/registry/schema/replay/ReplicateToDatastoreAction.java +++ b/core/src/main/java/google/registry/model/replay/ReplicateToDatastoreAction.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.replay; +package google.registry.model.replay; import static google.registry.model.ofy.ObjectifyService.auditedOfy; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/main/java/google/registry/schema/replay/SqlEntity.java b/core/src/main/java/google/registry/model/replay/SqlEntity.java similarity index 96% rename from core/src/main/java/google/registry/schema/replay/SqlEntity.java rename to core/src/main/java/google/registry/model/replay/SqlEntity.java index 55e43b19d..69144c6cb 100644 --- a/core/src/main/java/google/registry/schema/replay/SqlEntity.java +++ b/core/src/main/java/google/registry/model/replay/SqlEntity.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.replay; +package google.registry.model.replay; import java.util.Optional; diff --git a/core/src/main/java/google/registry/schema/replay/SqlOnlyEntity.java b/core/src/main/java/google/registry/model/replay/SqlOnlyEntity.java similarity index 95% rename from core/src/main/java/google/registry/schema/replay/SqlOnlyEntity.java rename to core/src/main/java/google/registry/model/replay/SqlOnlyEntity.java index a7124d1ce..0c25349da 100644 --- a/core/src/main/java/google/registry/schema/replay/SqlOnlyEntity.java +++ b/core/src/main/java/google/registry/model/replay/SqlOnlyEntity.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.replay; +package google.registry.model.replay; import java.util.Optional; diff --git a/core/src/main/java/google/registry/schema/replay/SqlReplayCheckpoint.java b/core/src/main/java/google/registry/model/replay/SqlReplayCheckpoint.java similarity index 97% rename from core/src/main/java/google/registry/schema/replay/SqlReplayCheckpoint.java rename to core/src/main/java/google/registry/model/replay/SqlReplayCheckpoint.java index 121c56cd0..85f6d5362 100644 --- a/core/src/main/java/google/registry/schema/replay/SqlReplayCheckpoint.java +++ b/core/src/main/java/google/registry/model/replay/SqlReplayCheckpoint.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.replay; +package google.registry.model.replay; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import static google.registry.util.DateTimeUtils.START_OF_TIME; diff --git a/core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java b/core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java index 4894ef6d9..a2a62c641 100644 --- a/core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java +++ b/core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java @@ -22,7 +22,7 @@ import com.googlecode.objectify.annotation.Embed; import com.googlecode.objectify.annotation.Ignore; import google.registry.model.Buildable; import google.registry.model.ImmutableObject; -import google.registry.schema.replay.DatastoreAndSqlEntity; +import google.registry.model.replay.DatastoreAndSqlEntity; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.EnumType; diff --git a/core/src/main/java/google/registry/model/reporting/HistoryEntry.java b/core/src/main/java/google/registry/model/reporting/HistoryEntry.java index 2d02c2982..899280897 100644 --- a/core/src/main/java/google/registry/model/reporting/HistoryEntry.java +++ b/core/src/main/java/google/registry/model/reporting/HistoryEntry.java @@ -46,9 +46,9 @@ import google.registry.model.host.HostBase; import google.registry.model.host.HostHistory; import google.registry.model.host.HostHistory.HostHistoryId; import google.registry.model.host.HostResource; +import google.registry.model.replay.DatastoreEntity; +import google.registry.model.replay.SqlEntity; import google.registry.persistence.VKey; -import google.registry.schema.replay.DatastoreEntity; -import google.registry.schema.replay.SqlEntity; import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; diff --git a/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatch.java b/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatch.java index 80a5fd3e8..aec00a2db 100644 --- a/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatch.java +++ b/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatch.java @@ -21,7 +21,7 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.common.collect.ImmutableSet; import google.registry.model.Buildable; import google.registry.model.ImmutableObject; -import google.registry.schema.replay.SqlOnlyEntity; +import google.registry.model.replay.SqlOnlyEntity; import google.registry.util.DomainNameUtils; import java.util.Set; import javax.persistence.Column; diff --git a/core/src/main/java/google/registry/model/server/Lock.java b/core/src/main/java/google/registry/model/server/Lock.java index b448d4360..69fddccf8 100644 --- a/core/src/main/java/google/registry/model/server/Lock.java +++ b/core/src/main/java/google/registry/model/server/Lock.java @@ -29,8 +29,8 @@ import com.googlecode.objectify.annotation.Id; import google.registry.model.ImmutableObject; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; +import google.registry.model.replay.DatastoreAndSqlEntity; import google.registry.persistence.VKey; -import google.registry.schema.replay.DatastoreAndSqlEntity; import google.registry.util.RequestStatusChecker; import google.registry.util.RequestStatusCheckerImpl; import java.io.Serializable; diff --git a/core/src/main/java/google/registry/model/server/ServerSecret.java b/core/src/main/java/google/registry/model/server/ServerSecret.java index 76ed2c7b9..d073e42b4 100644 --- a/core/src/main/java/google/registry/model/server/ServerSecret.java +++ b/core/src/main/java/google/registry/model/server/ServerSecret.java @@ -28,7 +28,7 @@ import com.googlecode.objectify.annotation.Unindex; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; import google.registry.model.common.CrossTldSingleton; -import google.registry.schema.replay.NonReplicatedEntity; +import google.registry.model.replay.NonReplicatedEntity; import java.nio.ByteBuffer; import java.util.Optional; import java.util.UUID; diff --git a/core/src/main/java/google/registry/model/smd/SignedMarkRevocationList.java b/core/src/main/java/google/registry/model/smd/SignedMarkRevocationList.java index e918e8215..c498119fb 100644 --- a/core/src/main/java/google/registry/model/smd/SignedMarkRevocationList.java +++ b/core/src/main/java/google/registry/model/smd/SignedMarkRevocationList.java @@ -21,7 +21,7 @@ import static google.registry.util.DateTimeUtils.isBeforeOrAt; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; import google.registry.model.ImmutableObject; -import google.registry.schema.replay.SqlOnlyEntity; +import google.registry.model.replay.SqlOnlyEntity; import java.util.Map; import javax.persistence.CollectionTable; import javax.persistence.Column; diff --git a/core/src/main/java/google/registry/model/tld/Registry.java b/core/src/main/java/google/registry/model/tld/Registry.java index 3928ae2f0..71d731a73 100644 --- a/core/src/main/java/google/registry/model/tld/Registry.java +++ b/core/src/main/java/google/registry/model/tld/Registry.java @@ -59,10 +59,10 @@ 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.replay.DatastoreAndSqlEntity; 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; import java.util.Map; import java.util.Optional; diff --git a/core/src/main/java/google/registry/model/tld/RegistryLockDao.java b/core/src/main/java/google/registry/model/tld/RegistryLockDao.java index 318eadf66..d8831d914 100644 --- a/core/src/main/java/google/registry/model/tld/RegistryLockDao.java +++ b/core/src/main/java/google/registry/model/tld/RegistryLockDao.java @@ -18,10 +18,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import com.google.common.collect.ImmutableList; -import google.registry.schema.domain.RegistryLock; +import google.registry.model.domain.RegistryLock; import java.util.Optional; -/** Data access object for {@link google.registry.schema.domain.RegistryLock}. */ +/** Data access object for {@link RegistryLock}. */ public final class RegistryLockDao { /** Returns the {@link RegistryLock} referred to by this revision ID, or empty if none exists. */ diff --git a/core/src/main/java/google/registry/model/tld/label/PremiumList.java b/core/src/main/java/google/registry/model/tld/label/PremiumList.java index 45c1be707..c9282c5e9 100644 --- a/core/src/main/java/google/registry/model/tld/label/PremiumList.java +++ b/core/src/main/java/google/registry/model/tld/label/PremiumList.java @@ -26,9 +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.replay.SqlOnlyEntity; import google.registry.model.tld.Registry; import google.registry.model.tld.label.PremiumList.PremiumEntry; -import google.registry.schema.replay.SqlOnlyEntity; import java.io.Serializable; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/core/src/main/java/google/registry/model/tld/label/ReservedList.java b/core/src/main/java/google/registry/model/tld/label/ReservedList.java index be5659364..e473f8799 100644 --- a/core/src/main/java/google/registry/model/tld/label/ReservedList.java +++ b/core/src/main/java/google/registry/model/tld/label/ReservedList.java @@ -39,9 +39,9 @@ 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.replay.NonReplicatedEntity; 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; import java.util.Map; diff --git a/core/src/main/java/google/registry/model/tmch/ClaimsEntry.java b/core/src/main/java/google/registry/model/tmch/ClaimsEntry.java index 864936d93..5c44494fa 100644 --- a/core/src/main/java/google/registry/model/tmch/ClaimsEntry.java +++ b/core/src/main/java/google/registry/model/tmch/ClaimsEntry.java @@ -15,7 +15,7 @@ package google.registry.model.tmch; import google.registry.model.ImmutableObject; -import google.registry.schema.replay.NonReplicatedEntity; +import google.registry.model.replay.NonReplicatedEntity; import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; 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 34ad5179c..ed1e5ab03 100644 --- a/core/src/main/java/google/registry/model/tmch/ClaimsList.java +++ b/core/src/main/java/google/registry/model/tmch/ClaimsList.java @@ -36,9 +36,9 @@ 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.replay.DatastoreOnlyEntity; +import google.registry.model.replay.NonReplicatedEntity; import google.registry.model.tld.label.ReservedList.ReservedListEntry; -import google.registry.schema.replay.DatastoreOnlyEntity; -import google.registry.schema.replay.NonReplicatedEntity; import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; diff --git a/core/src/main/java/google/registry/model/tmch/TmchCrl.java b/core/src/main/java/google/registry/model/tmch/TmchCrl.java index 0321cc5d5..8253e7469 100644 --- a/core/src/main/java/google/registry/model/tmch/TmchCrl.java +++ b/core/src/main/java/google/registry/model/tmch/TmchCrl.java @@ -23,7 +23,7 @@ import com.googlecode.objectify.annotation.Entity; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; import google.registry.model.common.CrossTldSingleton; -import google.registry.schema.replay.NonReplicatedEntity; +import google.registry.model.replay.NonReplicatedEntity; import java.util.Optional; import javax.annotation.concurrent.Immutable; import javax.persistence.Column; diff --git a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java index c40db39cd..06fd11225 100644 --- a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java +++ b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java @@ -38,11 +38,11 @@ import google.registry.model.index.ForeignKeyIndex.ForeignKeyContactIndex; import google.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex; import google.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex; import google.registry.model.ofy.DatastoreTransactionManager; +import google.registry.model.replay.NonReplicatedEntity; +import google.registry.model.replay.SqlOnlyEntity; import google.registry.model.tmch.ClaimsList.ClaimsListSingleton; import google.registry.persistence.JpaRetries; import google.registry.persistence.VKey; -import google.registry.schema.replay.NonReplicatedEntity; -import google.registry.schema.replay.SqlOnlyEntity; import google.registry.util.Clock; import google.registry.util.Retrier; import google.registry.util.SystemSleeper; diff --git a/core/src/main/java/google/registry/persistence/transaction/TransactionEntity.java b/core/src/main/java/google/registry/persistence/transaction/TransactionEntity.java index c159a4d1d..8ed18eadd 100644 --- a/core/src/main/java/google/registry/persistence/transaction/TransactionEntity.java +++ b/core/src/main/java/google/registry/persistence/transaction/TransactionEntity.java @@ -14,7 +14,7 @@ package google.registry.persistence.transaction; -import google.registry.schema.replay.SqlOnlyEntity; +import google.registry.model.replay.SqlOnlyEntity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; diff --git a/core/src/main/java/google/registry/tools/DomainLockUtils.java b/core/src/main/java/google/registry/tools/DomainLockUtils.java index 292bd9eda..4977f2fd5 100644 --- a/core/src/main/java/google/registry/tools/DomainLockUtils.java +++ b/core/src/main/java/google/registry/tools/DomainLockUtils.java @@ -28,10 +28,10 @@ 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.domain.RegistryLock; 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; import javax.annotation.Nullable; diff --git a/core/src/main/java/google/registry/tools/MutatingCommand.java b/core/src/main/java/google/registry/tools/MutatingCommand.java index 62150d703..10c1d6d17 100644 --- a/core/src/main/java/google/registry/tools/MutatingCommand.java +++ b/core/src/main/java/google/registry/tools/MutatingCommand.java @@ -32,8 +32,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.googlecode.objectify.Key; import google.registry.model.ImmutableObject; +import google.registry.model.replay.SqlEntity; import google.registry.persistence.VKey; -import google.registry.schema.replay.SqlEntity; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedHashMap; diff --git a/core/src/main/java/google/registry/tools/SetSqlReplayCheckpointCommand.java b/core/src/main/java/google/registry/tools/SetSqlReplayCheckpointCommand.java index 06413a958..e36e23798 100644 --- a/core/src/main/java/google/registry/tools/SetSqlReplayCheckpointCommand.java +++ b/core/src/main/java/google/registry/tools/SetSqlReplayCheckpointCommand.java @@ -20,7 +20,7 @@ import static google.registry.persistence.transaction.TransactionManagerFactory. import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.google.common.collect.Iterables; -import google.registry.schema.replay.SqlReplayCheckpoint; +import google.registry.model.replay.SqlReplayCheckpoint; import java.util.List; import org.joda.time.DateTime; 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 d5d236cb8..9de166140 100644 --- a/core/src/main/java/google/registry/tools/javascrap/BackfillRegistryLocksCommand.java +++ b/core/src/main/java/google/registry/tools/javascrap/BackfillRegistryLocksCommand.java @@ -30,11 +30,11 @@ 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.domain.RegistryLock; 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; import google.registry.tools.ConfirmingCommand; import google.registry.util.Clock; 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 87bd47186..331f9471a 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 @@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.flogger.FluentLogger; import com.google.common.net.MediaType; import com.google.gson.Gson; +import google.registry.model.domain.RegistryLock; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; import google.registry.model.tld.RegistryLockDao; @@ -41,7 +42,6 @@ import google.registry.request.auth.Auth; import google.registry.request.auth.AuthResult; import google.registry.request.auth.AuthenticatedRegistrarAccessor; import google.registry.request.auth.AuthenticatedRegistrarAccessor.RegistrarAccessDeniedException; -import google.registry.schema.domain.RegistryLock; import google.registry.security.JsonResponseHelper; import java.util.Objects; import java.util.Optional; diff --git a/core/src/main/java/google/registry/ui/server/registrar/RegistryLockPostAction.java b/core/src/main/java/google/registry/ui/server/registrar/RegistryLockPostAction.java index 2d230d815..1487e5a7a 100644 --- a/core/src/main/java/google/registry/ui/server/registrar/RegistryLockPostAction.java +++ b/core/src/main/java/google/registry/ui/server/registrar/RegistryLockPostAction.java @@ -31,6 +31,7 @@ import com.google.common.flogger.FluentLogger; import com.google.gson.Gson; import google.registry.config.RegistryConfig.Config; import google.registry.flows.domain.DomainFlowUtils; +import google.registry.model.domain.RegistryLock; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; import google.registry.request.Action; @@ -42,7 +43,6 @@ import google.registry.request.auth.AuthResult; import google.registry.request.auth.AuthenticatedRegistrarAccessor; import google.registry.request.auth.AuthenticatedRegistrarAccessor.RegistrarAccessDeniedException; import google.registry.request.auth.UserAuthInfo; -import google.registry.schema.domain.RegistryLock; import google.registry.security.JsonResponseHelper; import google.registry.tools.DomainLockUtils; import google.registry.util.EmailMessage; diff --git a/core/src/main/java/google/registry/ui/server/registrar/RegistryLockVerifyAction.java b/core/src/main/java/google/registry/ui/server/registrar/RegistryLockVerifyAction.java index 09fb1b194..901bb77a6 100644 --- a/core/src/main/java/google/registry/ui/server/registrar/RegistryLockVerifyAction.java +++ b/core/src/main/java/google/registry/ui/server/registrar/RegistryLockVerifyAction.java @@ -20,10 +20,10 @@ import com.google.common.base.Supplier; import com.google.common.base.Throwables; import com.google.common.flogger.FluentLogger; import com.google.template.soy.tofu.SoyTofu; +import google.registry.model.domain.RegistryLock; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.auth.Auth; -import google.registry.schema.domain.RegistryLock; import google.registry.tools.DomainLockUtils; import google.registry.ui.server.SoyTemplateUtils; import google.registry.ui.soy.registrar.RegistryLockVerificationSoyInfo; diff --git a/core/src/main/resources/META-INF/persistence.xml b/core/src/main/resources/META-INF/persistence.xml index 6463928c9..428cd342e 100644 --- a/core/src/main/resources/META-INF/persistence.xml +++ b/core/src/main/resources/META-INF/persistence.xml @@ -73,8 +73,8 @@ google.registry.model.tmch.ClaimsEntry google.registry.model.tmch.TmchCrl google.registry.persistence.transaction.TransactionEntity - google.registry.schema.domain.RegistryLock - google.registry.schema.replay.SqlReplayCheckpoint + google.registry.model.domain.RegistryLock + google.registry.model.replay.SqlReplayCheckpoint google.registry.persistence.converter.AllocationTokenStatusTransitionConverter diff --git a/core/src/test/java/google/registry/backup/ReplayCommitLogsToSqlActionTest.java b/core/src/test/java/google/registry/backup/ReplayCommitLogsToSqlActionTest.java index 2664536aa..9c050db24 100644 --- a/core/src/test/java/google/registry/backup/ReplayCommitLogsToSqlActionTest.java +++ b/core/src/test/java/google/registry/backup/ReplayCommitLogsToSqlActionTest.java @@ -56,6 +56,7 @@ 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.replay.SqlReplayCheckpoint; import google.registry.model.server.Lock; import google.registry.model.tld.label.PremiumList; import google.registry.model.tld.label.PremiumList.PremiumEntry; @@ -65,7 +66,6 @@ import google.registry.model.translators.VKeyTranslatorFactory; import google.registry.persistence.VKey; import google.registry.persistence.transaction.JpaTransactionManager; import google.registry.persistence.transaction.TransactionManagerFactory; -import google.registry.schema.replay.SqlReplayCheckpoint; import google.registry.testing.AppEngineExtension; import google.registry.testing.DatabaseHelper; import google.registry.testing.FakeClock; diff --git a/core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java b/core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java index 67e8a081c..33abab9da 100644 --- a/core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java +++ b/core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java @@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableSortedSet; import com.google.common.flogger.LoggerConfig; import com.googlecode.objectify.Key; import google.registry.model.contact.ContactResource; -import google.registry.schema.domain.RegistryLock; +import google.registry.model.domain.RegistryLock; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.FakeSleeper; diff --git a/core/src/test/java/google/registry/batch/RelockDomainActionTest.java b/core/src/test/java/google/registry/batch/RelockDomainActionTest.java index a3dca5714..94a9f3c0f 100644 --- a/core/src/test/java/google/registry/batch/RelockDomainActionTest.java +++ b/core/src/test/java/google/registry/batch/RelockDomainActionTest.java @@ -41,8 +41,8 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import com.google.common.collect.ImmutableSet; import google.registry.model.domain.DomainBase; +import google.registry.model.domain.RegistryLock; import google.registry.model.host.HostResource; -import google.registry.schema.domain.RegistryLock; import google.registry.testing.AppEngineExtension; import google.registry.testing.DeterministicStringGenerator; import google.registry.testing.DualDatabaseTest; diff --git a/core/src/test/java/google/registry/model/CreateAutoTimestampTest.java b/core/src/test/java/google/registry/model/CreateAutoTimestampTest.java index 48fdfd7db..bf87fd826 100644 --- a/core/src/test/java/google/registry/model/CreateAutoTimestampTest.java +++ b/core/src/test/java/google/registry/model/CreateAutoTimestampTest.java @@ -22,7 +22,7 @@ import static org.joda.time.DateTimeZone.UTC; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Ignore; import google.registry.model.common.CrossTldSingleton; -import google.registry.schema.replay.EntityTest.EntityForTesting; +import google.registry.model.replay.EntityTest.EntityForTesting; 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/ImmutableObjectTest.java b/core/src/test/java/google/registry/model/ImmutableObjectTest.java index a969cf06f..a67bfc794 100644 --- a/core/src/test/java/google/registry/model/ImmutableObjectTest.java +++ b/core/src/test/java/google/registry/model/ImmutableObjectTest.java @@ -29,7 +29,7 @@ import com.google.common.collect.Iterables; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; -import google.registry.schema.replay.EntityTest.EntityForTesting; +import google.registry.model.replay.EntityTest.EntityForTesting; import google.registry.testing.AppEngineExtension; import google.registry.util.CidrAddressBlock; import java.lang.reflect.Field; diff --git a/core/src/test/java/google/registry/model/UpdateAutoTimestampTest.java b/core/src/test/java/google/registry/model/UpdateAutoTimestampTest.java index c6dd15592..9b5712305 100644 --- a/core/src/test/java/google/registry/model/UpdateAutoTimestampTest.java +++ b/core/src/test/java/google/registry/model/UpdateAutoTimestampTest.java @@ -23,8 +23,8 @@ import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Ignore; import google.registry.model.common.CrossTldSingleton; import google.registry.model.ofy.Ofy; +import google.registry.model.replay.EntityTest.EntityForTesting; import google.registry.persistence.VKey; -import google.registry.schema.replay.EntityTest.EntityForTesting; import google.registry.testing.AppEngineExtension; import google.registry.testing.DualDatabaseTest; import google.registry.testing.FakeClock; diff --git a/core/src/test/java/google/registry/model/ofy/DatastoreTransactionManagerTest.java b/core/src/test/java/google/registry/model/ofy/DatastoreTransactionManagerTest.java index 2e155489d..982bb3eb6 100644 --- a/core/src/test/java/google/registry/model/ofy/DatastoreTransactionManagerTest.java +++ b/core/src/test/java/google/registry/model/ofy/DatastoreTransactionManagerTest.java @@ -27,7 +27,7 @@ import com.googlecode.objectify.annotation.Parent; import google.registry.model.ImmutableObject; import google.registry.model.annotations.InCrossTld; import google.registry.model.common.EntityGroupRoot; -import google.registry.schema.replay.EntityTest.EntityForTesting; +import google.registry.model.replay.EntityTest.EntityForTesting; 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/model/ofy/OfyTest.java b/core/src/test/java/google/registry/model/ofy/OfyTest.java index 96fa1167f..6a72710f8 100644 --- a/core/src/test/java/google/registry/model/ofy/OfyTest.java +++ b/core/src/test/java/google/registry/model/ofy/OfyTest.java @@ -45,8 +45,8 @@ import google.registry.model.contact.ContactHistory; import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainBase; import google.registry.model.eppcommon.Trid; +import google.registry.model.replay.EntityTest.EntityForTesting; import google.registry.model.reporting.HistoryEntry; -import google.registry.schema.replay.EntityTest.EntityForTesting; import google.registry.testing.AppEngineExtension; import google.registry.testing.DatabaseHelper; import google.registry.testing.FakeClock; diff --git a/core/src/test/java/google/registry/schema/replay/EntityTest.java b/core/src/test/java/google/registry/model/replay/EntityTest.java similarity index 99% rename from core/src/test/java/google/registry/schema/replay/EntityTest.java rename to core/src/test/java/google/registry/model/replay/EntityTest.java index 06b433669..81414e2b6 100644 --- a/core/src/test/java/google/registry/schema/replay/EntityTest.java +++ b/core/src/test/java/google/registry/model/replay/EntityTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.replay; +package google.registry.model.replay; 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/schema/replay/ReplicateToDatastoreActionTest.java b/core/src/test/java/google/registry/model/replay/ReplicateToDatastoreActionTest.java similarity index 99% rename from core/src/test/java/google/registry/schema/replay/ReplicateToDatastoreActionTest.java rename to core/src/test/java/google/registry/model/replay/ReplicateToDatastoreActionTest.java index 589747ac4..a44cecc5c 100644 --- a/core/src/test/java/google/registry/schema/replay/ReplicateToDatastoreActionTest.java +++ b/core/src/test/java/google/registry/model/replay/ReplicateToDatastoreActionTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.replay; +package google.registry.model.replay; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/test/java/google/registry/schema/replay/SqlReplayCheckpointTest.java b/core/src/test/java/google/registry/model/replay/SqlReplayCheckpointTest.java similarity index 98% rename from core/src/test/java/google/registry/schema/replay/SqlReplayCheckpointTest.java rename to core/src/test/java/google/registry/model/replay/SqlReplayCheckpointTest.java index a3ba49ddd..f9cfa30a0 100644 --- a/core/src/test/java/google/registry/schema/replay/SqlReplayCheckpointTest.java +++ b/core/src/test/java/google/registry/model/replay/SqlReplayCheckpointTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.schema.replay; +package google.registry.model.replay; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/test/java/google/registry/model/tld/RegistryLockDaoTest.java b/core/src/test/java/google/registry/model/tld/RegistryLockDaoTest.java index 2d8691b78..f0827ebfe 100644 --- a/core/src/test/java/google/registry/model/tld/RegistryLockDaoTest.java +++ b/core/src/test/java/google/registry/model/tld/RegistryLockDaoTest.java @@ -27,7 +27,7 @@ import static google.registry.testing.SqlHelper.saveRegistryLock; import static org.junit.jupiter.api.Assertions.assertThrows; import google.registry.model.EntityTestCase; -import google.registry.schema.domain.RegistryLock; +import google.registry.model.domain.RegistryLock; import java.util.Optional; import org.joda.time.Duration; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java b/core/src/test/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java index 9d0670408..212d2b497 100644 --- a/core/src/test/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java +++ b/core/src/test/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java @@ -27,7 +27,7 @@ import com.googlecode.objectify.annotation.Entity; import google.registry.model.common.CrossTldSingleton; import google.registry.model.ofy.CommitLogManifest; import google.registry.model.ofy.Ofy; -import google.registry.schema.replay.EntityTest.EntityForTesting; +import google.registry.model.replay.EntityTest.EntityForTesting; 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/BillingVKeyTest.java b/core/src/test/java/google/registry/persistence/BillingVKeyTest.java index 9bea667f1..2b68e5c23 100644 --- a/core/src/test/java/google/registry/persistence/BillingVKeyTest.java +++ b/core/src/test/java/google/registry/persistence/BillingVKeyTest.java @@ -26,10 +26,10 @@ import google.registry.model.ImmutableObject; import google.registry.model.billing.BillingEvent; import google.registry.model.common.EntityGroupRoot; import google.registry.model.domain.DomainBase; +import google.registry.model.replay.EntityTest.EntityForTesting; import google.registry.model.reporting.HistoryEntry; import google.registry.persistence.BillingVKey.BillingEventVKey; import google.registry.persistence.BillingVKey.BillingRecurrenceVKey; -import google.registry.schema.replay.EntityTest.EntityForTesting; import google.registry.testing.AppEngineExtension; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; diff --git a/core/src/test/java/google/registry/persistence/DomainHistoryVKeyTest.java b/core/src/test/java/google/registry/persistence/DomainHistoryVKeyTest.java index 958f19076..b888eea5a 100644 --- a/core/src/test/java/google/registry/persistence/DomainHistoryVKeyTest.java +++ b/core/src/test/java/google/registry/persistence/DomainHistoryVKeyTest.java @@ -26,8 +26,8 @@ import google.registry.model.ImmutableObject; import google.registry.model.common.EntityGroupRoot; import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainHistory.DomainHistoryId; +import google.registry.model.replay.EntityTest.EntityForTesting; import google.registry.model.reporting.HistoryEntry; -import google.registry.schema.replay.EntityTest.EntityForTesting; import google.registry.testing.AppEngineExtension; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; diff --git a/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java b/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java index df96a3602..16d18dfa5 100644 --- a/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java @@ -21,9 +21,9 @@ import static google.registry.persistence.transaction.TransactionManagerFactory. import com.google.common.collect.ImmutableSet; import com.google.common.hash.BloomFilter; import google.registry.model.ImmutableObject; +import google.registry.model.replay.EntityTest.EntityForTesting; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaUnitTestExtension; -import google.registry.schema.replay.EntityTest.EntityForTesting; import javax.persistence.Entity; import javax.persistence.Id; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/persistence/converter/CreateAutoTimestampConverterTest.java b/core/src/test/java/google/registry/persistence/converter/CreateAutoTimestampConverterTest.java index 2321b9fff..c0ab1d80b 100644 --- a/core/src/test/java/google/registry/persistence/converter/CreateAutoTimestampConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/CreateAutoTimestampConverterTest.java @@ -18,9 +18,9 @@ import static google.registry.persistence.transaction.TransactionManagerFactory. import google.registry.model.CreateAutoTimestamp; import google.registry.model.ImmutableObject; +import google.registry.model.replay.EntityTest.EntityForTesting; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaUnitTestExtension; -import google.registry.schema.replay.EntityTest.EntityForTesting; import google.registry.testing.FakeClock; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java b/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java index caccb0135..1feb7d128 100644 --- a/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java @@ -19,9 +19,9 @@ import static google.registry.persistence.transaction.TransactionManagerFactory. import static org.junit.jupiter.api.Assertions.assertThrows; import google.registry.model.ImmutableObject; +import google.registry.model.replay.EntityTest.EntityForTesting; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaUnitTestExtension; -import google.registry.schema.replay.EntityTest.EntityForTesting; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.PersistenceException; diff --git a/core/src/test/java/google/registry/persistence/converter/DurationConverterTest.java b/core/src/test/java/google/registry/persistence/converter/DurationConverterTest.java index d9f4bc735..35f6b3848 100644 --- a/core/src/test/java/google/registry/persistence/converter/DurationConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/DurationConverterTest.java @@ -18,9 +18,9 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import google.registry.model.ImmutableObject; +import google.registry.model.replay.EntityTest.EntityForTesting; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaUnitTestExtension; -import google.registry.schema.replay.EntityTest.EntityForTesting; import javax.persistence.Entity; import javax.persistence.Id; import org.joda.time.Duration; diff --git a/core/src/test/java/google/registry/persistence/converter/InetAddressSetConverterTest.java b/core/src/test/java/google/registry/persistence/converter/InetAddressSetConverterTest.java index 76b361287..4984f8e63 100644 --- a/core/src/test/java/google/registry/persistence/converter/InetAddressSetConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/InetAddressSetConverterTest.java @@ -20,8 +20,8 @@ import static google.registry.persistence.transaction.TransactionManagerFactory. import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; import google.registry.model.ImmutableObject; +import google.registry.model.replay.EntityTest.EntityForTesting; import google.registry.persistence.VKey; -import google.registry.schema.replay.EntityTest.EntityForTesting; import google.registry.testing.AppEngineExtension; import java.net.InetAddress; import java.util.Set; diff --git a/core/src/test/java/google/registry/persistence/converter/JodaMoneyConverterTest.java b/core/src/test/java/google/registry/persistence/converter/JodaMoneyConverterTest.java index 2baa2b3d6..ffb56f66e 100644 --- a/core/src/test/java/google/registry/persistence/converter/JodaMoneyConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/JodaMoneyConverterTest.java @@ -18,9 +18,9 @@ import static google.registry.persistence.transaction.TransactionManagerFactory. import com.google.common.collect.ImmutableMap; import google.registry.model.ImmutableObject; +import google.registry.model.replay.EntityTest.EntityForTesting; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaUnitTestExtension; -import google.registry.schema.replay.EntityTest.EntityForTesting; import java.math.BigDecimal; import java.util.Arrays; import java.util.List; diff --git a/core/src/test/java/google/registry/persistence/converter/LocalDateConverterTest.java b/core/src/test/java/google/registry/persistence/converter/LocalDateConverterTest.java index 9bc913b51..bfab1eac7 100644 --- a/core/src/test/java/google/registry/persistence/converter/LocalDateConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/LocalDateConverterTest.java @@ -18,10 +18,10 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import google.registry.model.ImmutableObject; +import google.registry.model.replay.EntityTest; import google.registry.persistence.VKey; import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules.JpaUnitTestExtension; -import google.registry.schema.replay.EntityTest; import javax.persistence.Entity; import javax.persistence.Id; import org.joda.time.LocalDate; 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 b912d1be0..6d92168cc 100644 --- a/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java +++ b/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java @@ -26,6 +26,7 @@ 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.replay.SqlReplayCheckpointTest; import google.registry.model.reporting.Spec11ThreatMatchTest; import google.registry.model.server.LockTest; import google.registry.model.server.ServerSecretTest; @@ -41,7 +42,6 @@ import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationWithCo 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.testing.AppEngineExtension; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/core/src/test/java/google/registry/testing/ReplayExtension.java b/core/src/test/java/google/registry/testing/ReplayExtension.java index 46671debd..3aab237d0 100644 --- a/core/src/test/java/google/registry/testing/ReplayExtension.java +++ b/core/src/test/java/google/registry/testing/ReplayExtension.java @@ -26,11 +26,11 @@ import google.registry.model.ImmutableObject; import google.registry.model.ofy.CommitLogBucket; import google.registry.model.ofy.ReplayQueue; import google.registry.model.ofy.TransactionInfo; +import google.registry.model.replay.DatastoreEntity; +import google.registry.model.replay.ReplicateToDatastoreAction; import google.registry.persistence.VKey; import google.registry.persistence.transaction.JpaTransactionManagerImpl; import google.registry.persistence.transaction.TransactionEntity; -import google.registry.schema.replay.DatastoreEntity; -import google.registry.schema.replay.ReplicateToDatastoreAction; import java.util.Optional; import javax.annotation.Nullable; import org.junit.jupiter.api.extension.AfterEachCallback; diff --git a/core/src/test/java/google/registry/testing/SqlHelper.java b/core/src/test/java/google/registry/testing/SqlHelper.java index 104271207..b89bb0605 100644 --- a/core/src/test/java/google/registry/testing/SqlHelper.java +++ b/core/src/test/java/google/registry/testing/SqlHelper.java @@ -21,9 +21,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; +import google.registry.model.domain.RegistryLock; import google.registry.model.registrar.Registrar; import google.registry.model.tld.RegistryLockDao; -import google.registry.schema.domain.RegistryLock; import java.sql.SQLException; import java.util.Optional; import javax.persistence.PersistenceException; diff --git a/core/src/test/java/google/registry/testing/TestObject.java b/core/src/test/java/google/registry/testing/TestObject.java index 88198b1c6..6ecd2439d 100644 --- a/core/src/test/java/google/registry/testing/TestObject.java +++ b/core/src/test/java/google/registry/testing/TestObject.java @@ -23,9 +23,9 @@ import com.googlecode.objectify.annotation.Parent; import google.registry.model.ImmutableObject; import google.registry.model.annotations.VirtualEntity; import google.registry.model.common.EntityGroupRoot; +import google.registry.model.replay.DatastoreAndSqlEntity; +import google.registry.model.replay.EntityTest.EntityForTesting; import google.registry.persistence.VKey; -import google.registry.schema.replay.DatastoreAndSqlEntity; -import google.registry.schema.replay.EntityTest.EntityForTesting; import javax.persistence.Transient; /** A test model object that can be persisted in any entity group. */ diff --git a/core/src/test/java/google/registry/tools/DomainLockUtilsTest.java b/core/src/test/java/google/registry/tools/DomainLockUtilsTest.java index a09d14041..cebaaaf83 100644 --- a/core/src/test/java/google/registry/tools/DomainLockUtilsTest.java +++ b/core/src/test/java/google/registry/tools/DomainLockUtilsTest.java @@ -42,10 +42,10 @@ 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.domain.RegistryLock; import google.registry.model.host.HostResource; 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; import google.registry.testing.DeterministicStringGenerator; diff --git a/core/src/test/java/google/registry/tools/SetSqlReplayCheckpointCommandTest.java b/core/src/test/java/google/registry/tools/SetSqlReplayCheckpointCommandTest.java index a21d665f5..61b57eb5b 100644 --- a/core/src/test/java/google/registry/tools/SetSqlReplayCheckpointCommandTest.java +++ b/core/src/test/java/google/registry/tools/SetSqlReplayCheckpointCommandTest.java @@ -19,7 +19,7 @@ import static google.registry.persistence.transaction.TransactionManagerFactory. import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.junit.Assert.assertThrows; -import google.registry.schema.replay.SqlReplayCheckpoint; +import google.registry.model.replay.SqlReplayCheckpoint; import org.joda.time.DateTime; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/tools/UnlockDomainCommandTest.java b/core/src/test/java/google/registry/tools/UnlockDomainCommandTest.java index a4cf02df1..5a472de18 100644 --- a/core/src/test/java/google/registry/tools/UnlockDomainCommandTest.java +++ b/core/src/test/java/google/registry/tools/UnlockDomainCommandTest.java @@ -31,8 +31,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import google.registry.batch.AsyncTaskEnqueuerTest; import google.registry.model.domain.DomainBase; +import google.registry.model.domain.RegistryLock; import google.registry.model.registrar.Registrar.Type; -import google.registry.schema.domain.RegistryLock; import google.registry.testing.DeterministicStringGenerator; import google.registry.util.AppEngineServiceUtils; import google.registry.util.StringGenerator.Alphabets; diff --git a/core/src/test/java/google/registry/tools/javascrap/BackfillRegistryLocksCommandTest.java b/core/src/test/java/google/registry/tools/javascrap/BackfillRegistryLocksCommandTest.java index 816094f34..9192e3172 100644 --- a/core/src/test/java/google/registry/tools/javascrap/BackfillRegistryLocksCommandTest.java +++ b/core/src/test/java/google/registry/tools/javascrap/BackfillRegistryLocksCommandTest.java @@ -34,9 +34,9 @@ import com.google.common.collect.Iterables; import com.google.common.truth.Truth8; import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainHistory; +import google.registry.model.domain.RegistryLock; import google.registry.model.registrar.Registrar; import google.registry.model.reporting.HistoryEntry; -import google.registry.schema.domain.RegistryLock; import google.registry.testing.DeterministicStringGenerator; import google.registry.testing.DualDatabaseTest; import google.registry.testing.TestOfyAndSql; diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockGetActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockGetActionTest.java index 59ad09555..dc63e6eac 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockGetActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockGetActionTest.java @@ -32,13 +32,13 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSetMultimap; import com.google.gson.Gson; +import google.registry.model.domain.RegistryLock; import google.registry.model.registrar.RegistrarContact; import google.registry.request.Action.Method; import google.registry.request.auth.AuthLevel; import google.registry.request.auth.AuthResult; import google.registry.request.auth.AuthenticatedRegistrarAccessor; import google.registry.request.auth.UserAuthInfo; -import google.registry.schema.domain.RegistryLock; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java index aaed45a4c..f89839b78 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java @@ -37,6 +37,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import google.registry.batch.AsyncTaskEnqueuerTest; import google.registry.model.domain.DomainBase; +import google.registry.model.domain.RegistryLock; import google.registry.request.JsonActionRunner; import google.registry.request.JsonResponse; import google.registry.request.ResponseImpl; @@ -45,7 +46,6 @@ import google.registry.request.auth.AuthResult; import google.registry.request.auth.AuthenticatedRegistrarAccessor; import google.registry.request.auth.AuthenticatedRegistrarAccessor.Role; import google.registry.request.auth.UserAuthInfo; -import google.registry.schema.domain.RegistryLock; import google.registry.testing.AppEngineExtension; import google.registry.testing.DeterministicStringGenerator; import google.registry.testing.FakeClock; 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 2e5ba67c3..b7b88eea0 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 @@ -38,13 +38,13 @@ 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.domain.RegistryLock; import google.registry.model.host.HostResource; 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; -import google.registry.schema.domain.RegistryLock; import google.registry.security.XsrfTokenManager; import google.registry.testing.AppEngineExtension; import google.registry.testing.DatabaseHelper; diff --git a/core/src/test/java/google/registry/webdriver/RegistrarConsoleScreenshotTest.java b/core/src/test/java/google/registry/webdriver/RegistrarConsoleScreenshotTest.java index 91f3cce17..ab08d22a9 100644 --- a/core/src/test/java/google/registry/webdriver/RegistrarConsoleScreenshotTest.java +++ b/core/src/test/java/google/registry/webdriver/RegistrarConsoleScreenshotTest.java @@ -31,11 +31,11 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableMap; import com.googlecode.objectify.ObjectifyFilter; import google.registry.model.domain.DomainBase; +import google.registry.model.domain.RegistryLock; import google.registry.model.ofy.OfyFilter; import google.registry.model.registrar.Registrar.State; import google.registry.model.registrar.RegistrarContact; import google.registry.module.frontend.FrontendServlet; -import google.registry.schema.domain.RegistryLock; import google.registry.server.RegistryTestServer; import google.registry.testing.AppEngineExtension; import google.registry.testing.CertificateSamples; diff --git a/core/src/test/resources/google/registry/model/schema.txt b/core/src/test/resources/google/registry/model/schema.txt index c953145f7..96b482418 100644 --- a/core/src/test/resources/google/registry/model/schema.txt +++ b/core/src/test/resources/google/registry/model/schema.txt @@ -654,6 +654,10 @@ enum google.registry.model.registrar.RegistrarContact$Type { TECH; WHOIS; } +class google.registry.model.replay.LastSqlTransaction { + @Id long id; + long transactionId; +} class google.registry.model.reporting.DomainTransactionRecord { google.registry.model.reporting.DomainTransactionRecord$TransactionReportField reportField; java.lang.Integer reportAmount; @@ -906,7 +910,3 @@ class google.registry.persistence.DomainHistoryVKey { java.lang.Long historyRevisionId; java.lang.String repoId; } -class google.registry.schema.replay.LastSqlTransaction { - @Id long id; - long transactionId; -}