killbill-aplcache
Changes
api/src/main/java/org/killbill/billing/subscription/api/timeline/SubscriptionBaseTimeline.java 4(+0 -4)
entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionEvent.java 5(+0 -5)
entitlement/src/test/java/org/killbill/billing/entitlement/api/TestDefaultSubscriptionApi.java 4(+0 -4)
subscription/src/main/java/org/killbill/billing/subscription/api/timeline/DefaultSubscriptionBaseTimeline.java 5(+0 -5)
Details
diff --git a/api/src/main/java/org/killbill/billing/subscription/api/timeline/SubscriptionBaseTimeline.java b/api/src/main/java/org/killbill/billing/subscription/api/timeline/SubscriptionBaseTimeline.java
index a0a981f..4934603 100644
--- a/api/src/main/java/org/killbill/billing/subscription/api/timeline/SubscriptionBaseTimeline.java
+++ b/api/src/main/java/org/killbill/billing/subscription/api/timeline/SubscriptionBaseTimeline.java
@@ -59,10 +59,6 @@ public interface SubscriptionBaseTimeline extends Entity {
*/
public PlanPhaseSpecifier getPlanPhaseSpecifier();
- /**
- * @return the date at which this event should be inserted into the stream
- */
- public DateTime getRequestedDate();
/**
* @return the {@code SubscriptionBaseTransitionType} for the event
diff --git a/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionEvent.java b/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionEvent.java
index 9035efc..78af96f 100644
--- a/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionEvent.java
+++ b/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionEvent.java
@@ -123,11 +123,6 @@ public class DefaultSubscriptionEvent implements SubscriptionEvent {
}
@Override
- public LocalDate getRequestedDate() {
- return requestedDate != null ? new LocalDate(requestedDate, accountTimeZone) : null;
- }
-
- @Override
public SubscriptionEventType getSubscriptionEventType() {
return eventType;
}
diff --git a/entitlement/src/test/java/org/killbill/billing/entitlement/api/TestDefaultSubscriptionApi.java b/entitlement/src/test/java/org/killbill/billing/entitlement/api/TestDefaultSubscriptionApi.java
index 474eb3e..55dcdad 100644
--- a/entitlement/src/test/java/org/killbill/billing/entitlement/api/TestDefaultSubscriptionApi.java
+++ b/entitlement/src/test/java/org/killbill/billing/entitlement/api/TestDefaultSubscriptionApi.java
@@ -276,18 +276,14 @@ public class TestDefaultSubscriptionApi extends EntitlementTestSuiteWithEmbedded
assertEquals(events.get(0).getSubscriptionEventType(), SubscriptionEventType.START_ENTITLEMENT);
assertEquals(events.get(0).getEffectiveDate().compareTo(effectiveDate), 0);
- assertEquals(events.get(0).getRequestedDate().compareTo(effectiveDate), 0);
assertEquals(events.get(1).getSubscriptionEventType(), SubscriptionEventType.START_BILLING);
assertEquals(events.get(1).getEffectiveDate().compareTo(effectiveDate), 0);
- assertEquals(events.get(1).getRequestedDate().compareTo(effectiveDate), 0);
assertEquals(events.get(2).getSubscriptionEventType(), SubscriptionEventType.PHASE);
assertEquals(events.get(2).getEffectiveDate().compareTo(effectiveDate.plusMonths(1)), 0);
- assertEquals(events.get(2).getRequestedDate().compareTo(effectiveDate.plusMonths(1)), 0);
assertListenerStatus();
-
}
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionJson.java
index c860f33..df99cfe 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionJson.java
@@ -72,7 +72,6 @@ public class SubscriptionJson extends JsonBase {
private final String eventId;
private final String billingPeriod;
- private final LocalDate requestedDate;
private final LocalDate effectiveDate;
private final String product;
private final String priceList;
@@ -87,7 +86,6 @@ public class SubscriptionJson extends JsonBase {
@JsonCreator
public EventSubscriptionJson(@JsonProperty("eventId") final String eventId,
@JsonProperty("billingPeriod") final String billingPeriod,
- @JsonProperty("requestedDt") final LocalDate requestedDate,
@JsonProperty("effectiveDt") final LocalDate effectiveDate,
@JsonProperty("product") final String product,
@JsonProperty("priceList") final String priceList,
@@ -101,7 +99,6 @@ public class SubscriptionJson extends JsonBase {
super(auditLogs);
this.eventId = eventId;
this.billingPeriod = billingPeriod;
- this.requestedDate = requestedDate;
this.effectiveDate = effectiveDate;
this.product = product;
this.priceList = priceList;
@@ -121,7 +118,6 @@ public class SubscriptionJson extends JsonBase {
final PlanPhase phase = subscriptionEvent.getNextPhase() != null ? subscriptionEvent.getNextPhase() : subscriptionEvent.getPrevPhase();
this.eventId = subscriptionEvent.getId().toString();
this.billingPeriod = billingPeriod != null ? billingPeriod.toString() : null;
- this.requestedDate = subscriptionEvent.getRequestedDate();
this.effectiveDate = subscriptionEvent.getEffectiveDate();
this.product = product != null ? product.getName() : null;
this.priceList = priceList != null ? priceList.getName() : null;
@@ -141,10 +137,6 @@ public class SubscriptionJson extends JsonBase {
return billingPeriod;
}
- public LocalDate getRequestedDate() {
- return requestedDate;
- }
-
public LocalDate getEffectiveDate() {
return effectiveDate;
}
@@ -186,7 +178,6 @@ public class SubscriptionJson extends JsonBase {
final StringBuilder sb = new StringBuilder("EventSubscriptionJson{");
sb.append("eventId='").append(eventId).append('\'');
sb.append(", billingPeriod='").append(billingPeriod).append('\'');
- sb.append(", requestedDate=").append(requestedDate);
sb.append(", effectiveDate=").append(effectiveDate);
sb.append(", product='").append(product).append('\'');
sb.append(", priceList='").append(priceList).append('\'');
@@ -238,9 +229,6 @@ public class SubscriptionJson extends JsonBase {
if (product != null ? !product.equals(that.product) : that.product != null) {
return false;
}
- if (requestedDate != null ? requestedDate.compareTo(that.requestedDate) != 0 : that.requestedDate != null) {
- return false;
- }
if (serviceName != null ? !serviceName.equals(that.serviceName) : that.serviceName != null) {
return false;
}
@@ -255,7 +243,6 @@ public class SubscriptionJson extends JsonBase {
public int hashCode() {
int result = eventId != null ? eventId.hashCode() : 0;
result = 31 * result + (billingPeriod != null ? billingPeriod.hashCode() : 0);
- result = 31 * result + (requestedDate != null ? requestedDate.hashCode() : 0);
result = 31 * result + (effectiveDate != null ? effectiveDate.hashCode() : 0);
result = 31 * result + (product != null ? product.hashCode() : 0);
result = 31 * result + (priceList != null ? priceList.hashCode() : 0);
diff --git a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestBundleJsonWithSubscriptions.java b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestBundleJsonWithSubscriptions.java
index 201c5fc..c27054c 100644
--- a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestBundleJsonWithSubscriptions.java
+++ b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestBundleJsonWithSubscriptions.java
@@ -45,7 +45,6 @@ public class TestBundleJsonWithSubscriptions extends JaxrsTestSuiteNoDB {
final EventSubscriptionJson event = new EventSubscriptionJson(UUID.randomUUID().toString(),
BillingPeriod.NO_BILLING_PERIOD.toString(),
new LocalDate(),
- new LocalDate(),
UUID.randomUUID().toString(),
UUID.randomUUID().toString(),
UUID.randomUUID().toString(),
diff --git a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestBundleTimelineJson.java b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestBundleTimelineJson.java
index 9874b55..5749e61 100644
--- a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestBundleTimelineJson.java
+++ b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestBundleTimelineJson.java
@@ -36,7 +36,6 @@ public class TestBundleTimelineJson extends JaxrsTestSuiteNoDB {
final EventSubscriptionJson event = new EventSubscriptionJson(UUID.randomUUID().toString(),
BillingPeriod.NO_BILLING_PERIOD.toString(),
new LocalDate(),
- new LocalDate(),
UUID.randomUUID().toString(),
UUID.randomUUID().toString(),
UUID.randomUUID().toString(),
diff --git a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestEntitlementJsonWithEvents.java b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestEntitlementJsonWithEvents.java
index 6026c77..41ed2ba 100644
--- a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestEntitlementJsonWithEvents.java
+++ b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestEntitlementJsonWithEvents.java
@@ -46,13 +46,11 @@ public class TestEntitlementJsonWithEvents extends JaxrsTestSuiteNoDB {
final String bundleId = UUID.randomUUID().toString();
final String subscriptionId = UUID.randomUUID().toString();
final String externalKey = UUID.randomUUID().toString();
- final DateTime requestedDate = DefaultClock.toUTCDateTime(new DateTime(DateTimeZone.UTC));
final DateTime effectiveDate = DefaultClock.toUTCDateTime(new DateTime(DateTimeZone.UTC));
final UUID eventId = UUID.randomUUID();
final List<AuditLogJson> auditLogs = createAuditLogsJson(clock.getUTCNow());
final EventSubscriptionJson newEvent = new EventSubscriptionJson(eventId.toString(),
BillingPeriod.NO_BILLING_PERIOD.toString(),
- requestedDate.toLocalDate(),
effectiveDate.toLocalDate(),
UUID.randomUUID().toString(),
UUID.randomUUID().toString(),
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/timeline/DefaultSubscriptionBaseTimeline.java b/subscription/src/main/java/org/killbill/billing/subscription/api/timeline/DefaultSubscriptionBaseTimeline.java
index fc33b62..1690d74 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/timeline/DefaultSubscriptionBaseTimeline.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/timeline/DefaultSubscriptionBaseTimeline.java
@@ -130,11 +130,6 @@ public class DefaultSubscriptionBaseTimeline implements SubscriptionBaseTimeline
}
@Override
- public DateTime getRequestedDate() {
- return cur.getEffectiveDate();
- }
-
- @Override
public PlanPhaseSpecifier getPlanPhaseSpecifier() {
return spec;
}
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 73d4492..dfb42e4 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
@@ -47,7 +47,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
private long totalOrdering;
private EventType eventType;
private ApiEventType userType;
- private DateTime requestedDate; // deprecated (similar to effectiveDate)
private DateTime effectiveDate;
private UUID subscriptionId;
private String planName;
@@ -61,14 +60,13 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
}
public SubscriptionEventModelDao(final UUID id, final long totalOrdering, final EventType eventType, final ApiEventType userType,
- final DateTime requestedDate, final DateTime effectiveDate, final UUID subscriptionId,
+ final DateTime effectiveDate, final UUID subscriptionId,
final String planName, final String phaseName, final String priceListName, final long currentVersion,
final boolean active, final DateTime createDate, final DateTime updateDate) {
super(id, createDate, updateDate);
this.totalOrdering = totalOrdering;
this.eventType = eventType;
this.userType = userType;
- this.requestedDate = requestedDate;
this.effectiveDate = effectiveDate;
this.subscriptionId = subscriptionId;
this.planName = planName;
@@ -83,7 +81,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
this.totalOrdering = src.getTotalOrdering();
this.eventType = src.getType();
this.userType = eventType == EventType.API_USER ? ((ApiEvent) src).getApiEventType() : null;
- this.requestedDate = src.getEffectiveDate();
this.effectiveDate = src.getEffectiveDate();
this.subscriptionId = src.getSubscriptionId();
this.planName = eventType == EventType.API_USER ? ((ApiEvent) src).getEventPlan() : null;
@@ -105,10 +102,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
return userType;
}
- public DateTime getRequestedDate() {
- return requestedDate;
- }
-
public DateTime getEffectiveDate() {
return effectiveDate;
}
@@ -154,10 +147,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
this.userType = userType;
}
- public void setRequestedDate(final DateTime requestedDate) {
- this.requestedDate = requestedDate;
- }
-
public void setEffectiveDate(final DateTime effectiveDate) {
this.effectiveDate = effectiveDate;
}
@@ -229,7 +218,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
sb.append("{totalOrdering=").append(totalOrdering);
sb.append(", eventType=").append(eventType);
sb.append(", userType=").append(userType);
- sb.append(", requestedDate=").append(requestedDate);
sb.append(", effectiveDate=").append(effectiveDate);
sb.append(", subscriptionId=").append(subscriptionId);
sb.append(", planName='").append(planName).append('\'');
@@ -279,9 +267,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
if (priceListName != null ? !priceListName.equals(that.priceListName) : that.priceListName != null) {
return false;
}
- if (requestedDate != null ? !requestedDate.equals(that.requestedDate) : that.requestedDate != null) {
- return false;
- }
if (subscriptionId != null ? !subscriptionId.equals(that.subscriptionId) : that.subscriptionId != null) {
return false;
}
@@ -298,7 +283,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
result = 31 * result + (int) (totalOrdering ^ (totalOrdering >>> 32));
result = 31 * result + (eventType != null ? eventType.hashCode() : 0);
result = 31 * result + (userType != null ? userType.hashCode() : 0);
- result = 31 * result + (requestedDate != null ? requestedDate.hashCode() : 0);
result = 31 * result + (effectiveDate != null ? effectiveDate.hashCode() : 0);
result = 31 * result + (subscriptionId != null ? subscriptionId.hashCode() : 0);
result = 31 * result + (planName != null ? planName.hashCode() : 0);
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 ed379f8..98fa9d1 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
@@ -89,7 +89,7 @@ public abstract class EventBase implements SubscriptionBaseEvent {
// Really used for unit tests only as the sql implementation relies on date first and then event insertion
//
// Order first by:
- // - effectiveDate, followed by processedDate, requestedDate
+ // - effectiveDate, followed by processedDate
// - if all dates are equal-- unlikely, we first return PHASE EVENTS
// - If both events are User events, return the first CREATE, CHANGE,... as specified by ApiEventType
// - If all that is not enough return consistent by random ordering based on UUID
diff --git a/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql b/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql
index 30137f4..c4ff0e0 100644
--- a/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql
+++ b/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql
@@ -6,7 +6,6 @@ CREATE TABLE subscription_events (
id varchar(36) NOT NULL,
event_type varchar(9) NOT NULL,
user_type varchar(25) DEFAULT NULL,
- requested_date datetime NOT NULL,
effective_date datetime NOT NULL,
subscription_id varchar(36) NOT NULL,
plan_name varchar(64) DEFAULT NULL,
@@ -24,7 +23,7 @@ CREATE TABLE subscription_events (
) /*! CHARACTER SET utf8 COLLATE utf8_bin */;
CREATE UNIQUE INDEX subscription_events_id ON subscription_events(id);
CREATE INDEX idx_ent_1 ON subscription_events(subscription_id, is_active, effective_date);
-CREATE INDEX idx_ent_2 ON subscription_events(subscription_id, effective_date, created_date, requested_date,id);
+CREATE INDEX idx_ent_2 ON subscription_events(subscription_id, effective_date, created_date, id);
CREATE INDEX subscription_events_tenant_account_record_id ON subscription_events(tenant_record_id, account_record_id);
DROP TABLE IF EXISTS subscriptions;
diff --git a/subscription/src/test/java/org/killbill/billing/subscription/api/transfer/TestDefaultSubscriptionTransferApi.java b/subscription/src/test/java/org/killbill/billing/subscription/api/transfer/TestDefaultSubscriptionTransferApi.java
index 6483634..7ee2265 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/api/transfer/TestDefaultSubscriptionTransferApi.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/api/transfer/TestDefaultSubscriptionTransferApi.java
@@ -199,11 +199,6 @@ public class TestDefaultSubscriptionTransferApi extends SubscriptionTestSuiteNoD
}
@Override
- public DateTime getRequestedDate() {
- return getEffectiveDate();
- }
-
- @Override
public SubscriptionBaseTransitionType getSubscriptionTransitionType() {
return subscriptionTransitionType;
}
@@ -239,11 +234,6 @@ public class TestDefaultSubscriptionTransferApi extends SubscriptionTestSuiteNoD
}
@Override
- public DateTime getRequestedDate() {
- return getEffectiveDate();
- }
-
- @Override
public SubscriptionBaseTransitionType getSubscriptionTransitionType() {
return SubscriptionBaseTransitionType.MIGRATE_ENTITLEMENT;
}
@@ -277,11 +267,6 @@ public class TestDefaultSubscriptionTransferApi extends SubscriptionTestSuiteNoD
}
@Override
- public DateTime getRequestedDate() {
- return migrateEntitlementEvent.getRequestedDate();
- }
-
- @Override
public SubscriptionBaseTransitionType getSubscriptionTransitionType() {
return SubscriptionBaseTransitionType.MIGRATE_BILLING;
}