diff --git a/java/google/registry/model/registry/label/PremiumList.java b/java/google/registry/model/registry/label/PremiumList.java index 334cf245c..632603335 100644 --- a/java/google/registry/model/registry/label/PremiumList.java +++ b/java/google/registry/model/registry/label/PremiumList.java @@ -52,6 +52,7 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import javax.annotation.Nullable; import org.joda.money.Money; +import org.joda.time.Duration; /** * A premium list entity, persisted to Datastore, that is used to check domain label prices. @@ -193,16 +194,15 @@ public final class PremiumList extends BaseDomainLabelList, Optional> cachePremiumListEntries = - createCachePremiumListEntries(getSingletonCachePersistDuration().getMillis()); + createCachePremiumListEntries(getSingletonCachePersistDuration()); @VisibleForTesting static LoadingCache, Optional> - createCachePremiumListEntries(long cachePersistDurationMillis) { + createCachePremiumListEntries(Duration cachePersistDuration) { return CacheBuilder.newBuilder() - .expireAfterWrite(cachePersistDurationMillis, MILLISECONDS) + .expireAfterWrite(cachePersistDuration.getMillis(), MILLISECONDS) .maximumSize(getStaticPremiumListMaxCachedEntries()) .build( new CacheLoader, Optional>() { diff --git a/javatests/google/registry/model/registry/label/PremiumListUtilsTest.java b/javatests/google/registry/model/registry/label/PremiumListUtilsTest.java index 3a8545bea..5e56f0b54 100644 --- a/javatests/google/registry/model/registry/label/PremiumListUtilsTest.java +++ b/javatests/google/registry/model/registry/label/PremiumListUtilsTest.java @@ -33,6 +33,7 @@ import static google.registry.testing.DatastoreHelper.createTld; import static google.registry.testing.DatastoreHelper.loadPremiumListEntries; import static google.registry.testing.DatastoreHelper.persistPremiumList; import static google.registry.testing.DatastoreHelper.persistResource; +import static org.joda.time.Duration.standardMinutes; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -63,7 +64,8 @@ public class PremiumListUtilsTest { @Before public void before() throws Exception { // createTld() overwrites the premium list, so call it first. - PremiumList.cachePremiumListEntries = PremiumList.createCachePremiumListEntries(60); + PremiumList.cachePremiumListEntries = + PremiumList.createCachePremiumListEntries(standardMinutes(1)); createTld("tld"); PremiumList pl = persistPremiumList(