Rename V30 -> V31 to avoid duplicates (#621)

* Upgrade to the latest version of Netty

* Update lock files

README.md

@@ -33,7 +33,7 @@ running system:
 *   View the source code for the [GAE app](https://github.com/google/nomulus/tree/master/core/src/main/java/google/registry)
     and for the [GKE proxy](https://github.com/google/nomulus/tree/master/proxy/src/main/java/google/registry)
 *   [Other docs](https://github.com/google/nomulus/tree/master/docs)
-*   [Javadoc](https://nomulus.foo/javadoc/latest/)
+*   [Javadoc](https://javadoc.nomulus.foo/)
 *   [Nomulus discussion
     group](https://groups.google.com/forum/#!forum/nomulus-discuss), for any
     other questions

core/src/main/java/google/registry/batch/DeleteContactsAndHostsAction.java

@@ -347,7 +347,7 @@ public class DeleteContactsAndHostsAction implements Runnable {
       String resourceClientId = resource.getPersistedCurrentSponsorClientId();
       if (resource instanceof HostResource && ((HostResource) resource).isSubordinate()) {
         resourceClientId =
-            ofy().load().key(((HostResource) resource).getSuperordinateDomain()).now()
+            tm().load(((HostResource) resource).getSuperordinateDomain())
                 .cloneProjectedAtTime(now)
                 .getCurrentSponsorClientId();
       }
@@ -466,10 +466,11 @@ public class DeleteContactsAndHostsAction implements Runnable {
         HostResource host = (HostResource) existingResource;
         if (host.isSubordinate()) {
           dnsQueue.addHostRefreshTask(host.getFullyQualifiedHostName());
-          ofy().save().entity(
-              ofy().load().key(host.getSuperordinateDomain()).now().asBuilder()
-                  .removeSubordinateHost(host.getFullyQualifiedHostName())
-                  .build());
+          tm().saveNewOrUpdate(
+                  tm().load(host.getSuperordinateDomain())
+                      .asBuilder()
+                      .removeSubordinateHost(host.getFullyQualifiedHostName())
+                      .build());
         }
       } else {
         throw new IllegalStateException(

core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java

@@ -97,7 +97,7 @@ public final class ContactTransferApproveFlow implements TransactionalFlow {
     ofy().save().<Object>entities(newContact, historyEntry, gainingPollMessage);
     // Delete the billing event and poll messages that were written in case the transfer would have
     // been implicitly server approved.
-    ofy().delete().keys(existingContact.getTransferData().getServerApproveEntities());
+    tm().delete(existingContact.getTransferData().getServerApproveEntities());
     return responseBuilder
         .setResData(createTransferResponse(targetId, newContact.getTransferData()))
         .build();

core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java

@@ -93,7 +93,7 @@ public final class ContactTransferCancelFlow implements TransactionalFlow {
     ofy().save().<Object>entities(newContact, historyEntry, losingPollMessage);
     // Delete the billing event and poll messages that were written in case the transfer would have
     // been implicitly server approved.
-    ofy().delete().keys(existingContact.getTransferData().getServerApproveEntities());
+    tm().delete(existingContact.getTransferData().getServerApproveEntities());
     return responseBuilder
         .setResData(createTransferResponse(targetId, newContact.getTransferData()))
         .build();

core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java

@@ -90,7 +90,7 @@ public final class ContactTransferRejectFlow implements TransactionalFlow {
     ofy().save().<Object>entities(newContact, historyEntry, gainingPollMessage);
     // Delete the billing event and poll messages that were written in case the transfer would have
     // been implicitly server approved.
-    ofy().delete().keys(existingContact.getTransferData().getServerApproveEntities());
+    tm().delete(existingContact.getTransferData().getServerApproveEntities());
     return responseBuilder
         .setResData(createTransferResponse(targetId, newContact.getTransferData()))
         .build();

core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java

@@ -126,13 +126,15 @@ public final class ContactTransferRequestFlow implements TransactionalFlow {
     // If the transfer is server approved, this message will be sent to the gaining registrar. */
     PollMessage serverApproveGainingPollMessage =
         createGainingTransferPollMessage(targetId, serverApproveTransferData, historyEntry);
-    TransferData pendingTransferData = serverApproveTransferData.asBuilder()
-        .setTransferStatus(TransferStatus.PENDING)
-        .setServerApproveEntities(
-            ImmutableSet.of(
-                Key.create(serverApproveGainingPollMessage),
-                Key.create(serverApproveLosingPollMessage)))
-        .build();
+    TransferData pendingTransferData =
+        serverApproveTransferData
+            .asBuilder()
+            .setTransferStatus(TransferStatus.PENDING)
+            .setServerApproveEntities(
+                ImmutableSet.of(
+                    serverApproveGainingPollMessage.createVKey(),
+                    serverApproveLosingPollMessage.createVKey()))
+            .build();
     // When a transfer is requested, a poll message is created to notify the losing registrar.
     PollMessage requestPollMessage =
         createLosingTransferPollMessage(targetId, pendingTransferData, historyEntry).asBuilder()

core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java

@@ -214,7 +214,7 @@ public final class DomainTransferApproveFlow implements TransactionalFlow {
     ofy().save().entities(entitiesToSave.build());
     // Delete the billing event and poll messages that were written in case the transfer would have
     // been implicitly server approved.
-    ofy().delete().keys(existingDomain.getTransferData().getServerApproveEntities());
+    tm().delete(existingDomain.getTransferData().getServerApproveEntities());
     return responseBuilder
         .setResData(createTransferResponse(
             targetId, newDomain.getTransferData(), newDomain.getRegistrationExpirationTime()))

core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java

@@ -110,7 +110,7 @@ public final class DomainTransferCancelFlow implements TransactionalFlow {
     updateAutorenewRecurrenceEndTime(existingDomain, END_OF_TIME);
     // Delete the billing event and poll messages that were written in case the transfer would have
     // been implicitly server approved.
-    ofy().delete().keys(existingDomain.getTransferData().getServerApproveEntities());
+    tm().delete(existingDomain.getTransferData().getServerApproveEntities());
     return responseBuilder
         .setResData(createTransferResponse(targetId, newDomain.getTransferData(), null))
         .build();

core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java

@@ -112,7 +112,7 @@ public final class DomainTransferRejectFlow implements TransactionalFlow {
     updateAutorenewRecurrenceEndTime(existingDomain, END_OF_TIME);
     // Delete the billing event and poll messages that were written in case the transfer would have
     // been implicitly server approved.
-    ofy().delete().keys(existingDomain.getTransferData().getServerApproveEntities());
+    tm().delete(existingDomain.getTransferData().getServerApproveEntities());
     return responseBuilder
         .setResData(createTransferResponse(targetId, newDomain.getTransferData(), null))
         .build();

core/src/main/java/google/registry/flows/domain/DomainTransferUtils.java

@@ -20,7 +20,6 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.googlecode.objectify.Key;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.billing.BillingEvent.Flag;
 import google.registry.model.billing.BillingEvent.Reason;
@@ -37,6 +36,7 @@ import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferData.TransferServerApproveEntity;
 import google.registry.model.transfer.TransferResponse.DomainTransferResponse;
 import google.registry.model.transfer.TransferStatus;
+import google.registry.persistence.VKey;
 import java.util.Optional;
 import javax.annotation.Nullable;
 import org.joda.money.Money;
@@ -52,37 +52,34 @@ public final class DomainTransferUtils {
       TransferData.Builder transferDataBuilder,
       ImmutableSet<TransferServerApproveEntity> serverApproveEntities,
       Period transferPeriod) {
-    ImmutableSet.Builder<Key<? extends TransferServerApproveEntity>> serverApproveEntityKeys =
+    ImmutableSet.Builder<VKey<? extends TransferServerApproveEntity>> serverApproveEntityKeys =
         new ImmutableSet.Builder<>();
     for (TransferServerApproveEntity entity : serverApproveEntities) {
-      serverApproveEntityKeys.add(Key.create(entity));
+      serverApproveEntityKeys.add(entity.createVKey());
     }
     if (transferPeriod.getValue() != 0) {
       // Unless superuser sets period to 0, add a transfer billing event.
       transferDataBuilder.setServerApproveBillingEvent(
-          Key.create(
-              serverApproveEntities
-                  .stream()
-                  .filter(BillingEvent.OneTime.class::isInstance)
-                  .map(BillingEvent.OneTime.class::cast)
-                  .collect(onlyElement())));
+          serverApproveEntities.stream()
+              .filter(BillingEvent.OneTime.class::isInstance)
+              .map(BillingEvent.OneTime.class::cast)
+              .collect(onlyElement())
+              .createVKey());
     }
     return transferDataBuilder
         .setTransferStatus(TransferStatus.PENDING)
         .setServerApproveAutorenewEvent(
-            Key.create(
-                serverApproveEntities
-                    .stream()
-                    .filter(BillingEvent.Recurring.class::isInstance)
-                    .map(BillingEvent.Recurring.class::cast)
-                    .collect(onlyElement())))
+            serverApproveEntities.stream()
+                .filter(BillingEvent.Recurring.class::isInstance)
+                .map(BillingEvent.Recurring.class::cast)
+                .collect(onlyElement())
+                .createVKey())
         .setServerApproveAutorenewPollMessage(
-            Key.create(
-                serverApproveEntities
-                    .stream()
-                    .filter(PollMessage.Autorenew.class::isInstance)
-                    .map(PollMessage.Autorenew.class::cast)
-                    .collect(onlyElement())))
+            serverApproveEntities.stream()
+                .filter(PollMessage.Autorenew.class::isInstance)
+                .map(PollMessage.Autorenew.class::cast)
+                .collect(onlyElement())
+                .createVKey())
         .setServerApproveEntities(serverApproveEntityKeys.build())
         .setTransferPeriod(transferPeriod)
         .build();

core/src/main/java/google/registry/flows/host/HostCreateFlow.java

@@ -128,7 +128,7 @@ public final class HostCreateFlow implements TransactionalFlow {
             .setFullyQualifiedHostName(targetId)
             .setInetAddresses(command.getInetAddresses())
             .setRepoId(createRepoId(ObjectifyService.allocateId(), roidSuffix))
-            .setSuperordinateDomain(superordinateDomain.map(Key::create).orElse(null))
+            .setSuperordinateDomain(superordinateDomain.map(DomainBase::createVKey).orElse(null))
             .build();
     historyBuilder
         .setType(HistoryEntry.Type.HOST_CREATE)

core/src/main/java/google/registry/flows/host/HostDeleteFlow.java

@@ -96,8 +96,7 @@ public final class HostDeleteFlow implements TransactionalFlow {
       // the client id, needs to be read off of it.
       EppResource owningResource =
           existingHost.isSubordinate()
-              ? ofy().load().key(existingHost.getSuperordinateDomain()).now()
-                  .cloneProjectedAtTime(now)
+              ? tm().load(existingHost.getSuperordinateDomain()).cloneProjectedAtTime(now)
               : existingHost;
       verifyResourceOwnership(clientId, owningResource);
     }

core/src/main/java/google/registry/flows/host/HostInfoFlow.java

@@ -18,7 +18,7 @@ import static google.registry.flows.FlowUtils.validateClientIsLoggedIn;
 import static google.registry.flows.ResourceFlowUtils.loadAndVerifyExistence;
 import static google.registry.flows.host.HostFlowUtils.validateHostName;
 import static google.registry.model.EppResourceUtils.isLinked;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 
 import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.Key;
@@ -77,7 +77,7 @@ public final class HostInfoFlow implements Flow {
     // there is no superordinate domain, the host's own values for these fields will be correct.
     if (host.isSubordinate()) {
       DomainBase superordinateDomain =
-          ofy().load().key(host.getSuperordinateDomain()).now().cloneProjectedAtTime(now);
+          tm().load(host.getSuperordinateDomain()).cloneProjectedAtTime(now);
       hostInfoDataBuilder
           .setCurrentSponsorClientId(superordinateDomain.getCurrentSponsorClientId())
           .setLastTransferTime(host.computeLastTransferTime(superordinateDomain));

core/src/main/java/google/registry/flows/host/HostUpdateFlow.java

@@ -60,6 +60,7 @@ import google.registry.model.host.HostResource;
 import google.registry.model.index.ForeignKeyIndex;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
+import google.registry.persistence.VKey;
 import java.util.Objects;
 import java.util.Optional;
 import javax.inject.Inject;
@@ -136,9 +137,10 @@ public final class HostUpdateFlow implements TransactionalFlow {
     boolean isHostRename = suppliedNewHostName != null;
     String oldHostName = targetId;
     String newHostName = firstNonNull(suppliedNewHostName, oldHostName);
-    DomainBase oldSuperordinateDomain = existingHost.isSubordinate()
-        ? ofy().load().key(existingHost.getSuperordinateDomain()).now().cloneProjectedAtTime(now)
-        : null;
+    DomainBase oldSuperordinateDomain =
+        existingHost.isSubordinate()
+            ? tm().load(existingHost.getSuperordinateDomain()).cloneProjectedAtTime(now)
+            : null;
     // Note that lookupSuperordinateDomain calls cloneProjectedAtTime on the domain for us.
     Optional<DomainBase> newSuperordinateDomain =
         lookupSuperordinateDomain(validateHostName(newHostName), now);
@@ -153,8 +155,8 @@ public final class HostUpdateFlow implements TransactionalFlow {
     AddRemove remove = command.getInnerRemove();
     checkSameValuesNotAddedAndRemoved(add.getStatusValues(), remove.getStatusValues());
     checkSameValuesNotAddedAndRemoved(add.getInetAddresses(), remove.getInetAddresses());
-    Key<DomainBase> newSuperordinateDomainKey =
-        newSuperordinateDomain.map(Key::create).orElse(null);
+    VKey<DomainBase> newSuperordinateDomainKey =
+        newSuperordinateDomain.map(DomainBase::createVKey).orElse(null);
     // If the superordinateDomain field is changing, set the lastSuperordinateChange to now.
     DateTime lastSuperordinateChange =
         Objects.equals(newSuperordinateDomainKey, existingHost.getSuperordinateDomain())
@@ -280,28 +282,28 @@ public final class HostUpdateFlow implements TransactionalFlow {
     if (existingHost.isSubordinate()
         && newHost.isSubordinate()
         && Objects.equals(
-            existingHost.getSuperordinateDomain(),
-            newHost.getSuperordinateDomain())) {
-      ofy().save().entity(
-          ofy().load().key(existingHost.getSuperordinateDomain()).now().asBuilder()
-              .removeSubordinateHost(existingHost.getFullyQualifiedHostName())
-              .addSubordinateHost(newHost.getFullyQualifiedHostName())
-              .build());
+            existingHost.getSuperordinateDomain(), newHost.getSuperordinateDomain())) {
+      tm().saveNewOrUpdate(
+              tm().load(existingHost.getSuperordinateDomain())
+                  .asBuilder()
+                  .removeSubordinateHost(existingHost.getFullyQualifiedHostName())
+                  .addSubordinateHost(newHost.getFullyQualifiedHostName())
+                  .build());
       return;
     }
     if (existingHost.isSubordinate()) {
-      ofy().save().entity(
-          ofy().load().key(existingHost.getSuperordinateDomain()).now()
-              .asBuilder()
-              .removeSubordinateHost(existingHost.getFullyQualifiedHostName())
-              .build());
+      tm().saveNewOrUpdate(
+              tm().load(existingHost.getSuperordinateDomain())
+                  .asBuilder()
+                  .removeSubordinateHost(existingHost.getFullyQualifiedHostName())
+                  .build());
     }
     if (newHost.isSubordinate()) {
-      ofy().save().entity(
-          ofy().load().key(newHost.getSuperordinateDomain()).now()
-              .asBuilder()
-              .addSubordinateHost(newHost.getFullyQualifiedHostName())
-              .build());
+      tm().saveNewOrUpdate(
+              tm().load(newHost.getSuperordinateDomain())
+                  .asBuilder()
+                  .addSubordinateHost(newHost.getFullyQualifiedHostName())
+                  .build());
     }
   }
 

core/src/main/java/google/registry/model/EppResource.java

@@ -68,11 +68,11 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable {
 
   /** The ID of the registrar that is currently sponsoring this resource. */
   @Index
-  @Column(nullable = false)
+  @Column(name = "currentSponsorRegistrarId", nullable = false)
   String currentSponsorClientId;
 
   /** The ID of the registrar that created this resource. */
-  @Column(nullable = false)
+  @Column(name = "creationRegistrarId", nullable = false)
   String creationClientId;
 
   /**
@@ -82,6 +82,7 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable {
    * edits; it only includes EPP-visible modifications such as {@literal <update>}. Can be null if
    * the resource has never been modified.
    */
+  @Column(name = "lastEppUpdateRegistrarId")
   String lastEppUpdateClientId;
 
   /** The time when this resource was created. */

core/src/main/java/google/registry/model/ResourceTransferUtils.java

@@ -18,6 +18,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -114,7 +115,7 @@ public final class ResourceTransferUtils {
             R resource, R newResource, DateTime now, HistoryEntry historyEntry) {
     if (resource.getStatusValues().contains(StatusValue.PENDING_TRANSFER)) {
       TransferData oldTransferData = resource.getTransferData();
-      ofy().delete().keys(oldTransferData.getServerApproveEntities());
+      tm().delete(oldTransferData.getServerApproveEntities());
       ofy()
           .save()
           .entity(

core/src/main/java/google/registry/model/billing/BillingEvent.java

@@ -116,7 +116,7 @@ public abstract class BillingEvent extends ImmutableObject
 
   /** The registrar to bill. */
   @Index
-  @Column(nullable = false)
+  @Column(name = "registrarId", nullable = false)
   String clientId;
 
   /** Revision id of the entry in DomainHistory table that ths bill belongs to. */
@@ -267,7 +267,7 @@ public abstract class BillingEvent extends ImmutableObject
   @javax.persistence.Entity(name = "BillingEvent")
   @javax.persistence.Table(
       indexes = {
-        @javax.persistence.Index(columnList = "clientId"),
+        @javax.persistence.Index(columnList = "registrarId"),
         @javax.persistence.Index(columnList = "eventTime"),
         @javax.persistence.Index(columnList = "billingTime"),
         @javax.persistence.Index(columnList = "syntheticCreationTime"),
@@ -345,6 +345,7 @@ public abstract class BillingEvent extends ImmutableObject
       return Optional.ofNullable(allocationToken);
     }
 
+    @Override
     public VKey<OneTime> createVKey() {
       return VKey.createOfy(getClass(), Key.create(this));
     }
@@ -439,7 +440,7 @@ public abstract class BillingEvent extends ImmutableObject
   @javax.persistence.Entity(name = "BillingRecurrence")
   @javax.persistence.Table(
       indexes = {
-        @javax.persistence.Index(columnList = "clientId"),
+        @javax.persistence.Index(columnList = "registrarId"),
         @javax.persistence.Index(columnList = "eventTime"),
         @javax.persistence.Index(columnList = "recurrenceEndTime"),
         @javax.persistence.Index(columnList = "recurrence_time_of_year")
@@ -482,6 +483,7 @@ public abstract class BillingEvent extends ImmutableObject
       return recurrenceTimeOfYear;
     }
 
+    @Override
     public VKey<Recurring> createVKey() {
       return VKey.createOfy(getClass(), Key.create(this));
     }
@@ -529,7 +531,7 @@ public abstract class BillingEvent extends ImmutableObject
   @javax.persistence.Entity(name = "BillingCancellation")
   @javax.persistence.Table(
       indexes = {
-        @javax.persistence.Index(columnList = "clientId"),
+        @javax.persistence.Index(columnList = "registrarId"),
         @javax.persistence.Index(columnList = "eventTime"),
         @javax.persistence.Index(columnList = "billingTime")
       })
@@ -603,6 +605,7 @@ public abstract class BillingEvent extends ImmutableObject
       return builder.build();
     }
 
+    @Override
     public VKey<Cancellation> createVKey() {
       return VKey.createOfy(getClass(), Key.create(this));
     }
@@ -682,6 +685,11 @@ public abstract class BillingEvent extends ImmutableObject
       return new Builder(clone(this));
     }
 
+    @Override
+    public VKey<Modification> createVKey() {
+      return VKey.createOfy(this.getClass(), Key.create(this));
+    }
+
     /**
      * Create a new Modification billing event which is a refund of the given OneTime billing event
      * and that is parented off the given HistoryEntry.

core/src/main/java/google/registry/model/contact/ContactResource.java

@@ -41,7 +41,6 @@ import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
-import javax.persistence.Transient;
 import javax.xml.bind.annotation.XmlElement;
 import org.joda.time.DateTime;
 
@@ -57,7 +56,7 @@ import org.joda.time.DateTime;
     name = "Contact",
     indexes = {
       @javax.persistence.Index(columnList = "creationTime"),
-      @javax.persistence.Index(columnList = "currentSponsorClientId"),
+      @javax.persistence.Index(columnList = "currentSponsorRegistrarId"),
       @javax.persistence.Index(columnList = "deletionTime"),
       @javax.persistence.Index(columnList = "contactId", unique = true),
       @javax.persistence.Index(columnList = "searchName")
@@ -171,8 +170,7 @@ public class ContactResource extends EppResource
   ContactAuthInfo authInfo;
 
   /** Data about any pending or past transfers on this contact. */
-  // TODO(b/153363295): Figure out how to persist transfer data
-  @Transient TransferData transferData;
+  TransferData transferData;
 
   /**
    * The time that this resource was last transferred.

core/src/main/java/google/registry/model/domain/DomainBase.java

@@ -66,6 +66,7 @@ import google.registry.model.registry.Registry;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.persistence.VKey;
+import google.registry.persistence.WithStringVKey;
 import google.registry.schema.replay.DatastoreAndSqlEntity;
 import google.registry.util.CollectionUtils;
 import java.util.HashSet;
@@ -101,11 +102,12 @@ import org.joda.time.Interval;
     name = "Domain",
     indexes = {
       @javax.persistence.Index(columnList = "creationTime"),
-      @javax.persistence.Index(columnList = "currentSponsorClientId"),
+      @javax.persistence.Index(columnList = "currentSponsorRegistrarId"),
       @javax.persistence.Index(columnList = "deletionTime"),
       @javax.persistence.Index(columnList = "fullyQualifiedDomainName"),
       @javax.persistence.Index(columnList = "tld")
     })
+@WithStringVKey
 @ExternalMessagingName("domain")
 public class DomainBase extends EppResource
     implements DatastoreAndSqlEntity, ForeignKeyedEppResource, ResourceWithTransferData {
@@ -251,7 +253,7 @@ public class DomainBase extends EppResource
   String smdId;
 
   /** Data about any pending or past transfers on this domain. */
-  @Transient TransferData transferData;
+  TransferData transferData;
 
   /**
    * The time that this resource was last transferred.
@@ -436,8 +438,14 @@ public class DomainBase extends EppResource
               .setRegistrationExpirationTime(expirationDate)
               // Set the speculatively-written new autorenew events as the domain's autorenew
               // events.
-              .setAutorenewBillingEvent(transferData.getServerApproveAutorenewEvent())
-              .setAutorenewPollMessage(transferData.getServerApproveAutorenewPollMessage());
+              .setAutorenewBillingEvent(
+                  transferData.getServerApproveAutorenewEvent() == null
+                      ? null
+                      : transferData.getServerApproveAutorenewEvent().getOfyKey())
+              .setAutorenewPollMessage(
+                  transferData.getServerApproveAutorenewPollMessage() == null
+                      ? null
+                      : transferData.getServerApproveAutorenewPollMessage().getOfyKey());
       if (transferData.getTransferPeriod().getValue() == 1) {
         // Set the grace period using a key to the prescheduled transfer billing event.  Not using
         // GracePeriod.forBillingEvent() here in order to avoid the actual Datastore fetch.
@@ -448,7 +456,9 @@ public class DomainBase extends EppResource
                     transferExpirationTime.plus(
                         Registry.get(getTld()).getTransferGracePeriodLength()),
                     transferData.getGainingClientId(),
-                    transferData.getServerApproveBillingEvent())));
+                    transferData.getServerApproveBillingEvent() == null
+                        ? null
+                        : transferData.getServerApproveBillingEvent().getOfyKey())));
       } else {
         // There won't be a billing event, so we don't need a grace period
         builder.setGracePeriods(ImmutableSet.of());

core/src/main/java/google/registry/model/domain/GracePeriod.java

@@ -24,6 +24,7 @@ import google.registry.model.ImmutableObject;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.domain.rgp.GracePeriodStatus;
 import javax.annotation.Nullable;
+import javax.persistence.Column;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import org.joda.time.DateTime;
@@ -51,6 +52,7 @@ public class GracePeriod extends ImmutableObject {
   DateTime expirationTime;
 
   /** The registrar to bill. */
+  @Column(name = "registrarId")
   String clientId;
 
   /**

core/src/main/java/google/registry/model/domain/Period.java

@@ -16,6 +16,8 @@ package google.registry.model.domain;
 
 import com.googlecode.objectify.annotation.Embed;
 import google.registry.model.ImmutableObject;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlValue;
@@ -25,6 +27,7 @@ import javax.xml.bind.annotation.XmlValue;
 @javax.persistence.Embeddable
 public class Period extends ImmutableObject {
 
+  @Enumerated(EnumType.STRING)
   @XmlAttribute
   Unit unit;
 

core/src/main/java/google/registry/model/host/HostResource.java

@@ -40,7 +40,6 @@ import java.net.InetAddress;
 import java.util.Optional;
 import java.util.Set;
 import javax.annotation.Nullable;
-import javax.persistence.ElementCollection;
 import org.joda.time.DateTime;
 
 /**
@@ -70,13 +69,13 @@ public class HostResource extends EppResource
   String fullyQualifiedHostName;
 
   /** IP Addresses for this host. Can be null if this is an external host. */
-  @Index @ElementCollection Set<InetAddress> inetAddresses;
+  @Index Set<InetAddress> inetAddresses;
 
   /** The superordinate domain of this host, or null if this is an external host. */
   @Index
   @IgnoreSave(IfNull.class)
   @DoNotHydrate
-  Key<DomainBase> superordinateDomain;
+  VKey<DomainBase> superordinateDomain;
 
   /**
    * The time that this resource was last transferred.
@@ -98,7 +97,7 @@ public class HostResource extends EppResource
     return fullyQualifiedHostName;
   }
 
-  public Key<DomainBase> getSuperordinateDomain() {
+  public VKey<DomainBase> getSuperordinateDomain() {
     return superordinateDomain;
   }
 
@@ -145,18 +144,18 @@ public class HostResource extends EppResource
    *
    * <p>If the host is not subordinate the domain can be null and we just return last transfer time.
    *
-   * @param superordinateDomain the loaded superordinate domain, which must match the key in
-   *     the {@link #superordinateDomain} field. Passing it as a parameter allows the caller to
-   *     control the degree of consistency used to load it.
+   * @param superordinateDomain the loaded superordinate domain, which must match the key in the
+   *     {@link #superordinateDomain} field. Passing it as a parameter allows the caller to control
+   *     the degree of consistency used to load it.
    */
-   public DateTime computeLastTransferTime(@Nullable DomainBase superordinateDomain) {
+  public DateTime computeLastTransferTime(@Nullable DomainBase superordinateDomain) {
     if (!isSubordinate()) {
       checkArgument(superordinateDomain == null);
       return getLastTransferTime();
     }
     checkArgument(
         superordinateDomain != null
-            && Key.create(superordinateDomain).equals(getSuperordinateDomain()));
+            && superordinateDomain.createVKey().equals(getSuperordinateDomain()));
     DateTime lastSuperordinateChange =
         Optional.ofNullable(getLastSuperordinateChange()).orElse(getCreationTime());
     DateTime lastTransferOfCurrentSuperordinate =
@@ -207,7 +206,7 @@ public class HostResource extends EppResource
           difference(getInstance().getInetAddresses(), inetAddresses)));
     }
 
-    public Builder setSuperordinateDomain(Key<DomainBase> superordinateDomain) {
+    public Builder setSuperordinateDomain(VKey<DomainBase> superordinateDomain) {
       getInstance().superordinateDomain = superordinateDomain;
       return this;
     }

core/src/main/java/google/registry/model/poll/PollMessage.java

@@ -43,6 +43,7 @@ import google.registry.model.transfer.TransferData.TransferServerApproveEntity;
 import google.registry.model.transfer.TransferResponse;
 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 java.util.List;
 import java.util.Optional;
@@ -150,6 +151,9 @@ public abstract class PollMessage extends ImmutableObject
 
   public abstract ImmutableList<ResponseData> getResponseData();
 
+  @Override
+  public abstract VKey<? extends PollMessage> createVKey();
+
   /** Override Buildable.asBuilder() to give this method stronger typing. */
   @Override
   public abstract Builder<?, ?> asBuilder();
@@ -291,6 +295,11 @@ public abstract class PollMessage extends ImmutableObject
     @Column(name = "transfer_response_contact_id")
     String contactId;
 
+    @Override
+    public VKey<OneTime> createVKey() {
+      return VKey.createOfy(this.getClass(), Key.create(this));
+    }
+
     @Override
     public Builder asBuilder() {
       return new Builder(clone(this));
@@ -387,6 +396,11 @@ public abstract class PollMessage extends ImmutableObject
       return autorenewEndTime;
     }
 
+    @Override
+    public VKey<Autorenew> createVKey() {
+      return VKey.createOfy(this.getClass(), Key.create(this));
+    }
+
     @Override
     public ImmutableList<ResponseData> getResponseData() {
       // Note that the event time is when the auto-renew occured, so the expiration time in the

core/src/main/java/google/registry/model/registrar/Registrar.java

@@ -236,7 +236,7 @@ public class Registrar extends ImmutableObject
    */
   @Id
   @javax.persistence.Id
-  @Column(name = "client_id", nullable = false)
+  @Column(name = "registrarId", nullable = false)
   String clientIdentifier;
 
   /**

core/src/main/java/google/registry/model/transfer/BaseTransferObject.java

@@ -16,6 +16,7 @@ package google.registry.model.transfer;
 
 import google.registry.model.Buildable.GenericBuilder;
 import google.registry.model.ImmutableObject;
+import javax.persistence.Column;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.MappedSuperclass;
@@ -38,6 +39,7 @@ public abstract class BaseTransferObject extends ImmutableObject {
 
   /** The gaining registrar of the current or last transfer. Can be null if never transferred. */
   @XmlElement(name = "reID")
+  @Column(name = "transfer_gaining_registrar_id")
   String gainingClientId;
 
   /** The time that the last transfer was requested. Can be null if never transferred. */
@@ -46,6 +48,7 @@ public abstract class BaseTransferObject extends ImmutableObject {
 
   /** The losing registrar of the current or last transfer. Can be null if never transferred. */
   @XmlElement(name = "acID")
+  @Column(name = "transfer_losing_registrar_id")
   String losingClientId;
 
   /**
@@ -54,6 +57,7 @@ public abstract class BaseTransferObject extends ImmutableObject {
    * this holds the time that the last pending transfer ended. Can be null if never transferred.
    */
   @XmlElement(name = "acDate")
+  @Column(name = "transfer_pending_expiration_time")
   DateTime pendingTransferExpirationTime;
 
   public TransferStatus getTransferStatus() {

core/src/main/java/google/registry/model/transfer/TransferData.java

@@ -17,8 +17,8 @@ package google.registry.model.transfer;
 import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
 
 import com.google.common.collect.ImmutableSet;
-import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Embed;
+import com.googlecode.objectify.annotation.Ignore;
 import com.googlecode.objectify.annotation.IgnoreSave;
 import com.googlecode.objectify.annotation.Unindex;
 import com.googlecode.objectify.condition.IfNull;
@@ -29,10 +29,14 @@ import google.registry.model.domain.Period;
 import google.registry.model.domain.Period.Unit;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.poll.PollMessage;
+import google.registry.persistence.VKey;
 import java.util.Set;
 import javax.annotation.Nullable;
-import javax.persistence.ElementCollection;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
 import javax.persistence.Embedded;
+import javax.persistence.Transient;
 import org.joda.time.DateTime;
 
 /**
@@ -47,7 +51,16 @@ public class TransferData extends BaseTransferObject implements Buildable {
   public static final TransferData EMPTY = new TransferData();
 
   /** The transaction id of the most recent transfer request (or null if there never was one). */
-  @Embedded Trid transferRequestTrid;
+  @Embedded
+  @AttributeOverrides({
+    @AttributeOverride(
+        name = "serverTransactionId",
+        column = @Column(name = "transfer_server_txn_id")),
+    @AttributeOverride(
+        name = "clientTransactionId",
+        column = @Column(name = "transfer_client_txn_id"))
+  })
+  Trid transferRequestTrid;
 
   /**
    * The period to extend the registration upon completion of the transfer.
@@ -55,23 +68,29 @@ public class TransferData extends BaseTransferObject implements Buildable {
    * <p>By default, domain transfers are for one year. This can be changed to zero by using the
    * superuser EPP extension.
    */
-  @Embedded Period transferPeriod = Period.create(1, Unit.YEARS);
+  @Embedded
+  @AttributeOverrides({
+    @AttributeOverride(name = "unit", column = @Column(name = "transfer_renew_period_unit")),
+    @AttributeOverride(name = "value", column = @Column(name = "transfer_renew_period_value"))
+  })
+  Period transferPeriod = Period.create(1, Unit.YEARS);
 
   /**
    * The registration expiration time resulting from the approval - speculative or actual - of the
    * most recent transfer request, applicable for domains only.
    *
    * <p>For pending transfers, this is the expiration time that will take effect under a projected
-   * server approval. For approved transfers, this is the actual expiration time of the domain as
-   * of the moment of transfer completion. For rejected or cancelled transfers, this field will be
+   * server approval. For approved transfers, this is the actual expiration time of the domain as of
+   * the moment of transfer completion. For rejected or cancelled transfers, this field will be
    * reset to null.
    *
    * <p>Note that even when this field is set, it does not necessarily mean that the post-transfer
-   * domain has a new expiration time.  Superuser transfers may not include a bundled 1 year renewal
+   * domain has a new expiration time. Superuser transfers may not include a bundled 1 year renewal
    * at all, or even when a renewal is bundled, for a transfer during the autorenew grace period the
    * bundled renewal simply subsumes the recent autorenewal, resulting in the same expiration time.
    */
   // TODO(b/36405140): backfill this field for existing domains to which it should apply.
+  @Column(name = "transfer_registration_expiration_time")
   DateTime transferredRegistrationExpirationTime;
 
   /**
@@ -83,18 +102,35 @@ public class TransferData extends BaseTransferObject implements Buildable {
    * pending transfer is explicitly approved, rejected or cancelled, the referenced entities should
    * be deleted.
    */
+  @Transient
   @IgnoreSave(IfNull.class)
-  @ElementCollection
-  Set<Key<? extends TransferServerApproveEntity>> serverApproveEntities;
+  Set<VKey<? extends TransferServerApproveEntity>> serverApproveEntities;
+
+  // The following 3 fields are the replacement for serverApproveEntities in Cloud SQL.
+  // TODO(shicong): Add getter/setter for these 3 fields and use them in the application code.
+  @Ignore
+  @Column(name = "transfer_gaining_poll_message_id")
+  Long gainingTransferPollMessageId;
+
+  @Ignore
+  @Column(name = "transfer_losing_poll_message_id")
+  Long losingTransferPollMessageId;
+
+  @Ignore
+  @Column(name = "transfer_billing_cancellation_id")
+  Long billingCancellationId;
 
   /**
    * The regular one-time billing event that will be charged for a server-approved transfer.
    *
    * <p>This field should be null if there is not currently a pending transfer or if the object
    * being transferred is not a domain.
+   *
+   * <p>TODO(b/158230654) Remove unused columns for TransferData in Contact table.
    */
   @IgnoreSave(IfNull.class)
-  Key<BillingEvent.OneTime> serverApproveBillingEvent;
+  @Column(name = "transfer_billing_event_id")
+  VKey<BillingEvent.OneTime> serverApproveBillingEvent;
 
   /**
    * The autorenew billing event that should be associated with this resource after the transfer.
@@ -103,7 +139,8 @@ public class TransferData extends BaseTransferObject implements Buildable {
    * being transferred is not a domain.
    */
   @IgnoreSave(IfNull.class)
-  Key<BillingEvent.Recurring> serverApproveAutorenewEvent;
+  @Column(name = "transfer_billing_recurrence_id")
+  VKey<BillingEvent.Recurring> serverApproveAutorenewEvent;
 
   /**
    * The autorenew poll message that should be associated with this resource after the transfer.
@@ -112,7 +149,8 @@ public class TransferData extends BaseTransferObject implements Buildable {
    * being transferred is not a domain.
    */
   @IgnoreSave(IfNull.class)
-  Key<PollMessage.Autorenew> serverApproveAutorenewPollMessage;
+  @Column(name = "transfer_autorenew_poll_message_id")
+  VKey<PollMessage.Autorenew> serverApproveAutorenewPollMessage;
 
   @Nullable
   public Trid getTransferRequestTrid() {
@@ -128,22 +166,22 @@ public class TransferData extends BaseTransferObject implements Buildable {
     return transferredRegistrationExpirationTime;
   }
 
-  public ImmutableSet<Key<? extends TransferServerApproveEntity>> getServerApproveEntities() {
+  public ImmutableSet<VKey<? extends TransferServerApproveEntity>> getServerApproveEntities() {
     return nullToEmptyImmutableCopy(serverApproveEntities);
   }
 
   @Nullable
-  public Key<BillingEvent.OneTime> getServerApproveBillingEvent() {
+  public VKey<BillingEvent.OneTime> getServerApproveBillingEvent() {
     return serverApproveBillingEvent;
   }
 
   @Nullable
-  public Key<BillingEvent.Recurring> getServerApproveAutorenewEvent() {
+  public VKey<BillingEvent.Recurring> getServerApproveAutorenewEvent() {
     return serverApproveAutorenewEvent;
   }
 
   @Nullable
-  public Key<PollMessage.Autorenew> getServerApproveAutorenewPollMessage() {
+  public VKey<PollMessage.Autorenew> getServerApproveAutorenewPollMessage() {
     return serverApproveAutorenewPollMessage;
   }
 
@@ -202,25 +240,25 @@ public class TransferData extends BaseTransferObject implements Buildable {
     }
 
     public Builder setServerApproveEntities(
-        ImmutableSet<Key<? extends TransferServerApproveEntity>> serverApproveEntities) {
+        ImmutableSet<VKey<? extends TransferServerApproveEntity>> serverApproveEntities) {
       getInstance().serverApproveEntities = serverApproveEntities;
       return this;
     }
 
     public Builder setServerApproveBillingEvent(
-        Key<BillingEvent.OneTime> serverApproveBillingEvent) {
+        VKey<BillingEvent.OneTime> serverApproveBillingEvent) {
       getInstance().serverApproveBillingEvent = serverApproveBillingEvent;
       return this;
     }
 
     public Builder setServerApproveAutorenewEvent(
-        Key<BillingEvent.Recurring> serverApproveAutorenewEvent) {
+        VKey<BillingEvent.Recurring> serverApproveAutorenewEvent) {
       getInstance().serverApproveAutorenewEvent = serverApproveAutorenewEvent;
       return this;
     }
 
     public Builder setServerApproveAutorenewPollMessage(
-        Key<PollMessage.Autorenew> serverApproveAutorenewPollMessage) {
+        VKey<PollMessage.Autorenew> serverApproveAutorenewPollMessage) {
       getInstance().serverApproveAutorenewPollMessage = serverApproveAutorenewPollMessage;
       return this;
     }
@@ -230,5 +268,7 @@ public class TransferData extends BaseTransferObject implements Buildable {
    * Marker interface for objects that are written in anticipation of a server approval, and
    * therefore need to be deleted under any other outcome.
    */
-  public interface TransferServerApproveEntity {}
+  public interface TransferServerApproveEntity {
+    VKey<? extends TransferServerApproveEntity> createVKey();
+  }
 }

core/src/main/java/google/registry/persistence/VKey.java

@@ -17,6 +17,7 @@ package google.registry.persistence;
 import static com.google.common.base.Preconditions.checkState;
 import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 
+import com.googlecode.objectify.Key;
 import google.registry.model.ImmutableObject;
 import java.util.Optional;
 
@@ -57,6 +58,23 @@ public class VKey<T> extends ImmutableObject {
     return new VKey(kind, ofyKey, null);
   }
 
+  /**
+   * Creates a {@link VKey} which only contains the ofy primary key by specifying the id of the
+   * {@link Key}.
+   */
+  public static <T> VKey<T> createOfy(Class<? extends T> kind, long id) {
+    return createOfy(kind, Key.create(kind, id));
+  }
+
+  /**
+   * Creates a {@link VKey} which only contains the ofy primary key by specifying the name of the
+   * {@link Key}.
+   */
+  public static <T> VKey<T> createOfy(Class<? extends T> kind, String name) {
+    checkArgumentNotNull(kind, "name must not be null");
+    return createOfy(kind, Key.create(kind, name));
+  }
+
   /** Creates a {@link VKey} which only contains both sql and ofy primary key. */
   public static <T> VKey<T> create(
       Class<? extends T> kind, Object sqlKey, com.googlecode.objectify.Key ofyKey) {

core/src/main/java/google/registry/persistence/converter/InetAddressSetConverter.java

@@ -0,0 +1,33 @@
+// Copyright 2020 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package google.registry.persistence.converter;
+
+import com.google.common.net.InetAddresses;
+import java.net.InetAddress;
+import javax.persistence.Converter;
+
+@Converter(autoApply = true)
+public class InetAddressSetConverter extends StringSetConverterBase<InetAddress> {
+
+  @Override
+  String toString(InetAddress element) {
+    return InetAddresses.toAddrString(element);
+  }
+
+  @Override
+  InetAddress fromString(String value) {
+    return InetAddresses.forString(value);
+  }
+}

core/src/main/java/google/registry/persistence/converter/TransferServerApproveEntitySetConverter.java

@@ -0,0 +1,37 @@
+// Copyright 2020 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package google.registry.persistence.converter;
+
+import google.registry.model.transfer.TransferData.TransferServerApproveEntity;
+import google.registry.persistence.VKey;
+import java.util.Set;
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+/** {@link AttributeConverter} for {@link Set}. */
+@Converter(autoApply = true)
+public class TransferServerApproveEntitySetConverter
+    extends StringSetConverterBase<VKey<? extends TransferServerApproveEntity>> {
+
+  @Override
+  String toString(VKey<? extends TransferServerApproveEntity> element) {
+    return String.valueOf(element.getSqlKey());
+  }
+
+  @Override
+  VKey<? extends TransferServerApproveEntity> fromString(String value) {
+    return VKey.createSql(TransferServerApproveEntity.class, Long.parseLong(value));
+  }
+}

core/src/main/java/google/registry/rdap/RdapJsonFormatter.java

@@ -433,10 +433,7 @@ public class RdapJsonFormatter {
         statuses.add(StatusValue.LINKED);
       }
       if (hostResource.isSubordinate()
-          && ofy()
-              .load()
-              .key(hostResource.getSuperordinateDomain())
-              .now()
+          && tm().load(hostResource.getSuperordinateDomain())
               .cloneProjectedAtTime(getRequestTime())
               .getStatusValues()
               .contains(StatusValue.PENDING_TRANSFER)) {

core/src/main/java/google/registry/rde/HostResourceToXjcConverter.java

@@ -17,7 +17,6 @@ package google.registry.rde;
 import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.net.InetAddresses;
-import com.googlecode.objectify.Key;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.host.HostResource;
@@ -35,9 +34,8 @@ import org.joda.time.DateTime;
 final class HostResourceToXjcConverter {
 
   /** Converts a subordinate {@link HostResource} to {@link XjcRdeHostElement}. */
-  static XjcRdeHostElement convertSubordinate(
-      HostResource host, DomainBase superordinateDomain) {
-    checkArgument(Key.create(superordinateDomain).equals(host.getSuperordinateDomain()));
+  static XjcRdeHostElement convertSubordinate(HostResource host, DomainBase superordinateDomain) {
+    checkArgument(superordinateDomain.createVKey().equals(host.getSuperordinateDomain()));
     return new XjcRdeHostElement(convertSubordinateHost(host, superordinateDomain));
   }
 

core/src/main/java/google/registry/rde/RdeStagingMapper.java

@@ -18,6 +18,7 @@ import static com.google.common.base.Strings.nullToEmpty;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static google.registry.model.EppResourceUtils.loadAtPointInTime;
 import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 
 import com.google.appengine.tools.mapreduce.Mapper;
 import com.google.auto.value.AutoValue;
@@ -186,13 +187,16 @@ public final class RdeStagingMapper extends Mapper<EppResource, PendingDeposit,
         return result;
       } else if (resource instanceof HostResource) {
         HostResource host = (HostResource) resource;
-        result = Optional.of(host.isSubordinate()
-            ? marshaller.marshalSubordinateHost(
-                host,
-                // Note that loadAtPointInTime() does cloneProjectedAtTime(watermark) for us.
-                loadAtPointInTime(
-                    ofy().load().key(host.getSuperordinateDomain()).now(), watermark).now())
-            : marshaller.marshalExternalHost(host));
+        result =
+            Optional.of(
+                host.isSubordinate()
+                    ? marshaller.marshalSubordinateHost(
+                        host,
+                        // Note that loadAtPointInTime() does cloneProjectedAtTime(watermark) for
+                        // us.
+                        loadAtPointInTime(tm().load(host.getSuperordinateDomain()), watermark)
+                            .now())
+                    : marshaller.marshalExternalHost(host));
         cache.put(WatermarkModePair.create(watermark, RdeMode.FULL), result);
         cache.put(WatermarkModePair.create(watermark, RdeMode.THIN), result);
         return result;

core/src/main/java/google/registry/whois/NameserverWhoisResponse.java

@@ -16,7 +16,7 @@ package google.registry.whois;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.net.InetAddresses;
@@ -49,7 +49,7 @@ final class NameserverWhoisResponse extends WhoisResponseImpl {
       HostResource host = hosts.get(i);
       String clientId =
           host.isSubordinate()
-              ? ofy().load().key(host.getSuperordinateDomain()).now()
+              ? tm().load(host.getSuperordinateDomain())
                   .cloneProjectedAtTime(getTimestamp())
                   .getCurrentSponsorClientId()
               : host.getPersistedCurrentSponsorClientId();

core/src/main/resources/META-INF/persistence.xml

@@ -50,20 +50,25 @@
     <class>google.registry.persistence.converter.CurrencyUnitConverter</class>
     <class>google.registry.persistence.converter.DateTimeConverter</class>
     <class>google.registry.persistence.converter.DurationConverter</class>
+    <class>google.registry.persistence.converter.InetAddressSetConverter</class>
     <class>google.registry.persistence.converter.PostalInfoChoiceListConverter</class>
     <class>google.registry.persistence.converter.RegistrarPocSetConverter</class>
     <class>google.registry.persistence.converter.StatusValueSetConverter</class>
     <class>google.registry.persistence.converter.StringListConverter</class>
     <class>google.registry.persistence.converter.StringSetConverter</class>
     <class>google.registry.persistence.converter.TldStateTransitionConverter</class>
+    <class>google.registry.persistence.converter.TransferServerApproveEntitySetConverter</class>
     <class>google.registry.persistence.converter.UpdateAutoTimestampConverter</class>
     <class>google.registry.persistence.converter.ZonedDateTimeConverter</class>
 
     <!-- Generated converters for VKey -->
     <class>google.registry.model.billing.VKeyConverter_BillingEvent</class>
+    <class>google.registry.model.domain.VKeyConverter_DomainBase</class>
+    <class>google.registry.model.contact.VKeyConverter_ContactResource</class>
     <class>google.registry.model.domain.token.VKeyConverter_AllocationToken</class>
     <class>google.registry.model.host.VKeyConverter_HostResource</class>
-    <class>google.registry.model.contact.VKeyConverter_ContactResource</class>
+    <class>google.registry.model.poll.VKeyConverter_Autorenew</class>
+    <class>google.registry.model.poll.VKeyConverter_OneTime</class>
 
     <!-- TODO(weiminyu): check out application-layer validation. -->
     <validation-mode>NONE</validation-mode>

core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java

@@ -725,7 +725,7 @@ public class DeleteContactsAndHostsActionTest
         persistResource(
             persistHostPendingDelete("ns2.example.tld")
                 .asBuilder()
-                .setSuperordinateDomain(Key.create(domain))
+                .setSuperordinateDomain(domain.createVKey())
                 .build());
     enqueuer.enqueueAsyncDelete(
         host,

core/src/test/java/google/registry/flows/EppLifecycleHostTest.java

@@ -24,7 +24,6 @@ import static google.registry.testing.EppMetricSubject.assertThat;
 import static google.registry.testing.HostResourceSubject.assertAboutHosts;
 
 import com.google.common.collect.ImmutableMap;
-import com.googlecode.objectify.Key;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.host.HostResource;
 import google.registry.testing.AppEngineRule;
@@ -221,7 +220,7 @@ public class EppLifecycleHostTest extends EppTestCase {
         loadByForeignKey(DomainBase.class, "example.bar.foo.tld", timeAfterCreates).get();
     assertAboutHosts()
         .that(exampleBarFooTldHost)
-        .hasSuperordinateDomain(Key.create(exampleBarFooTldDomain));
+        .hasSuperordinateDomain(exampleBarFooTldDomain.createVKey());
     assertThat(exampleBarFooTldDomain.getSubordinateHosts())
         .containsExactly("ns1.example.bar.foo.tld");
 
@@ -231,14 +230,14 @@ public class EppLifecycleHostTest extends EppTestCase {
         loadByForeignKey(DomainBase.class, "example.foo.tld", timeAfterCreates).get();
     assertAboutHosts()
         .that(exampleFooTldHost)
-        .hasSuperordinateDomain(Key.create(exampleFooTldDomain));
+        .hasSuperordinateDomain(exampleFooTldDomain.createVKey());
     assertThat(exampleFooTldDomain.getSubordinateHosts()).containsExactly("ns1.example.foo.tld");
 
     HostResource exampleTldHost =
         loadByForeignKey(HostResource.class, "ns1.example.tld", timeAfterCreates).get();
     DomainBase exampleTldDomain =
         loadByForeignKey(DomainBase.class, "example.tld", timeAfterCreates).get();
-    assertAboutHosts().that(exampleTldHost).hasSuperordinateDomain(Key.create(exampleTldDomain));
+    assertAboutHosts().that(exampleTldHost).hasSuperordinateDomain(exampleTldDomain.createVKey());
     assertThat(exampleTldDomain.getSubordinateHosts()).containsExactly("ns1.example.tld");
 
     assertThatLogoutSucceeds();

core/src/test/java/google/registry/flows/contact/ContactTransferRequestFlowTest.java

@@ -52,6 +52,7 @@ import google.registry.model.poll.PollMessage;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferStatus;
+import google.registry.persistence.VKey;
 import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Test;
@@ -129,9 +130,13 @@ public class ContactTransferRequestFlowTest
     // poll messages, the approval notice ones for gaining and losing registrars.
     assertPollMessagesEqual(
         Iterables.filter(
-            ofy().load()
+            ofy()
+                .load()
                 // Use toArray() to coerce the type to something keys() will accept.
-                .keys(contact.getTransferData().getServerApproveEntities().toArray(new Key<?>[]{}))
+                .keys(
+                    contact.getTransferData().getServerApproveEntities().stream()
+                        .map(VKey::getOfyKey)
+                        .toArray(Key[]::new))
                 .values(),
             PollMessage.class),
         ImmutableList.of(gainingApproveMessage, losingApproveMessage));

core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java

@@ -93,6 +93,7 @@ import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferResponse;
 import google.registry.model.transfer.TransferStatus;
+import google.registry.persistence.VKey;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import java.util.Map;
 import org.joda.money.Money;
@@ -668,13 +669,24 @@ public class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow,
                 .setPendingTransferExpirationTime(clock.nowUtc())
                 .build());
     // The server-approve entities should all be deleted.
-    assertThat(ofy().load().key(oldTransferData.getServerApproveBillingEvent()).now()).isNull();
-    assertThat(ofy().load().key(oldTransferData.getServerApproveAutorenewEvent()).now()).isNull();
-    assertThat(ofy().load().key(oldTransferData.getServerApproveAutorenewPollMessage()).now())
+    assertThat(ofy().load().key(oldTransferData.getServerApproveBillingEvent().getOfyKey()).now())
+        .isNull();
+    assertThat(ofy().load().key(oldTransferData.getServerApproveAutorenewEvent().getOfyKey()).now())
+        .isNull();
+    assertThat(
+            ofy()
+                .load()
+                .key(oldTransferData.getServerApproveAutorenewPollMessage().getOfyKey())
+                .now())
         .isNull();
     assertThat(oldTransferData.getServerApproveEntities()).isNotEmpty(); // Just a sanity check.
     assertThat(
-            ofy().load().keys(oldTransferData.getServerApproveEntities().toArray(new Key<?>[] {})))
+            ofy()
+                .load()
+                .keys(
+                    oldTransferData.getServerApproveEntities().stream()
+                        .map(VKey::getOfyKey)
+                        .toArray(Key[]::new)))
         .isEmpty();
   }
 
@@ -719,7 +731,7 @@ public class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow,
     persistResource(
         newHostResource("ns1." + getUniqueIdFromCommand())
             .asBuilder()
-            .setSuperordinateDomain(Key.create(reloadResourceByForeignKey()))
+            .setSuperordinateDomain(reloadResourceByForeignKey().createVKey())
             .setDeletionTime(clock.nowUtc().minusDays(1))
             .build());
     clock.advanceOneMilli();
@@ -767,7 +779,7 @@ public class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow,
         persistResource(
             newHostResource("ns1." + getUniqueIdFromCommand())
                 .asBuilder()
-                .setSuperordinateDomain(Key.create(reloadResourceByForeignKey()))
+                .setSuperordinateDomain(reloadResourceByForeignKey().createVKey())
                 .build());
     persistResource(
         domain.asBuilder().addSubordinateHost(subordinateHost.getFullyQualifiedHostName()).build());

core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java

@@ -123,14 +123,14 @@ public class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, Dom
                 .build());
     // Set the superordinate domain of ns1.example.com to example.com. In reality, this would have
     // happened in the flow that created it, but here we just overwrite it in Datastore.
-    host1 = persistResource(host1.asBuilder().setSuperordinateDomain(Key.create(domain)).build());
+    host1 = persistResource(host1.asBuilder().setSuperordinateDomain(domain.createVKey()).build());
     // Create a subordinate host that is not delegated to by anyone.
     host3 =
         persistResource(
             new HostResource.Builder()
                 .setFullyQualifiedHostName("ns2.example.tld")
                 .setRepoId("3FF-TLD")
-                .setSuperordinateDomain(Key.create(domain))
+                .setSuperordinateDomain(domain.createVKey())
                 .build());
     // Add the subordinate host keys to the existing domain.
     domain =

core/src/test/java/google/registry/flows/domain/DomainTransferFlowTestCase.java

@@ -29,7 +29,6 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME;
 
 import com.google.common.base.Ascii;
 import com.google.common.collect.ImmutableSet;
-import com.googlecode.objectify.Key;
 import google.registry.flows.Flow;
 import google.registry.flows.ResourceFlowTestCase;
 import google.registry.model.EppResource;
@@ -116,7 +115,7 @@ public class DomainTransferFlowTestCase<F extends Flow, R extends EppResource>
             .setPersistedCurrentSponsorClientId("TheRegistrar")
             .setCreationClientId("TheRegistrar")
             .setCreationTimeForTest(DateTime.parse("1999-04-03T22:00:00.0Z"))
-            .setSuperordinateDomain(Key.create(domain))
+            .setSuperordinateDomain(domain.createVKey())
             .build());
     domain =
         persistResource(

core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java

@@ -27,6 +27,7 @@ import static google.registry.model.registry.Registry.TldState.QUIET_PERIOD;
 import static google.registry.model.reporting.DomainTransactionRecord.TransactionReportField.TRANSFER_SUCCESSFUL;
 import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_CREATE;
 import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_TRANSFER_REQUEST;
+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.testing.DatastoreHelper.assertBillingEvents;
 import static google.registry.testing.DatastoreHelper.assertBillingEventsEqual;
 import static google.registry.testing.DatastoreHelper.assertPollMessagesEqual;
@@ -290,13 +291,13 @@ public class DomainTransferRequestFlowTest
     // Assert that the domain's TransferData server-approve billing events match the above.
     if (expectTransferBillingEvent) {
       assertBillingEventsEqual(
-          ofy().load().key(domain.getTransferData().getServerApproveBillingEvent()).now(),
+          tm().load(domain.getTransferData().getServerApproveBillingEvent()),
           optionalTransferBillingEvent.get());
     } else {
       assertThat(domain.getTransferData().getServerApproveBillingEvent()).isNull();
     }
     assertBillingEventsEqual(
-        ofy().load().key(domain.getTransferData().getServerApproveAutorenewEvent()).now(),
+        tm().load(domain.getTransferData().getServerApproveAutorenewEvent()),
         gainingClientAutorenew);
     // Assert that the full set of server-approve billing events is exactly the extra ones plus
     // the transfer billing event (if present) and the gaining client autorenew.
@@ -309,7 +310,10 @@ public class DomainTransferRequestFlowTest
             ofy()
                 .load()
                 // Use toArray() to coerce the type to something keys() will accept.
-                .keys(domain.getTransferData().getServerApproveEntities().toArray(new Key<?>[] {}))
+                .keys(
+                    domain.getTransferData().getServerApproveEntities().stream()
+                        .map(VKey::getOfyKey)
+                        .toArray(Key[]::new))
                 .values(),
             BillingEvent.class),
         Sets.union(expectedServeApproveBillingEvents, extraBillingEvents));
@@ -410,7 +414,7 @@ public class DomainTransferRequestFlowTest
 
     // Assert that the poll messages show up in the TransferData server approve entities.
     assertPollMessagesEqual(
-        ofy().load().key(domain.getTransferData().getServerApproveAutorenewPollMessage()).now(),
+        tm().load(domain.getTransferData().getServerApproveAutorenewPollMessage()),
         autorenewPollMessage);
     // Assert that the full set of server-approve poll messages is exactly the server approve
     // OneTime messages to gaining and losing registrars plus the gaining client autorenew.
@@ -419,7 +423,10 @@ public class DomainTransferRequestFlowTest
             ofy()
                 .load()
                 // Use toArray() to coerce the type to something keys() will accept.
-                .keys(domain.getTransferData().getServerApproveEntities().toArray(new Key<?>[] {}))
+                .keys(
+                    domain.getTransferData().getServerApproveEntities().stream()
+                        .map(VKey::getOfyKey)
+                        .toArray(Key[]::new))
                 .values(),
             PollMessage.class),
         ImmutableList.of(

core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java

@@ -389,8 +389,8 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow,
     HostResource existingHost =
         loadByForeignKey(HostResource.class, "ns1.example.tld", clock.nowUtc()).get();
     addedHost = loadByForeignKey(HostResource.class, "ns2.example.tld", clock.nowUtc()).get();
-    assertThat(existingHost.getSuperordinateDomain()).isEqualTo(Key.create(domain));
-    assertThat(addedHost.getSuperordinateDomain()).isEqualTo(Key.create(domain));
+    assertThat(existingHost.getSuperordinateDomain()).isEqualTo(domain.createVKey());
+    assertThat(addedHost.getSuperordinateDomain()).isEqualTo(domain.createVKey());
   }
 
   @Test

core/src/test/java/google/registry/flows/host/HostCreateFlowTest.java

@@ -34,7 +34,6 @@ import static org.junit.Assert.assertThrows;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.googlecode.objectify.Key;
 import google.registry.flows.EppException;
 import google.registry.flows.FlowUtils.IpAddressVersionMismatchException;
 import google.registry.flows.ResourceFlowTestCase;
@@ -119,7 +118,7 @@ public class HostCreateFlowTest extends ResourceFlowTestCase<HostCreateFlow, Hos
     HostResource host = reloadResourceByForeignKey();
     DomainBase superordinateDomain =
         loadByForeignKey(DomainBase.class, "example.tld", clock.nowUtc()).get();
-    assertAboutHosts().that(host).hasSuperordinateDomain(Key.create(superordinateDomain));
+    assertAboutHosts().that(host).hasSuperordinateDomain(superordinateDomain.createVKey());
     assertThat(superordinateDomain.getSubordinateHosts()).containsExactly("ns1.example.tld");
     assertDnsTasksEnqueued("ns1.example.tld");
   }
@@ -148,7 +147,7 @@ public class HostCreateFlowTest extends ResourceFlowTestCase<HostCreateFlow, Hos
     HostResource host = reloadResourceByForeignKey();
     DomainBase superordinateDomain =
         loadByForeignKey(DomainBase.class, "example.tld", clock.nowUtc()).get();
-    assertAboutHosts().that(host).hasSuperordinateDomain(Key.create(superordinateDomain));
+    assertAboutHosts().that(host).hasSuperordinateDomain(superordinateDomain.createVKey());
     assertThat(superordinateDomain.getSubordinateHosts()).containsExactly("ns1.example.tld");
     assertDnsTasksEnqueued("ns1.example.tld");
   }

core/src/test/java/google/registry/flows/host/HostDeleteFlowTest.java

@@ -29,7 +29,6 @@ import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.googlecode.objectify.Key;
 import google.registry.flows.EppException;
 import google.registry.flows.ResourceFlowTestCase;
 import google.registry.flows.ResourceFlowUtils.ResourceDoesNotExistException;
@@ -186,7 +185,7 @@ public class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, Hos
         newHostResource("ns1.example.tld")
             .asBuilder()
             .setPersistedCurrentSponsorClientId("NewRegistrar") // Shouldn't hurt.
-            .setSuperordinateDomain(Key.create(domain))
+            .setSuperordinateDomain(domain.createVKey())
             .build());
     clock.advanceOneMilli();
     runFlowAssertResponse(loadFile("host_delete_response.xml"));
@@ -206,7 +205,7 @@ public class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, Hos
         newHostResource("ns1.example.tld")
             .asBuilder()
             .setPersistedCurrentSponsorClientId("TheRegistrar") // Shouldn't help.
-            .setSuperordinateDomain(Key.create(domain))
+            .setSuperordinateDomain(domain.createVKey())
             .build());
     EppException thrown = assertThrows(ResourceNotOwnedException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -239,7 +238,7 @@ public class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, Hos
         newHostResource("ns1.example.tld")
             .asBuilder()
             .setPersistedCurrentSponsorClientId("TheRegistrar") // Shouldn't hurt.
-            .setSuperordinateDomain(Key.create(domain))
+            .setSuperordinateDomain(domain.createVKey())
             .build());
     clock.advanceOneMilli();
     runFlowAssertResponse(loadFile("host_delete_response.xml"));
@@ -272,7 +271,7 @@ public class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, Hos
         newHostResource("ns1.example.tld")
             .asBuilder()
             .setPersistedCurrentSponsorClientId("NewRegistrar") // Shouldn't help.
-            .setSuperordinateDomain(Key.create(domain))
+            .setSuperordinateDomain(domain.createVKey())
             .build());
     EppException thrown = assertThrows(ResourceNotOwnedException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();

core/src/test/java/google/registry/flows/host/HostInfoFlowTest.java

@@ -25,7 +25,6 @@ import static org.junit.Assert.assertThrows;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.InetAddresses;
-import com.googlecode.objectify.Key;
 import google.registry.flows.EppException;
 import google.registry.flows.ResourceFlowTestCase;
 import google.registry.flows.ResourceFlowUtils.ResourceDoesNotExistException;
@@ -118,7 +117,7 @@ public class HostInfoFlowTest extends ResourceFlowTestCase<HostInfoFlow, HostRes
         persistHostResource()
             .asBuilder()
             .setRepoId("CEEF-FOOBAR")
-            .setSuperordinateDomain(Key.create(domain))
+            .setSuperordinateDomain(domain.createVKey())
             .setLastSuperordinateChange(lastSuperordinateChange)
             .build());
     assertTransactionalFlow(false);

core/src/test/java/google/registry/flows/host/HostUpdateFlowTest.java

@@ -220,7 +220,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
         .that(reloadResourceByForeignKey())
         .hasLastSuperordinateChange(oldHost.getLastSuperordinateChange())
         .and()
-        .hasSuperordinateDomain(Key.create(domain))
+        .hasSuperordinateDomain(domain.createVKey())
         .and()
         .hasPersistedCurrentSponsorClientId("TheRegistrar")
         .and()
@@ -246,7 +246,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
         .that(reloadResourceByForeignKey())
         .hasLastSuperordinateChange(oldHost.getLastSuperordinateChange())
         .and()
-        .hasSuperordinateDomain(Key.create(domain))
+        .hasSuperordinateDomain(domain.createVKey())
         .and()
         .hasPersistedCurrentSponsorClientId("NewRegistrar")
         .and()
@@ -279,7 +279,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
     HostResource renamedHost = doSuccessfulTest();
     assertAboutHosts()
         .that(renamedHost)
-        .hasSuperordinateDomain(Key.create(domain))
+        .hasSuperordinateDomain(domain.createVKey())
         .and()
         .hasLastSuperordinateChange(oldHost.getLastSuperordinateChange())
         .and()
@@ -313,7 +313,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
     DateTime now = clock.nowUtc();
     assertAboutHosts()
         .that(renamedHost)
-        .hasSuperordinateDomain(Key.create(example))
+        .hasSuperordinateDomain(example.createVKey())
         .and()
         .hasLastSuperordinateChange(now)
         .and()
@@ -350,7 +350,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
     DateTime now = clock.nowUtc();
     assertAboutHosts()
         .that(renamedHost)
-        .hasSuperordinateDomain(Key.create(tldDomain))
+        .hasSuperordinateDomain(tldDomain.createVKey())
         .and()
         .hasLastSuperordinateChange(now)
         .and()
@@ -432,7 +432,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
     DateTime now = clock.nowUtc();
     assertAboutHosts()
         .that(renamedHost)
-        .hasSuperordinateDomain(Key.create(domain))
+        .hasSuperordinateDomain(domain.createVKey())
         .and()
         .hasLastSuperordinateChange(now)
         .and()
@@ -514,7 +514,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
     persistResource(
         newHostResource(oldHostName())
             .asBuilder()
-            .setSuperordinateDomain(Key.create(foo))
+            .setSuperordinateDomain(foo.createVKey())
             .setLastTransferTime(null)
             .build());
     persistResource(foo.asBuilder().setSubordinateHosts(ImmutableSet.of(oldHostName())).build());
@@ -551,7 +551,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
         persistResource(
             newHostResource(oldHostName())
                 .asBuilder()
-                .setSuperordinateDomain(Key.create(domain))
+                .setSuperordinateDomain(domain.createVKey())
                 .setLastTransferTime(clock.nowUtc().minusDays(20))
                 .setLastSuperordinateChange(clock.nowUtc().minusDays(3))
                 .build());
@@ -586,7 +586,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
     persistResource(
         newHostResource(oldHostName())
             .asBuilder()
-            .setSuperordinateDomain(Key.create(foo))
+            .setSuperordinateDomain(foo.createVKey())
             .setLastTransferTime(lastTransferTime)
             .setLastSuperordinateChange(clock.nowUtc().minusDays(3))
             .build());
@@ -617,7 +617,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
     persistResource(
         newHostResource(oldHostName())
             .asBuilder()
-            .setSuperordinateDomain(Key.create(foo))
+            .setSuperordinateDomain(foo.createVKey())
             .setLastTransferTime(lastTransferTime)
             .setLastSuperordinateChange(clock.nowUtc().minusDays(10))
             .build());
@@ -649,7 +649,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
     persistResource(
         newHostResource(oldHostName())
             .asBuilder()
-            .setSuperordinateDomain(Key.create(foo))
+            .setSuperordinateDomain(foo.createVKey())
             .setLastTransferTime(null)
             .setLastSuperordinateChange(clock.nowUtc().minusDays(3))
             .build());
@@ -675,7 +675,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
     persistResource(
         newHostResource(oldHostName())
             .asBuilder()
-            .setSuperordinateDomain(Key.create(domain))
+            .setSuperordinateDomain(domain.createVKey())
             .build());
     DateTime lastTransferTime = clock.nowUtc().minusDays(2);
     persistResource(
@@ -712,7 +712,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
     persistResource(
         newHostResource(oldHostName())
             .asBuilder()
-            .setSuperordinateDomain(Key.create(domain))
+            .setSuperordinateDomain(domain.createVKey())
             .setLastTransferTime(lastTransferTime)
             .setLastSuperordinateChange(clock.nowUtc().minusDays(4))
             .build());
@@ -747,7 +747,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
     persistResource(
         newHostResource(oldHostName())
             .asBuilder()
-            .setSuperordinateDomain(Key.create(domain))
+            .setSuperordinateDomain(domain.createVKey())
             .setLastTransferTime(clock.nowUtc().minusDays(12))
             .setLastSuperordinateChange(clock.nowUtc().minusDays(4))
             .build());
@@ -1017,7 +1017,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
         newHostResource(oldHostName())
             .asBuilder()
             .setStatusValues(ImmutableSet.of(StatusValue.CLIENT_UPDATE_PROHIBITED))
-            .setSuperordinateDomain(Key.create(persistActiveDomain("example.tld")))
+            .setSuperordinateDomain(persistActiveDomain("example.tld").createVKey())
             .build());
     EppException thrown =
         assertThrows(ResourceHasClientUpdateProhibitedException.class, this::runFlow);
@@ -1031,7 +1031,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
         newHostResource(oldHostName())
             .asBuilder()
             .setStatusValues(ImmutableSet.of(StatusValue.SERVER_UPDATE_PROHIBITED))
-            .setSuperordinateDomain(Key.create(persistActiveDomain("example.tld")))
+            .setSuperordinateDomain(persistActiveDomain("example.tld").createVKey())
             .build());
     ResourceStatusProhibitsOperationException thrown =
         assertThrows(ResourceStatusProhibitsOperationException.class, this::runFlow);
@@ -1045,7 +1045,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
         newHostResource(oldHostName())
             .asBuilder()
             .setStatusValues(ImmutableSet.of(StatusValue.PENDING_DELETE))
-            .setSuperordinateDomain(Key.create(persistActiveDomain("example.tld")))
+            .setSuperordinateDomain(persistActiveDomain("example.tld").createVKey())
             .build());
     ResourceStatusProhibitsOperationException thrown =
         assertThrows(ResourceStatusProhibitsOperationException.class, this::runFlow);
@@ -1105,7 +1105,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
         newHostResource("ns1.example.tld")
             .asBuilder()
             .setPersistedCurrentSponsorClientId("TheRegistrar") // Shouldn't hurt.
-            .setSuperordinateDomain(Key.create(domain))
+            .setSuperordinateDomain(domain.createVKey())
             .setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
             .build());
 
@@ -1127,7 +1127,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
         newHostResource("ns1.example.tld")
             .asBuilder()
             .setPersistedCurrentSponsorClientId("NewRegistrar") // Shouldn't help.
-            .setSuperordinateDomain(Key.create(domain))
+            .setSuperordinateDomain(domain.createVKey())
             .setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
             .build());
 
@@ -1145,7 +1145,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
         newHostResource("ns1.example.tld")
             .asBuilder()
             .setPersistedCurrentSponsorClientId("TheRegistrar") // Shouldn't hurt.
-            .setSuperordinateDomain(Key.create(domain))
+            .setSuperordinateDomain(domain.createVKey())
             .setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
             .build());
 
@@ -1163,7 +1163,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
         newHostResource("ns1.example.tld")
             .asBuilder()
             .setPersistedCurrentSponsorClientId("TheRegistrar") // Shouldn't help.
-            .setSuperordinateDomain(Key.create(domain))
+            .setSuperordinateDomain(domain.createVKey())
             .setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
             .build());
 
@@ -1228,7 +1228,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
     persistResource(
         newHostResource("ns1.example.foo")
             .asBuilder()
-            .setSuperordinateDomain(Key.create(superordinate))
+            .setSuperordinateDomain(superordinate.createVKey())
             .setPersistedCurrentSponsorClientId("NewRegistrar")
             .build());
 

core/src/test/java/google/registry/model/contact/ContactResourceTest.java

@@ -29,7 +29,6 @@ import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.googlecode.objectify.Key;
 import google.registry.model.EntityTestCase;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.contact.Disclose.PostalInfoChoice;
@@ -114,7 +113,7 @@ public class ContactResourceTest extends EntityTestCase {
                     .setLosingClientId("losing")
                     .setPendingTransferExpirationTime(fakeClock.nowUtc())
                     .setServerApproveEntities(
-                        ImmutableSet.of(Key.create(BillingEvent.OneTime.class, 1)))
+                        ImmutableSet.of(VKey.createOfy(BillingEvent.OneTime.class, 1)))
                     .setTransferRequestTime(fakeClock.nowUtc())
                     .setTransferStatus(TransferStatus.SERVER_APPROVED)
                     .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
@@ -134,6 +133,8 @@ public class ContactResourceTest extends EntityTestCase {
     saveRegistrar("registrar1");
     saveRegistrar("registrar2");
     saveRegistrar("registrar3");
+    saveRegistrar("gaining");
+    saveRegistrar("losing");
     jpaTm().transact(() -> jpaTm().saveNew(originalContact));
     ContactResource persisted =
         jpaTm()
@@ -141,15 +142,17 @@ public class ContactResourceTest extends EntityTestCase {
                 () ->
                     jpaTm()
                         .load(VKey.createSql(ContactResource.class, originalContact.getRepoId())));
-    // TODO(b/153378849): Remove the hard code for postal info after resolving the issue that
-    // @PostLoad doesn't work in Address
+
     ContactResource fixed =
         originalContact
             .asBuilder()
             .setCreationTime(persisted.getCreationTime())
-            .setInternationalizedPostalInfo(persisted.getInternationalizedPostalInfo())
-            .setLocalizedPostalInfo(persisted.getLocalizedPostalInfo())
-            .setTransferData(null)
+            .setTransferData(
+                originalContact
+                    .getTransferData()
+                    .asBuilder()
+                    .setServerApproveEntities(null)
+                    .build())
             .build();
     assertThat(persisted).isEqualTo(fixed);
   }

core/src/test/java/google/registry/model/domain/DomainBaseTest.java

@@ -76,7 +76,7 @@ public class DomainBaseTest extends EntityTestCase {
         persistResource(
                 new HostResource.Builder()
                     .setFullyQualifiedHostName("ns1.example.com")
-                    .setSuperordinateDomain(domainKey)
+                    .setSuperordinateDomain(VKey.createOfy(DomainBase.class, domainKey))
                     .setRepoId("1-COM")
                     .build())
             .createVKey();
@@ -138,10 +138,16 @@ public class DomainBaseTest extends EntityTestCase {
                             .setLosingClientId("losing")
                             .setPendingTransferExpirationTime(fakeClock.nowUtc())
                             .setServerApproveEntities(
-                                ImmutableSet.of(oneTimeBillKey, recurringBillKey, autorenewPollKey))
-                            .setServerApproveBillingEvent(oneTimeBillKey)
-                            .setServerApproveAutorenewEvent(recurringBillKey)
-                            .setServerApproveAutorenewPollMessage(autorenewPollKey)
+                                ImmutableSet.of(
+                                    VKey.createOfy(BillingEvent.OneTime.class, oneTimeBillKey),
+                                    VKey.createOfy(BillingEvent.Recurring.class, recurringBillKey),
+                                    VKey.createOfy(PollMessage.Autorenew.class, autorenewPollKey)))
+                            .setServerApproveBillingEvent(
+                                VKey.createOfy(BillingEvent.OneTime.class, oneTimeBillKey))
+                            .setServerApproveAutorenewEvent(
+                                VKey.createOfy(BillingEvent.Recurring.class, recurringBillKey))
+                            .setServerApproveAutorenewPollMessage(
+                                VKey.createOfy(PollMessage.Autorenew.class, autorenewPollKey))
                             .setTransferRequestTime(fakeClock.nowUtc().plusDays(1))
                             .setTransferStatus(TransferStatus.SERVER_APPROVED)
                             .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
@@ -363,8 +369,8 @@ public class DomainBaseTest extends EntityTestCase {
                     .setTransferRequestTime(fakeClock.nowUtc().minusDays(4))
                     .setPendingTransferExpirationTime(fakeClock.nowUtc().plusDays(1))
                     .setGainingClientId("winner")
-                    .setServerApproveBillingEvent(Key.create(transferBillingEvent))
-                    .setServerApproveEntities(ImmutableSet.of(Key.create(transferBillingEvent)))
+                    .setServerApproveBillingEvent(transferBillingEvent.createVKey())
+                    .setServerApproveEntities(ImmutableSet.of(transferBillingEvent.createVKey()))
                     .build())
             .addGracePeriod(
                 // Okay for billing event to be null since the point of this grace period is just
@@ -375,7 +381,7 @@ public class DomainBaseTest extends EntityTestCase {
     DomainBase afterTransfer = domain.cloneProjectedAtTime(fakeClock.nowUtc().plusDays(1));
     DateTime newExpirationTime = oldExpirationTime.plusYears(1);
     Key<BillingEvent.Recurring> serverApproveAutorenewEvent =
-        domain.getTransferData().getServerApproveAutorenewEvent();
+        domain.getTransferData().getServerApproveAutorenewEvent().getOfyKey();
     assertTransferred(afterTransfer, newExpirationTime, serverApproveAutorenewEvent);
     assertThat(afterTransfer.getGracePeriods())
         .containsExactly(
@@ -746,8 +752,10 @@ public class DomainBaseTest extends EntityTestCase {
             .setPendingTransferExpirationTime(transferExpirationTime)
             .setTransferStatus(TransferStatus.PENDING)
             .setGainingClientId("TheRegistrar")
-            .setServerApproveAutorenewEvent(recurringBillKey)
-            .setServerApproveBillingEvent(oneTimeBillKey)
+            .setServerApproveAutorenewEvent(
+                VKey.createOfy(BillingEvent.Recurring.class, recurringBillKey))
+            .setServerApproveBillingEvent(
+                VKey.createOfy(BillingEvent.OneTime.class, oneTimeBillKey))
             .build();
     domain =
         persistResource(

core/src/test/java/google/registry/model/host/HostResourceTest.java

@@ -26,7 +26,6 @@ import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.InetAddresses;
-import com.googlecode.objectify.Key;
 import google.registry.model.EntityTestCase;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.domain.DomainBase;
@@ -34,6 +33,7 @@ import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferStatus;
+import google.registry.persistence.VKey;
 import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Test;
@@ -63,7 +63,7 @@ public class HostResourceTest extends EntityTestCase {
                         .setLosingClientId("losing")
                         .setPendingTransferExpirationTime(fakeClock.nowUtc())
                         .setServerApproveEntities(
-                            ImmutableSet.of(Key.create(BillingEvent.OneTime.class, 1)))
+                            ImmutableSet.of(VKey.createOfy(BillingEvent.OneTime.class, 1)))
                         .setTransferRequestTime(fakeClock.nowUtc())
                         .setTransferStatus(TransferStatus.SERVER_APPROVED)
                         .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
@@ -81,7 +81,7 @@ public class HostResourceTest extends EntityTestCase {
                     .setLastTransferTime(fakeClock.nowUtc())
                     .setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
                     .setStatusValues(ImmutableSet.of(StatusValue.OK))
-                    .setSuperordinateDomain(Key.create(domain))
+                    .setSuperordinateDomain(domain.createVKey())
                     .build()));
   }
 
@@ -228,7 +228,7 @@ public class HostResourceTest extends EntityTestCase {
                     .setLastEppUpdateClientId("another registrar")
                     .setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
                     .setStatusValues(ImmutableSet.of(StatusValue.OK))
-                    .setSuperordinateDomain(Key.create(domain))
+                    .setSuperordinateDomain(domain.createVKey())
                     .build()));
     assertThat(host.computeLastTransferTime(domain)).isNull();
   }

core/src/test/java/google/registry/model/transfer/TransferDataTest.java

@@ -18,11 +18,11 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.joda.time.DateTimeZone.UTC;
 
 import com.google.common.collect.ImmutableSet;
-import com.googlecode.objectify.Key;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.domain.Period;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.poll.PollMessage;
+import google.registry.persistence.VKey;
 import google.registry.testing.AppEngineRule;
 import org.joda.time.DateTime;
 import org.junit.Before;
@@ -40,19 +40,19 @@ public class TransferDataTest {
 
   private final DateTime now = DateTime.now(UTC);
 
-  private Key<BillingEvent.OneTime> transferBillingEventKey;
-  private Key<BillingEvent.Cancellation> otherServerApproveBillingEventKey;
-  private Key<BillingEvent.Recurring> recurringBillingEventKey;
-  private Key<PollMessage.Autorenew> autorenewPollMessageKey;
-  private Key<PollMessage.OneTime> otherServerApprovePollMessageKey;
+  private VKey<BillingEvent.OneTime> transferBillingEventKey;
+  private VKey<BillingEvent.Cancellation> otherServerApproveBillingEventKey;
+  private VKey<BillingEvent.Recurring> recurringBillingEventKey;
+  private VKey<PollMessage.Autorenew> autorenewPollMessageKey;
+  private VKey<PollMessage.OneTime> otherServerApprovePollMessageKey;
 
   @Before
   public void setUp() {
-    transferBillingEventKey = Key.create(BillingEvent.OneTime.class, 12345);
-    otherServerApproveBillingEventKey = Key.create(BillingEvent.Cancellation.class, 2468);
-    recurringBillingEventKey = Key.create(BillingEvent.Recurring.class, 13579);
-    autorenewPollMessageKey = Key.create(PollMessage.Autorenew.class, 67890);
-    otherServerApprovePollMessageKey = Key.create(PollMessage.OneTime.class, 314159);
+    transferBillingEventKey = VKey.createOfy(BillingEvent.OneTime.class, 12345);
+    otherServerApproveBillingEventKey = VKey.createOfy(BillingEvent.Cancellation.class, 2468);
+    recurringBillingEventKey = VKey.createOfy(BillingEvent.Recurring.class, 13579);
+    autorenewPollMessageKey = VKey.createOfy(PollMessage.Autorenew.class, 67890);
+    otherServerApprovePollMessageKey = VKey.createOfy(PollMessage.OneTime.class, 314159);
   }
 
   @Test
@@ -67,7 +67,8 @@ public class TransferDataTest {
             .setTransferPeriod(Period.create(5, Period.Unit.YEARS))
             .build();
     TransferData fullTransferData =
-        constantTransferData.asBuilder()
+        constantTransferData
+            .asBuilder()
             .setPendingTransferExpirationTime(now)
             .setTransferStatus(TransferStatus.PENDING)
             .setServerApproveEntities(

core/src/test/java/google/registry/persistence/converter/InetAddressSetConverterTest.java

@@ -0,0 +1,86 @@
+// Copyright 2020 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package google.registry.persistence.converter;
+
+import static com.google.common.truth.Truth.assertThat;
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.net.InetAddresses;
+import google.registry.model.ImmutableObject;
+import google.registry.persistence.VKey;
+import google.registry.schema.replay.EntityTest.EntityForTesting;
+import google.registry.testing.AppEngineRule;
+import java.net.InetAddress;
+import java.util.Set;
+import javax.annotation.Nullable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+/** Unit tests for {@link google.registry.persistence.converter.InetAddressSetConverter}. */
+public class InetAddressSetConverterTest {
+
+  @RegisterExtension
+  public final AppEngineRule appEngine =
+      AppEngineRule.builder()
+          .withDatastoreAndCloudSql()
+          .withJpaUnitTestEntities(InetAddressSetTestEntity.class)
+          .build();
+
+  @Test
+  public void roundTripConversion_returnsSameAddresses() {
+    verifySaveAndLoad(
+        ImmutableSet.of(
+            InetAddresses.forString("0.0.0.0"),
+            InetAddresses.forString("192.168.0.1"),
+            InetAddresses.forString("2001:41d0:1:a41e:0:0:0:1"),
+            InetAddresses.forString("2041:0:140F::875B:131B")));
+  }
+
+  @Test
+  public void roundTrip_emptySet() {
+    verifySaveAndLoad(ImmutableSet.of());
+  }
+
+  @Test
+  public void roundTrip_null() {
+    verifySaveAndLoad(null);
+  }
+
+  private void verifySaveAndLoad(@Nullable Set<InetAddress> inetAddresses) {
+    InetAddressSetTestEntity testEntity = new InetAddressSetTestEntity(inetAddresses);
+    jpaTm().transact(() -> jpaTm().saveNew(testEntity));
+    InetAddressSetTestEntity persisted =
+        jpaTm().transact(() -> jpaTm().load(VKey.createSql(InetAddressSetTestEntity.class, "id")));
+    assertThat(persisted.addresses).isEqualTo(inetAddresses);
+  }
+
+  @Entity(name = "TestEntity") // Override entity name to avoid the nested class reference.
+  @EntityForTesting
+  private static class InetAddressSetTestEntity extends ImmutableObject {
+
+    @Id String name = "id";
+
+    Set<InetAddress> addresses;
+
+    private InetAddressSetTestEntity() {}
+
+    private InetAddressSetTestEntity(Set<InetAddress> addresses) {
+      this.addresses = addresses;
+    }
+  }
+}

core/src/test/java/google/registry/persistence/transaction/JpaTestRules.java

@@ -71,7 +71,7 @@ public class JpaTestRules {
         Optional<String> initScriptPath,
         ImmutableList<Class> extraEntityClasses,
         ImmutableMap<String, String> userProperties) {
-      super(clock, initScriptPath, extraEntityClasses, userProperties);
+      super(clock, initScriptPath, false, extraEntityClasses, userProperties);
     }
 
     @Override

core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerRule.java

@@ -15,6 +15,7 @@
 package google.registry.persistence.transaction;
 
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static org.testcontainers.containers.PostgreSQLContainer.POSTGRESQL_PORT;
 
@@ -41,12 +42,14 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import javax.persistence.Entity;
 import javax.persistence.EntityManagerFactory;
 import org.hibernate.cfg.Environment;
 import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor;
@@ -94,7 +97,25 @@ abstract class JpaTransactionManagerRule extends ExternalResource {
   // Hash of the ORM entity names requested by this rule instance.
   private int entityHash;
 
-  protected JpaTransactionManagerRule(
+  // Whether to create nomulus tables in the test db. Right now, only the JpaTestRules set this to
+  // false.
+  private boolean includeNomulusSchema = true;
+
+  JpaTransactionManagerRule(
+      Clock clock,
+      Optional<String> initScriptPath,
+      boolean includeNomulusSchema,
+      ImmutableList<Class> extraEntityClasses,
+      ImmutableMap<String, String> userProperties) {
+    this.clock = clock;
+    this.initScriptPath = initScriptPath;
+    this.includeNomulusSchema = includeNomulusSchema;
+    this.extraEntityClasses = extraEntityClasses;
+    this.userProperties = userProperties;
+    this.entityHash = getOrmEntityHash(initScriptPath, extraEntityClasses);
+  }
+
+  JpaTransactionManagerRule(
       Clock clock,
       Optional<String> initScriptPath,
       ImmutableList<Class> extraEntityClasses,
@@ -277,7 +298,7 @@ abstract class JpaTransactionManagerRule extends ExternalResource {
   }
 
   /** Constructs the {@link EntityManagerFactory} instance. */
-  private static EntityManagerFactory createEntityManagerFactory(
+  private EntityManagerFactory createEntityManagerFactory(
       String jdbcUrl,
       String username,
       String password,
@@ -293,6 +314,24 @@ abstract class JpaTransactionManagerRule extends ExternalResource {
     ParsedPersistenceXmlDescriptor descriptor =
         PersistenceXmlUtility.getParsedPersistenceXmlDescriptor();
 
+    // If we don't include the nomulus schema, remove all entity classes in the descriptor but keep
+    // other settings like the converter classes.
+    if (!includeNomulusSchema) {
+      List<String> nonEntityClasses =
+          descriptor.getManagedClassNames().stream()
+              .filter(
+                  classString -> {
+                    try {
+                      return !Class.forName(classString).isAnnotationPresent(Entity.class);
+                    } catch (ClassNotFoundException e) {
+                      throw new IllegalArgumentException(e);
+                    }
+                  })
+              .collect(toImmutableList());
+      descriptor.getManagedClassNames().clear();
+      descriptor.getManagedClassNames().addAll(nonEntityClasses);
+    }
+
     extraEntityClasses.stream().map(Class::getName).forEach(descriptor::addClasses);
     return Bootstrap.getEntityManagerFactoryBuilder(descriptor, properties).build();
   }

core/src/test/java/google/registry/rdap/RdapDomainSearchActionTest.java

@@ -37,7 +37,6 @@ import com.google.common.collect.Range;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.googlecode.objectify.Key;
 import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.Period;
@@ -81,14 +80,18 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDom
   private HostResource hostNs2CatLol;
   private HashMap<String, HostResource> hostNameToHostMap = new HashMap<>();
 
-  enum RequestType { NONE, NAME, NS_LDH_NAME, NS_IP }
+  enum RequestType {
+    NONE,
+    NAME,
+    NS_LDH_NAME,
+    NS_IP
+  }
 
   private JsonObject generateActualJson(RequestType requestType, String paramValue) {
     return generateActualJson(requestType, paramValue, null);
   }
 
-  private JsonObject generateActualJson(
-      RequestType requestType, String paramValue, String cursor) {
+  private JsonObject generateActualJson(RequestType requestType, String paramValue, String cursor) {
     action.requestPath = actionPath;
     action.requestMethod = POST;
     String requestTypeParam = null;
@@ -179,9 +182,9 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDom
                 .setCreationClientId("foo")
                 .build());
     persistResource(
-        hostNs1CatLol.asBuilder().setSuperordinateDomain(Key.create(domainCatLol)).build());
+        hostNs1CatLol.asBuilder().setSuperordinateDomain(domainCatLol.createVKey()).build());
     persistResource(
-        hostNs2CatLol.asBuilder().setSuperordinateDomain(Key.create(domainCatLol)).build());
+        hostNs2CatLol.asBuilder().setSuperordinateDomain(domainCatLol.createVKey()).build());
 
     domainCatLol2 =
         persistResource(
@@ -220,8 +223,9 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDom
                 .build());
     // cat.example
     createTld("example");
-    registrar = persistResource(
-        makeRegistrar("goodregistrar", "St. John Chrysostom", Registrar.State.ACTIVE));
+    registrar =
+        persistResource(
+            makeRegistrar("goodregistrar", "St. John Chrysostom", Registrar.State.ACTIVE));
     persistSimpleResources(makeRegistrarContacts(registrar));
     domainCatExample =
         persistResource(
@@ -297,8 +301,7 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDom
                 .build());
     // cat.1.test
     createTld("1.test");
-    registrar =
-        persistResource(makeRegistrar("multiregistrar", "1.test", Registrar.State.ACTIVE));
+    registrar = persistResource(makeRegistrar("multiregistrar", "1.test", Registrar.State.ACTIVE));
     persistSimpleResources(makeRegistrarContacts(registrar));
     domainMultipart =
         persistResource(
@@ -395,10 +398,7 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDom
 
   private void deleteCatLol() {
     persistResource(
-        domainCatLol
-            .asBuilder()
-            .setDeletionTime(clock.nowUtc().minusMonths(6))
-            .build());
+        domainCatLol.asBuilder().setDeletionTime(clock.nowUtc().minusMonths(6)).build());
     persistResource(
         makeHistoryEntry(
             domainCatLol,
@@ -416,8 +416,11 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDom
     for (int i = numHosts; i >= 1; i--) {
       String hostName = String.format("ns%d.%s", i, mainDomainName);
       subordinateHostnamesBuilder.add(hostName);
-      HostResource host = makeAndPersistHostResource(
-          hostName, String.format("5.5.%d.%d", 5 + i / 250, i % 250), clock.nowUtc().minusYears(1));
+      HostResource host =
+          makeAndPersistHostResource(
+              hostName,
+              String.format("5.5.%d.%d", 5 + i / 250, i % 250),
+              clock.nowUtc().minusYears(1));
       hostKeysBuilder.add(host.createVKey());
     }
     ImmutableSet<VKey<HostResource>> hostKeys = hostKeysBuilder.build();
@@ -533,8 +536,7 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDom
     assertThat(response.getStatus()).isEqualTo(200);
   }
 
-  private void runNotFoundTest(
-      RequestType requestType, String queryString, String errorMessage) {
+  private void runNotFoundTest(RequestType requestType, String queryString, String errorMessage) {
     rememberWildcardType(queryString);
     assertThat(generateActualJson(requestType, queryString))
         .isEqualTo(generateExpectedJsonError(errorMessage, 404));
@@ -654,9 +656,9 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDom
   @Test
   public void testInvalidRequest_rejected() {
     assertThat(generateActualJson(RequestType.NONE, null))
-        .isEqualTo(generateExpectedJsonError(
-            "You must specify either name=XXXX, nsLdhName=YYYY or nsIp=ZZZZ",
-            400));
+        .isEqualTo(
+            generateExpectedJsonError(
+                "You must specify either name=XXXX, nsLdhName=YYYY or nsIp=ZZZZ", 400));
     assertThat(response.getStatus()).isEqualTo(400);
     verifyErrorMetrics(SearchType.NONE, Optional.empty(), 400);
   }
@@ -1233,7 +1235,7 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDom
     login("evilregistrar");
     runSuccessfulTestWithCatLol(RequestType.NS_LDH_NAME, "ns2.cat.l*", "rdap_domain.json");
     verifyMetrics(SearchType.BY_NAMESERVER_NAME, 1, 1);
- }
+  }
 
   @Test
   public void testNameserverMatchWithWildcard_found_sameRegistrarRequested() {
@@ -1458,24 +1460,21 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDom
 
   @Test
   public void testNameserverMatchDeletedNameserver_notFound() {
-    persistResource(
-        hostNs1CatLol.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
+    persistResource(hostNs1CatLol.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
     runNotFoundTest(RequestType.NS_LDH_NAME, "ns1.cat.lol", "No matching nameservers found");
     verifyErrorMetrics(SearchType.BY_NAMESERVER_NAME, Optional.empty(), Optional.of(0L), 404);
   }
 
   @Test
   public void testNameserverMatchDeletedNameserverWithWildcard_notFound() {
-    persistResource(
-        hostNs1CatLol.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
+    persistResource(hostNs1CatLol.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
     runNotFoundTest(RequestType.NS_LDH_NAME, "ns1.cat.l*", "No matching nameservers found");
     verifyErrorMetrics(SearchType.BY_NAMESERVER_NAME, Optional.empty(), Optional.of(0L), 404);
   }
 
   @Test
   public void testNameserverMatchDeletedNameserverWithWildcardAndSuffix_notFound() {
-    persistResource(
-        hostNs1CatLol.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
+    persistResource(hostNs1CatLol.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
     runNotFoundTest(RequestType.NS_LDH_NAME, "ns1*.cat.lol", "No matching nameservers found");
     verifyErrorMetrics(SearchType.BY_NAMESERVER_NAME, Optional.empty(), Optional.of(0L), 404);
   }

core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java

@@ -31,7 +31,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import com.googlecode.objectify.Key;
 import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.eppcommon.StatusValue;
@@ -159,8 +158,7 @@ public class RdapJsonFormatterTest {
                     "ns1.dog.みんな", null, null, clock.nowUtc().minusYears(6), "unicoderegistrar")
                 .asBuilder()
                 .setSuperordinateDomain(
-                    Key.create(
-                        persistResource(
+                    persistResource(
                             makeDomainBase(
                                     "dog.みんな",
                                     contactResourceRegistrant,
@@ -182,7 +180,8 @@ public class RdapJsonFormatterTest {
                                         .setTransferredRegistrationExpirationTime(
                                             DateTime.parse("2111-10-08T00:44:59Z"))
                                         .build())
-                                .build())))
+                                .build())
+                        .createVKey())
                 .build());
     domainBaseFull =
         persistResource(

core/src/test/java/google/registry/rdap/RdapNameserverSearchActionTest.java

@@ -36,7 +36,6 @@ import com.google.common.collect.ImmutableSet;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.googlecode.objectify.Key;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.host.HostResource;
 import google.registry.model.registrar.Registrar;
@@ -111,10 +110,11 @@ public class RdapNameserverSearchActionTest
         persistResource(
             makeRegistrar("evilregistrar", "Yes Virginia <script>", Registrar.State.ACTIVE));
     persistSimpleResources(makeRegistrarContacts(registrar));
-    hostNs1CatLol = makeAndPersistHostResource(
-        "ns1.cat.lol", "1.2.3.4", clock.nowUtc().minusYears(1));
-    hostNs2CatLol = makeAndPersistHostResource(
-        "ns2.cat.lol", "bad:f00d:cafe::15:beef", clock.nowUtc().minusYears(1));
+    hostNs1CatLol =
+        makeAndPersistHostResource("ns1.cat.lol", "1.2.3.4", clock.nowUtc().minusYears(1));
+    hostNs2CatLol =
+        makeAndPersistHostResource(
+            "ns2.cat.lol", "bad:f00d:cafe::15:beef", clock.nowUtc().minusYears(1));
     makeAndPersistHostResource(
         "ns1.cat2.lol", "1.2.3.3", "bad:f00d:cafe::15:beef", clock.nowUtc().minusYears(1));
     makeAndPersistHostResource("ns1.cat.external", null, null, clock.nowUtc().minusYears(1));
@@ -132,25 +132,28 @@ public class RdapNameserverSearchActionTest
     makeAndPersistHostResource("ns1.cat.1.test", "1.2.3.6", clock.nowUtc().minusYears(1));
 
     // create a domain so that we can use it as a test nameserver search string suffix
-    domainCatLol = persistResource(
-        makeDomainBase(
-                "cat.lol",
-                persistResource(
-                    makeContactResource("5372808-ERL", "Goblin Market", "lol@cat.lol", registrar)),
-                persistResource(
-                    makeContactResource("5372808-IRL", "Santa Claus", "BOFH@cat.lol", registrar)),
-                persistResource(
-                    makeContactResource("5372808-TRL", "The Raven", "bog@cat.lol", registrar)),
-                hostNs1CatLol,
-                hostNs2CatLol,
-                registrar)
-            .asBuilder()
-            .setSubordinateHosts(ImmutableSet.of("ns1.cat.lol", "ns2.cat.lol"))
-            .build());
+    domainCatLol =
+        persistResource(
+            makeDomainBase(
+                    "cat.lol",
+                    persistResource(
+                        makeContactResource(
+                            "5372808-ERL", "Goblin Market", "lol@cat.lol", registrar)),
+                    persistResource(
+                        makeContactResource(
+                            "5372808-IRL", "Santa Claus", "BOFH@cat.lol", registrar)),
+                    persistResource(
+                        makeContactResource("5372808-TRL", "The Raven", "bog@cat.lol", registrar)),
+                    hostNs1CatLol,
+                    hostNs2CatLol,
+                    registrar)
+                .asBuilder()
+                .setSubordinateHosts(ImmutableSet.of("ns1.cat.lol", "ns2.cat.lol"))
+                .build());
     persistResource(
-        hostNs1CatLol.asBuilder().setSuperordinateDomain(Key.create(domainCatLol)).build());
+        hostNs1CatLol.asBuilder().setSuperordinateDomain(domainCatLol.createVKey()).build());
     persistResource(
-        hostNs2CatLol.asBuilder().setSuperordinateDomain(Key.create(domainCatLol)).build());
+        hostNs2CatLol.asBuilder().setSuperordinateDomain(domainCatLol.createVKey()).build());
 
     action.ipParam = Optional.empty();
     action.nameParam = Optional.empty();
@@ -187,10 +190,9 @@ public class RdapNameserverSearchActionTest
       hostsBuilder.add(makeHostResource(hostName, "5.5.5.1", "5.5.5.2"));
     }
     persistResources(hostsBuilder.build());
-    domainCatLol = persistResource(
-        domainCatLol.asBuilder()
-            .setSubordinateHosts(subordinateHostsBuilder.build())
-            .build());
+    domainCatLol =
+        persistResource(
+            domainCatLol.asBuilder().setSubordinateHosts(subordinateHostsBuilder.build()).build());
   }
 
   private void createDeletedHost() {
@@ -245,10 +247,7 @@ public class RdapNameserverSearchActionTest
   public void testInvalidRequest_rejected() {
     action.run();
     assertThat(parseJsonObject(response.getPayload()))
-        .isEqualTo(
-            generateExpectedJsonError(
-                "You must specify either name=XXXX or ip=YYYY",
-                400));
+        .isEqualTo(generateExpectedJsonError("You must specify either name=XXXX or ip=YYYY", 400));
     assertThat(response.getStatus()).isEqualTo(400);
     verifyErrorMetrics(Optional.empty(), 400);
   }
@@ -294,8 +293,7 @@ public class RdapNameserverSearchActionTest
   public void testNoCharactersToMatch_rejected() {
     assertThat(generateActualJsonWithName("*"))
         .isEqualTo(
-            generateExpectedJsonError(
-                "Initial search string must be at least 2 characters", 422));
+            generateExpectedJsonError("Initial search string must be at least 2 characters", 422));
     assertThat(response.getStatus()).isEqualTo(422);
     verifyErrorMetrics(Optional.empty(), 422);
   }
@@ -304,8 +302,7 @@ public class RdapNameserverSearchActionTest
   public void testFewerThanTwoCharactersToMatch_rejected() {
     assertThat(generateActualJsonWithName("a*"))
         .isEqualTo(
-            generateExpectedJsonError(
-                "Initial search string must be at least 2 characters", 422));
+            generateExpectedJsonError("Initial search string must be at least 2 characters", 422));
     assertThat(response.getStatus()).isEqualTo(422);
     verifyErrorMetrics(Optional.empty(), 422);
   }
@@ -349,7 +346,8 @@ public class RdapNameserverSearchActionTest
   @Test
   public void testNameMatch_ns2_cat_lol_found() {
     assertThat(generateActualJsonWithName("ns2.cat.lol"))
-        .isEqualTo(generateExpectedJsonForNameserver(
+        .isEqualTo(
+            generateExpectedJsonForNameserver(
                 "ns2.cat.lol",
                 null,
                 "4-ROID",
@@ -505,7 +503,7 @@ public class RdapNameserverSearchActionTest
   public void testNameMatch_nontruncatedResultSet() {
     createManyHosts(4);
     assertThat(generateActualJsonWithName("nsx*.cat.lol"))
-      .isEqualTo(loadJsonFile("rdap_nontruncated_hosts.json"));
+        .isEqualTo(loadJsonFile("rdap_nontruncated_hosts.json"));
     assertThat(response.getStatus()).isEqualTo(200);
     verifyMetrics(4);
   }
@@ -535,8 +533,7 @@ public class RdapNameserverSearchActionTest
 
   @Test
   public void testNameMatchDeletedHost_foundTheOtherHost() {
-    persistResource(
-        hostNs1CatLol.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
+    persistResource(hostNs1CatLol.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
     assertThat(generateActualJsonWithName("ns*.cat.lol"))
         .isEqualTo(
             generateExpectedJsonForNameserver(
@@ -648,8 +645,7 @@ public class RdapNameserverSearchActionTest
    * @param expectedNames an immutable list of the host names we expect to retrieve
    */
   private void checkCursorNavigation(
-      boolean byName, String paramValue, ImmutableList<String> expectedNames)
-      throws Exception {
+      boolean byName, String paramValue, ImmutableList<String> expectedNames) throws Exception {
     String cursor = null;
     int expectedNameOffset = 0;
     int expectedPageCount =
@@ -792,9 +788,9 @@ public class RdapNameserverSearchActionTest
   public void testAddressMatch_truncatedResultSet() {
     createManyHosts(5);
     assertThat(generateActualJsonWithIp("5.5.5.1"))
-    .isEqualTo(
-        loadJsonFile(
-            "rdap_truncated_hosts.json", "QUERY", "ip=5.5.5.1&cursor=MTctUk9JRA%3D%3D"));
+        .isEqualTo(
+            loadJsonFile(
+                "rdap_truncated_hosts.json", "QUERY", "ip=5.5.5.1&cursor=MTctUk9JRA%3D%3D"));
     assertThat(response.getStatus()).isEqualTo(200);
     verifyMetrics(5, IncompletenessWarningType.TRUNCATED);
   }

core/src/test/java/google/registry/rde/DomainBaseToXjcConverterTest.java

@@ -332,10 +332,9 @@ public class DomainBaseToXjcConverterTest {
                     .setGainingClientId("gaining")
                     .setLosingClientId("losing")
                     .setPendingTransferExpirationTime(DateTime.parse("1925-04-20T00:00:00Z"))
-                    .setServerApproveBillingEvent(Key.create(billingEvent))
+                    .setServerApproveBillingEvent(billingEvent.createVKey())
                     .setServerApproveAutorenewEvent(
-                        Key.create(
-                            persistResource(
+                        persistResource(
                                 new BillingEvent.Recurring.Builder()
                                     .setReason(Reason.RENEW)
                                     .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
@@ -344,10 +343,10 @@ public class DomainBaseToXjcConverterTest {
                                     .setEventTime(END_OF_TIME)
                                     .setRecurrenceEndTime(END_OF_TIME)
                                     .setParent(historyEntry)
-                                    .build())))
+                                    .build())
+                            .createVKey())
                     .setServerApproveAutorenewPollMessage(
-                        Key.create(
-                            persistResource(
+                        persistResource(
                                 new Autorenew.Builder()
                                     .setTargetId("example.xn--q9jyb4c")
                                     .setClientId("TheRegistrar")
@@ -355,8 +354,9 @@ public class DomainBaseToXjcConverterTest {
                                     .setAutorenewEndTime(END_OF_TIME)
                                     .setMsg("Domain was auto-renewed.")
                                     .setParent(historyEntry)
-                                    .build())))
-                    .setServerApproveEntities(ImmutableSet.of(Key.create(billingEvent)))
+                                    .build())
+                            .createVKey())
+                    .setServerApproveEntities(ImmutableSet.of(billingEvent.createVKey()))
                     .setTransferRequestTime(DateTime.parse("1919-01-01T00:00:00Z"))
                     .setTransferStatus(TransferStatus.PENDING)
                     .setTransferredRegistrationExpirationTime(

core/src/test/java/google/registry/rde/HostResourceToXjcConverterTest.java

@@ -23,7 +23,6 @@ import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.InetAddresses;
-import com.googlecode.objectify.Key;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.host.HostResource;
@@ -43,8 +42,8 @@ import org.junit.runners.JUnit4;
 /**
  * Unit tests for {@link HostResourceToXjcConverter}.
  *
- * <p>This tests the mapping between {@link HostResource} and {@link XjcRdeHost} as well as
- * some exceptional conditions.
+ * <p>This tests the mapping between {@link HostResource} and {@link XjcRdeHost} as well as some
+ * exceptional conditions.
  */
 @RunWith(JUnit4.class)
 public class HostResourceToXjcConverterTest {
@@ -59,26 +58,29 @@ public class HostResourceToXjcConverterTest {
 
   @Test
   public void testConvertSubordinateHost() {
-    DomainBase domain = newDomainBase("love.foobar").asBuilder()
-        .setPersistedCurrentSponsorClientId("LeisureDog")
-        .setLastTransferTime(DateTime.parse("2010-01-01T00:00:00Z"))
-        .addStatusValue(StatusValue.PENDING_TRANSFER)
-        .build();
-    XjcRdeHost bean = HostResourceToXjcConverter.convertSubordinateHost(
-        new HostResource.Builder()
-            .setCreationClientId("LawyerCat")
-            .setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
-            .setPersistedCurrentSponsorClientId("BusinessCat")
-            .setFullyQualifiedHostName("ns1.love.foobar")
-            .setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
-            .setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
-            .setLastEppUpdateClientId("CeilingCat")
-            .setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
-            .setRepoId("2-roid")
-            .setStatusValues(ImmutableSet.of(StatusValue.OK))
-            .setSuperordinateDomain(Key.create(domain))
-            .build(),
-        domain);
+    DomainBase domain =
+        newDomainBase("love.foobar")
+            .asBuilder()
+            .setPersistedCurrentSponsorClientId("LeisureDog")
+            .setLastTransferTime(DateTime.parse("2010-01-01T00:00:00Z"))
+            .addStatusValue(StatusValue.PENDING_TRANSFER)
+            .build();
+    XjcRdeHost bean =
+        HostResourceToXjcConverter.convertSubordinateHost(
+            new HostResource.Builder()
+                .setCreationClientId("LawyerCat")
+                .setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
+                .setPersistedCurrentSponsorClientId("BusinessCat")
+                .setFullyQualifiedHostName("ns1.love.foobar")
+                .setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
+                .setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
+                .setLastEppUpdateClientId("CeilingCat")
+                .setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
+                .setRepoId("2-roid")
+                .setStatusValues(ImmutableSet.of(StatusValue.OK))
+                .setSuperordinateDomain(domain.createVKey())
+                .build(),
+            domain);
 
     assertThat(bean.getAddrs()).hasSize(1);
     assertThat(bean.getAddrs().get(0).getIp().value()).isEqualTo("v4");
@@ -119,19 +121,20 @@ public class HostResourceToXjcConverterTest {
 
   @Test
   public void testConvertExternalHost() {
-    XjcRdeHost bean = HostResourceToXjcConverter.convertExternalHost(
-        new HostResource.Builder()
-            .setCreationClientId("LawyerCat")
-            .setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
-            .setPersistedCurrentSponsorClientId("BusinessCat")
-            .setFullyQualifiedHostName("ns1.love.lol")
-            .setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
-            .setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
-            .setLastEppUpdateClientId("CeilingCat")
-            .setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
-            .setRepoId("2-roid")
-            .setStatusValues(ImmutableSet.of(StatusValue.OK))
-            .build());
+    XjcRdeHost bean =
+        HostResourceToXjcConverter.convertExternalHost(
+            new HostResource.Builder()
+                .setCreationClientId("LawyerCat")
+                .setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
+                .setPersistedCurrentSponsorClientId("BusinessCat")
+                .setFullyQualifiedHostName("ns1.love.lol")
+                .setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
+                .setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
+                .setLastEppUpdateClientId("CeilingCat")
+                .setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
+                .setRepoId("2-roid")
+                .setStatusValues(ImmutableSet.of(StatusValue.OK))
+                .build());
 
     assertThat(bean.getAddrs()).hasSize(1);
     assertThat(bean.getAddrs().get(0).getIp().value()).isEqualTo("v4");
@@ -167,19 +170,20 @@ public class HostResourceToXjcConverterTest {
 
   @Test
   public void testConvertExternalHost_ipv6() {
-    XjcRdeHost bean = HostResourceToXjcConverter.convertExternalHost(
-        new HostResource.Builder()
-            .setCreationClientId("LawyerCat")
-            .setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
-            .setPersistedCurrentSponsorClientId("BusinessCat")
-            .setFullyQualifiedHostName("ns1.love.lol")
-            .setInetAddresses(ImmutableSet.of(InetAddresses.forString("cafe::abba")))
-            .setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
-            .setLastEppUpdateClientId("CeilingCat")
-            .setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
-            .setRepoId("2-LOL")
-            .setStatusValues(ImmutableSet.of(StatusValue.OK))
-            .build());
+    XjcRdeHost bean =
+        HostResourceToXjcConverter.convertExternalHost(
+            new HostResource.Builder()
+                .setCreationClientId("LawyerCat")
+                .setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
+                .setPersistedCurrentSponsorClientId("BusinessCat")
+                .setFullyQualifiedHostName("ns1.love.lol")
+                .setInetAddresses(ImmutableSet.of(InetAddresses.forString("cafe::abba")))
+                .setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
+                .setLastEppUpdateClientId("CeilingCat")
+                .setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
+                .setRepoId("2-LOL")
+                .setStatusValues(ImmutableSet.of(StatusValue.OK))
+                .build());
     assertThat(bean.getAddrs()).hasSize(1);
     assertThat(bean.getAddrs().get(0).getIp().value()).isEqualTo("v6");
     assertThat(bean.getAddrs().get(0).getValue()).isEqualTo("cafe::abba");
@@ -208,19 +212,20 @@ public class HostResourceToXjcConverterTest {
   @Test
   public void testMarshal() throws Exception {
     // Bean! Bean! Bean!
-    XjcRdeHostElement bean = HostResourceToXjcConverter.convertExternal(
-        new HostResource.Builder()
-            .setCreationClientId("LawyerCat")
-            .setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
-            .setPersistedCurrentSponsorClientId("BusinessCat")
-            .setFullyQualifiedHostName("ns1.love.lol")
-            .setInetAddresses(ImmutableSet.of(InetAddresses.forString("cafe::abba")))
-            .setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
-            .setLastEppUpdateClientId("CeilingCat")
-            .setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
-            .setRepoId("2-LOL")
-            .setStatusValues(ImmutableSet.of(StatusValue.OK))
-            .build());
+    XjcRdeHostElement bean =
+        HostResourceToXjcConverter.convertExternal(
+            new HostResource.Builder()
+                .setCreationClientId("LawyerCat")
+                .setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
+                .setPersistedCurrentSponsorClientId("BusinessCat")
+                .setFullyQualifiedHostName("ns1.love.lol")
+                .setInetAddresses(ImmutableSet.of(InetAddresses.forString("cafe::abba")))
+                .setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
+                .setLastEppUpdateClientId("CeilingCat")
+                .setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
+                .setRepoId("2-LOL")
+                .setStatusValues(ImmutableSet.of(StatusValue.OK))
+                .build());
     marshalStrict(bean, new ByteArrayOutputStream(), UTF_8);
   }
 }

core/src/test/java/google/registry/rde/RdeFixtures.java

@@ -174,10 +174,9 @@ final class RdeFixtures {
                     .setGainingClientId("gaining")
                     .setLosingClientId("losing")
                     .setPendingTransferExpirationTime(DateTime.parse("1993-04-20T00:00:00Z"))
-                    .setServerApproveBillingEvent(Key.create(billingEvent))
+                    .setServerApproveBillingEvent(billingEvent.createVKey())
                     .setServerApproveAutorenewEvent(
-                        Key.create(
-                            persistResource(
+                        persistResource(
                                 new BillingEvent.Recurring.Builder()
                                     .setReason(Reason.RENEW)
                                     .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
@@ -186,10 +185,10 @@ final class RdeFixtures {
                                     .setEventTime(END_OF_TIME)
                                     .setRecurrenceEndTime(END_OF_TIME)
                                     .setParent(historyEntry)
-                                    .build())))
+                                    .build())
+                            .createVKey())
                     .setServerApproveAutorenewPollMessage(
-                        Key.create(
-                            persistResource(
+                        persistResource(
                                 new Autorenew.Builder()
                                     .setTargetId("example." + tld)
                                     .setClientId("TheRegistrar")
@@ -197,8 +196,9 @@ final class RdeFixtures {
                                     .setAutorenewEndTime(END_OF_TIME)
                                     .setMsg("Domain was auto-renewed.")
                                     .setParent(historyEntry)
-                                    .build())))
-                    .setServerApproveEntities(ImmutableSet.of(Key.create(billingEvent)))
+                                    .build())
+                            .createVKey())
+                    .setServerApproveEntities(ImmutableSet.of(billingEvent.createVKey()))
                     .setTransferRequestTime(DateTime.parse("1991-01-01T00:00:00Z"))
                     .setTransferStatus(TransferStatus.PENDING)
                     .setTransferredRegistrationExpirationTime(

core/src/test/java/google/registry/testing/AbstractEppResourceSubject.java

@@ -185,7 +185,7 @@ abstract class AbstractEppResourceSubject<
     return andChainer();
   }
 
-  protected <E> And<S> hasValue(E expected, E actual, String name) {
+  protected <E> And<S> hasValue(@Nullable E expected, @Nullable E actual, String name) {
     check(name).that(actual).isEqualTo(expected);
     return andChainer();
   }

core/src/test/java/google/registry/testing/DatastoreHelper.java

@@ -239,7 +239,7 @@ public class DatastoreHelper {
     return persistResource(
         newHostResource(hostName)
             .asBuilder()
-            .setSuperordinateDomain(Key.create(superordinateDomain))
+            .setSuperordinateDomain(superordinateDomain.createVKey())
             .setInetAddresses(
                 ImmutableSet.of(InetAddresses.forString("1080:0:0:0:8:800:200C:417A")))
             .build());
@@ -443,32 +443,37 @@ public class DatastoreHelper {
             .setParent(contact)
             .build());
     return persistResource(
-        contact.asBuilder()
+        contact
+            .asBuilder()
             .setPersistedCurrentSponsorClientId("TheRegistrar")
             .addStatusValue(StatusValue.PENDING_TRANSFER)
-            .setTransferData(createTransferDataBuilder(requestTime, expirationTime)
+            .setTransferData(
+                createTransferDataBuilder(requestTime, expirationTime)
                     .setPendingTransferExpirationTime(now.plus(getContactAutomaticTransferLength()))
-                .setServerApproveEntities(
-                    ImmutableSet.of(
-                    // Pretend it's 3 days since the request
-                    Key.create(persistResource(
-                        createPollMessageForImplicitTransfer(
-                            contact,
-                            historyEntryContactTransfer,
-                            "NewRegistrar",
-                            requestTime,
-                            expirationTime,
-                            null))),
-                    Key.create(persistResource(
-                        createPollMessageForImplicitTransfer(
-                            contact,
-                            historyEntryContactTransfer,
-                            "TheRegistrar",
-                            requestTime,
-                            expirationTime,
-                            null)))))
-                .setTransferRequestTrid(Trid.create("transferClient-trid", "transferServer-trid"))
-                .build())
+                    .setServerApproveEntities(
+                        ImmutableSet.of(
+                            // Pretend it's 3 days since the request
+                            persistResource(
+                                    createPollMessageForImplicitTransfer(
+                                        contact,
+                                        historyEntryContactTransfer,
+                                        "NewRegistrar",
+                                        requestTime,
+                                        expirationTime,
+                                        null))
+                                .createVKey(),
+                            persistResource(
+                                    createPollMessageForImplicitTransfer(
+                                        contact,
+                                        historyEntryContactTransfer,
+                                        "TheRegistrar",
+                                        requestTime,
+                                        expirationTime,
+                                        null))
+                                .createVKey()))
+                    .setTransferRequestTrid(
+                        Trid.create("transferClient-trid", "transferServer-trid"))
+                    .build())
             .build());
   }
 
@@ -585,38 +590,46 @@ public class DatastoreHelper {
     }
     TransferData.Builder transferDataBuilder =
         createTransferDataBuilder(requestTime, expirationTime);
-    return persistResource(domain.asBuilder()
-        .setPersistedCurrentSponsorClientId("TheRegistrar")
-        .addStatusValue(StatusValue.PENDING_TRANSFER)
-        .setTransferData(transferDataBuilder
-            .setPendingTransferExpirationTime(expirationTime)
-            .setTransferredRegistrationExpirationTime(extendedRegistrationExpirationTime)
-            .setServerApproveBillingEvent(Key.create(transferBillingEvent))
-            .setServerApproveAutorenewEvent(Key.create(gainingClientAutorenewEvent))
-            .setServerApproveAutorenewPollMessage(Key.create(gainingClientAutorenewPollMessage))
-            .setServerApproveEntities(ImmutableSet.of(
-                Key.create(transferBillingEvent),
-                Key.create(gainingClientAutorenewEvent),
-                Key.create(gainingClientAutorenewPollMessage),
-                Key.create(persistResource(
-                    createPollMessageForImplicitTransfer(
-                        domain,
-                        historyEntryDomainTransfer,
-                        "NewRegistrar",
-                        requestTime,
-                        expirationTime,
-                        extendedRegistrationExpirationTime))),
-                Key.create(persistResource(
-                    createPollMessageForImplicitTransfer(
-                        domain,
-                        historyEntryDomainTransfer,
-                        "TheRegistrar",
-                        requestTime,
-                        expirationTime,
-                        extendedRegistrationExpirationTime)))))
-            .setTransferRequestTrid(Trid.create("transferClient-trid", "transferServer-trid"))
-            .build())
-        .build());
+    return persistResource(
+        domain
+            .asBuilder()
+            .setPersistedCurrentSponsorClientId("TheRegistrar")
+            .addStatusValue(StatusValue.PENDING_TRANSFER)
+            .setTransferData(
+                transferDataBuilder
+                    .setPendingTransferExpirationTime(expirationTime)
+                    .setTransferredRegistrationExpirationTime(extendedRegistrationExpirationTime)
+                    .setServerApproveBillingEvent(transferBillingEvent.createVKey())
+                    .setServerApproveAutorenewEvent(gainingClientAutorenewEvent.createVKey())
+                    .setServerApproveAutorenewPollMessage(
+                        gainingClientAutorenewPollMessage.createVKey())
+                    .setServerApproveEntities(
+                        ImmutableSet.of(
+                            transferBillingEvent.createVKey(),
+                            gainingClientAutorenewEvent.createVKey(),
+                            gainingClientAutorenewPollMessage.createVKey(),
+                            persistResource(
+                                    createPollMessageForImplicitTransfer(
+                                        domain,
+                                        historyEntryDomainTransfer,
+                                        "NewRegistrar",
+                                        requestTime,
+                                        expirationTime,
+                                        extendedRegistrationExpirationTime))
+                                .createVKey(),
+                            persistResource(
+                                    createPollMessageForImplicitTransfer(
+                                        domain,
+                                        historyEntryDomainTransfer,
+                                        "TheRegistrar",
+                                        requestTime,
+                                        expirationTime,
+                                        extendedRegistrationExpirationTime))
+                                .createVKey()))
+                    .setTransferRequestTrid(
+                        Trid.create("transferClient-trid", "transferServer-trid"))
+                    .build())
+            .build());
   }
 
   /** Persists and returns a {@link Registrar} with the specified attributes. */

core/src/test/java/google/registry/testing/HostResourceSubject.java

@@ -19,10 +19,11 @@ import static com.google.common.truth.Truth.assertAbout;
 
 import com.google.common.truth.FailureMetadata;
 import com.google.common.truth.SimpleSubjectBuilder;
-import com.googlecode.objectify.Key;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.host.HostResource;
+import google.registry.persistence.VKey;
 import google.registry.testing.TruthChainer.And;
+import javax.annotation.Nullable;
 import org.joda.time.DateTime;
 
 /** Truth subject for asserting things about {@link HostResource} instances. */
@@ -55,7 +56,8 @@ public final class HostResourceSubject
         "has lastSuperordinateChange");
   }
 
-  public And<HostResourceSubject> hasSuperordinateDomain(Key<DomainBase> superordinateDomain) {
+  public And<HostResourceSubject> hasSuperordinateDomain(
+      @Nullable VKey<DomainBase> superordinateDomain) {
     return hasValue(
         superordinateDomain, actual.getSuperordinateDomain(), "has superordinateDomain");
   }

core/src/test/resources/google/registry/model/schema.txt

@@ -288,9 +288,9 @@ class google.registry.model.eppcommon.Trid {
 class google.registry.model.host.HostResource {
   @Id java.lang.String repoId;
   com.google.common.collect.ImmutableSortedMap<org.joda.time.DateTime, com.googlecode.objectify.Key<google.registry.model.ofy.CommitLogManifest>> revisions;
-  com.googlecode.objectify.Key<google.registry.model.domain.DomainBase> superordinateDomain;
   google.registry.model.CreateAutoTimestamp creationTime;
   google.registry.model.UpdateAutoTimestamp updateTimestamp;
+  google.registry.persistence.VKey<google.registry.model.domain.DomainBase> superordinateDomain;
   java.lang.String creationClientId;
   java.lang.String currentSponsorClientId;
   java.lang.String fullyQualifiedHostName;
@@ -716,15 +716,15 @@ class google.registry.model.tmch.TmchCrl {
   org.joda.time.DateTime updated;
 }
 class google.registry.model.transfer.TransferData {
-  com.googlecode.objectify.Key<google.registry.model.billing.BillingEvent$OneTime> serverApproveBillingEvent;
-  com.googlecode.objectify.Key<google.registry.model.billing.BillingEvent$Recurring> serverApproveAutorenewEvent;
-  com.googlecode.objectify.Key<google.registry.model.poll.PollMessage$Autorenew> serverApproveAutorenewPollMessage;
   google.registry.model.domain.Period transferPeriod;
   google.registry.model.eppcommon.Trid transferRequestTrid;
   google.registry.model.transfer.TransferStatus transferStatus;
+  google.registry.persistence.VKey<google.registry.model.billing.BillingEvent$OneTime> serverApproveBillingEvent;
+  google.registry.persistence.VKey<google.registry.model.billing.BillingEvent$Recurring> serverApproveAutorenewEvent;
+  google.registry.persistence.VKey<google.registry.model.poll.PollMessage$Autorenew> serverApproveAutorenewPollMessage;
   java.lang.String gainingClientId;
   java.lang.String losingClientId;
-  java.util.Set<com.googlecode.objectify.Key<? extends google.registry.model.transfer.TransferData$TransferServerApproveEntity>> serverApproveEntities;
+  java.util.Set<google.registry.persistence.VKey<? extends google.registry.model.transfer.TransferData$TransferServerApproveEntity>> serverApproveEntities;
   org.joda.time.DateTime pendingTransferExpirationTime;
   org.joda.time.DateTime transferRequestTime;
   org.joda.time.DateTime transferredRegistrationExpirationTime;

db/src/main/resources/sql/flyway/V28__superordinate_domain_vkey.sql

@@ -0,0 +1,19 @@
+-- Copyright 2020 The Nomulus Authors. All Rights Reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+ALTER TABLE "HostResource" ALTER COLUMN superordinate_domain TYPE text;
+
+ALTER TABLE IF EXISTS "HostResource"
+   ADD CONSTRAINT fk_host_resource_superordinate_domain
+   FOREIGN KEY (superordinate_domain) REFERENCES "Domain"(repo_id);

db/src/main/resources/sql/flyway/V29__add_columns_for_transfer_data.sql

@@ -0,0 +1,84 @@
+-- Copyright 2020 The Nomulus Authors. All Rights Reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+alter table "Contact"
+    add column transfer_gaining_poll_message_id int8,
+    add column transfer_losing_poll_message_id int8,
+    add column transfer_billing_cancellation_id int8,
+    add column transfer_billing_event_id int8,
+    add column transfer_billing_recurrence_id int8,
+    add column transfer_autorenew_poll_message_id int8,
+    add column transfer_renew_period_unit text,
+    add column transfer_renew_period_value int4,
+    add column transfer_client_txn_id text,
+    add column transfer_server_txn_id text,
+    add column transfer_registration_expiration_time timestamptz,
+    add column transfer_gaining_registrar_id text,
+    add column transfer_losing_registrar_id text,
+    add column transfer_pending_expiration_time timestamptz,
+    add column transfer_request_time timestamptz,
+    add column transfer_status text;
+
+alter table "Domain"
+    add column transfer_gaining_poll_message_id int8,
+    add column transfer_losing_poll_message_id int8,
+    add column transfer_billing_cancellation_id int8,
+    add column transfer_billing_event_id int8,
+    add column transfer_billing_recurrence_id int8,
+    add column transfer_autorenew_poll_message_id int8,
+    add column transfer_renew_period_unit text,
+    add column transfer_renew_period_value int4,
+    add column transfer_client_txn_id text,
+    add column transfer_server_txn_id text,
+    add column transfer_registration_expiration_time timestamptz,
+    add column transfer_gaining_registrar_id text,
+    add column transfer_losing_registrar_id text,
+    add column transfer_pending_expiration_time timestamptz,
+    add column transfer_request_time timestamptz,
+    add column transfer_status text;
+
+alter table if exists "Contact"
+   add constraint fk_contact_transfer_gaining_registrar_id
+   foreign key (transfer_gaining_registrar_id)
+   references "Registrar";
+
+alter table if exists "Contact"
+   add constraint fk_contact_transfer_losing_registrar_id
+   foreign key (transfer_losing_registrar_id)
+   references "Registrar";
+
+alter table if exists "Domain"
+   add constraint fk_domain_transfer_gaining_registrar_id
+   foreign key (transfer_gaining_registrar_id)
+   references "Registrar";
+
+alter table if exists "Domain"
+   add constraint fk_domain_transfer_losing_registrar_id
+   foreign key (transfer_losing_registrar_id)
+   references "Registrar";
+
+alter table if exists "Domain"
+   add constraint fk_domain_transfer_billing_cancellation_id
+   foreign key (transfer_billing_cancellation_id)
+   references "BillingCancellation";
+
+alter table if exists "Domain"
+   add constraint fk_domain_transfer_billing_event_id
+   foreign key (transfer_billing_event_id)
+   references "BillingEvent";
+
+alter table if exists "Domain"
+   add constraint fk_domain_transfer_billing_recurrence_id
+   foreign key (transfer_billing_recurrence_id)
+   references "BillingRecurrence";

db/src/main/resources/sql/flyway/V30__inet_address_converter.sql

@@ -0,0 +1,17 @@
+-- Copyright 2020 The Nomulus Authors. All Rights Reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+AlTER TABLE "HostResource" ADD COLUMN inet_addresses text[];
+
+DROP TABLE IF EXISTS "HostResource_inetAddresses";

db/src/main/resources/sql/flyway/V31__client_id_to_registrar_id.sql

@@ -0,0 +1,34 @@
+-- Copyright 2020 The Nomulus Authors. All Rights Reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+ALTER TABLE IF EXISTS "Domain" RENAME creation_client_id TO creation_registrar_id;
+ALTER TABLE IF EXISTS "Domain" RENAME current_sponsor_client_id TO current_sponsor_registrar_id;
+ALTER TABLE IF EXISTS "Domain" RENAME last_epp_update_client_id TO last_epp_update_registrar_id;
+
+ALTER TABLE IF EXISTS "Contact" RENAME creation_client_id TO creation_registrar_id;
+ALTER TABLE IF EXISTS "Contact" RENAME current_sponsor_client_id TO current_sponsor_registrar_id;
+ALTER TABLE IF EXISTS "Contact" RENAME last_epp_update_client_id TO last_epp_update_registrar_id;
+
+ALTER TABLE IF EXISTS "HostResource" RENAME creation_client_id TO creation_registrar_id;
+ALTER TABLE IF EXISTS "HostResource" RENAME current_sponsor_client_id TO current_sponsor_registrar_id;
+ALTER TABLE IF EXISTS "HostResource" RENAME last_epp_update_client_id TO last_epp_update_registrar_id;
+
+ALTER TABLE IF EXISTS "Registrar" RENAME client_id TO registrar_id;
+
+ALTER TABLE IF EXISTS "BillingCancellation" RENAME client_id TO registrar_id;
+ALTER TABLE IF EXISTS "BillingCancellation" RENAME CONSTRAINT fk_billing_cancellation_client_id TO fk_billing_cancellation_registrar_id;
+ALTER TABLE IF EXISTS "BillingEvent" RENAME client_id TO registrar_id;
+ALTER TABLE IF EXISTS "BillingEvent" RENAME CONSTRAINT fk_billing_event_client_id TO fk_billing_event_registrar_id;
+ALTER TABLE IF EXISTS "BillingRecurrence" RENAME client_id TO registrar_id;
+ALTER TABLE IF EXISTS "BillingRecurrence" RENAME CONSTRAINT fk_billing_recurrence_client_id TO fk_billing_recurrence_registrar_id;

db/src/main/resources/sql/schema/db-schema.sql.generated

@@ -14,7 +14,7 @@
 
     create table "BillingCancellation" (
        billing_cancellation_id  bigserial not null,
-        client_id text not null,
+        registrar_id text not null,
         domain_history_revision_id int8 not null,
         domain_repo_id text not null,
         event_time timestamptz not null,
@@ -29,7 +29,7 @@
 
     create table "BillingEvent" (
        billing_event_id  bigserial not null,
-        client_id text not null,
+        registrar_id text not null,
         domain_history_revision_id int8 not null,
         domain_repo_id text not null,
         event_time timestamptz not null,
@@ -48,7 +48,7 @@
 
     create table "BillingRecurrence" (
        billing_recurrence_id  bigserial not null,
-        client_id text not null,
+        registrar_id text not null,
         domain_history_revision_id int8 not null,
         domain_repo_id text not null,
         event_time timestamptz not null,
@@ -76,11 +76,11 @@
 
     create table "Contact" (
        repo_id text not null,
-        creation_client_id text not null,
+        creation_registrar_id text not null,
         creation_time timestamptz not null,
-        current_sponsor_client_id text not null,
+        current_sponsor_registrar_id text not null,
         deletion_time timestamptz,
-        last_epp_update_client_id text,
+        last_epp_update_registrar_id text,
         last_epp_update_time timestamptz,
         statuses text[],
         auth_info_repo_id text,
@@ -118,6 +118,22 @@
         addr_local_org text,
         addr_local_type text,
         search_name text,
+        transfer_billing_cancellation_id int8,
+        transfer_gaining_poll_message_id int8,
+        transfer_losing_poll_message_id int8,
+        transfer_billing_recurrence_id int8,
+        transfer_autorenew_poll_message_id int8,
+        transfer_billing_event_id int8,
+        transfer_renew_period_unit text,
+        transfer_renew_period_value int4,
+        transfer_client_txn_id text,
+        transfer_server_txn_id text,
+        transfer_registration_expiration_time timestamptz,
+        transfer_gaining_registrar_id text,
+        transfer_losing_registrar_id text,
+        transfer_pending_expiration_time timestamptz,
+        transfer_request_time timestamptz,
+        transfer_status text,
         voice_phone_extension text,
         voice_phone_number text,
         primary key (repo_id)
@@ -141,11 +157,11 @@
 
     create table "Domain" (
        repo_id text not null,
-        creation_client_id text not null,
+        creation_registrar_id text not null,
         creation_time timestamptz not null,
-        current_sponsor_client_id text not null,
+        current_sponsor_registrar_id text not null,
         deletion_time timestamptz,
-        last_epp_update_client_id text,
+        last_epp_update_registrar_id text,
         last_epp_update_time timestamptz,
         statuses text[],
         admin_contact text,
@@ -165,6 +181,22 @@
         subordinate_hosts text[],
         tech_contact text,
         tld text,
+        transfer_billing_cancellation_id int8,
+        transfer_gaining_poll_message_id int8,
+        transfer_losing_poll_message_id int8,
+        transfer_billing_recurrence_id int8,
+        transfer_autorenew_poll_message_id int8,
+        transfer_billing_event_id int8,
+        transfer_renew_period_unit text,
+        transfer_renew_period_value int4,
+        transfer_client_txn_id text,
+        transfer_server_txn_id text,
+        transfer_registration_expiration_time timestamptz,
+        transfer_gaining_registrar_id text,
+        transfer_losing_registrar_id text,
+        transfer_pending_expiration_time timestamptz,
+        transfer_request_time timestamptz,
+        transfer_status text,
         primary key (repo_id)
     );
 
@@ -177,7 +209,7 @@
        id  bigserial not null,
         billing_event_one_time bytea,
         billing_event_recurring bytea,
-        client_id text,
+        registrar_id text,
         expiration_time timestamptz,
         type int4,
         primary key (id)
@@ -185,25 +217,21 @@
 
     create table "HostResource" (
        repo_id text not null,
-        creation_client_id text not null,
+        creation_registrar_id text not null,
         creation_time timestamptz not null,
-        current_sponsor_client_id text not null,
+        current_sponsor_registrar_id text not null,
         deletion_time timestamptz,
-        last_epp_update_client_id text,
+        last_epp_update_registrar_id text,
         last_epp_update_time timestamptz,
         statuses text[],
         fully_qualified_host_name text,
+        inet_addresses text[],
         last_superordinate_change timestamptz,
         last_transfer_time timestamptz,
-        superordinate_domain bytea,
+        superordinate_domain text,
         primary key (repo_id)
     );
 
-    create table "HostResource_inetAddresses" (
-       host_resource_repo_id text not null,
-        inet_addresses bytea
-    );
-
     create table "Lock" (
        resource_name text not null,
         tld text not null,
@@ -260,7 +288,7 @@
     );
 
     create table "Registrar" (
-       client_id text not null,
+       registrar_id text not null,
         allowed_tlds text[],
         billing_account_map hstore,
         billing_identifier int8,
@@ -305,7 +333,7 @@
         type text not null,
         url text,
         whois_server text,
-        primary key (client_id)
+        primary key (registrar_id)
     );
 
     create table "RegistrarPoc" (
@@ -358,27 +386,27 @@
         should_publish boolean not null,
         primary key (revision_id)
     );
-create index IDXeokttmxtpq2hohcioe5t2242b on "BillingCancellation" (client_id);
+create index IDXih4b2tea127p5rb61gje6e1y2 on "BillingCancellation" (registrar_id);
 create index IDX2exdfbx6oiiwnhr8j6gjpqt2j on "BillingCancellation" (event_time);
 create index IDXqa3g92jc17e8dtiaviy4fet4x on "BillingCancellation" (billing_time);
-create index IDX73l103vc5900ig3p4odf0cngt on "BillingEvent" (client_id);
+create index IDXqspv57gj2led8ly42fq01t7m7 on "BillingEvent" (registrar_id);
 create index IDX5yfbr88439pxw0v3j86c74fp8 on "BillingEvent" (event_time);
 create index IDX6py6ocrab0ivr76srcd2okpnq on "BillingEvent" (billing_time);
 create index IDXplxf9v56p0wg8ws6qsvd082hk on "BillingEvent" (synthetic_creation_time);
 create index IDXhmv411mdqo5ibn4vy7ykxpmlv on "BillingEvent" (allocation_token_id);
-create index IDXn898pb9mwcg359cdwvolb11ck on "BillingRecurrence" (client_id);
+create index IDXd3gxhkh0jk694pjvh9pyn7wjc on "BillingRecurrence" (registrar_id);
 create index IDX6syykou4nkc7hqa5p8r92cpch on "BillingRecurrence" (event_time);
 create index IDXp3usbtvk0v1m14i5tdp4xnxgc on "BillingRecurrence" (recurrence_end_time);
 create index IDXjny8wuot75b5e6p38r47wdawu on "BillingRecurrence" (recurrence_time_of_year);
 create index IDX3y752kr9uh4kh6uig54vemx0l on "Contact" (creation_time);
-create index IDXbn8t4wp85fgxjl8q4ctlscx55 on "Contact" (current_sponsor_client_id);
+create index IDXtm415d6fe1rr35stm33s5mg18 on "Contact" (current_sponsor_registrar_id);
 create index IDXn1f711wicdnooa2mqb7g1m55o on "Contact" (deletion_time);
 create index IDX1p3esngcwwu6hstyua6itn6ff on "Contact" (search_name);
 
     alter table if exists "Contact" 
        add constraint UKoqd7n4hbx86hvlgkilq75olas unique (contact_id);
 create index IDX8nr0ke9mrrx4ewj6pd2ag4rmr on "Domain" (creation_time);
-create index IDX8ffrqm27qtj20jac056j7yq07 on "Domain" (current_sponsor_client_id);
+create index IDXhsjqiy2lyobfymplb28nm74lm on "Domain" (current_sponsor_registrar_id);
 create index IDX5mnf0wn20tno4b9do88j61klr on "Domain" (deletion_time);
 create index IDX1rcgkdd777bpvj0r94sltwd5y on "Domain" (fully_qualified_domain_name);
 create index IDXrwl38wwkli1j7gkvtywi9jokq on "Domain" (tld);
@@ -405,11 +433,6 @@ create index reservedlist_name_idx on "ReservedList" (name);
        foreign key (domain_repo_id) 
        references "Domain";
 
-    alter table if exists "HostResource_inetAddresses" 
-       add constraint FK6unwhfkcu3oq6q347fxvpagv 
-       foreign key (host_resource_repo_id) 
-       references "HostResource";
-
     alter table if exists "PremiumEntry" 
        add constraint FKo0gw90lpo1tuee56l0nb6y6g5 
        foreign key (revision_id) 

db/src/main/resources/sql/schema/nomulus.golden.sql

@@ -40,7 +40,7 @@ SET default_with_oids = false;
 
 CREATE TABLE public."BillingCancellation" (
     billing_cancellation_id bigint NOT NULL,
-    client_id text NOT NULL,
+    registrar_id text NOT NULL,
     domain_history_revision_id bigint NOT NULL,
     domain_repo_id text NOT NULL,
     event_time timestamp with time zone NOT NULL,
@@ -78,7 +78,7 @@ ALTER SEQUENCE public."BillingCancellation_billing_cancellation_id_seq" OWNED BY
 
 CREATE TABLE public."BillingEvent" (
     billing_event_id bigint NOT NULL,
-    client_id text NOT NULL,
+    registrar_id text NOT NULL,
     domain_history_revision_id bigint NOT NULL,
     domain_repo_id text NOT NULL,
     event_time timestamp with time zone NOT NULL,
@@ -120,7 +120,7 @@ ALTER SEQUENCE public."BillingEvent_billing_event_id_seq" OWNED BY public."Billi
 
 CREATE TABLE public."BillingRecurrence" (
     billing_recurrence_id bigint NOT NULL,
-    client_id text NOT NULL,
+    registrar_id text NOT NULL,
     domain_history_revision_id bigint NOT NULL,
     domain_repo_id text NOT NULL,
     event_time timestamp with time zone NOT NULL,
@@ -198,11 +198,11 @@ ALTER SEQUENCE public."ClaimsList_revision_id_seq" OWNED BY public."ClaimsList".
 
 CREATE TABLE public."Contact" (
     repo_id text NOT NULL,
-    creation_client_id text NOT NULL,
+    creation_registrar_id text NOT NULL,
     creation_time timestamp with time zone NOT NULL,
-    current_sponsor_client_id text NOT NULL,
+    current_sponsor_registrar_id text NOT NULL,
     deletion_time timestamp with time zone,
-    last_epp_update_client_id text,
+    last_epp_update_registrar_id text,
     last_epp_update_time timestamp with time zone,
     statuses text[],
     auth_info_repo_id text,
@@ -241,7 +241,23 @@ CREATE TABLE public."Contact" (
     addr_local_type text,
     search_name text,
     voice_phone_extension text,
-    voice_phone_number text
+    voice_phone_number text,
+    transfer_gaining_poll_message_id bigint,
+    transfer_losing_poll_message_id bigint,
+    transfer_billing_cancellation_id bigint,
+    transfer_billing_event_id bigint,
+    transfer_billing_recurrence_id bigint,
+    transfer_autorenew_poll_message_id bigint,
+    transfer_renew_period_unit text,
+    transfer_renew_period_value integer,
+    transfer_client_txn_id text,
+    transfer_server_txn_id text,
+    transfer_registration_expiration_time timestamp with time zone,
+    transfer_gaining_registrar_id text,
+    transfer_losing_registrar_id text,
+    transfer_pending_expiration_time timestamp with time zone,
+    transfer_request_time timestamp with time zone,
+    transfer_status text
 );
 
 
@@ -263,11 +279,11 @@ CREATE TABLE public."Cursor" (
 
 CREATE TABLE public."Domain" (
     repo_id text NOT NULL,
-    creation_client_id text NOT NULL,
+    creation_registrar_id text NOT NULL,
     creation_time timestamp with time zone NOT NULL,
-    current_sponsor_client_id text NOT NULL,
+    current_sponsor_registrar_id text NOT NULL,
     deletion_time timestamp with time zone,
-    last_epp_update_client_id text,
+    last_epp_update_registrar_id text,
     last_epp_update_time timestamp with time zone,
     statuses text[],
     auth_info_repo_id text,
@@ -286,7 +302,23 @@ CREATE TABLE public."Domain" (
     admin_contact text,
     billing_contact text,
     registrant_contact text,
-    tech_contact text
+    tech_contact text,
+    transfer_gaining_poll_message_id bigint,
+    transfer_losing_poll_message_id bigint,
+    transfer_billing_cancellation_id bigint,
+    transfer_billing_event_id bigint,
+    transfer_billing_recurrence_id bigint,
+    transfer_autorenew_poll_message_id bigint,
+    transfer_renew_period_unit text,
+    transfer_renew_period_value integer,
+    transfer_client_txn_id text,
+    transfer_server_txn_id text,
+    transfer_registration_expiration_time timestamp with time zone,
+    transfer_gaining_registrar_id text,
+    transfer_losing_registrar_id text,
+    transfer_pending_expiration_time timestamp with time zone,
+    transfer_request_time timestamp with time zone,
+    transfer_status text
 );
 
 
@@ -306,27 +338,18 @@ CREATE TABLE public."DomainHost" (
 
 CREATE TABLE public."HostResource" (
     repo_id text NOT NULL,
-    creation_client_id text,
+    creation_registrar_id text,
     creation_time timestamp with time zone,
-    current_sponsor_client_id text,
+    current_sponsor_registrar_id text,
     deletion_time timestamp with time zone,
-    last_epp_update_client_id text,
+    last_epp_update_registrar_id text,
     last_epp_update_time timestamp with time zone,
     statuses text[],
     fully_qualified_host_name text,
     last_superordinate_change timestamp with time zone,
     last_transfer_time timestamp with time zone,
-    superordinate_domain bytea
-);
-
-
---
--- Name: HostResource_inetAddresses; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public."HostResource_inetAddresses" (
-    host_resource_repo_id text NOT NULL,
-    inet_addresses bytea
+    superordinate_domain text,
+    inet_addresses text[]
 );
 
 
@@ -444,7 +467,7 @@ ALTER SEQUENCE public."PremiumList_revision_id_seq" OWNED BY public."PremiumList
 --
 
 CREATE TABLE public."Registrar" (
-    client_id text NOT NULL,
+    registrar_id text NOT NULL,
     allowed_tlds text[],
     billing_account_map public.hstore,
     billing_identifier bigint,
@@ -770,7 +793,7 @@ ALTER TABLE ONLY public."RegistrarPoc"
 --
 
 ALTER TABLE ONLY public."Registrar"
-    ADD CONSTRAINT "Registrar_pkey" PRIMARY KEY (client_id);
+    ADD CONSTRAINT "Registrar_pkey" PRIMARY KEY (registrar_id);
 
 
 --
@@ -873,7 +896,7 @@ CREATE INDEX idx6syykou4nkc7hqa5p8r92cpch ON public."BillingRecurrence" USING bt
 -- Name: idx73l103vc5900ig3p4odf0cngt; Type: INDEX; Schema: public; Owner: -
 --
 
-CREATE INDEX idx73l103vc5900ig3p4odf0cngt ON public."BillingEvent" USING btree (client_id);
+CREATE INDEX idx73l103vc5900ig3p4odf0cngt ON public."BillingEvent" USING btree (registrar_id);
 
 
 --
@@ -908,7 +931,7 @@ CREATE INDEX idxaydgox62uno9qx8cjlj5lauye ON public."PollMessage" USING btree (e
 -- Name: idxbn8t4wp85fgxjl8q4ctlscx55; Type: INDEX; Schema: public; Owner: -
 --
 
-CREATE INDEX idxbn8t4wp85fgxjl8q4ctlscx55 ON public."Contact" USING btree (current_sponsor_client_id);
+CREATE INDEX idxbn8t4wp85fgxjl8q4ctlscx55 ON public."Contact" USING btree (current_sponsor_registrar_id);
 
 
 --
@@ -922,7 +945,7 @@ CREATE INDEX idxe7wu46c7wpvfmfnj4565abibp ON public."PollMessage" USING btree (r
 -- Name: idxeokttmxtpq2hohcioe5t2242b; Type: INDEX; Schema: public; Owner: -
 --
 
-CREATE INDEX idxeokttmxtpq2hohcioe5t2242b ON public."BillingCancellation" USING btree (client_id);
+CREATE INDEX idxeokttmxtpq2hohcioe5t2242b ON public."BillingCancellation" USING btree (registrar_id);
 
 
 --
@@ -943,7 +966,7 @@ CREATE INDEX idxjny8wuot75b5e6p38r47wdawu ON public."BillingRecurrence" USING bt
 -- Name: idxkjt9yaq92876dstimd93hwckh; Type: INDEX; Schema: public; Owner: -
 --
 
-CREATE INDEX idxkjt9yaq92876dstimd93hwckh ON public."Domain" USING btree (current_sponsor_client_id);
+CREATE INDEX idxkjt9yaq92876dstimd93hwckh ON public."Domain" USING btree (current_sponsor_registrar_id);
 
 
 --
@@ -957,7 +980,7 @@ CREATE INDEX idxn1f711wicdnooa2mqb7g1m55o ON public."Contact" USING btree (delet
 -- Name: idxn898pb9mwcg359cdwvolb11ck; Type: INDEX; Schema: public; Owner: -
 --
 
-CREATE INDEX idxn898pb9mwcg359cdwvolb11ck ON public."BillingRecurrence" USING btree (client_id);
+CREATE INDEX idxn898pb9mwcg359cdwvolb11ck ON public."BillingRecurrence" USING btree (registrar_id);
 
 
 --
@@ -1028,7 +1051,7 @@ CREATE INDEX reservedlist_name_idx ON public."ReservedList" USING btree (name);
 --
 
 ALTER TABLE ONLY public."Contact"
-    ADD CONSTRAINT fk1sfyj7o7954prbn1exk7lpnoe FOREIGN KEY (creation_client_id) REFERENCES public."Registrar"(client_id);
+    ADD CONSTRAINT fk1sfyj7o7954prbn1exk7lpnoe FOREIGN KEY (creation_registrar_id) REFERENCES public."Registrar"(registrar_id);
 
 
 --
@@ -1036,7 +1059,7 @@ ALTER TABLE ONLY public."Contact"
 --
 
 ALTER TABLE ONLY public."Domain"
-    ADD CONSTRAINT fk2jc69qyg2tv9hhnmif6oa1cx1 FOREIGN KEY (creation_client_id) REFERENCES public."Registrar"(client_id);
+    ADD CONSTRAINT fk2jc69qyg2tv9hhnmif6oa1cx1 FOREIGN KEY (creation_registrar_id) REFERENCES public."Registrar"(registrar_id);
 
 
 --
@@ -1052,7 +1075,7 @@ ALTER TABLE ONLY public."RegistryLock"
 --
 
 ALTER TABLE ONLY public."Domain"
-    ADD CONSTRAINT fk2u3srsfbei272093m3b3xwj23 FOREIGN KEY (current_sponsor_client_id) REFERENCES public."Registrar"(client_id);
+    ADD CONSTRAINT fk2u3srsfbei272093m3b3xwj23 FOREIGN KEY (current_sponsor_registrar_id) REFERENCES public."Registrar"(registrar_id);
 
 
 --
@@ -1063,20 +1086,12 @@ ALTER TABLE ONLY public."ClaimsEntry"
     ADD CONSTRAINT fk6sc6at5hedffc0nhdcab6ivuq FOREIGN KEY (revision_id) REFERENCES public."ClaimsList"(revision_id);
 
 
---
--- Name: HostResource_inetAddresses fk6unwhfkcu3oq6q347fxvpagv; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public."HostResource_inetAddresses"
-    ADD CONSTRAINT fk6unwhfkcu3oq6q347fxvpagv FOREIGN KEY (host_resource_repo_id) REFERENCES public."HostResource"(repo_id);
-
-
 --
 -- Name: Contact fk93c185fx7chn68uv7nl6uv2s0; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY public."Contact"
-    ADD CONSTRAINT fk93c185fx7chn68uv7nl6uv2s0 FOREIGN KEY (current_sponsor_client_id) REFERENCES public."Registrar"(client_id);
+    ADD CONSTRAINT fk93c185fx7chn68uv7nl6uv2s0 FOREIGN KEY (current_sponsor_registrar_id) REFERENCES public."Registrar"(registrar_id);
 
 
 --
@@ -1096,11 +1111,11 @@ ALTER TABLE ONLY public."BillingCancellation"
 
 
 --
--- Name: BillingCancellation fk_billing_cancellation_client_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: BillingCancellation fk_billing_cancellation_registrar_id; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY public."BillingCancellation"
-    ADD CONSTRAINT fk_billing_cancellation_client_id FOREIGN KEY (client_id) REFERENCES public."Registrar"(client_id);
+    ADD CONSTRAINT fk_billing_cancellation_registrar_id FOREIGN KEY (registrar_id) REFERENCES public."Registrar"(registrar_id);
 
 
 --
@@ -1112,19 +1127,35 @@ ALTER TABLE ONLY public."BillingEvent"
 
 
 --
--- Name: BillingEvent fk_billing_event_client_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: BillingEvent fk_billing_event_registrar_id; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY public."BillingEvent"
-    ADD CONSTRAINT fk_billing_event_client_id FOREIGN KEY (client_id) REFERENCES public."Registrar"(client_id);
+    ADD CONSTRAINT fk_billing_event_registrar_id FOREIGN KEY (registrar_id) REFERENCES public."Registrar"(registrar_id);
 
 
 --
--- Name: BillingRecurrence fk_billing_recurrence_client_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: BillingRecurrence fk_billing_recurrence_registrar_id; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY public."BillingRecurrence"
-    ADD CONSTRAINT fk_billing_recurrence_client_id FOREIGN KEY (client_id) REFERENCES public."Registrar"(client_id);
+    ADD CONSTRAINT fk_billing_recurrence_registrar_id FOREIGN KEY (registrar_id) REFERENCES public."Registrar"(registrar_id);
+
+
+--
+-- Name: Contact fk_contact_transfer_gaining_registrar_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public."Contact"
+    ADD CONSTRAINT fk_contact_transfer_gaining_registrar_id FOREIGN KEY (transfer_gaining_registrar_id) REFERENCES public."Registrar"(registrar_id);
+
+
+--
+-- Name: Contact fk_contact_transfer_losing_registrar_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public."Contact"
+    ADD CONSTRAINT fk_contact_transfer_losing_registrar_id FOREIGN KEY (transfer_losing_registrar_id) REFERENCES public."Registrar"(registrar_id);
 
 
 --
@@ -1159,6 +1190,46 @@ ALTER TABLE ONLY public."Domain"
     ADD CONSTRAINT fk_domain_tech_contact FOREIGN KEY (tech_contact) REFERENCES public."Contact"(repo_id);
 
 
+--
+-- Name: Domain fk_domain_transfer_billing_cancellation_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public."Domain"
+    ADD CONSTRAINT fk_domain_transfer_billing_cancellation_id FOREIGN KEY (transfer_billing_cancellation_id) REFERENCES public."BillingCancellation"(billing_cancellation_id);
+
+
+--
+-- Name: Domain fk_domain_transfer_billing_event_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public."Domain"
+    ADD CONSTRAINT fk_domain_transfer_billing_event_id FOREIGN KEY (transfer_billing_event_id) REFERENCES public."BillingEvent"(billing_event_id);
+
+
+--
+-- Name: Domain fk_domain_transfer_billing_recurrence_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public."Domain"
+    ADD CONSTRAINT fk_domain_transfer_billing_recurrence_id FOREIGN KEY (transfer_billing_recurrence_id) REFERENCES public."BillingRecurrence"(billing_recurrence_id);
+
+
+--
+-- Name: Domain fk_domain_transfer_gaining_registrar_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public."Domain"
+    ADD CONSTRAINT fk_domain_transfer_gaining_registrar_id FOREIGN KEY (transfer_gaining_registrar_id) REFERENCES public."Registrar"(registrar_id);
+
+
+--
+-- Name: Domain fk_domain_transfer_losing_registrar_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public."Domain"
+    ADD CONSTRAINT fk_domain_transfer_losing_registrar_id FOREIGN KEY (transfer_losing_registrar_id) REFERENCES public."Registrar"(registrar_id);
+
+
 --
 -- Name: DomainHost fk_domainhost_host_valid; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -1167,6 +1238,14 @@ ALTER TABLE ONLY public."DomainHost"
     ADD CONSTRAINT fk_domainhost_host_valid FOREIGN KEY (ns_hosts) REFERENCES public."HostResource"(repo_id);
 
 
+--
+-- Name: HostResource fk_host_resource_superordinate_domain; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public."HostResource"
+    ADD CONSTRAINT fk_host_resource_superordinate_domain FOREIGN KEY (superordinate_domain) REFERENCES public."Domain"(repo_id);
+
+
 --
 -- Name: PollMessage fk_poll_message_contact_repo_id; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -1196,7 +1275,7 @@ ALTER TABLE ONLY public."PollMessage"
 --
 
 ALTER TABLE ONLY public."PollMessage"
-    ADD CONSTRAINT fk_poll_message_registrar_id FOREIGN KEY (registrar_id) REFERENCES public."Registrar"(client_id);
+    ADD CONSTRAINT fk_poll_message_registrar_id FOREIGN KEY (registrar_id) REFERENCES public."Registrar"(registrar_id);
 
 
 --
@@ -1204,7 +1283,7 @@ ALTER TABLE ONLY public."PollMessage"
 --
 
 ALTER TABLE ONLY public."PollMessage"
-    ADD CONSTRAINT fk_poll_message_transfer_response_gaining_registrar_id FOREIGN KEY (transfer_response_gaining_registrar_id) REFERENCES public."Registrar"(client_id);
+    ADD CONSTRAINT fk_poll_message_transfer_response_gaining_registrar_id FOREIGN KEY (transfer_response_gaining_registrar_id) REFERENCES public."Registrar"(registrar_id);
 
 
 --
@@ -1212,7 +1291,7 @@ ALTER TABLE ONLY public."PollMessage"
 --
 
 ALTER TABLE ONLY public."PollMessage"
-    ADD CONSTRAINT fk_poll_message_transfer_response_losing_registrar_id FOREIGN KEY (transfer_response_losing_registrar_id) REFERENCES public."Registrar"(client_id);
+    ADD CONSTRAINT fk_poll_message_transfer_response_losing_registrar_id FOREIGN KEY (transfer_response_losing_registrar_id) REFERENCES public."Registrar"(registrar_id);
 
 
 --
@@ -1236,7 +1315,7 @@ ALTER TABLE ONLY public."ReservedEntry"
 --
 
 ALTER TABLE ONLY public."Domain"
-    ADD CONSTRAINT fkjc0r9r5y1lfbt4gpbqw4wsuvq FOREIGN KEY (last_epp_update_client_id) REFERENCES public."Registrar"(client_id);
+    ADD CONSTRAINT fkjc0r9r5y1lfbt4gpbqw4wsuvq FOREIGN KEY (last_epp_update_registrar_id) REFERENCES public."Registrar"(registrar_id);
 
 
 --
@@ -1244,7 +1323,7 @@ ALTER TABLE ONLY public."Domain"
 --
 
 ALTER TABLE ONLY public."Contact"
-    ADD CONSTRAINT fkmb7tdiv85863134w1wogtxrb2 FOREIGN KEY (last_epp_update_client_id) REFERENCES public."Registrar"(client_id);
+    ADD CONSTRAINT fkmb7tdiv85863134w1wogtxrb2 FOREIGN KEY (last_epp_update_registrar_id) REFERENCES public."Registrar"(registrar_id);
 
 
 --

dependencies.gradle

@@ -87,13 +87,13 @@ ext {
       'dnsjava:dnsjava:2.1.7',
       'io.github.classgraph:classgraph:4.8.52',
       'io.github.java-diff-utils:java-diff-utils:4.0',
-      'io.netty:netty-buffer:4.1.31.Final',
-      'io.netty:netty-codec-http:4.1.31.Final',
-      'io.netty:netty-codec:4.1.31.Final',
-      'io.netty:netty-common:4.1.31.Final',
-      'io.netty:netty-handler:4.1.31.Final',
-      'io.netty:netty-tcnative-boringssl-static:2.0.22.Final',
-      'io.netty:netty-transport:4.1.31.Final',
+      'io.netty:netty-buffer:4.1.50.Final',
+      'io.netty:netty-codec-http:4.1.50.Final',
+      'io.netty:netty-codec:4.1.50.Final',
+      'io.netty:netty-common:4.1.50.Final',
+      'io.netty:netty-handler:4.1.50.Final',
+      'io.netty:netty-tcnative-boringssl-static:2.0.30.Final',
+      'io.netty:netty-transport:4.1.50.Final',
       'javax.annotation:javax.annotation-api:1.3.2',
       'javax.annotation:jsr250-api:1.0',
       'javax.inject:javax.inject:1',

networking/gradle/dependency-locks/compile.lockfile

@@ -26,13 +26,13 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

networking/gradle/dependency-locks/compileClasspath.lockfile

@@ -26,13 +26,13 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

networking/gradle/dependency-locks/default.lockfile

@@ -27,14 +27,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

networking/gradle/dependency-locks/deploy_jar.lockfile

@@ -27,14 +27,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

networking/gradle/dependency-locks/runtime.lockfile

@@ -27,14 +27,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

networking/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -27,14 +27,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

networking/gradle/dependency-locks/testCompile.lockfile

@@ -28,13 +28,13 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

networking/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -28,13 +28,13 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

networking/gradle/dependency-locks/testRuntime.lockfile

@@ -29,14 +29,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

networking/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -29,14 +29,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

prober/gradle/dependency-locks/compile.lockfile

@@ -29,14 +29,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

prober/gradle/dependency-locks/compileClasspath.lockfile

@@ -29,14 +29,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

prober/gradle/dependency-locks/default.lockfile

@@ -29,14 +29,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

prober/gradle/dependency-locks/deploy_jar.lockfile

@@ -29,14 +29,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

prober/gradle/dependency-locks/runtime.lockfile

@@ -29,14 +29,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

prober/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -29,14 +29,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

prober/gradle/dependency-locks/testCompile.lockfile

@@ -32,14 +32,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

prober/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -32,14 +32,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

prober/gradle/dependency-locks/testRuntime.lockfile

@@ -32,14 +32,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

prober/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -32,14 +32,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

proxy/gradle/dependency-locks/compile.lockfile

@@ -34,14 +34,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

proxy/gradle/dependency-locks/compileClasspath.lockfile

@@ -34,14 +34,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

proxy/gradle/dependency-locks/default.lockfile

@@ -34,14 +34,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

proxy/gradle/dependency-locks/deploy_jar.lockfile

@@ -34,14 +34,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

proxy/gradle/dependency-locks/runtime.lockfile

@@ -34,14 +34,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

proxy/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -34,14 +34,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

proxy/gradle/dependency-locks/testCompile.lockfile

@@ -37,14 +37,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

proxy/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -37,14 +37,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

proxy/gradle/dependency-locks/testRuntime.lockfile

@@ -37,14 +37,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1

proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -37,14 +37,14 @@ com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 io.grpc:grpc-context:1.22.1
-io.netty:netty-buffer:4.1.31.Final
-io.netty:netty-codec-http:4.1.31.Final
-io.netty:netty-codec:4.1.31.Final
-io.netty:netty-common:4.1.31.Final
-io.netty:netty-handler:4.1.31.Final
-io.netty:netty-resolver:4.1.31.Final
-io.netty:netty-tcnative-boringssl-static:2.0.22.Final
-io.netty:netty-transport:4.1.31.Final
+io.netty:netty-buffer:4.1.50.Final
+io.netty:netty-codec-http:4.1.50.Final
+io.netty:netty-codec:4.1.50.Final
+io.netty:netty-common:4.1.50.Final
+io.netty:netty-handler:4.1.50.Final
+io.netty:netty-resolver:4.1.50.Final
+io.netty:netty-tcnative-boringssl-static:2.0.30.Final
+io.netty:netty-transport:4.1.50.Final
 io.opencensus:opencensus-api:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
 javax.activation:activation:1.1