mirror of
https://github.com/google/nomulus.git
synced 2025-06-28 23:33:36 +02:00
Change lrpTldStates to Interval
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=135957698
This commit is contained in:
parent
edbb8985e6
commit
4e0b6d36c4
13 changed files with 232 additions and 131 deletions
|
@ -32,8 +32,8 @@ import google.registry.model.registry.Registry;
|
|||
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.OptionalIntervalParameter;
|
||||
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;
|
||||
|
@ -45,6 +45,7 @@ import javax.inject.Named;
|
|||
import org.joda.money.Money;
|
||||
import org.joda.time.DateTime;
|
||||
import org.joda.time.Duration;
|
||||
import org.joda.time.Interval;
|
||||
|
||||
/** Shared base class for commands to create or update a TLD. */
|
||||
abstract class CreateOrUpdateTldCommand extends MutatingCommand {
|
||||
|
@ -220,10 +221,12 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
|
|||
|
||||
@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;
|
||||
names = "--lrp_period",
|
||||
description =
|
||||
"LRP period (in ISO-8601 format, e.g. 2004-06-09T12:30:00Z/2004-07-10T13:30:00Z",
|
||||
converter = OptionalIntervalParameter.class,
|
||||
validateWith = OptionalIntervalParameter.class)
|
||||
private Optional<Interval> lrpPeriod;
|
||||
|
||||
/** Returns the existing registry (for update) or null (for creates). */
|
||||
@Nullable
|
||||
|
@ -391,8 +394,8 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
|
|||
}
|
||||
}
|
||||
|
||||
if (lrpTldStates != null) {
|
||||
builder.setLrpTldStates(ImmutableSet.copyOf(lrpTldStates));
|
||||
if (lrpPeriod != null) {
|
||||
builder.setLrpPeriod(lrpPeriod.orNull());
|
||||
}
|
||||
|
||||
ImmutableSet<String> newReservedListNames = getReservedLists(oldRegistry);
|
||||
|
|
41
java/google/registry/tools/params/IntervalParameter.java
Normal file
41
java/google/registry/tools/params/IntervalParameter.java
Normal file
|
@ -0,0 +1,41 @@
|
|||
// Copyright 2016 The Nomulus 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 org.joda.time.DateTimeZone;
|
||||
import org.joda.time.Interval;
|
||||
|
||||
/** Interval CLI parameter converter/validator. */
|
||||
public final class IntervalParameter extends ParameterConverterValidator<Interval> {
|
||||
|
||||
public IntervalParameter() {
|
||||
super("not an ISO-8601 interval (e.g. 2004-06-09T12:30:00Z/2004-07-10T13:30:00Z)");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Interval convert(String value) {
|
||||
// Interval.parse(null) creates an interval with both start and end times set to now.
|
||||
// Do something a little more reasonable.
|
||||
if (value == null) {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
Interval interval = Interval.parse(value);
|
||||
// Interval does not have a way to set the time zone, so create a new interval with the
|
||||
// start and end times of the parsed interval converted to UTC.
|
||||
return new Interval(
|
||||
interval.getStart().withZone(DateTimeZone.UTC),
|
||||
interval.getEnd().withZone(DateTimeZone.UTC));
|
||||
}
|
||||
}
|
|
@ -0,0 +1,21 @@
|
|||
// Copyright 2016 The Nomulus 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 org.joda.time.Interval;
|
||||
|
||||
/** Optional wrapper for IntervalParameter. */
|
||||
public final class OptionalIntervalParameter
|
||||
extends OptionalParameterConverterValidator<Interval, IntervalParameter> {}
|
|
@ -26,6 +26,7 @@ import javax.annotation.Nullable;
|
|||
import org.joda.money.Money;
|
||||
import org.joda.time.DateTime;
|
||||
import org.joda.time.Duration;
|
||||
import org.joda.time.Interval;
|
||||
import org.joda.time.LocalDate;
|
||||
import org.joda.time.YearMonth;
|
||||
|
||||
|
@ -46,6 +47,7 @@ public final class ParameterFactory implements IStringConverterFactory {
|
|||
.put(Duration.class, DurationParameter.class)
|
||||
.put(HostAndPort.class, HostAndPortParameter.class)
|
||||
.put(InternetDomainName.class, InternetDomainNameParameter.class)
|
||||
.put(Interval.class, IntervalParameter.class)
|
||||
.put(Level.class, LoggingLevelParameter.class)
|
||||
.put(LocalDate.class, LocalDateParameter.class)
|
||||
.put(Money.class, MoneyParameter.class)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue