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

Add LRP TLD states to Registry and *_tld tools

Browse source 
Also had to add an EnumParameter class to support
List<T extends Enum<T>>, as these aren't natively supported by
JCommander (although single Enum parameters are.)

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=129464699
This commit is contained in:
Chris Tingue 2016-08-05 11:39:06 -07:00 • committed by Justine Tunney
parent 751df4b488
commit 1ef8716177
10 changed files with 259 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
java/google/registry/model/registry/Registry.java
View file

@ -398,6 +398,9 @@ public class Registry extends ImmutableObject implements Buildable {
/** A whitelist of hosts allowed to be used on domains on this TLD (ignored if empty). */
Set<String> allowedFullyQualifiedHostNames;
/** The set of {@link TldState}s for which LRP applications are accepted (ignored if empty). */
Set<TldState> lrpTldStates;
public String getTldStr() {
return tldStr;
}
@ -575,6 +578,10 @@ public class Registry extends ImmutableObject implements Buildable {
return nullToEmptyImmutableCopy(allowedFullyQualifiedHostNames);
}
public ImmutableSet<TldState> getLrpTldStates() {
return nullToEmptyImmutableCopy(lrpTldStates);
}
@Override
public Builder asBuilder() {
return new Builder(clone(this));
@ -831,6 +838,11 @@ public class Registry extends ImmutableObject implements Buildable {
return this;
}
public Builder setLrpTldStates(ImmutableSet<TldState> lrpTldStates) {
getInstance().lrpTldStates = lrpTldStates;
return this;
}
@Override
public Registry build() {
final Registry instance = getInstance();
@ -848,6 +860,10 @@ public class Registry extends ImmutableObject implements Buildable {
// cloned it into a new builder, to block re-building a Registry in an invalid state.
instance.tldStateTransitions.checkValidity();
instance.renewBillingCostTransitions.checkValidity();
checkArgument(
instance.tldStateTransitions.toValueMap().values()
.containsAll(instance.getLrpTldStates()),
"Cannot specify an LRP TLD state that is not part of the TLD state transitions.");
instance.eapFeeSchedule.checkValidity();
// All costs must be in the expected currency.
// TODO(b/21854155): When we move PremiumList into datastore, verify its currency too.