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 minor items on recurring billing expansion MR

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=126060671
This commit is contained in:
ctingue 2016-06-28 04:45:51 -07:00 • committed by Ben McIlwain
parent 372bf5718e
commit 65f920594b
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
java/google/registry/billing/ExpandRecurringBillingEventsAction.java
View file

@ -203,7 +203,12 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
getContext().incrementCounter("error: " + t.getClass().getSimpleName()); getContext().incrementCounter("error: " + t.getClass().getSimpleName());
getContext().incrementCounter(ERROR_COUNTER); getContext().incrementCounter(ERROR_COUNTER);
} }
getContext().incrementCounter("Saved OneTime billing events", billingEventsSaved); if (!isDryRun) {
getContext().incrementCounter("Saved OneTime billing events", billingEventsSaved);
} else {
getContext().incrementCounter(
"Generated OneTime billing events (dry run)", billingEventsSaved);
}
} }
/** /**
@ -236,8 +241,11 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
.filter(new Predicate<BillingEvent.OneTime>() { .filter(new Predicate<BillingEvent.OneTime>() {
@Override @Override
public boolean apply(OneTime billingEvent) { public boolean apply(OneTime billingEvent) {
return billingEvent.getCancellationMatchingBillingEvent().equals( Key<? extends BillingEvent> cancellationMatchingBillingEvent =
Key.create(recurringEvent)); billingEvent.getCancellationMatchingBillingEvent();
return cancellationMatchingBillingEvent != null
&& billingEvent.getCancellationMatchingBillingEvent().equals(
Key.create(recurringEvent));
}}) }})
.transform(new Function<OneTime, DateTime>() { .transform(new Function<OneTime, DateTime>() {
@Override @Override

2
java/google/registry/module/backend/BackendRequestComponent.java
View file

@ -21,6 +21,7 @@ import google.registry.backup.CommitLogCheckpointAction;
import google.registry.backup.DeleteOldCommitLogsAction; import google.registry.backup.DeleteOldCommitLogsAction;
import google.registry.backup.ExportCommitLogDiffAction; import google.registry.backup.ExportCommitLogDiffAction;
import google.registry.backup.RestoreCommitLogsAction; import google.registry.backup.RestoreCommitLogsAction;
import google.registry.billing.ExpandRecurringBillingEventsAction;
import google.registry.cron.CommitLogFanoutAction; import google.registry.cron.CommitLogFanoutAction;
import google.registry.cron.CronModule; import google.registry.cron.CronModule;
import google.registry.cron.TldFanoutAction; import google.registry.cron.TldFanoutAction;
@ -87,6 +88,7 @@ interface BackendRequestComponent {
DeleteHostResourceAction deleteHostResourceAction(); DeleteHostResourceAction deleteHostResourceAction();
DeleteOldCommitLogsAction deleteOldCommitLogsAction(); DeleteOldCommitLogsAction deleteOldCommitLogsAction();
DnsRefreshForHostRenameAction dnsRefreshForHostRenameAction(); DnsRefreshForHostRenameAction dnsRefreshForHostRenameAction();
ExpandRecurringBillingEventsAction expandRecurringBillingEventsAction();
ExportCommitLogDiffAction exportCommitLogDiffAction(); ExportCommitLogDiffAction exportCommitLogDiffAction();
ExportDomainListsAction exportDomainListsAction(); ExportDomainListsAction exportDomainListsAction();
ExportReservedTermsAction exportReservedTermsAction(); ExportReservedTermsAction exportReservedTermsAction();