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

Clean up BillingEvent.Reason.AUTO_RENEW and scraps

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=138903021
This commit is contained in:
ctingue 2016-11-11 12:01:44 -08:00 • committed by Ben McIlwain
parent 0af09d264f
commit 1b6f2f82cd
4 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
java/google/registry/env/common/tools/WEB-INF/web.xml vendored
View file

@ -72,7 +72,6 @@
<url-pattern>/_dr/task/resaveAllEppResources</url-pattern>
</servlet-mapping>
<!-- Mapreduce to delete EppResources, children, and indices. -->
<servlet-mapping>
<servlet-name>tools-servlet</servlet-name>

13
java/google/registry/model/billing/BillingEvent.java
View file

@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkState;
import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.util.CollectionUtils.forceEmptyToNull;
import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
import static google.registry.util.CollectionUtils.union;
import static google.registry.util.DateTimeUtils.END_OF_TIME;
import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
@ -34,7 +33,6 @@ import com.googlecode.objectify.annotation.Entity;
import com.googlecode.objectify.annotation.Id;
import com.googlecode.objectify.annotation.IgnoreSave;
import com.googlecode.objectify.annotation.Index;
import com.googlecode.objectify.annotation.OnLoad;
import com.googlecode.objectify.annotation.Parent;
import com.googlecode.objectify.condition.IfNull;
import google.registry.model.Buildable;
@ -56,8 +54,6 @@ public abstract class BillingEvent extends ImmutableObject
/** The reason for the bill, which maps 1:1 to skus in go/registry-billing-skus. */
public enum Reason {
// TODO(b/27777398): Drop Reason.AUTO_RENEW after migration to Flag.AUTO_RENEW.
AUTO_RENEW,
CREATE,
@Deprecated // TODO(b/31676071): remove this legacy value once old data is cleaned up.
ERROR,
@ -335,15 +331,6 @@ public abstract class BillingEvent extends ImmutableObject
@Entity
public static class Recurring extends BillingEvent {
// TODO(b/27777398): Remove after migration is complete and Reason.AUTO_RENEW is removed.
@OnLoad
void setAutorenewFlag() {
if (Reason.AUTO_RENEW.equals(reason)) {
reason = Reason.RENEW;
flags = union(getFlags(), Flag.AUTO_RENEW);
}
}
/**
* The billing event recurs every year between {@link #eventTime} and this time on the
* [month, day, time] specified in {@link #recurrenceTimeOfYear}.

4
javatests/google/registry/mapreduce/inputs/ChildEntityInputTest.java
View file

@ -120,7 +120,7 @@ public class ChildEntityInputTest {
recurringA = persistResource(
new BillingEvent.Recurring.Builder()
.setParent(domainHistoryEntryA)
.setReason(Reason.AUTO_RENEW)
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
.setRecurrenceEndTime(END_OF_TIME)
.setClientId("TheRegistrar")
@ -150,7 +150,7 @@ public class ChildEntityInputTest {
recurringB = persistResource(
new BillingEvent.Recurring.Builder()
.setParent(domainHistoryEntryA)
.setReason(Reason.AUTO_RENEW)
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
.setRecurrenceEndTime(END_OF_TIME)
.setClientId("TheRegistrar")

2
javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java
View file

@ -129,7 +129,7 @@ public class KillAllEppResourcesActionTest extends MapreduceTestCase<KillAllEppR
.setEventTime(START_OF_TIME)
.setClientId("")
.setTargetId("")
.setReason(Reason.AUTO_RENEW)
.setReason(Reason.RENEW)
.build())) {
persistResource(descendant);
}