Change lrpTldStates to Interval

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=135957698

java/google/registry/flows/domain/BaseDomainCreateFlow.java

@@ -201,7 +201,8 @@ public abstract class BaseDomainCreateFlow<R extends DomainBase, B extends Build
     isAnchorTenantViaReservation = matchesAnchorTenantReservation(
         domainLabel, tld, command.getAuthInfo().getPw().getValue());
     boolean isLrpApplication =
-        registry.getLrpTldStates().contains(tldState)
+        registry.getLrpPeriod() != null
+            && registry.getLrpPeriod().contains(now)
             && !command.getAuthInfo().getPw().getValue().isEmpty()
             && !isAnchorTenantViaReservation;
     lrpToken = isLrpApplication

java/google/registry/model/ofy/ObjectifyService.java

@@ -121,15 +121,15 @@ public class ObjectifyService {
   /** Register translators that allow less common types to be stored directly in Datastore. */
   private static void registerTranslators() {
     for (TranslatorFactory<?> translatorFactory : Arrays.asList(
-        new ReadableInstantUtcTranslatorFactory(),
         new CidrAddressBlockTranslatorFactory(),
+        new CommitLogRevisionsTranslatorFactory(),
+        new CreateAutoTimestampTranslatorFactory(),
         new CurrencyUnitTranslatorFactory(),
         new DurationTranslatorFactory(),
         new InetAddressTranslatorFactory(),
         new MoneyStringTranslatorFactory(),
-        new CreateAutoTimestampTranslatorFactory(),
-        new UpdateAutoTimestampTranslatorFactory(),
-        new CommitLogRevisionsTranslatorFactory())) {
+        new ReadableInstantUtcTranslatorFactory(),
+        new UpdateAutoTimestampTranslatorFactory())) {
       factory().getTranslators().add(translatorFactory);
     }
   }

java/google/registry/model/registry/Registry.java

@@ -62,10 +62,12 @@ import google.registry.model.registry.label.PremiumList;
 import google.registry.model.registry.label.ReservedList;
 import google.registry.util.Idn;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.joda.money.CurrencyUnit;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
+import org.joda.time.Interval;
 
 /** Persisted per-TLD configuration data. */
 @Cache(expirationSeconds = RECOMMENDED_MEMCACHE_EXPIRATION)
@@ -368,15 +370,26 @@ public class Registry extends ImmutableObject implements Buildable {
   /** The end of the claims period (at or after this time, claims no longer applies). */
   DateTime claimsPeriodEnd = END_OF_TIME;
 
+  /**
+   * The (inclusive) start {@link DateTime} of LRP. This (and lrpPeriodEnd) exist for serialization
+   * purposes, though everything else that interacts with the LRP period should use getLrpPeriod()
+   * and setLrpPeriod(), which uses an {@link Interval}.
+   */
+  DateTime lrpPeriodStart;
+
+  /**
+   * The (exclusive) end {@link DateTime} of LRP. This (and lrpPeriodStart) exist for serialization
+   * purposes, though everything else that interacts with the LRP period should use getLrpPeriod()
+   * and setLrpPeriod(), which uses an {@link Interval}.
+   */
+  DateTime lrpPeriodEnd;
+
   /** A whitelist of clients allowed to be used on domains on this TLD (ignored if empty). */
   Set<String> allowedRegistrantContactIds;
 
   /** 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;
   }
@@ -558,8 +571,11 @@ public class Registry extends ImmutableObject implements Buildable {
     return nullToEmptyImmutableCopy(allowedFullyQualifiedHostNames);
   }
 
-  public ImmutableSet<TldState> getLrpTldStates() {
-    return nullToEmptyImmutableCopy(lrpTldStates);
+  @Nullable
+  public Interval getLrpPeriod() {
+    return (lrpPeriodStart == null && lrpPeriodEnd == null)
+        ? null
+        : new Interval(lrpPeriodStart, lrpPeriodEnd);
   }
 
   @Override
@@ -818,8 +834,9 @@ public class Registry extends ImmutableObject implements Buildable {
       return this;
     }
 
-    public Builder setLrpTldStates(ImmutableSet<TldState> lrpTldStates) {
-      getInstance().lrpTldStates = lrpTldStates;
+    public Builder setLrpPeriod(@Nullable Interval lrpPeriod) {
+      getInstance().lrpPeriodStart = (lrpPeriod == null ? null : lrpPeriod.getStart());
+      getInstance().lrpPeriodEnd = (lrpPeriod == null ? null : lrpPeriod.getEnd());
       return this;
     }
 
@@ -840,10 +857,6 @@ 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.

java/google/registry/tools/CreateOrUpdateTldCommand.java

@@ -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);

java/google/registry/tools/params/IntervalParameter.java

@@ -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));
+  }
+}

java/google/registry/tools/params/OptionalIntervalParameter.java

@@ -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> {}

java/google/registry/tools/params/ParameterFactory.java

@@ -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)