zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-13 07:57:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add extra flow logic hooks for info and update

Browse source 
This CL adds the hooks necessary to implement TLD-specific flow info and update flow logic. Usage of the hooks follows in a separate CL.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=130108832
This commit is contained in:
mountford 2016-08-12 09:41:48 -07:00 • committed by Ben McIlwain
parent e55ed209c5
commit 0066a03709
18 changed files with 397 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
java/google/registry/flows/domain/DomainFlowUtils.java
View file

@ -324,7 +324,7 @@ public class DomainFlowUtils {
throws RegistrantNotAllowedException {
ImmutableSet<String> whitelist = Registry.get(tld).getAllowedRegistrantContactIds();
// Empty whitelist or null registrantContactId are ignored.
if (registrantContactId != null && !whitelist.isEmpty()
if (registrantContactId != null && !whitelist.isEmpty()
&& !whitelist.contains(registrantContactId)) {
throw new RegistrantNotAllowedException(registrantContactId);
}
@ -576,7 +576,7 @@ public class DomainFlowUtils {
if (feeRequest.getPhase() != null || feeRequest.getSubphase() != null) {
throw new FeeChecksDontSupportPhasesException();
}
CurrencyUnit currency =
feeRequest.isCurrencySupported() ? feeRequest.getCurrency() : topLevelCurrency;
if ((currency != null) && !currency.equals(registry.getCurrency())) {
@ -620,7 +620,7 @@ public class DomainFlowUtils {
}
}
static void validateFeeChallenge(
public static void validateFeeChallenge(
String domainName,
String tld,
DateTime priceTime,
@ -664,7 +664,7 @@ public class DomainFlowUtils {
throw new CurrencyUnitMismatchException();
}
if (!feeTotal.equals(costTotal)) {
throw new FeesMismatchException();
throw new FeesMismatchException(costTotal);
}
}
@ -988,10 +988,16 @@ public class DomainFlowUtils {
}
/** The fees passed in the transform command do not match the fees that will be charged. */
static class FeesMismatchException extends ParameterValueRangeErrorException {
public static class FeesMismatchException extends ParameterValueRangeErrorException {
public FeesMismatchException() {
super("The fees passed in the transform command do not match the fees that will be charged");
}
public FeesMismatchException(Money correctFee) {
super(String.format(
"The fees passed in the transform command do not match the expected total of %s",
correctFee));
}
}
/** Registrar is not authorized to access this TLD. */