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

Change lrpTldStates to Interval

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=135957698
This commit is contained in:
ctingue 2016-10-12 13:51:28 -07:00 • committed by Ben McIlwain
parent edbb8985e6
commit 4e0b6d36c4
13 changed files with 232 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

8
java/google/registry/model/ofy/ObjectifyService.java
View file

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

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

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