Consolidate expand billing events action into 'batch' package

Now it lives alongside the delete prober data action, as well as any future
batch/maintenance tasks that should run periodically.

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

javatests/google/registry/batch/BUILD

@@ -9,23 +9,34 @@ load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules")
 
 
 java_library(
-    name = "billing",
+    name = "batch",
     srcs = glob(["*.java"]),
     deps = [
         "//java/com/google/common/base",
         "//java/com/google/common/collect",
+        "//java/com/google/common/io",
+        "//java/com/google/common/net",
         "//third_party/java/appengine:appengine-api-testonly",
-        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
+        "//third_party/java/appengine:appengine-stubs",
+        "//third_party/java/appengine_gcs_client",
+        "//third_party/java/dagger",
         "//third_party/java/joda_money",
         "//third_party/java/joda_time",
+        "//third_party/java/jsr305_annotations",
         "//third_party/java/junit",
+        "//third_party/java/mockito",
         "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/java/re2j",
+        "//third_party/java/servlet/servlet_api",
         "//third_party/java/truth",
-        "//java/google/registry/billing",
+        "//java/google/registry/batch",
+        "//java/google/registry/config",
+        "//java/google/registry/gcs",
+        "//java/google/registry/groups",
         "//java/google/registry/mapreduce",
         "//java/google/registry/model",
+        "//java/google/registry/request",
         "//java/google/registry/util",
-        "//javatests/google/registry/model",
         "//javatests/google/registry/testing",
         "//javatests/google/registry/testing/mapreduce",
     ],
@@ -36,5 +47,5 @@ GenTestRules(
     default_test_size = "medium",
     shard_count = 3,
     test_files = glob(["*Test.java"]),
-    deps = [":billing"],
+    deps = [":batch"],
 )

javatests/google/registry/batch/DeleteProberDataActionTest.java

@@ -0,0 +1,176 @@
+// 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.batch;
+
+import static com.google.common.truth.Truth.assertThat;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.testing.DatastoreHelper.createTld;
+import static google.registry.testing.DatastoreHelper.persistActiveDomain;
+import static google.registry.testing.DatastoreHelper.persistDeletedDomain;
+import static google.registry.testing.DatastoreHelper.persistResource;
+import static google.registry.testing.DatastoreHelper.persistSimpleResource;
+import static google.registry.util.DateTimeUtils.START_OF_TIME;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableSet;
+import com.googlecode.objectify.Key;
+import google.registry.mapreduce.MapreduceRunner;
+import google.registry.model.ImmutableObject;
+import google.registry.model.billing.BillingEvent;
+import google.registry.model.billing.BillingEvent.Reason;
+import google.registry.model.domain.DomainResource;
+import google.registry.model.index.EppResourceIndex;
+import google.registry.model.index.ForeignKeyIndex;
+import google.registry.model.poll.PollMessage;
+import google.registry.model.registry.Registry;
+import google.registry.model.registry.Registry.TldType;
+import google.registry.model.reporting.HistoryEntry;
+import google.registry.testing.ExceptionRule;
+import google.registry.testing.FakeResponse;
+import google.registry.testing.mapreduce.MapreduceTestCase;
+import java.util.Set;
+import org.joda.money.Money;
+import org.joda.time.DateTime;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Unit tests for {@link DeleteProberDataAction}. */
+@RunWith(JUnit4.class)
+public class DeleteProberDataActionTest extends MapreduceTestCase<DeleteProberDataAction> {
+
+  private static final DateTime DELETION_TIME = DateTime.parse("2010-01-01T00:00:00.000Z");
+
+  @Rule
+  public final ExceptionRule thrown = new ExceptionRule();
+
+  @Before
+  public void init() {
+    // Entities in these two should not be touched.
+    createTld("tld", "TLD");
+    // Since "example" doesn't end with .test, its entities won't be deleted even though it is of
+    // TEST type.
+    createTld("example", "EXAMPLE");
+    persistResource(Registry.get("example").asBuilder().setTldType(TldType.TEST).build());
+
+    // Entities in these two should be deleted.
+    createTld("ib-any.test", "IBANYT");
+    persistResource(Registry.get("ib-any.test").asBuilder().setTldType(TldType.TEST).build());
+    createTld("oa-canary.test", "OACANT");
+    persistResource(Registry.get("oa-canary.test").asBuilder().setTldType(TldType.TEST).build());
+
+    action = new DeleteProberDataAction();
+    action.mrRunner = new MapreduceRunner(Optional.<Integer>of(5), Optional.<Integer>absent());
+    action.response = new FakeResponse();
+    action.isDryRun = false;
+  }
+
+  private void runMapreduce() throws Exception {
+    action.run();
+    executeTasksUntilEmpty("mapreduce");
+  }
+
+  @Test
+  public void test_deletesAllAndOnlyProberData() throws Exception {
+    Set<ImmutableObject> tldEntities = persistLotsOfDomains("tld");
+    Set<ImmutableObject> exampleEntities = persistLotsOfDomains("example");
+    Set<ImmutableObject> ibEntities = persistLotsOfDomains("ib-any.test");
+    Set<ImmutableObject> oaEntities = persistLotsOfDomains("oa-canary.test");
+    runMapreduce();
+    assertNotDeleted(tldEntities);
+    assertNotDeleted(exampleEntities);
+    assertDeleted(ibEntities);
+    assertDeleted(oaEntities);
+  }
+
+  @Test
+  public void testSuccess_doesntDeleteNicDomainForProbers() throws Exception {
+    DomainResource nic = persistActiveDomain("nic.ib-any.test");
+    ForeignKeyIndex<DomainResource> fkiNic =
+        ForeignKeyIndex.load(DomainResource.class, "nic.ib-any.test", START_OF_TIME);
+    Set<ImmutableObject> ibEntities = persistLotsOfDomains("ib-any.test");
+    runMapreduce();
+    assertDeleted(ibEntities);
+    assertNotDeleted(ImmutableSet.<ImmutableObject>of(nic, fkiNic));
+  }
+
+  @Test
+  public void testSuccess_dryRunDoesntDeleteData() throws Exception {
+    Set<ImmutableObject> tldEntities = persistLotsOfDomains("tld");
+    Set<ImmutableObject> oaEntities = persistLotsOfDomains("oa-canary.test");
+    action.isDryRun = true;
+    assertNotDeleted(tldEntities);
+    assertNotDeleted(oaEntities);
+  }
+
+  /**
+   * Persists and returns a domain and a descendant history entry, billing event, and poll message,
+   * along with the ForeignKeyIndex and EppResourceIndex.
+   */
+  private static Set<ImmutableObject> persistDomainAndDescendants(String fqdn) {
+    DomainResource domain = persistDeletedDomain(fqdn, DELETION_TIME);
+    HistoryEntry historyEntry = persistSimpleResource(
+        new HistoryEntry.Builder()
+            .setParent(domain)
+            .setType(HistoryEntry.Type.DOMAIN_CREATE)
+            .build());
+    BillingEvent.OneTime billingEvent = persistSimpleResource(
+        new BillingEvent.OneTime.Builder()
+            .setParent(historyEntry)
+            .setBillingTime(DELETION_TIME.plusYears(1))
+            .setCost(Money.parse("USD 10"))
+            .setPeriodYears(1)
+            .setReason(Reason.CREATE)
+            .setClientId("TheRegistrar")
+            .setEventTime(DELETION_TIME)
+            .setTargetId(fqdn)
+            .build());
+    PollMessage.OneTime pollMessage = persistSimpleResource(
+        new PollMessage.OneTime.Builder()
+            .setParent(historyEntry)
+            .setEventTime(DELETION_TIME)
+            .setClientId("TheRegistrar")
+            .setMsg("Domain registered")
+            .build());
+    ForeignKeyIndex<DomainResource> fki =
+        ForeignKeyIndex.load(DomainResource.class, fqdn, START_OF_TIME);
+    EppResourceIndex eppIndex =
+        ofy().load().entity(EppResourceIndex.create(Key.create(domain))).now();
+    return ImmutableSet.<ImmutableObject>of(
+        domain, historyEntry, billingEvent, pollMessage, fki, eppIndex);
+  }
+
+  private static Set<ImmutableObject> persistLotsOfDomains(String tld) {
+    ImmutableSet.Builder<ImmutableObject> persistedObjects = new ImmutableSet.Builder<>();
+    for (int i = 0; i < 20; i++) {
+      persistedObjects.addAll(persistDomainAndDescendants(String.format("domain%d.%s", i, tld)));
+    }
+    return persistedObjects.build();
+  }
+
+  private static void assertNotDeleted(Iterable<ImmutableObject> entities) {
+    for (ImmutableObject entity : entities) {
+      assertThat(ofy().load().entity(entity).now()).isNotNull();
+    }
+  }
+
+  private static void assertDeleted(Iterable<ImmutableObject> entities) {
+    for (ImmutableObject entity : entities) {
+      assertThat(ofy().load().entity(entity).now()).isNull();
+    }
+  }
+}

javatests/google/registry/batch/ExpandRecurringBillingEventsActionTest.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package google.registry.billing;
+package google.registry.batch;
 
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.model.common.Cursor.CursorType.RECURRING_BILLING;
@@ -96,7 +96,7 @@ public class ExpandRecurringBillingEventsActionTest
         ofy().save().entity(Cursor.createGlobal(RECURRING_BILLING, cursorTime));
       }});
   }
