killbill-aplcache

Remove unused processedDate for subscription events (similar

8/26/2015 8:11:45 PM

Details

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/migration/DefaultSubscriptionBaseMigrationApi.java b/subscription/src/main/java/org/killbill/billing/subscription/api/migration/DefaultSubscriptionBaseMigrationApi.java
index 39fdf2b..2fc9585 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/migration/DefaultSubscriptionBaseMigrationApi.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/migration/DefaultSubscriptionBaseMigrationApi.java
@@ -206,7 +206,6 @@ public class DefaultSubscriptionBaseMigrationApi extends SubscriptionApiBase imp
                     .setEventPriceList(cur.getPriceList())
                     .setActiveVersion(defaultSubscriptionBase.getActiveVersion())
                     .setEffectiveDate(cur.getEventTime())
-                    .setProcessedDate(now)
                     .setRequestedDate(now)
                     .setFromDisk(true);
 
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/transfer/DefaultSubscriptionBaseTransferApi.java b/subscription/src/main/java/org/killbill/billing/subscription/api/transfer/DefaultSubscriptionBaseTransferApi.java
index 8a36c06..4abe2f7 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/transfer/DefaultSubscriptionBaseTransferApi.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/transfer/DefaultSubscriptionBaseTransferApi.java
@@ -102,7 +102,6 @@ public class DefaultSubscriptionBaseTransferApi extends SubscriptionApiBase impl
                 .setEventPlanPhase(currentPhase.getName())
                 .setEventPriceList(spec.getPriceListName())
                 .setActiveVersion(subscription.getActiveVersion())
-                .setProcessedDate(clock.getUTCNow())
                 .setEffectiveDate(effectiveDate)
                 .setRequestedDate(effectiveDate)
                 .setFromDisk(true);
@@ -241,7 +240,6 @@ public class DefaultSubscriptionBaseTransferApi extends SubscriptionApiBase impl
                     final SubscriptionBaseEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
                                                                                          .setSubscriptionId(cur.getId())
                                                                                          .setActiveVersion(cur.getActiveVersion())
-                                                                                         .setProcessedDate(clock.getUTCNow())
                                                                                          .setEffectiveDate(effectiveCancelDate)
                                                                                          .setRequestedDate(effectiveTransferDate)
                                                                                          .setFromDisk(true));
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBaseApiService.java b/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBaseApiService.java
index 9601adf..5ff0345 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBaseApiService.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBaseApiService.java
@@ -238,7 +238,6 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
         final SubscriptionBaseEvent uncancelEvent = new ApiEventUncancel(new ApiEventBuilder()
                                                                                  .setSubscriptionId(subscription.getId())
                                                                                  .setActiveVersion(subscription.getActiveVersion())
-                                                                                 .setProcessedDate(now)
                                                                                  .setRequestedDate(now)
                                                                                  .setEffectiveDate(now)
                                                                                  .setFromDisk(true));
@@ -380,7 +379,6 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
                 .setEventPlanPhase(curAndNextPhases[0].getPhase().getName())
                 .setEventPriceList(realPriceList)
                 .setActiveVersion(activeVersion)
-                .setProcessedDate(processedDate)
                 .setEffectiveDate(effectiveDate)
                 .setRequestedDate(requestedDate)
                 .setFromDisk(true);
@@ -410,7 +408,6 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
                                                                              .setEventPlanPhase(currentTimedPhase.getPhase().getName())
                                                                              .setEventPriceList(newPriceList)
                                                                              .setActiveVersion(subscription.getActiveVersion())
-                                                                             .setProcessedDate(processedDate)
                                                                              .setEffectiveDate(effectiveDate)
                                                                              .setRequestedDate(requestedDate)
                                                                              .setFromDisk(true));
@@ -443,7 +440,6 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
         final SubscriptionBaseEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
                                                                              .setSubscriptionId(subscription.getId())
                                                                              .setActiveVersion(subscription.getActiveVersion())
-                                                                             .setProcessedDate(processedDate)
                                                                              .setEffectiveDate(effectiveDate)
                                                                              .setRequestedDate(requestedDate)
                                                                              .setFromDisk(true));
@@ -495,7 +491,6 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
                 final SubscriptionBaseEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
                                                                                      .setSubscriptionId(cur.getId())
                                                                                      .setActiveVersion(cur.getActiveVersion())
-                                                                                     .setProcessedDate(processedDate)
                                                                                      .setEffectiveDate(effectiveDate)
                                                                                      .setRequestedDate(requestedDate)
                                                                                      .setFromDisk(true));
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java
index 7c91589..9bbbd32 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java
@@ -699,7 +699,6 @@ public class DefaultSubscriptionDao extends EntityDaoBase<SubscriptionBundleMode
                     .setUpdatedDate(now)
                     .setRequestedDate(migrateBillingEvent.getRequestedDate())
                     .setEffectiveDate(migrateBillingEvent.getEffectiveDate())
