diff --git a/core/src/main/java/google/registry/model/registry/label/BaseDomainLabelList.java b/core/src/main/java/google/registry/model/registry/label/BaseDomainLabelList.java index f2ba7709c..9cbf743f5 100644 --- a/core/src/main/java/google/registry/model/registry/label/BaseDomainLabelList.java +++ b/core/src/main/java/google/registry/model/registry/label/BaseDomainLabelList.java @@ -164,16 +164,12 @@ public abstract class BaseDomainLabelList, R extends Dom /** Gets the names of the tlds that reference this list. */ public final ImmutableSet getReferencingTlds() { - Key> key = Key.create(this); - return getTlds() - .stream() - .filter((tld) -> refersToKey(Registry.get(tld), key)) + return getTlds().stream() + .filter((tld) -> refersToList(Registry.get(tld), name)) .collect(toImmutableSet()); } - // TODO(b/193043636): Refactor this class to no longer use key references - protected abstract boolean refersToKey( - Registry registry, Key> key); + protected abstract boolean refersToList(Registry registry, String name); protected static Optional getFromCache(String listName, LoadingCache cache) { try { diff --git a/core/src/main/java/google/registry/model/registry/label/PremiumList.java b/core/src/main/java/google/registry/model/registry/label/PremiumList.java index ead36bbc1..e42583702 100644 --- a/core/src/main/java/google/registry/model/registry/label/PremiumList.java +++ b/core/src/main/java/google/registry/model/registry/label/PremiumList.java @@ -282,8 +282,8 @@ public final class PremiumList extends BaseDomainLabelList> key) { - return Objects.equals(registry.getPremiumListName().orElse(null), key.getName()); + public boolean refersToList(Registry registry, String name) { + return Objects.equals(registry.getPremiumListName().orElse(null), name); } @Override diff --git a/core/src/main/java/google/registry/model/registry/label/ReservedList.java b/core/src/main/java/google/registry/model/registry/label/ReservedList.java index e07b62041..b930fb7df 100644 --- a/core/src/main/java/google/registry/model/registry/label/ReservedList.java +++ b/core/src/main/java/google/registry/model/registry/label/ReservedList.java @@ -33,7 +33,6 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.UncheckedExecutionException; -import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Embed; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Mapify; @@ -185,8 +184,8 @@ public final class ReservedList } @Override - protected boolean refersToKey(Registry registry, Key> key) { - return registry.getReservedListNames().contains(key.getName()); + protected boolean refersToList(Registry registry, String name) { + return registry.getReservedListNames().contains(name); } /** Determines whether the ReservedList is in use on any Registry */