mirror of
https://github.com/google/nomulus.git
synced 2025-05-13 07:57:13 +02:00
Change second-level domain name to fully-qualified domain name
Second-level domain name isn't accurate because we support multi-part TLDs, so standardize on the "fullyQualifiedDomainName" name that is used throughout the code base. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=122693009
This commit is contained in:
parent
ca0e546230
commit
a2d2764115
14 changed files with 58 additions and 49 deletions
|
@ -17,7 +17,7 @@ package google.registry.pricing;
|
|||
import static com.google.common.base.Preconditions.checkArgument;
|
||||
import static com.google.common.base.Preconditions.checkState;
|
||||
import static google.registry.model.registry.Registries.assertTldExists;
|
||||
import static google.registry.util.DomainNameUtils.getTldFromSld;
|
||||
import static google.registry.util.DomainNameUtils.getTldFromDomainName;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.base.Optional;
|
||||
|
@ -74,7 +74,7 @@ public final class PricingEngineProxy {
|
|||
getPremiumPriceForDomainName(
|
||||
InternetDomainName.from(domainName), priceTime, clientIdentifier);
|
||||
return annualCost
|
||||
.or(Registry.get(getTldFromSld(domainName)).getStandardCreateCost())
|
||||
.or(Registry.get(getTldFromDomainName(domainName)).getStandardCreateCost())
|
||||
.multipliedBy(years);
|
||||
}
|
||||
|
||||
|
@ -86,7 +86,7 @@ public final class PricingEngineProxy {
|
|||
getPremiumPriceForDomainName(
|
||||
InternetDomainName.from(domainName), priceTime, clientIdentifier);
|
||||
return annualCost
|
||||
.or(Registry.get(getTldFromSld(domainName)).getStandardRenewCost(priceTime))
|
||||
.or(Registry.get(getTldFromDomainName(domainName)).getStandardRenewCost(priceTime))
|
||||
.multipliedBy(years);
|
||||
}
|
||||
|
||||
|
@ -96,7 +96,7 @@ public final class PricingEngineProxy {
|
|||
*/
|
||||
private static Optional<Money> getPremiumPriceForDomainName(
|
||||
InternetDomainName domainName, DateTime priceTime, String clientIdentifier) {
|
||||
String tld = assertTldExists(getTldFromSld(domainName));
|
||||
String tld = assertTldExists(getTldFromDomainName(domainName));
|
||||
String clazz = Registry.get(tld).getPricingEngineClassName();
|
||||
PricingEngine engine = pricingEngines.get(clazz);
|
||||
checkState(engine != null, "Could not load pricing engine %s for TLD %s", clazz, tld);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue