From a9b0988c8f3b65a62ef3222070d632a23d2f40df Mon Sep 17 00:00:00 2001
From: gbrodman <gbrodman@google.com>
Date: Thu, 5 May 2022 11:21:10 -0400
Subject: [PATCH] Fix compilation errors caused by Caffeine changes (#1623)

---
 core/src/main/java/google/registry/model/EppResource.java | 2 +-
 .../java/google/registry/model/index/ForeignKeyIndex.java | 8 ++++----
 .../src/main/java/google/registry/model/tld/Registry.java | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/google/registry/model/EppResource.java b/core/src/main/java/google/registry/model/EppResource.java
index 7cb0ba13e..b1e37110b 100644
--- a/core/src/main/java/google/registry/model/EppResource.java
+++ b/core/src/main/java/google/registry/model/EppResource.java
@@ -394,7 +394,7 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable {
 
         @Override
         public Map<VKey<? extends EppResource>, EppResource> loadAll(
-            Set<? extends VKey<? extends EppResource>> keys) {
+            Iterable<? extends VKey<? extends EppResource>> keys) {
           return replicaTm().doTransactionless(() -> replicaTm().loadByKeys(keys));
         }
       };
diff --git a/core/src/main/java/google/registry/model/index/ForeignKeyIndex.java b/core/src/main/java/google/registry/model/index/ForeignKeyIndex.java
index 9248b16f3..0e70f6c54 100644
--- a/core/src/main/java/google/registry/model/index/ForeignKeyIndex.java
+++ b/core/src/main/java/google/registry/model/index/ForeignKeyIndex.java
@@ -35,6 +35,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimaps;
+import com.google.common.collect.Streams;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
@@ -58,7 +59,6 @@ import java.util.Collection;
 import java.util.Comparator;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import javax.annotation.Nullable;
 import org.joda.time.DateTime;
 
@@ -272,14 +272,14 @@ public abstract class ForeignKeyIndex<E extends EppResource> extends BackupGroup
 
         @Override
         public Map<VKey<ForeignKeyIndex<?>>, Optional<ForeignKeyIndex<?>>> loadAll(
-            Set<? extends VKey<ForeignKeyIndex<?>>> keys) {
-          if (keys.isEmpty()) {
+            Iterable<? extends VKey<ForeignKeyIndex<?>>> keys) {
+          if (!keys.iterator().hasNext()) {
             return ImmutableMap.of();
           }
           Class<? extends EppResource> resourceClass =
               RESOURCE_CLASS_TO_FKI_CLASS.inverse().get(keys.iterator().next().getKind());
           ImmutableSet<String> foreignKeys =
-              keys.stream().map(v -> v.getSqlKey().toString()).collect(toImmutableSet());
+              Streams.stream(keys).map(v -> v.getSqlKey().toString()).collect(toImmutableSet());
           ImmutableSet<VKey<ForeignKeyIndex<?>>> typedKeys = ImmutableSet.copyOf(keys);
           ImmutableMap<String, ? extends ForeignKeyIndex<? extends EppResource>> existingFkis =
               loadIndexesFromStore(resourceClass, foreignKeys, false, true);
diff --git a/core/src/main/java/google/registry/model/tld/Registry.java b/core/src/main/java/google/registry/model/tld/Registry.java
index 34e116048..cbfab4875 100644
--- a/core/src/main/java/google/registry/model/tld/Registry.java
+++ b/core/src/main/java/google/registry/model/tld/Registry.java
@@ -277,7 +277,7 @@ public class Registry extends ImmutableObject
                 }
 
                 @Override
-                public Map<String, Optional<Registry>> loadAll(Set<? extends String> tlds) {
+                public Map<String, Optional<Registry>> loadAll(Iterable<? extends String> tlds) {
                   ImmutableMap<String, VKey<Registry>> keysMap =
                       toMap(ImmutableSet.copyOf(tlds), Registry::createVKey);
                   Map<VKey<? extends Registry>, Registry> entities =