mirror of
https://github.com/google/nomulus
synced 2026-08-17 20:56:10 +00:00
Extract premium pricing to a PricingEngine interface
This refactors the existing premium list functionality into the new class StaticPremiumListPricingEngine, which implements PricingEngine. A backfill @OnLoad is provided to default existing Registry entities into the static implementation. For now there is just this one implementation. Dagger map multibinding is used to generate the total set of allowed pricing engines, and allows other parties to plug in their own implementations. The pricing engine is a required field on the Registry object. If you don't want a particular Registry to actually have a premium list, then use the static pricing engine but don't actually set a premium list. A subsequent CL will refactor the Key<PremiumList> field on the Registry entity class to be handled solely by the StaticPremiumListPricingEngine implementation. Going forward, all configuration and implementation details that are specific to a given pricing engine should be handled by that pricing engine, and not as fields on the Registry object. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=121850176
This commit is contained in:
@@ -49,6 +49,7 @@ java_library(
|
||||
"//java/google/registry/flows",
|
||||
"//java/google/registry/keyring/api",
|
||||
"//java/google/registry/model",
|
||||
"//java/google/registry/pricing",
|
||||
"//java/google/registry/rde",
|
||||
"//java/google/registry/security",
|
||||
"//java/google/registry/request:modules",
|
||||
|
||||
@@ -17,6 +17,7 @@ package google.registry.tools;
|
||||
import static com.google.common.base.Preconditions.checkArgument;
|
||||
import static com.google.common.base.Strings.isNullOrEmpty;
|
||||
import static google.registry.model.registry.Registries.findTldForNameOrThrow;
|
||||
import static google.registry.pricing.PricingEngineProxy.getDomainCreateCost;
|
||||
import static org.joda.time.DateTimeZone.UTC;
|
||||
|
||||
import com.google.common.net.InternetDomainName;
|
||||
@@ -25,7 +26,6 @@ import com.google.template.soy.data.SoyMapData;
|
||||
import com.beust.jcommander.Parameter;
|
||||
import com.beust.jcommander.Parameters;
|
||||
|
||||
import google.registry.model.registry.Registry;
|
||||
import google.registry.tools.Command.GtechCommand;
|
||||
import google.registry.tools.soy.CreateAnchorTenantSoyInfo;
|
||||
|
||||
@@ -81,15 +81,15 @@ final class CreateAnchorTenantCommand extends MutatingEppToolCommand implements
|
||||
@Override
|
||||
protected void initMutatingEppToolCommand() {
|
||||
checkArgument(superuser, "This command must be run as a superuser.");
|
||||
String tld = findTldForNameOrThrow(InternetDomainName.from(domainName)).toString();
|
||||
findTldForNameOrThrow(InternetDomainName.from(domainName)); // Check that the tld exists.
|
||||
if (isNullOrEmpty(password)) {
|
||||
password = passwordGenerator.createPassword(PASSWORD_LENGTH);
|
||||
}
|
||||
|
||||
Money cost = null;
|
||||
if (fee) {
|
||||
cost = Registry.get(tld)
|
||||
.getDomainCreateCost(
|
||||
cost =
|
||||
getDomainCreateCost(
|
||||
domainName, DateTime.now(UTC), clientIdentifier, DEFAULT_ANCHOR_TENANT_PERIOD_YEARS);
|
||||
}
|
||||
|
||||
|
||||
@@ -35,6 +35,7 @@ import com.google.common.collect.ImmutableSortedMap;
|
||||
import com.beust.jcommander.Parameter;
|
||||
import com.googlecode.objectify.Key;
|
||||
|
||||
import google.registry.model.pricing.StaticPremiumListPricingEngine;
|
||||
import google.registry.model.registry.Registries;
|
||||
import google.registry.model.registry.Registry;
|
||||
import google.registry.model.registry.Registry.TldState;
|
||||
@@ -259,8 +260,13 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
|
||||
"The roid suffix %s is already in use",
|
||||
roidSuffix);
|
||||
}
|
||||
Registry.Builder builder = oldRegistry == null
|
||||
? new Registry.Builder().setTldStr(tld) : oldRegistry.asBuilder();
|
||||
// TODO(b/26901539): Add a flag to set the pricing engine once we have more than one option.
|
||||
Registry.Builder builder =
|
||||
oldRegistry == null
|
||||
? new Registry.Builder()
|
||||
.setTldStr(tld)
|
||||
.setPricingEngineClass(StaticPremiumListPricingEngine.class)
|
||||
: oldRegistry.asBuilder();
|
||||
|
||||
if (escrow != null) {
|
||||
builder.setEscrowEnabled(escrow);
|
||||
|
||||
@@ -22,13 +22,10 @@ import com.beust.jcommander.Parameters;
|
||||
import google.registry.model.registry.label.PremiumList;
|
||||
import google.registry.tools.server.CreatePremiumListAction;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
/** Command to create a {@link PremiumList} on Datastore. */
|
||||
@Parameters(separators = " =", commandDescription = "Create a PremiumList in Datastore.")
|
||||
public class CreatePremiumListCommand extends CreateOrUpdatePremiumListCommand {
|
||||
|
||||
@Nullable
|
||||
@Parameter(
|
||||
names = {"-o", "--override"},
|
||||
description = "Override restrictions on premium list naming")
|
||||
|
||||
Reference in New Issue
Block a user