mirror of
https://github.com/google/nomulus.git
synced 2025-05-17 17:59:41 +02:00
Add LRP TLD states to Registry and *_tld tools
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:
parent
751df4b488
commit
1ef8716177
10 changed files with 259 additions and 2 deletions
|
@ -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.
|
||||
|
|
|
@ -35,6 +35,7 @@ import google.registry.model.registry.Registry.TldState;
|
|||
import google.registry.model.registry.Registry.TldType;
|
||||
import google.registry.model.registry.label.PremiumList;
|
||||
import google.registry.tools.params.OptionalStringParameter;
|
||||
import google.registry.tools.params.TldStateParameter;
|
||||
import google.registry.tools.params.TransitionListParameter.BillingCostTransitions;
|
||||
import google.registry.tools.params.TransitionListParameter.TldStateTransitions;
|
||||
import java.util.List;
|
||||
|
@ -215,10 +216,16 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
|
|||
names = "--dns_writer",
|
||||
description = "The name of the DnsWriter implementation to use",
|
||||
converter = OptionalStringParameter.class,
|
||||
validateWith = OptionalStringParameter.class
|
||||
)
|
||||
validateWith = OptionalStringParameter.class)
|
||||
Optional<String> dnsWriter;
|
||||
|
||||
@Nullable
|
||||
@Parameter(
|
||||
names = "--lrp_tld_states",
|
||||
converter = TldStateParameter.class,
|
||||
description = "A comma-separated list of TLD states for which LRP is available")
|
||||
List<TldState> lrpTldStates;
|
||||
|
||||
/** Returns the existing registry (for update) or null (for creates). */
|
||||
@Nullable
|
||||
abstract Registry getOldRegistry(String tld);
|
||||
|
@ -385,6 +392,10 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
|
|||
}
|
||||
}
|
||||
|
||||
if (lrpTldStates != null) {
|
||||
builder.setLrpTldStates(ImmutableSet.copyOf(lrpTldStates));
|
||||
}
|
||||
|
||||
ImmutableSet<String> newReservedListNames = getReservedLists(oldRegistry);
|
||||
checkReservedListValidityForTld(tld, newReservedListNames);
|
||||
builder.setReservedListsByName(newReservedListNames);
|
||||
|
|
30
java/google/registry/tools/params/EnumParameter.java
Normal file
30
java/google/registry/tools/params/EnumParameter.java
Normal file
|
@ -0,0 +1,30 @@
|
|||
// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package google.registry.tools.params;
|
||||
|
||||
import google.registry.util.TypeUtils.TypeInstantiator;
|
||||
|
||||
/** Base class for Enum-based parameters.
|
||||
*
|
||||
* <p>This is not necessary for single-value Enum parameters (i.e. arity = 1) as JCommander natively
|
||||
* supports them, but is necessary for variable-arity ({@code List<Enum>}) parameters.
|
||||
*/
|
||||
public abstract class EnumParameter<T extends Enum<T>> extends ParameterConverterValidator<T> {
|
||||
|
||||
@Override
|
||||
public T convert(String value) {
|
||||
return Enum.<T>valueOf(new TypeInstantiator<T>(getClass()){}.getExactType(), value);
|
||||
}
|
||||
}
|
23
java/google/registry/tools/params/TldStateParameter.java
Normal file
23
java/google/registry/tools/params/TldStateParameter.java
Normal file
|
@ -0,0 +1,23 @@
|
|||
// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package google.registry.tools.params;
|
||||
|
||||
import google.registry.model.registry.Registry.TldState;
|
||||
|
||||
/**
|
||||
* {@link TldState} CLI parameter converter/validator. Required to support multi-value
|
||||
* TldState parameters.
|
||||
*/
|
||||
public final class TldStateParameter extends EnumParameter<TldState> {}
|
Loading…
Add table
Add a link
Reference in a new issue