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

Fix Java 7 type inference issue in ExpandRecurringBillingEvents

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166478634
This commit is contained in:
mcilwain 2017-08-25 08:19:45 -07:00 • committed by Ben McIlwain
parent 4a81236652
commit d011b8e073
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
java/google/registry/batch/ExpandRecurringBillingEventsAction.java
View file

@ -44,6 +44,7 @@ import com.googlecode.objectify.VoidWork;
import com.googlecode.objectify.Work; import com.googlecode.objectify.Work;
import google.registry.mapreduce.MapreduceRunner; import google.registry.mapreduce.MapreduceRunner;
import google.registry.mapreduce.inputs.NullInput; import google.registry.mapreduce.inputs.NullInput;
import google.registry.model.EppResource;
import google.registry.model.ImmutableObject; import google.registry.model.ImmutableObject;
import google.registry.model.billing.BillingEvent; import google.registry.model.billing.BillingEvent;
import google.registry.model.billing.BillingEvent.Flag; import google.registry.model.billing.BillingEvent.Flag;
@ -174,9 +175,9 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
final ImmutableSet<DateTime> billingTimes = final ImmutableSet<DateTime> billingTimes =
getBillingTimesInScope(eventTimes, cursorTime, executeTime, tld); getBillingTimesInScope(eventTimes, cursorTime, executeTime, tld);
Iterable<OneTime> oneTimesForDomain = ofy().load() Key<? extends EppResource> domainKey = recurring.getParentKey().getParent();
.type(OneTime.class) Iterable<OneTime> oneTimesForDomain =
.ancestor(recurring.getParentKey().getParent()); ofy().load().type(OneTime.class).ancestor(domainKey);
// Determine the billing times that already have OneTime events persisted. // Determine the billing times that already have OneTime events persisted.
ImmutableSet<DateTime> existingBillingTimes = ImmutableSet<DateTime> existingBillingTimes =
@ -192,7 +193,7 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
.setBySuperuser(false) .setBySuperuser(false)
.setClientId(recurring.getClientId()) .setClientId(recurring.getClientId())
.setModificationTime(DateTime.now(DateTimeZone.UTC)) .setModificationTime(DateTime.now(DateTimeZone.UTC))
.setParent(recurring.getParentKey().getParent()) .setParent(domainKey)
.setPeriod(Period.create(1, YEARS)) .setPeriod(Period.create(1, YEARS))
.setReason("Domain autorenewal by ExpandRecurringBillingEventsAction") .setReason("Domain autorenewal by ExpandRecurringBillingEventsAction")
.setRequestedByRegistrar(false) .setRequestedByRegistrar(false)