diff --git a/core/src/main/java/google/registry/model/eppcommon/Address.java b/core/src/main/java/google/registry/model/eppcommon/Address.java index b43983aa0..28cf6f558 100644 --- a/core/src/main/java/google/registry/model/eppcommon/Address.java +++ b/core/src/main/java/google/registry/model/eppcommon/Address.java @@ -175,7 +175,7 @@ public class Address extends ImmutableObject implements Jsonifiable { * entity from Datastore. * *

This callback method is used by Objectify to set streetLine[1,2,3] fields as they are not - * persisted in the Datastore. TODO(shicong): Delete this method after database migration. + * persisted in the Datastore. */ void onLoad(@AlsoLoad("street") List street) { mapStreetListToIndividualFields(street); diff --git a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java index 7a270e488..504d77908 100644 --- a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java +++ b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java @@ -116,8 +116,6 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager { @Override public T transact(Supplier work) { - // TODO(shicong): Investigate removing transactNew functionality after migration as it may - // be same as this one. return retrier.callWithRetry( () -> { if (inTransaction()) { @@ -197,6 +195,8 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager { }); } + // TODO(b/177674699): Remove all transactNew methods as they are same as transact after the + // database migration. @Override public T transactNew(Supplier work) { return transact(work);