mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-01-06 21:47:31 +00:00
Code Issues Releases Wiki Activity

Enforce currency consistency for server status billing cost

Browse Source 
Also adds tests for currency consistency for other costs, and cleans
up some of the testing for negative currencies (since I was there).
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=120231198
This commit is contained in:
nickfelt
2016-04-19 08:29:27 -07:00
committed by Justine Tunney
parent c5d09227c5
commit 706f3b44ed
9 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/com/google/domain/registry/model/registry/Registry.java
View File

@@ -657,7 +657,7 @@ public class Registry extends BackupGroupRoot implements Buildable {
}
public Builder setCreateBillingCost(Money amount) {
checkArgument(amount.isPositiveOrZero(), "billing costs must be non-negative");
checkArgument(amount.isPositiveOrZero(), "create billing cost cannot be negative");
getInstance().createBillingCost = amount;
return this;
}
@@ -698,7 +698,7 @@ public class Registry extends BackupGroupRoot implements Buildable {
}
public Builder setRestoreBillingCost(Money amount) {
checkArgument(amount.isPositiveOrZero(), "billing costs must be non-negative");
checkArgument(amount.isPositiveOrZero(), "restore billing cost cannot be negative");
getInstance().restoreBillingCost = amount;
return this;
}
@@ -713,7 +713,7 @@ public class Registry extends BackupGroupRoot implements Buildable {
*/
public Builder setRenewBillingCostTransitions(
ImmutableSortedMap<DateTime, Money> renewCostsMap) {
checkNotNull(renewCostsMap, "Renew billing costs map cannot be null");
checkNotNull(renewCostsMap, "renew billing costs map cannot be null");
checkArgument(Iterables.all(
renewCostsMap.values(),
new Predicate<Money>() {
@@ -721,7 +721,7 @@ public class Registry extends BackupGroupRoot implements Buildable {
public boolean apply(Money amount) {
return amount.isPositiveOrZero();
}}),
"Renew billing costs cannot be negative");
"renew billing cost cannot be negative");
getInstance().renewBillingCostTransitions =
TimedTransitionProperty.fromValueMap(renewCostsMap, BillingCostTransition.class);
return this;
@@ -733,7 +733,8 @@ public class Registry extends BackupGroupRoot implements Buildable {
}
public Builder setServerStatusChangeBillingCost(Money amount) {
checkArgument(amount.isPositiveOrZero(), "billing costs must be non-negative");
checkArgument(
amount.isPositiveOrZero(), "server status change billing cost cannot be negative");
getInstance().serverStatusChangeBillingCost = amount;
return this;
}
@@ -785,6 +786,9 @@ public class Registry extends BackupGroupRoot implements Buildable {
checkArgument(
instance.getStandardRestoreCost().getCurrencyUnit().equals(instance.currency),
"Restore cost must be in the registry's currency");
checkArgument(
instance.getServerStatusChangeCost().getCurrencyUnit().equals(instance.currency),
"Server status change cost must be in the registry's currency");
checkArgument(
Iterables.all(
instance.getRenewBillingCostTransitions().values(),
@@ -793,7 +797,7 @@ public class Registry extends BackupGroupRoot implements Buildable {
public boolean apply(Money money) {
return money.getCurrencyUnit().equals(instance.currency);
}}),
"Renew costs must be in the registry's currency");
"Renew cost must be in the registry's currency");
instance.tldStrId = tldName;
instance.tldUnicode = Idn.toUnicode(tldName);
return super.build();