-  
+
   void runMapreduce() throws Exception {
     action.response = new FakeResponse();
     action.run();
@@ -369,7 +369,7 @@ public class ExpandRecurringBillingEventsActionTest
         .setCancellationMatchingBillingEvent(Key.create(recurring))
         .setTargetId(domain.getFullyQualifiedDomainName())
         .build();
-    assertBillingEventsForResource(domain, expected, recurring); 
+    assertBillingEventsForResource(domain, expected, recurring);
     assertCursorAt(clock.nowUtc());
   }
 
@@ -379,7 +379,7 @@ public class ExpandRecurringBillingEventsActionTest
     // Simulate a quick second run of the mapreduce (this should be a no-op).
     saveCursor(clock.nowUtc().minusSeconds(1));
     runMapreduce();
-    assertBillingEventsForResource(domain, recurring); 
+    assertBillingEventsForResource(domain, recurring);
     assertCursorAt(clock.nowUtc());
   }
 
@@ -419,7 +419,7 @@ public class ExpandRecurringBillingEventsActionTest
           .setTargetId(domain.getFullyQualifiedDomainName())
           .build());
     }
-    assertBillingEventsForResource(domain, Iterables.toArray(expectedEvents, BillingEvent.class)); 
+    assertBillingEventsForResource(domain, Iterables.toArray(expectedEvents, BillingEvent.class));
     assertCursorAt(clock.nowUtc());
   }
 
