diff --git a/core/build.gradle b/core/build.gradle index e0e5062e8..a699c0318 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -600,7 +600,6 @@ task compileProdJS(type: JavaExec) { closureArgs << "--js=${jsDir}/soyutils_usegoog.js" closureArgs << "--js=${cssSourceDir}/registrar_bin.css.js" closureArgs << "--js=${jsSourceDir}/**.js" - // TODO(shicong) Verify the compiled JS file works in Alpha closureArgs << "--js=${externsDir}/json.js" closureArgs << "--js=${soySourceDir}/**.js" args closureArgs 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 a85fa308d..ee5e61a69 100644 --- a/core/src/main/java/google/registry/model/domain/GracePeriod.java +++ b/core/src/main/java/google/registry/model/domain/GracePeriod.java @@ -193,19 +193,6 @@ public class GracePeriod extends GracePeriodBase implements DatastoreAndSqlEntit return clone; } - /** - * Returns a clone of this {@link GracePeriod} with prepopulated {@link #gracePeriodId} generated - * by {@link ObjectifyService#allocateId()}. - * - *

TODO(shicong): Figure out how to generate the id only when the entity is used for Cloud SQL. - */ - @VisibleForTesting - public GracePeriod cloneWithPrepopulatedId() { - GracePeriod clone = clone(this); - clone.gracePeriodId = ObjectifyService.allocateId(); - return clone; - } - /** Entity class to represent a historic {@link GracePeriod}. */ @Entity(name = "GracePeriodHistory") @Table(indexes = @Index(columnList = "domainRepoId")) diff --git a/core/src/main/java/google/registry/model/domain/secdns/DelegationSignerData.java b/core/src/main/java/google/registry/model/domain/secdns/DelegationSignerData.java index 39af4b44a..2ec76a2bd 100644 --- a/core/src/main/java/google/registry/model/domain/secdns/DelegationSignerData.java +++ b/core/src/main/java/google/registry/model/domain/secdns/DelegationSignerData.java @@ -35,7 +35,7 @@ import javax.xml.bind.annotation.XmlType; * * @see RFC 5910 * @see RFC 4034 - *

TODO(shicong): Rename this class to DomainDsData. + *

TODO(b/177567432): Rename this class to DomainDsData. */ @Embed @XmlType(name = "dsData") 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 35bd61aad..b43983aa0 100644 --- a/core/src/main/java/google/registry/model/eppcommon/Address.java +++ b/core/src/main/java/google/registry/model/eppcommon/Address.java @@ -59,8 +59,8 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; public class Address extends ImmutableObject implements Jsonifiable { /** The schema validation will enforce that this has 3 lines at most. */ - // TODO(shicong): Remove this field after migration. We need to figure out how to generate same - // XML from streetLine[1,2,3]. + // TODO(b/177569726): Remove this field after migration. We need to figure out how to generate + // same XML from streetLine[1,2,3]. @XmlJavaTypeAdapter(NormalizedStringAdapter.class) @Transient List street; diff --git a/core/src/main/java/google/registry/model/registrar/Registrar.java b/core/src/main/java/google/registry/model/registrar/Registrar.java index c5a08892b..d27f6b870 100644 --- a/core/src/main/java/google/registry/model/registrar/Registrar.java +++ b/core/src/main/java/google/registry/model/registrar/Registrar.java @@ -234,7 +234,7 @@ public class Registrar extends ImmutableObject * Unique registrar client id. Must conform to "clIDType" as defined in RFC5730. * * @see Shared Structure Schema - *

TODO(shicong): Rename this field to clientId + *

TODO(b/177568946): Rename this field to registrarId. */ @Id @javax.persistence.Id diff --git a/core/src/main/java/google/registry/model/tmch/ClaimsListDao.java b/core/src/main/java/google/registry/model/tmch/ClaimsListDao.java index d0d377d80..4d76803f0 100644 --- a/core/src/main/java/google/registry/model/tmch/ClaimsListDao.java +++ b/core/src/main/java/google/registry/model/tmch/ClaimsListDao.java @@ -58,7 +58,7 @@ public class ClaimsListDao { /** * Returns the most recent revision of the {@link ClaimsListShard} in Cloud SQL, if it exists. - * TODO(shicong): Change this method to package level access after dual-read phase. + * TODO(b/177569979): Change this method to package level access after dual-read phase. * ClaimsListShard uses this method to retrieve claims list in Cloud SQL for the comparison, and * ClaimsListShard is not in this package. */ diff --git a/core/src/main/java/google/registry/model/transfer/TransferData.java b/core/src/main/java/google/registry/model/transfer/TransferData.java index 7c3fa4ed4..c17054f7e 100644 --- a/core/src/main/java/google/registry/model/transfer/TransferData.java +++ b/core/src/main/java/google/registry/model/transfer/TransferData.java @@ -69,7 +69,7 @@ public abstract class TransferData< Set> 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. + // TODO(b/177589157): Make transfer flows work with Cloud SQL. @Ignore @Column(name = "transfer_gaining_poll_message_id") Long gainingTransferPollMessageId; diff --git a/core/src/main/java/google/registry/persistence/PersistenceModule.java b/core/src/main/java/google/registry/persistence/PersistenceModule.java index 8c658d505..198d26b05 100644 --- a/core/src/main/java/google/registry/persistence/PersistenceModule.java +++ b/core/src/main/java/google/registry/persistence/PersistenceModule.java @@ -351,8 +351,8 @@ public abstract class PersistenceModule { @interface BeamPipelineCloudSqlConfigs {} /** Dagger qualifier for the default Hibernate configurations. */ - // TODO(shicong): Change annotations in this class to none public or put them in a top level - // package + // TODO(b/177568911): Change annotations in this class to none public or put them in a top level + // package. @Qualifier @Documented public @interface DefaultHibernateConfigs {} diff --git a/core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java b/core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java index c21da980e..e47b44f9e 100644 --- a/core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java @@ -20,7 +20,6 @@ import javax.persistence.Converter; /** * JPA {@link AttributeConverter} for storing/retrieving {@code List} objects. - * TODO(shicong): Investigate if we can have one converter for any List type */ @Converter(autoApply = true) public class CidrAddressBlockListConverter extends StringListConverterBase { 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 38355c451..7a270e488 100644 --- a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java +++ b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java @@ -76,8 +76,9 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager { // EntityManagerFactory is thread safe. private final EntityManagerFactory emf; private final Clock clock; - // TODO(shicong): Investigate alternatives for managing transaction information. ThreadLocal adds - // an unnecessary restriction that each request has to be processed by one thread synchronously. + // TODO(b/177588434): Investigate alternatives for managing transaction information. ThreadLocal + // adds an unnecessary restriction that each request has to be processed by one thread + // synchronously. private final ThreadLocal transactionInfo = ThreadLocal.withInitial(TransactionInfo::new); diff --git a/core/src/test/java/google/registry/model/history/DomainHistoryTest.java b/core/src/test/java/google/registry/model/history/DomainHistoryTest.java index a76df7e5d..6b46c677d 100644 --- a/core/src/test/java/google/registry/model/history/DomainHistoryTest.java +++ b/core/src/test/java/google/registry/model/history/DomainHistoryTest.java @@ -221,8 +221,7 @@ public class DomainHistoryTest extends EntityTestCase { .setGracePeriods( ImmutableSet.of( GracePeriod.create( - GracePeriodStatus.ADD, "domainRepoId", END_OF_TIME, "clientId", null) - .cloneWithPrepopulatedId())) + GracePeriodStatus.ADD, "domainRepoId", END_OF_TIME, "clientId", null))) .build(); } diff --git a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java index 6c35400bd..5555771a0 100644 --- a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java +++ b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java @@ -48,8 +48,8 @@ import org.junit.jupiter.api.extension.RegisterExtension; * Unit tests for SQL only APIs defined in {@link JpaTransactionManagerImpl}. Note that the tests * for common APIs in {@link TransactionManager} are added in {@link TransactionManagerTest}. * - *

TODO(shicong): Remove duplicate tests that covered by TransactionManagerTest by refactoring - * the test schema. + *

TODO(b/177587763): Remove duplicate tests that covered by TransactionManagerTest by + * refactoring the test schema. */ class JpaTransactionManagerImplTest {