From 1eef260da9ef59e00a6aa6b5422830f2d87f7485 Mon Sep 17 00:00:00 2001 From: Ben McIlwain Date: Fri, 23 Feb 2024 13:56:40 -0500 Subject: [PATCH] Convert some more @AutoValues to records (#2334) --- ...ingCertificateNotificationEmailAction.java | 20 ++--------- .../registry/beam/spec11/Spec11Pipeline.java | 15 ++------ .../registry/bsa/api/UnblockableDomain.java | 16 ++------- .../bsa/api/UnblockableDomainChange.java | 4 +-- .../bsa/persistence/DomainsRefresher.java | 4 +-- .../bsa/persistence/LabelDiffUpdates.java | 4 +-- .../google/registry/flows/FlowMetadata.java | 18 ++++------ .../google/registry/flows/FlowModule.java | 2 +- .../bsa/BsaRefreshFunctionalTest.java | 34 +++++++++---------- .../bsa/api/JsonSerializationsTest.java | 8 ++--- .../bsa/api/UnblockableDomainTest.java | 2 +- .../bsa/persistence/DomainsRefresherTest.java | 14 ++++---- .../bsa/persistence/LabelDiffUpdatesTest.java | 10 +++--- 13 files changed, 56 insertions(+), 95 deletions(-) diff --git a/core/src/main/java/google/registry/batch/SendExpiringCertificateNotificationEmailAction.java b/core/src/main/java/google/registry/batch/SendExpiringCertificateNotificationEmailAction.java index df2b6f536..56f3f3d62 100644 --- a/core/src/main/java/google/registry/batch/SendExpiringCertificateNotificationEmailAction.java +++ b/core/src/main/java/google/registry/batch/SendExpiringCertificateNotificationEmailAction.java @@ -21,7 +21,6 @@ import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR; import static org.apache.http.HttpStatus.SC_OK; import static org.joda.time.DateTimeZone.UTC; -import com.google.auto.value.AutoValue; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -125,7 +124,7 @@ public class SendExpiringCertificateNotificationEmailAction implements Runnable return Streams.stream(Registrar.loadAllCached()) .map( registrar -> - RegistrarInfo.create( + new RegistrarInfo( registrar, registrar.getClientCertificate().isPresent() && certificateChecker.shouldReceiveExpiringNotification( @@ -333,19 +332,6 @@ public class SendExpiringCertificateNotificationEmailAction implements Runnable } } - @AutoValue - public abstract static class RegistrarInfo { - - static RegistrarInfo create( - Registrar registrar, boolean isCertExpiring, boolean isFailOverCertExpiring) { - return new AutoValue_SendExpiringCertificateNotificationEmailAction_RegistrarInfo( - registrar, isCertExpiring, isFailOverCertExpiring); - } - - public abstract Registrar registrar(); - - public abstract boolean isCertExpiring(); - - public abstract boolean isFailOverCertExpiring(); - } + record RegistrarInfo( + Registrar registrar, boolean isCertExpiring, boolean isFailOverCertExpiring) {} } diff --git a/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java b/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java index 00723f903..a5a4d275a 100644 --- a/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java +++ b/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java @@ -17,7 +17,6 @@ package google.registry.beam.spec11; import static com.google.common.base.Preconditions.checkArgument; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableSet; import dagger.Component; import dagger.Module; @@ -199,7 +198,7 @@ public class Spec11Pipeline implements Serializable { (KV kv) -> KV.of( kv.getKey().registrarId(), - EmailAndThreatMatch.create( + new EmailAndThreatMatch( kv.getKey().registrarEmailAddress(), kv.getValue())))) .apply("Group by registrar client ID", GroupByKey.create()) .apply( @@ -281,15 +280,5 @@ public class Spec11Pipeline implements Serializable { Spec11Pipeline spec11Pipeline(); } - @AutoValue - abstract static class EmailAndThreatMatch implements Serializable { - - abstract String email(); - - abstract ThreatMatch threatMatch(); - - static EmailAndThreatMatch create(String email, ThreatMatch threatMatch) { - return new AutoValue_Spec11Pipeline_EmailAndThreatMatch(email, threatMatch); - } - } + record EmailAndThreatMatch(String email, ThreatMatch threatMatch) implements Serializable {} } diff --git a/core/src/main/java/google/registry/bsa/api/UnblockableDomain.java b/core/src/main/java/google/registry/bsa/api/UnblockableDomain.java index bf141a59f..0fab6a904 100644 --- a/core/src/main/java/google/registry/bsa/api/UnblockableDomain.java +++ b/core/src/main/java/google/registry/bsa/api/UnblockableDomain.java @@ -18,19 +18,13 @@ import static google.registry.bsa.BsaStringUtils.DOMAIN_JOINER; import static google.registry.bsa.BsaStringUtils.PROPERTY_JOINER; import static google.registry.bsa.BsaStringUtils.PROPERTY_SPLITTER; -import com.google.auto.value.AutoValue; import java.util.List; /** * A domain name whose second-level domain (SLD) matches a BSA label but is not blocked. It may be * already registered, or on the TLD's reserve list. */ -// TODO(1/15/2024): rename to UnblockableDomain. -@AutoValue -public abstract class UnblockableDomain { - public abstract String domainName(); - - public abstract Reason reason(); +public record UnblockableDomain(String domainName, Reason reason) { /** Reasons why a valid domain name cannot be blocked. */ public enum Reason { @@ -45,14 +39,10 @@ public abstract class UnblockableDomain { public static UnblockableDomain deserialize(String text) { List items = PROPERTY_SPLITTER.splitToList(text); - return of(items.get(0), Reason.valueOf(items.get(1))); - } - - public static UnblockableDomain of(String domainName, Reason reason) { - return new AutoValue_UnblockableDomain(domainName, reason); + return new UnblockableDomain(items.get(0), Reason.valueOf(items.get(1))); } public static UnblockableDomain of(String label, String tld, Reason reason) { - return of(DOMAIN_JOINER.join(label, tld), reason); + return new UnblockableDomain(DOMAIN_JOINER.join(label, tld), reason); } } diff --git a/core/src/main/java/google/registry/bsa/api/UnblockableDomainChange.java b/core/src/main/java/google/registry/bsa/api/UnblockableDomainChange.java index 5e36082a0..6d42656b1 100644 --- a/core/src/main/java/google/registry/bsa/api/UnblockableDomainChange.java +++ b/core/src/main/java/google/registry/bsa/api/UnblockableDomainChange.java @@ -49,7 +49,7 @@ public abstract class UnblockableDomainChange { @Memoized public UnblockableDomain newValue() { verify(newReason().isPresent(), "Removed unblockable does not have new value."); - return UnblockableDomain.of(unblockable().domainName(), newReason().get()); + return new UnblockableDomain(unblockable().domainName(), newReason().get()); } public boolean isNewOrChange() { @@ -78,7 +78,7 @@ public abstract class UnblockableDomainChange { public static UnblockableDomainChange deserialize(String text) { List items = BsaStringUtils.PROPERTY_SPLITTER.splitToList(text); return of( - UnblockableDomain.of(items.get(0), Reason.valueOf(items.get(1))), + new UnblockableDomain(items.get(0), Reason.valueOf(items.get(1))), Objects.equals(items.get(2), DELETE_REASON_PLACEHOLDER) ? Optional.empty() : Optional.of(Reason.valueOf(items.get(2)))); diff --git a/core/src/main/java/google/registry/bsa/persistence/DomainsRefresher.java b/core/src/main/java/google/registry/bsa/persistence/DomainsRefresher.java index 7da95e220..26569b939 100644 --- a/core/src/main/java/google/registry/bsa/persistence/DomainsRefresher.java +++ b/core/src/main/java/google/registry/bsa/persistence/DomainsRefresher.java @@ -239,10 +239,10 @@ public final class DomainsRefresher { Streams.concat( newCreated.stream() - .map(name -> UnblockableDomain.of(name, Reason.REGISTERED)) + .map(name -> new UnblockableDomain(name, Reason.REGISTERED)) .map(UnblockableDomainChange::ofNew), reservedNotCreated.stream() - .map(name -> UnblockableDomain.of(name, Reason.RESERVED)) + .map(name -> new UnblockableDomain(name, Reason.RESERVED)) .map(UnblockableDomainChange::ofNew)) .forEach(changes::add); return changes.build(); diff --git a/core/src/main/java/google/registry/bsa/persistence/LabelDiffUpdates.java b/core/src/main/java/google/registry/bsa/persistence/LabelDiffUpdates.java index e2c33f54a..4b58294c0 100644 --- a/core/src/main/java/google/registry/bsa/persistence/LabelDiffUpdates.java +++ b/core/src/main/java/google/registry/bsa/persistence/LabelDiffUpdates.java @@ -152,7 +152,7 @@ public final class LabelDiffUpdates { ImmutableSet registeredDomainNames = ImmutableSet.copyOf(ForeignKeyUtils.load(Domain.class, validDomainNames, now).keySet()); for (String domain : registeredDomainNames) { - nonBlockedDomains.add(UnblockableDomain.of(domain, Reason.REGISTERED)); + nonBlockedDomains.add(new UnblockableDomain(domain, Reason.REGISTERED)); tm().put(BsaUnblockableDomain.of(domain, BsaUnblockableDomain.Reason.REGISTERED)); } @@ -161,7 +161,7 @@ public final class LabelDiffUpdates { .filter(domain -> isReservedDomain(domain, now)) .collect(toImmutableSet()); for (String domain : reservedDomainNames) { - nonBlockedDomains.add(UnblockableDomain.of(domain, Reason.RESERVED)); + nonBlockedDomains.add(new UnblockableDomain(domain, Reason.RESERVED)); tm().put(BsaUnblockableDomain.of(domain, BsaUnblockableDomain.Reason.RESERVED)); } return nonBlockedDomains.build(); diff --git a/core/src/main/java/google/registry/flows/FlowMetadata.java b/core/src/main/java/google/registry/flows/FlowMetadata.java index c5d37100f..4683cc080 100644 --- a/core/src/main/java/google/registry/flows/FlowMetadata.java +++ b/core/src/main/java/google/registry/flows/FlowMetadata.java @@ -14,25 +14,21 @@ package google.registry.flows; -import com.google.auto.value.AutoValue; -import google.registry.model.ImmutableObject; +import com.google.auto.value.AutoBuilder; /** Object to hold metadata specific to a particular execution of a flow. */ -@AutoValue -public abstract class FlowMetadata extends ImmutableObject { - - public abstract boolean isSuperuser(); +public record FlowMetadata(boolean isSuperuser) { public static Builder newBuilder() { - return new AutoValue_FlowMetadata.Builder(); + return new AutoBuilder_FlowMetadata_Builder(); } /** Builder for {@link FlowMetadata} */ - @AutoValue.Builder - public abstract static class Builder { + @AutoBuilder + public interface Builder { - public abstract Builder setSuperuser(boolean isSuperuser); + Builder setIsSuperuser(boolean isSuperuser); - public abstract FlowMetadata build(); + FlowMetadata build(); } } diff --git a/core/src/main/java/google/registry/flows/FlowModule.java b/core/src/main/java/google/registry/flows/FlowModule.java index 4c9ccfe37..32c0ef0c2 100644 --- a/core/src/main/java/google/registry/flows/FlowModule.java +++ b/core/src/main/java/google/registry/flows/FlowModule.java @@ -314,7 +314,7 @@ public class FlowModule { @Provides static FlowMetadata provideFlowMetadata(@Superuser boolean isSuperuser) { - return FlowMetadata.newBuilder().setSuperuser(isSuperuser).build(); + return FlowMetadata.newBuilder().setIsSuperuser(isSuperuser).build(); } /** Wrapper class to carry an {@link EppException} to the calling code. */ diff --git a/core/src/test/java/google/registry/bsa/BsaRefreshFunctionalTest.java b/core/src/test/java/google/registry/bsa/BsaRefreshFunctionalTest.java index 1e742e8a2..8f7c74cd3 100644 --- a/core/src/test/java/google/registry/bsa/BsaRefreshFunctionalTest.java +++ b/core/src/test/java/google/registry/bsa/BsaRefreshFunctionalTest.java @@ -139,7 +139,7 @@ class BsaRefreshFunctionalTest { RESERVED_LIST_NAME, ImmutableMap.of("blocked1", RESERVED_FOR_SPECIFIC_USE)); String jobName = getRefreshJobName(fakeClock.nowUtc()); action.run(); - UnblockableDomain newUnblockable = UnblockableDomain.of("blocked1.app", Reason.RESERVED); + UnblockableDomain newUnblockable = new UnblockableDomain("blocked1.app", Reason.RESERVED); assertThat(queryUnblockableDomains()).containsExactly(newUnblockable); assertThat(gcsClient.readRefreshChanges(jobName)) .containsExactly(UnblockableDomainChange.ofNew(newUnblockable)); @@ -154,7 +154,7 @@ class BsaRefreshFunctionalTest { persistActiveDomain("dummy.dev", fakeClock.nowUtc()); String jobName = getRefreshJobName(fakeClock.nowUtc()); action.run(); - UnblockableDomain newUnblockable = UnblockableDomain.of("blocked1.dev", Reason.REGISTERED); + UnblockableDomain newUnblockable = new UnblockableDomain("blocked1.dev", Reason.REGISTERED); assertThat(queryUnblockableDomains()).containsExactly(newUnblockable); assertThat(gcsClient.readRefreshChanges(jobName)) .containsExactly(UnblockableDomainChange.ofNew(newUnblockable)); @@ -169,7 +169,7 @@ class BsaRefreshFunctionalTest { Domain domain = persistActiveDomain("blocked1.dev", fakeClock.nowUtc()); action.run(); assertThat(queryUnblockableDomains()) - .containsExactly(UnblockableDomain.of("blocked1.dev", Reason.REGISTERED)); + .containsExactly(new UnblockableDomain("blocked1.dev", Reason.REGISTERED)); fakeClock.advanceOneMilli(); deleteTestDomain(domain, fakeClock.nowUtc()); fakeClock.advanceOneMilli(); @@ -181,7 +181,7 @@ class BsaRefreshFunctionalTest { assertThat(gcsClient.readRefreshChanges(jobName)) .containsExactly( UnblockableDomainChange.ofDeleted( - UnblockableDomain.of("blocked1.dev", Reason.REGISTERED))); + new UnblockableDomain("blocked1.dev", Reason.REGISTERED))); verify(bsaReportSender, never()).addUnblockableDomainsUpdates(anyString()); verify(bsaReportSender, times(1)).removeUnblockableDomainsUpdates("[\n \"blocked1.dev\"\n]"); @@ -193,7 +193,7 @@ class BsaRefreshFunctionalTest { RESERVED_LIST_NAME, ImmutableMap.of("blocked1", RESERVED_FOR_SPECIFIC_USE)); action.run(); assertThat(queryUnblockableDomains()) - .containsExactly(UnblockableDomain.of("blocked1.app", Reason.RESERVED)); + .containsExactly(new UnblockableDomain("blocked1.app", Reason.RESERVED)); fakeClock.advanceOneMilli(); removeReservedDomainFromList(RESERVED_LIST_NAME, ImmutableSet.of("blocked1")); @@ -204,7 +204,7 @@ class BsaRefreshFunctionalTest { assertThat(gcsClient.readRefreshChanges(jobName)) .containsExactly( UnblockableDomainChange.ofDeleted( - UnblockableDomain.of("blocked1.app", Reason.RESERVED))); + new UnblockableDomain("blocked1.app", Reason.RESERVED))); verify(bsaReportSender, never()).addUnblockableDomainsUpdates(anyString()); verify(bsaReportSender, times(1)).removeUnblockableDomainsUpdates("[\n \"blocked1.app\"\n]"); @@ -217,7 +217,7 @@ class BsaRefreshFunctionalTest { Domain domain = persistActiveDomain("blocked1.app", fakeClock.nowUtc()); action.run(); assertThat(queryUnblockableDomains()) - .containsExactly(UnblockableDomain.of("blocked1.app", Reason.REGISTERED)); + .containsExactly(new UnblockableDomain("blocked1.app", Reason.REGISTERED)); fakeClock.advanceOneMilli(); deleteTestDomain(domain, fakeClock.nowUtc()); fakeClock.advanceOneMilli(); @@ -226,11 +226,11 @@ class BsaRefreshFunctionalTest { Mockito.reset(bsaReportSender); action.run(); assertThat(queryUnblockableDomains()) - .containsExactly(UnblockableDomain.of("blocked1.app", Reason.RESERVED)); + .containsExactly(new UnblockableDomain("blocked1.app", Reason.RESERVED)); assertThat(gcsClient.readRefreshChanges(jobName)) .containsExactly( UnblockableDomainChange.ofChanged( - UnblockableDomain.of("blocked1.app", Reason.REGISTERED), Reason.RESERVED)); + new UnblockableDomain("blocked1.app", Reason.REGISTERED), Reason.RESERVED)); InOrder inOrder = Mockito.inOrder(bsaReportSender); inOrder.verify(bsaReportSender).removeUnblockableDomainsUpdates("[\n \"blocked1.app\"\n]"); inOrder @@ -244,7 +244,7 @@ class BsaRefreshFunctionalTest { RESERVED_LIST_NAME, ImmutableMap.of("blocked1", RESERVED_FOR_SPECIFIC_USE)); action.run(); assertThat(queryUnblockableDomains()) - .containsExactly(UnblockableDomain.of("blocked1.app", Reason.RESERVED)); + .containsExactly(new UnblockableDomain("blocked1.app", Reason.RESERVED)); fakeClock.advanceOneMilli(); persistActiveDomain("blocked1.app", fakeClock.nowUtc()); fakeClock.advanceOneMilli(); @@ -252,12 +252,12 @@ class BsaRefreshFunctionalTest { Mockito.reset(bsaReportSender); String jobName = getRefreshJobName(fakeClock.nowUtc()); action.run(); - UnblockableDomain changed = UnblockableDomain.of("blocked1.app", Reason.REGISTERED); + UnblockableDomain changed = new UnblockableDomain("blocked1.app", Reason.REGISTERED); assertThat(queryUnblockableDomains()).containsExactly(changed); assertThat(gcsClient.readRefreshChanges(jobName)) .containsExactly( UnblockableDomainChange.ofChanged( - UnblockableDomain.of("blocked1.app", Reason.RESERVED), Reason.REGISTERED)); + new UnblockableDomain("blocked1.app", Reason.RESERVED), Reason.REGISTERED)); InOrder inOrder = Mockito.inOrder(bsaReportSender); inOrder.verify(bsaReportSender).removeUnblockableDomainsUpdates("[\n \"blocked1.app\"\n]"); inOrder @@ -272,7 +272,7 @@ class BsaRefreshFunctionalTest { persistActiveDomain("blocked1.app", fakeClock.nowUtc()); String jobName = getRefreshJobName(fakeClock.nowUtc()); action.run(); - UnblockableDomain newUnblockable = UnblockableDomain.of("blocked1.app", Reason.REGISTERED); + UnblockableDomain newUnblockable = new UnblockableDomain("blocked1.app", Reason.REGISTERED); assertThat(queryUnblockableDomains()).containsExactly(newUnblockable); assertThat(gcsClient.readRefreshChanges(jobName)) .containsExactly(UnblockableDomainChange.ofNew(newUnblockable)); @@ -285,7 +285,7 @@ class BsaRefreshFunctionalTest { persistActiveDomain("blocked1.app", fakeClock.nowUtc()); action.run(); assertThat(queryUnblockableDomains()) - .containsExactly(UnblockableDomain.of("blocked1.app", Reason.REGISTERED)); + .containsExactly(new UnblockableDomain("blocked1.app", Reason.REGISTERED)); fakeClock.advanceOneMilli(); removeReservedDomainFromList(RESERVED_LIST_NAME, ImmutableSet.of("blocked1")); fakeClock.advanceOneMilli(); @@ -294,7 +294,7 @@ class BsaRefreshFunctionalTest { String jobName = getRefreshJobName(fakeClock.nowUtc()); action.run(); assertThat(queryUnblockableDomains()) - .containsExactly(UnblockableDomain.of("blocked1.app", Reason.REGISTERED)); + .containsExactly(new UnblockableDomain("blocked1.app", Reason.REGISTERED)); // Verify that refresh change file does not exist (404 error) since there is no change. assertThat( assertThrows( @@ -309,7 +309,7 @@ class BsaRefreshFunctionalTest { persistActiveDomain("blocked1.app", fakeClock.nowUtc()); action.run(); assertThat(queryUnblockableDomains()) - .containsExactly(UnblockableDomain.of("blocked1.app", Reason.REGISTERED)); + .containsExactly(new UnblockableDomain("blocked1.app", Reason.REGISTERED)); fakeClock.advanceOneMilli(); addReservedDomainToList( RESERVED_LIST_NAME, ImmutableMap.of("blocked1", RESERVED_FOR_SPECIFIC_USE)); @@ -319,7 +319,7 @@ class BsaRefreshFunctionalTest { String jobName = getRefreshJobName(fakeClock.nowUtc()); action.run(); assertThat(queryUnblockableDomains()) - .containsExactly(UnblockableDomain.of("blocked1.app", Reason.REGISTERED)); + .containsExactly(new UnblockableDomain("blocked1.app", Reason.REGISTERED)); // Verify that refresh change file does not exist (404 error) since there is no change. assertThat( assertThrows( diff --git a/core/src/test/java/google/registry/bsa/api/JsonSerializationsTest.java b/core/src/test/java/google/registry/bsa/api/JsonSerializationsTest.java index 0ada58d3a..5808601b7 100644 --- a/core/src/test/java/google/registry/bsa/api/JsonSerializationsTest.java +++ b/core/src/test/java/google/registry/bsa/api/JsonSerializationsTest.java @@ -134,10 +134,10 @@ class JsonSerializationsTest { assertThat( toUnblockableDomainsReport( Stream.of( - UnblockableDomain.of("a.ing", Reason.REGISTERED), - UnblockableDomain.of("b.app", Reason.INVALID), - UnblockableDomain.of("c.dev", Reason.RESERVED), - UnblockableDomain.of("d.page", Reason.REGISTERED)))) + new UnblockableDomain("a.ing", Reason.REGISTERED), + new UnblockableDomain("b.app", Reason.INVALID), + new UnblockableDomain("c.dev", Reason.RESERVED), + new UnblockableDomain("d.page", Reason.REGISTERED)))) .hasValue(expected); } } diff --git a/core/src/test/java/google/registry/bsa/api/UnblockableDomainTest.java b/core/src/test/java/google/registry/bsa/api/UnblockableDomainTest.java index 1677ef7c1..21dcd83c3 100644 --- a/core/src/test/java/google/registry/bsa/api/UnblockableDomainTest.java +++ b/core/src/test/java/google/registry/bsa/api/UnblockableDomainTest.java @@ -27,7 +27,7 @@ class UnblockableDomainTest { @BeforeEach void setup() { - unit = UnblockableDomain.of("buy.app", Reason.REGISTERED); + unit = new UnblockableDomain("buy.app", Reason.REGISTERED); } @Test diff --git a/core/src/test/java/google/registry/bsa/persistence/DomainsRefresherTest.java b/core/src/test/java/google/registry/bsa/persistence/DomainsRefresherTest.java index cbf46c068..ecff5e7a1 100644 --- a/core/src/test/java/google/registry/bsa/persistence/DomainsRefresherTest.java +++ b/core/src/test/java/google/registry/bsa/persistence/DomainsRefresherTest.java @@ -69,7 +69,7 @@ public class DomainsRefresherTest { assertThat(refresher.refreshStaleUnblockables()) .containsExactly( UnblockableDomainChange.ofDeleted( - UnblockableDomain.of("label.tld", UnblockableDomain.Reason.REGISTERED))); + new UnblockableDomain("label.tld", UnblockableDomain.Reason.REGISTERED))); } @Test @@ -79,7 +79,7 @@ public class DomainsRefresherTest { assertThat(refresher.refreshStaleUnblockables()) .containsExactly( UnblockableDomainChange.ofDeleted( - UnblockableDomain.of("label.tld", UnblockableDomain.Reason.RESERVED))); + new UnblockableDomain("label.tld", UnblockableDomain.Reason.RESERVED))); } @Test @@ -89,7 +89,7 @@ public class DomainsRefresherTest { assertThat(refresher.getNewUnblockables()) .containsExactly( UnblockableDomainChange.ofNew( - UnblockableDomain.of("label.tld", UnblockableDomain.Reason.REGISTERED))); + new UnblockableDomain("label.tld", UnblockableDomain.Reason.REGISTERED))); } @Test @@ -100,7 +100,7 @@ public class DomainsRefresherTest { assertThat(refresher.getNewUnblockables()) .containsExactly( UnblockableDomainChange.ofNew( - UnblockableDomain.of("label.tld", UnblockableDomain.Reason.RESERVED))); + new UnblockableDomain("label.tld", UnblockableDomain.Reason.RESERVED))); } @Test @@ -113,7 +113,7 @@ public class DomainsRefresherTest { assertThat(refresher.refreshStaleUnblockables()) .containsExactly( UnblockableDomainChange.ofChanged( - UnblockableDomain.of("label.tld", UnblockableDomain.Reason.REGISTERED), + new UnblockableDomain("label.tld", UnblockableDomain.Reason.REGISTERED), UnblockableDomain.Reason.RESERVED)); } @@ -126,7 +126,7 @@ public class DomainsRefresherTest { assertThat(refresher.refreshStaleUnblockables()) .containsExactly( UnblockableDomainChange.ofChanged( - UnblockableDomain.of("label.tld", UnblockableDomain.Reason.RESERVED), + new UnblockableDomain("label.tld", UnblockableDomain.Reason.RESERVED), UnblockableDomain.Reason.REGISTERED)); } @@ -141,7 +141,7 @@ public class DomainsRefresherTest { assertThat(refresher.refreshStaleUnblockables()) .containsExactly( UnblockableDomainChange.ofChanged( - UnblockableDomain.of("label.tld", UnblockableDomain.Reason.RESERVED), + new UnblockableDomain("label.tld", UnblockableDomain.Reason.RESERVED), UnblockableDomain.Reason.REGISTERED)); } } diff --git a/core/src/test/java/google/registry/bsa/persistence/LabelDiffUpdatesTest.java b/core/src/test/java/google/registry/bsa/persistence/LabelDiffUpdatesTest.java index bb8226d96..04863aeeb 100644 --- a/core/src/test/java/google/registry/bsa/persistence/LabelDiffUpdatesTest.java +++ b/core/src/test/java/google/registry/bsa/persistence/LabelDiffUpdatesTest.java @@ -126,8 +126,8 @@ class LabelDiffUpdatesTest { fakeClock.nowUtc()); assertThat(unblockableDomains) .containsExactly( - UnblockableDomain.of("label.app", UnblockableDomain.Reason.REGISTERED), - UnblockableDomain.of("label.dev", UnblockableDomain.Reason.INVALID)); + new UnblockableDomain("label.app", UnblockableDomain.Reason.REGISTERED), + new UnblockableDomain("label.dev", UnblockableDomain.Reason.INVALID)); assertThat(tm().transact(() -> tm().loadByKeyIfPresent(BsaLabel.vKey("label")))).isPresent(); assertThat( tm().transact(() -> tm().loadByKeyIfPresent(BsaUnblockableDomain.vKey("label", "app")))) @@ -153,9 +153,9 @@ class LabelDiffUpdatesTest { fakeClock.nowUtc()); assertThat(unblockableDomains) .containsExactly( - UnblockableDomain.of("label.app", UnblockableDomain.Reason.REGISTERED), - UnblockableDomain.of("label.page", UnblockableDomain.Reason.RESERVED), - UnblockableDomain.of("label.dev", UnblockableDomain.Reason.INVALID)); + new UnblockableDomain("label.app", UnblockableDomain.Reason.REGISTERED), + new UnblockableDomain("label.page", UnblockableDomain.Reason.RESERVED), + new UnblockableDomain("label.dev", UnblockableDomain.Reason.INVALID)); assertThat(tm().transact(() -> tm().loadByKeyIfPresent(BsaLabel.vKey("label")))).isPresent(); assertThat( tm().transact(() -> tm().loadByKey(BsaUnblockableDomain.vKey("label", "app")).reason))