mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-01-11 00:10:36 +00:00
Code Issues Releases Wiki Activity

Remove key references from BaseDomainLabelList (#1239)

Browse Source
This commit is contained in:
sarahcaseybot
2021-07-13 16:49:34 -04:00
committed by GitHub
parent 676616a172
commit 6ce0211537
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/google/registry/model/registry/label/BaseDomainLabelList.java
View File

@@ -164,16 +164,12 @@ public abstract class BaseDomainLabelList<T extends Comparable<?>, R extends Dom
/** Gets the names of the tlds that reference this list. */
public final ImmutableSet<String> getReferencingTlds() {
Key<? extends BaseDomainLabelList<?, ?>> 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<? extends BaseDomainLabelList<?, ?>> key);
protected abstract boolean refersToList(Registry registry, String name);
protected static <R> Optional<R> getFromCache(String listName, LoadingCache<String, R> cache) {
try {

4
core/src/main/java/google/registry/model/registry/label/PremiumList.java
View File

@@ -282,8 +282,8 @@ public final class PremiumList extends BaseDomainLabelList<Money, PremiumList.Pr
}
@Override
public boolean refersToKey(Registry registry, Key<? 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

5
core/src/main/java/google/registry/model/registry/label/ReservedList.java
View File

@@ -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<? extends BaseDomainLabelList<?, ?>> 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 */