-                    .setProcessedDate(now)
                     .setActiveVersion(migrateBillingEvent.getCurrentVersion())
                     .setEventPlan(prevPlan)
                     .setEventPlanPhase(prevPhase)
@@ -905,7 +904,6 @@ public class DefaultSubscriptionDao extends EntityDaoBase<SubscriptionBundleMode
                         final SubscriptionBaseEvent addOnCancelEvent = new ApiEventCancel(new ApiEventBuilder()
                                                                                                   .setSubscriptionId(reloaded.getId())
                                                                                                   .setActiveVersion(((DefaultSubscriptionBase) reloaded).getActiveVersion())
-                                                                                                  .setProcessedDate(now)
                                                                                                   .setEffectiveDate(baseTriggerEventForAddOnCancellation.getEffectiveDate())
                                                                                                   .setRequestedDate(now)
                                                                                                   .setCreatedDate(baseTriggerEventForAddOnCancellation.getCreatedDate())
@@ -943,7 +941,7 @@ public class DefaultSubscriptionDao extends EntityDaoBase<SubscriptionBundleMode
                         it.remove();
                     }
                 }
-                // Set total ordering value of the fake dryRun event to make sure billing events are correctly ordererd
+                // Set total ordering value of the fake dryRun event to make sure billing events are correctly ordered
                 if (!events.isEmpty()) {
                     curDryRun.setTotalOrdering(events.get(events.size() - 1).getTotalOrdering() + 1);
                 }
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java
index 2809ea8..f6b13df 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java
@@ -203,7 +203,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
                 .setUpdatedDate(src.getUpdatedDate())
                 .setRequestedDate(src.getRequestedDate())
                 .setEffectiveDate(src.getEffectiveDate())
