diff --git a/core/src/main/java/google/registry/model/domain/DomainContent.java b/core/src/main/java/google/registry/model/domain/DomainContent.java index a395add00..b037368c8 100644 --- a/core/src/main/java/google/registry/model/domain/DomainContent.java +++ b/core/src/main/java/google/registry/model/domain/DomainContent.java @@ -321,9 +321,6 @@ public class DomainContent extends EppResource nullToEmptyImmutableCopy(gracePeriods).stream() .map(gracePeriod -> gracePeriod.cloneAfterOfyLoad(getRepoId())) .collect(toImmutableSet()); - // TODO(b/169873747): Remove this method after explicitly re-saving all domain entities. - // See also: GradePeriod.onLoad. - gracePeriods.forEach(GracePeriod::onLoad); // Restore history record ids. autorenewPollMessageHistoryId = getHistoryId(autorenewPollMessage); diff --git a/core/src/main/java/google/registry/model/domain/GracePeriod.java b/core/src/main/java/google/registry/model/domain/GracePeriod.java index ee5e61a69..555978880 100644 --- a/core/src/main/java/google/registry/model/domain/GracePeriod.java +++ b/core/src/main/java/google/registry/model/domain/GracePeriod.java @@ -54,17 +54,6 @@ public class GracePeriod extends GracePeriodBase implements DatastoreAndSqlEntit return super.getGracePeriodId(); } - // TODO(b/169873747): Remove this method after explicitly re-saving all domain entities. - // This method is invoked from DomainContent.load(): Objectify's @OnLoad annotation - // apparently does not work on embedded objects inside an entity. - // Changing signature to void onLoad(@AlsoLoad("gracePeriodId") Long gracePeriodId) - // would not work. Method is not called if gracePeriodId is null. - void onLoad() { - if (gracePeriodId == null) { - gracePeriodId = ObjectifyService.allocateId(); - } - } - private static GracePeriod createInternal( GracePeriodStatus type, String domainRepoId, diff --git a/core/src/test/java/google/registry/model/domain/DomainBaseTest.java b/core/src/test/java/google/registry/model/domain/DomainBaseTest.java index 09a6ae5cc..0f4dd593e 100644 --- a/core/src/test/java/google/registry/model/domain/DomainBaseTest.java +++ b/core/src/test/java/google/registry/model/domain/DomainBaseTest.java @@ -19,8 +19,6 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; import static google.registry.model.EppResourceUtils.loadByForeignKey; -import static google.registry.model.ofy.ObjectifyService.ofy; -import static google.registry.persistence.transaction.TransactionManagerFactory.ofyTm; import static google.registry.testing.DatabaseHelper.cloneAndSetAutoTimestamps; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.newDomainBase; @@ -32,7 +30,6 @@ import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; import static org.junit.jupiter.api.Assertions.assertThrows; -import com.google.appengine.api.datastore.Entity; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; @@ -167,15 +164,6 @@ public class DomainBaseTest extends EntityTestCase { .build())); } - @Test - void testGracePeriod_nullIdFromOfy() { - Entity entity = ofyTm().transact(() -> ofy().save().toEntity(domain)); - entity.setUnindexedProperty("gracePeriods.gracePeriodId", null); - DomainBase domainFromEntity = ofyTm().transact(() -> ofy().load().fromEntity(entity)); - GracePeriod gracePeriod = domainFromEntity.getGracePeriods().iterator().next(); - assertThat(gracePeriod.gracePeriodId).isNotNull(); - } - @Test void testPersistence() { // Note that this only verifies that the value stored under the foreign key is the same as that