@@ -449,7 +449,7 @@ public class ExpandRecurringBillingEventsActionTest
           .setTargetId(domain.getFullyQualifiedDomainName())
           .build());
     }
-    assertBillingEventsForResource(domain, Iterables.toArray(expectedEvents, BillingEvent.class)); 
+    assertBillingEventsForResource(domain, Iterables.toArray(expectedEvents, BillingEvent.class));
     assertCursorAt(clock.nowUtc());
   }
 
@@ -606,7 +606,7 @@ public class ExpandRecurringBillingEventsActionTest
         .setCancellationMatchingBillingEvent(Key.create(recurring))
         .setTargetId(domain.getFullyQualifiedDomainName())
         .build();
-    assertBillingEventsForResource(domain, expected, recurring); 
+    assertBillingEventsForResource(domain, expected, recurring);
     assertCursorAt(clock.nowUtc());
   }
 
@@ -645,7 +645,7 @@ public class ExpandRecurringBillingEventsActionTest
         .setBillingTime(billingDate.plusYears(1))
         .setEventTime(eventDate.plusYears(1))
         .build();
-    assertBillingEventsForResource(domain, recurring, cheaper, expensive); 
+    assertBillingEventsForResource(domain, recurring, cheaper, expensive);
     assertCursorAt(clock.nowUtc());
   }