-                .setProcessedDate(src.getCreatedDate())
                 .setActiveVersion(src.getCurrentVersion())
                 .setActive(src.isActive());
 
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/events/EventBase.java b/subscription/src/main/java/org/killbill/billing/subscription/events/EventBase.java
index 926ccaf..95d86d1 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/events/EventBase.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/events/EventBase.java
@@ -30,7 +30,6 @@ public abstract class EventBase implements SubscriptionBaseEvent {
     private final DateTime updatedDate;
     private final DateTime requestedDate;
     private final DateTime effectiveDate;
-    private final DateTime processedDate;
 
     private long totalOrdering;
     private long activeVersion;
@@ -44,7 +43,6 @@ public abstract class EventBase implements SubscriptionBaseEvent {
         this.updatedDate = builder.getUpdatedDate();
         this.requestedDate = builder.getRequestedDate();
         this.effectiveDate = builder.getEffectiveDate();
-        this.processedDate = builder.getProcessedDate();
         this.activeVersion = builder.getActiveVersion();
         this.isActive = builder.isActive();
     }
@@ -60,11 +58,6 @@ public abstract class EventBase implements SubscriptionBaseEvent {
     }
 
     @Override
-    public DateTime getProcessedDate() {
-        return processedDate;
-    }
-
-    @Override
     public UUID getSubscriptionId() {
         return subscriptionId;
     }
@@ -128,10 +121,6 @@ public abstract class EventBase implements SubscriptionBaseEvent {
             return -1;
         } else if (effectiveDate.isAfter(other.getEffectiveDate())) {
             return 1;
-        } else if (processedDate.isBefore(other.getProcessedDate())) {
-            return -1;
-        } else if (processedDate.isAfter(other.getProcessedDate())) {
-            return 1;
         } else if (requestedDate.isBefore(other.getRequestedDate())) {
             return -1;
         } else if (requestedDate.isAfter(other.getRequestedDate())) {
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/events/EventBaseBuilder.java b/subscription/src/main/java/org/killbill/billing/subscription/events/EventBaseBuilder.java
index 1c90547..ea022cf 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/events/EventBaseBuilder.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/events/EventBaseBuilder.java
@@ -31,7 +31,6 @@ public class EventBaseBuilder<T extends EventBaseBuilder<T>> {
     private DateTime updatedDate;
     private DateTime requestedDate;
     private DateTime effectiveDate;
-    private DateTime processedDate;
 
     private long activeVersion;
     private boolean isActive;
@@ -46,7 +45,6 @@ public class EventBaseBuilder<T extends EventBaseBuilder<T>> {
         this.subscriptionId = copy.subscriptionId;
         this.requestedDate = copy.requestedDate;
         this.effectiveDate = copy.effectiveDate;
-        this.processedDate = copy.processedDate;
         this.createdDate = copy.getCreatedDate();
         this.activeVersion = copy.activeVersion;
         this.isActive = copy.isActive;
@@ -88,11 +86,6 @@ public class EventBaseBuilder<T extends EventBaseBuilder<T>> {
         return (T) this;
     }
 
-    public T setProcessedDate(final DateTime processedDate) {
-        this.processedDate = processedDate;
-        return (T) this;
-    }
-
     public T setActiveVersion(final long activeVersion) {
         this.activeVersion = activeVersion;
         return (T) this;
@@ -131,10 +124,6 @@ public class EventBaseBuilder<T extends EventBaseBuilder<T>> {
         return effectiveDate;
     }
 
-    public DateTime getProcessedDate() {
-        return processedDate;
-    }
-
     public long getActiveVersion() {
         return activeVersion;
     }
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/events/phase/PhaseEventData.java b/subscription/src/main/java/org/killbill/billing/subscription/events/phase/PhaseEventData.java
index b3da3d8..6da067c 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/events/phase/PhaseEventData.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/events/phase/PhaseEventData.java
@@ -53,7 +53,6 @@ public class PhaseEventData extends EventBase implements PhaseEvent {
                 + ", getRequestedDate()=" + getRequestedDate()
                 + ", getEffectiveDate()=" + getEffectiveDate()
                 + ", getActiveVersion()=" + getActiveVersion()
-                + ", getProcessedDate()=" + getProcessedDate()
                 + ", getSubscriptionId()=" + getSubscriptionId()
                 + ", isActive()=" + isActive() + "]\n";
     }
@@ -65,7 +64,6 @@ public class PhaseEventData extends EventBase implements PhaseEvent {
                                            .setSubscriptionId(subscriptionId)
                                            .setRequestedDate(now)
                                            .setEffectiveDate(effectiveDate)
-                                           .setProcessedDate(now)
                                            .setActiveVersion(activeVersion)
                                            .setPhaseName(phaseName));
     }
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/events/SubscriptionBaseEvent.java b/subscription/src/main/java/org/killbill/billing/subscription/events/SubscriptionBaseEvent.java
index 225cf92..23b5b20 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/events/SubscriptionBaseEvent.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/events/SubscriptionBaseEvent.java
@@ -42,8 +42,6 @@ public interface SubscriptionBaseEvent extends Comparable<SubscriptionBaseEvent>
 
     public boolean isActive();
 
-    public DateTime getProcessedDate();
-
     public DateTime getRequestedDate();
 
     public DateTime getEffectiveDate();
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/events/user/ApiEventBase.java b/subscription/src/main/java/org/killbill/billing/subscription/events/user/ApiEventBase.java
index ce462fe..140b2a4 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/events/user/ApiEventBase.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/events/user/ApiEventBase.java
@@ -80,7 +80,6 @@ public class ApiEventBase extends EventBase implements ApiEvent {
                + ", getRequestedDate()=" + getRequestedDate()
                + ", getEffectiveDate()=" + getEffectiveDate()
                + ", getActiveVersion()=" + getActiveVersion()
-               + ", getProcessedDate()=" + getProcessedDate()
                + ", getSubscriptionId()=" + getSubscriptionId()
                + ", isActive()=" + isActive() + "]";
     }
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/events/user/ApiEventMigrateBilling.java b/subscription/src/main/java/org/killbill/billing/subscription/events/user/ApiEventMigrateBilling.java
index 8cdd287..d4b17c1 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/events/user/ApiEventMigrateBilling.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/events/user/ApiEventMigrateBilling.java
@@ -16,25 +16,8 @@
 
 package org.killbill.billing.subscription.events.user;
 
-import org.joda.time.DateTime;
-
 public class ApiEventMigrateBilling extends ApiEventBase {
     public ApiEventMigrateBilling(final ApiEventBuilder builder) {
         super(builder.setEventType(ApiEventType.MIGRATE_BILLING));
     }
-
-    public ApiEventMigrateBilling(final ApiEventMigrateSubscription input, final DateTime ctd) {
-        super(new ApiEventBuilder()
-                      .setSubscriptionId(input.getSubscriptionId())
-                      .setEventPlan(input.getEventPlan())
-                      .setEventPlanPhase(input.getEventPlanPhase())
-                      .setEventPriceList(input.getPriceList())
-                      .setActiveVersion(input.getActiveVersion())
-                      .setEffectiveDate(ctd)
-                      .setProcessedDate(input.getProcessedDate())
-                      .setRequestedDate(input.getRequestedDate())
-                      .setFromDisk(true)
-                      .setEventType(ApiEventType.MIGRATE_BILLING));
-    }
-
 }