killbill-memoizeit
Changes
api/src/main/java/com/ning/billing/subscription/api/migration/SubscriptionMigrationApi.java 26(+13 -13)
beatrix/src/test/java/com/ning/billing/beatrix/integration/osgi/TestPaymentOSGIWithTestPaymentBundle.java 2(+1 -1)
beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestBillingAlignment.java 2(+1 -1)
beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueWithSubscriptionCancellation.java 2(+1 -1)
beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java 32(+16 -16)
beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java 12(+6 -6)
beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoPayOff.java 8(+4 -4)
invoice/src/main/java/com/ning/billing/invoice/notification/DefaultNextBillingDateNotifier.java 10(+5 -5)
jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/SubscriptionBillingApiExceptionMapper.java 2(+1 -1)
junction/src/main/java/com/ning/billing/junction/plumbing/api/BlockingSubscriptionUserApi.java 28(+14 -14)
junction/src/main/java/com/ning/billing/junction/plumbing/billing/BillCycleDayCalculator.java 12(+6 -6)
junction/src/main/java/com/ning/billing/junction/plumbing/billing/DefaultInternalBillingApi.java 14(+7 -7)
junction/src/test/java/com/ning/billing/junction/plumbing/billing/TestBillCycleDayCalculator.java 2(+1 -1)
overdue/src/main/java/com/ning/billing/overdue/calculator/BillingStateCalculatorBundle.java 10(+5 -5)
overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculatorBundle.java 14(+7 -7)
subscription/src/main/java/com/ning/billing/subscription/alignment/MigrationPlanAligner.java 12(+6 -6)
subscription/src/main/java/com/ning/billing/subscription/api/migration/DefaultSubscriptionMigrationApi.java 20(+10 -10)
subscription/src/main/java/com/ning/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java 2(+1 -1)
subscription/src/main/java/com/ning/billing/subscription/api/user/SubscriptionTransitionDataIterator.java 8(+4 -4)
subscription/src/main/java/com/ning/billing/subscription/engine/core/DefaultSubscriptionService.java 8(+4 -4)
subscription/src/main/java/com/ning/billing/subscription/engine/dao/DefaultSubscriptionDao.java 10(+5 -5)
subscription/src/main/java/com/ning/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java 2(+1 -1)
subscription/src/main/java/com/ning/billing/subscription/engine/dao/RepairSubscriptionDao.java 16(+8 -8)
subscription/src/main/java/com/ning/billing/subscription/glue/DefaultSubscriptionModule.java 10(+5 -5)
subscription/src/test/java/com/ning/billing/subscription/api/migration/TestMigration.java 38(+19 -19)
subscription/src/test/java/com/ning/billing/subscription/api/timeline/TestRepairWithAO.java 52(+26 -26)
subscription/src/test/java/com/ning/billing/subscription/api/transfer/TestDefaultSubscriptionTransferApi.java 34(+17 -17)
subscription/src/test/java/com/ning/billing/subscription/api/user/TestSubscriptionHelper.java 96(+48 -48)
subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiChangePlan.java 16(+8 -8)
subscription/src/test/java/com/ning/billing/subscription/DefaultSubscriptionTestInitializer.java 24(+12 -12)
subscription/src/test/java/com/ning/billing/subscription/engine/dao/MockSubscriptionDaoMemory.java 2(+1 -1)
subscription/src/test/java/com/ning/billing/subscription/glue/TestDefaultSubscriptionModuleNoDB.java 2(+1 -1)
subscription/src/test/java/com/ning/billing/subscription/glue/TestDefaultSubscriptionModuleWithEmbeddedDB.java 2(+1 -1)
subscription/src/test/java/com/ning/billing/subscription/SubscriptionTestSuiteWithEmbeddedDB.java 14(+7 -7)
Details
diff --git a/api/src/main/java/com/ning/billing/subscription/api/migration/SubscriptionMigrationApi.java b/api/src/main/java/com/ning/billing/subscription/api/migration/SubscriptionMigrationApi.java
index 5be4c0b..3e34ba1 100644
--- a/api/src/main/java/com/ning/billing/subscription/api/migration/SubscriptionMigrationApi.java
+++ b/api/src/main/java/com/ning/billing/subscription/api/migration/SubscriptionMigrationApi.java
@@ -32,10 +32,10 @@ public interface SubscriptionMigrationApi {
/**
- * The interface {@code EntitlementAccountMigration} captures all the {@code SubscriptionBundle} associated with
+ * The interface {@code AccountMigration} captures all the {@code SubscriptionBundle} associated with
* that account.
*/
- public interface EntitlementAccountMigration {
+ public interface AccountMigration {
/**
*
@@ -45,16 +45,16 @@ public interface SubscriptionMigrationApi {
/**
*
- * @return an array of {@code EntitlementBundleMigration}
+ * @return an array of {@code BundleMigration}
*/
- public EntitlementBundleMigration[] getBundles();
+ public BundleMigration[] getBundles();
}
/**
- * The interface {@code EntitlementBundleMigration} captures all the {@code Subscription} asociated with a given
+ * The interface {@code BundleMigration} captures all the {@code Subscription} asociated with a given
* {@code SubscriptionBundle}
*/
- public interface EntitlementBundleMigration {
+ public interface BundleMigration {
/**
*
@@ -66,14 +66,14 @@ public interface SubscriptionMigrationApi {
*
* @return an array of {@code Subscription}
*/
- public EntitlementSubscriptionMigration[] getSubscriptions();
+ public SubscriptionMigration[] getSubscriptions();
}
/**
- * The interface {@code EntitlementSubscriptionMigration} captures the detail for each {@code Subscription} to be
+ * The interface {@code SubscriptionMigration} captures the detail for each {@code Subscription} to be
* migrated.
*/
- public interface EntitlementSubscriptionMigration {
+ public interface SubscriptionMigration {
/**
*
@@ -91,15 +91,15 @@ public interface SubscriptionMigrationApi {
*
* @return the various phase information for that {@code Subscription}
*/
- public EntitlementSubscriptionMigrationCase[] getSubscriptionCases();
+ public SubscriptionMigrationCase[] getSubscriptionCases();
}
/**
- * The interface {@code EntitlementSubscriptionMigrationCase} captures the details of
+ * The interface {@code SubscriptionMigrationCase} captures the details of
* phase for a {@code Subscription}.
*
*/
- public interface EntitlementSubscriptionMigrationCase {
+ public interface SubscriptionMigrationCase {
/**
*
* @return the {@code PlanPhaseSpecifier}
@@ -128,6 +128,6 @@ public interface SubscriptionMigrationApi {
* @throws SubscriptionMigrationApiException
* an subscription api exception
*/
- public void migrate(EntitlementAccountMigration toBeMigrated, CallContext context)
+ public void migrate(AccountMigration toBeMigrated, CallContext context)
throws SubscriptionMigrationApiException;
}
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/osgi/TestPaymentOSGIWithTestPaymentBundle.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/osgi/TestPaymentOSGIWithTestPaymentBundle.java
index 99d619f..edc35c9 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/osgi/TestPaymentOSGIWithTestPaymentBundle.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/osgi/TestPaymentOSGIWithTestPaymentBundle.java
@@ -142,7 +142,7 @@ public class TestPaymentOSGIWithTestPaymentBundle extends TestOSGIBase {
// Set clock to the initial start date - we implicitly assume here that the account timezone is UTC
clock.setDay(new LocalDate(2012, 4, 1));
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
//
// CREATE SUBSCRIPTION AND EXPECT BOTH EVENTS: NextEvent.CREATE NextEvent.INVOICE
//
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestBillingAlignment.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestBillingAlignment.java
index 7c94789..4adda35 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestBillingAlignment.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestBillingAlignment.java
@@ -49,7 +49,7 @@ public class TestBillingAlignment extends TestIntegrationBase {
// Set clock to the initial start date - we implicitly assume here that the account timezone is UTC
clock.setDay(new LocalDate(2012, 4, 1));
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
//
// CREATE SUBSCRIPTION AND EXPECT BOTH EVENTS: NextEvent.CREATE NextEvent.INVOICE
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueBase.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueBase.java
index b7e1eea..dc707e7 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueBase.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueBase.java
@@ -66,7 +66,7 @@ public abstract class TestOverdueBase extends TestIntegrationBase {
paymentApi.addPaymentMethod(BeatrixIntegrationModule.NON_OSGI_PLUGIN_NAME, account, true, paymentMethodPlugin, callContext);
- bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
productName = "Shotgun";
term = BillingPeriod.MONTHLY;
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueWithSubscriptionCancellation.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueWithSubscriptionCancellation.java
index 8fb7f02..6885ead 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueWithSubscriptionCancellation.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueWithSubscriptionCancellation.java
@@ -84,7 +84,7 @@ public class TestOverdueWithSubscriptionCancellation extends TestOverdueBase {
// Should be in OD1
checkODState("OD1");
- final Subscription cancelledBaseSubscription = entitlementUserApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ final Subscription cancelledBaseSubscription = subscriptionUserApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertTrue(cancelledBaseSubscription.getState() == SubscriptionState.CANCELLED);
}
}
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestBundleTransfer.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestBundleTransfer.java
index c065438..9650a47 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestBundleTransfer.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestBundleTransfer.java
@@ -55,7 +55,7 @@ public class TestBundleTransfer extends TestIntegrationBase {
final DateTime initialDate = new DateTime(2012, 4, 1, 0, 15, 42, 0, testTimeZone);
clock.setDeltaFromReality(initialDate.getMillis() - clock.getUTCNow().getMillis());
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "mycutebundle", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "mycutebundle", callContext);
final String productName = "Shotgun";
final BillingPeriod term = BillingPeriod.ANNUAL;
@@ -65,7 +65,7 @@ public class TestBundleTransfer extends TestIntegrationBase {
//
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
final PlanPhaseSpecifier bpPlanPhaseSpecifier = new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null);
- final SubscriptionData bpSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData bpSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
bpPlanPhaseSpecifier,
null,
callContext));
@@ -74,7 +74,7 @@ public class TestBundleTransfer extends TestIntegrationBase {
assertListenerStatus();
assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
- assertEquals(entitlementUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+ assertEquals(subscriptionUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
// Move out of trials for interesting invoices adjustments
busHandler.pushExpectedEvent(NextEvent.PHASE);
@@ -115,7 +115,7 @@ public class TestBundleTransfer extends TestIntegrationBase {
final DateTime initialDate = new DateTime(2012, 4, 1, 0, 15, 42, 0, testTimeZone);
clock.setDeltaFromReality(initialDate.getMillis() - clock.getUTCNow().getMillis());
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "mycutebundle", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "mycutebundle", callContext);
final String productName = "Shotgun";
final BillingPeriod term = BillingPeriod.MONTHLY;
@@ -125,7 +125,7 @@ public class TestBundleTransfer extends TestIntegrationBase {
//
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
final PlanPhaseSpecifier bpPlanPhaseSpecifier = new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null);
- final SubscriptionData bpSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData bpSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
bpPlanPhaseSpecifier,
null,
callContext));
@@ -134,7 +134,7 @@ public class TestBundleTransfer extends TestIntegrationBase {
assertListenerStatus();
assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
- assertEquals(entitlementUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
+ assertEquals(subscriptionUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
// Move out of trials for interesting invoices adjustments
busHandler.pushExpectedEvent(NextEvent.PHASE);
@@ -182,7 +182,7 @@ public class TestBundleTransfer extends TestIntegrationBase {
final DateTime initialDate = new DateTime(2012, 4, 1, 0, 15, 42, 0, testTimeZone);
clock.setDeltaFromReality(initialDate.getMillis() - clock.getUTCNow().getMillis());
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "mycutebundle", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "mycutebundle", callContext);
final String productName = "Shotgun";
final BillingPeriod term = BillingPeriod.MONTHLY;
@@ -192,7 +192,7 @@ public class TestBundleTransfer extends TestIntegrationBase {
//
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
final PlanPhaseSpecifier bpPlanPhaseSpecifier = new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null);
- final SubscriptionData bpSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData bpSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
bpPlanPhaseSpecifier,
null,
callContext));
@@ -201,7 +201,7 @@ public class TestBundleTransfer extends TestIntegrationBase {
assertListenerStatus();
assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
- assertEquals(entitlementUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
+ assertEquals(subscriptionUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
// Move out of trials for interesting invoices adjustments
busHandler.pushExpectedEvent(NextEvent.PHASE);
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestCustomFieldApi.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestCustomFieldApi.java
index 3381325..30bd0e0 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestCustomFieldApi.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestCustomFieldApi.java
@@ -84,7 +84,7 @@ public class TestCustomFieldApi extends TestIntegrationBase {
//
// Create necessary logic to end up with an Invoice object on that account.
//
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
final String productName = "Shotgun";
final BillingPeriod term = BillingPeriod.ANNUAL;
@@ -92,7 +92,7 @@ public class TestCustomFieldApi extends TestIntegrationBase {
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
final PlanPhaseSpecifier bpPlanPhaseSpecifier = new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null);
- final SubscriptionData bpSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData bpSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
bpPlanPhaseSpecifier,
null,
callContext));
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
index 87672ba..2619e8e 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
@@ -60,7 +60,7 @@ public class TestIntegration extends TestIntegrationBase {
// Set clock to the initial start date - we implicitly assume here that the account timezone is UTC
clock.setDay(new LocalDate(2012, 4, 1));
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
subscriptionChecker.checkBundleNoAudits(bundle.getId(), bundle.getAccountId(), bundle.getExternalKey(), callContext);
//
@@ -104,7 +104,7 @@ public class TestIntegration extends TestIntegrationBase {
// set clock to the initial start date
clock.setTime(initialCreationDate);
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
int invoiceItemCount = 1;
@@ -186,7 +186,7 @@ public class TestIntegration extends TestIntegrationBase {
// set clock to the initial start date
clock.setTime(initialCreationDate);
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
int invoiceItemCount = 1;
@@ -268,7 +268,7 @@ public class TestIntegration extends TestIntegrationBase {
// set clock to the initial start date
clock.setTime(initialCreationDate);
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
int invoiceItemCount = 1;
@@ -400,7 +400,7 @@ public class TestIntegration extends TestIntegrationBase {
final Account account = createAccountWithNonOsgiPaymentMethod(getAccountData(25));
assertNotNull(account);
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
final String productName = "Shotgun";
final BillingPeriod term = BillingPeriod.MONTHLY;
@@ -408,7 +408,7 @@ public class TestIntegration extends TestIntegrationBase {
busHandler.pushExpectedEvent(NextEvent.CREATE);
busHandler.pushExpectedEvent(NextEvent.INVOICE);
- final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData baseSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, callContext));
assertNotNull(baseSubscription);
assertTrue(busHandler.isCompleted(DELAY));
@@ -422,7 +422,7 @@ public class TestIntegration extends TestIntegrationBase {
busHandler.pushExpectedEvent(NextEvent.CREATE);
busHandler.pushExpectedEvent(NextEvent.INVOICE);
busHandler.pushExpectedEvent(NextEvent.PAYMENT);
- subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier("Telescopic-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null), null, callContext));
assertTrue(busHandler.isCompleted(DELAY));
assertListenerStatus();
@@ -430,7 +430,7 @@ public class TestIntegration extends TestIntegrationBase {
busHandler.pushExpectedEvent(NextEvent.CREATE);
busHandler.pushExpectedEvent(NextEvent.INVOICE);
busHandler.pushExpectedEvent(NextEvent.PAYMENT);
- final SubscriptionData aoSubscription2 = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData aoSubscription2 = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier("Laser-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null), null, callContext));
assertTrue(busHandler.isCompleted(DELAY));
assertListenerStatus();
@@ -483,13 +483,13 @@ public class TestIntegration extends TestIntegrationBase {
final DateTime initialDate = new DateTime(2012, 4, 25, 0, 3, 42, 0, testTimeZone);
clock.setDeltaFromReality(initialDate.getMillis() - clock.getUTCNow().getMillis());
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "someBundle", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "someBundle", callContext);
assertNotNull(bundle);
final String productName = "Shotgun";
final BillingPeriod term = BillingPeriod.MONTHLY;
final String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
- entitlementUserApi.createSubscription(bundle.getId(),
+ subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, callContext);
busHandler.reset();
@@ -515,7 +515,7 @@ public class TestIntegration extends TestIntegrationBase {
// set clock to the initial start date
clock.setDeltaFromReality(initialDate.getMillis() - clock.getUTCNow().getMillis());
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever2", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever2", callContext);
String productName = "Shotgun";
BillingPeriod term = BillingPeriod.MONTHLY;
@@ -527,7 +527,7 @@ public class TestIntegration extends TestIntegrationBase {
busHandler.pushExpectedEvent(NextEvent.CREATE);
busHandler.pushExpectedEvent(NextEvent.INVOICE);
- SubscriptionData subscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ SubscriptionData subscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, callContext));
assertNotNull(subscription);
@@ -550,7 +550,7 @@ public class TestIntegration extends TestIntegrationBase {
clock.addDeltaFromReality(AT_LEAST_ONE_MONTH_MS);
assertTrue(busHandler.isCompleted(DELAY));
- subscription = subscriptionDataFromSubscription(entitlementUserApi.getSubscriptionFromId(subscription.getId(), callContext));
+ subscription = subscriptionDataFromSubscription(subscriptionUserApi.getSubscriptionFromId(subscription.getId(), callContext));
subscription.cancel(clock.getUTCNow(), callContext);
// MOVE AFTER CANCEL DATE AND EXPECT EVENT : NextEvent.CANCEL
@@ -589,8 +589,8 @@ public class TestIntegration extends TestIntegrationBase {
busHandler.pushExpectedEvent(NextEvent.CREATE);
busHandler.pushExpectedEvent(NextEvent.INVOICE);
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(accountId, "testKey", callContext);
- subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(accountId, "testKey", callContext);
+ subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier(productName, ProductCategory.BASE,
BillingPeriod.MONTHLY, planSetName, PhaseType.TRIAL), null, callContext));
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
index 130c3df..1177ede 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
@@ -126,7 +126,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
protected BusService busService;
@Inject
- protected SubscriptionService entitlementService;
+ protected SubscriptionService subscriptionService;
@Inject
protected InvoiceService invoiceService;
@@ -135,7 +135,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
protected AccountService accountService;
@Inject
- protected SubscriptionUserApi entitlementUserApi;
+ protected SubscriptionUserApi subscriptionUserApi;
@Inject
protected SubscriptionTransferApi transferApi;
@@ -279,7 +279,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
final DateTime startDate, @Nullable final DateTime endDate,
final BigDecimal amount, final DateTime chargeThroughDate,
final int totalInvoiceItemCount) throws SubscriptionUserApiException {
- final SubscriptionData subscription = subscriptionDataFromSubscription(entitlementUserApi.getSubscriptionFromId(subscriptionId, callContext));
+ final SubscriptionData subscription = subscriptionDataFromSubscription(subscriptionUserApi.getSubscriptionFromId(subscriptionId, callContext));
/*
final List<Invoice> invoices = invoiceUserApi.getInvoicesByAccount(accountId);
@@ -496,7 +496,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
@Override
public Subscription apply(@Nullable final Void dontcare) {
try {
- final Subscription subscription = entitlementUserApi.createSubscription(bundleId,
+ final Subscription subscription = subscriptionUserApi.createSubscription(bundleId,
new PlanPhaseSpecifier(productName, productCategory, billingPeriod, PriceListSet.DEFAULT_PRICELIST_NAME, null),
null,
callContext);
@@ -519,7 +519,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
public Subscription apply(@Nullable final Void dontcare) {
try {
// Need to fetch again to get latest CTD updated from the system
- final Subscription refreshedSubscription = entitlementUserApi.getSubscriptionFromId(subscription.getId(), callContext);
+ final Subscription refreshedSubscription = subscriptionUserApi.getSubscriptionFromId(subscription.getId(), callContext);
refreshedSubscription.changePlan(productName, billingPeriod, PriceListSet.DEFAULT_PRICELIST_NAME, clock.getUTCNow(), callContext);
return refreshedSubscription;
} catch (SubscriptionUserApiException e) {
@@ -538,7 +538,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
public Subscription apply(@Nullable final Void dontcare) {
try {
// Need to fetch again to get latest CTD updated from the system
- final Subscription refreshedSubscription = entitlementUserApi.getSubscriptionFromId(subscription.getId(), callContext);
+ final Subscription refreshedSubscription = subscriptionUserApi.getSubscriptionFromId(subscription.getId(), callContext);
refreshedSubscription.cancel(requestedDate, callContext);
return refreshedSubscription;
} catch (SubscriptionUserApiException e) {
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java
index 4cfc7c7..42a5341 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java
@@ -80,14 +80,14 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
final BillingPeriod term = BillingPeriod.MONTHLY;
final String pricelistName = PriceListSet.DEFAULT_PRICELIST_NAME;
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), UUID.randomUUID().toString(), callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), UUID.randomUUID().toString(), callContext);
final PlanPhaseSpecifier bpPlanPhaseSpecifier = new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, pricelistName, null);
//
// CREATE SUBSCRIPTION AND EXPECT BOTH EVENTS: NextEvent.CREATE NextEvent.INVOICE
//
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
- final SubscriptionData bpSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData bpSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
bpPlanPhaseSpecifier,
null,
callContext));
@@ -188,14 +188,14 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
final BillingPeriod term = BillingPeriod.MONTHLY;
final String pricelistName = PriceListSet.DEFAULT_PRICELIST_NAME;
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), UUID.randomUUID().toString(), callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), UUID.randomUUID().toString(), callContext);
final PlanPhaseSpecifier bpPlanPhaseSpecifier = new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, pricelistName, null);
//
// CREATE SUBSCRIPTION AND EXPECT BOTH EVENTS: NextEvent.CREATE NextEvent.INVOICE
//
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
- final SubscriptionData bpSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData bpSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
bpPlanPhaseSpecifier,
null,
callContext));
@@ -429,7 +429,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
// Set clock to the initial start date - we implicitly assume here that the account timezone is UTC
clock.setDeltaFromReality(today.toDateTimeAtCurrentTime(DateTimeZone.UTC).getMillis() - clock.getUTCNow().getMillis());
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
final String productName = "Shotgun";
final BillingPeriod term = BillingPeriod.ANNUAL;
@@ -440,7 +440,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
//
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
final PlanPhaseSpecifier bpPlanPhaseSpecifier = new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null);
- final SubscriptionData bpSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData bpSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
bpPlanPhaseSpecifier,
null,
callContext));
@@ -449,7 +449,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
assertListenerStatus();
assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
- assertEquals(entitlementUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+ assertEquals(subscriptionUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
// Move out of trials for interesting invoices adjustments
busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT);
@@ -471,7 +471,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
assertTrue(busHandler.isCompleted(DELAY));
assertListenerStatus();
- assertEquals(entitlementUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
+ assertEquals(subscriptionUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
invoices = invoiceUserApi.getInvoicesByAccount(account.getId(), callContext);
@@ -553,7 +553,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
// Set clock to the initial start date - we implicitly assume here that the account timezone is UTC
clock.setDeltaFromReality(today.toDateTimeAtCurrentTime(DateTimeZone.UTC).getMillis() - clock.getUTCNow().getMillis());
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
final String productName = "Shotgun";
final BillingPeriod term = BillingPeriod.ANNUAL;
@@ -564,7 +564,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
//
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
final PlanPhaseSpecifier bpPlanPhaseSpecifier = new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null);
- final SubscriptionData bpSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData bpSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
bpPlanPhaseSpecifier,
null,
callContext));
@@ -573,7 +573,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
assertListenerStatus();
assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
- assertEquals(entitlementUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+ assertEquals(subscriptionUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
// Move out of trials for interesting invoices adjustments
busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT);
@@ -592,7 +592,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
//
busHandler.pushExpectedEvents(NextEvent.CHANGE, NextEvent.INVOICE, NextEvent.INVOICE_ADJUSTMENT);
assertTrue(bpSubscription.changePlanWithPolicy(productName, BillingPeriod.MONTHLY, planSetName, clock.getUTCNow(), ActionPolicy.IMMEDIATE, callContext));
- assertEquals(entitlementUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
+ assertEquals(subscriptionUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
assertTrue(busHandler.isCompleted(DELAY));
assertListenerStatus();
@@ -669,7 +669,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
// Set clock to the initial start date - we implicitly assume here that the account timezone is UTC
clock.setDeltaFromReality(today.toDateTimeAtCurrentTime(DateTimeZone.UTC).getMillis() - clock.getUTCNow().getMillis());
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
final String productName = "Shotgun";
final BillingPeriod term = BillingPeriod.ANNUAL;
@@ -680,7 +680,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
//
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
final PlanPhaseSpecifier bpPlanPhaseSpecifier = new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null);
- final SubscriptionData bpSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData bpSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
bpPlanPhaseSpecifier,
null,
callContext));
@@ -689,7 +689,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
assertListenerStatus();
assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
- assertEquals(entitlementUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+ assertEquals(subscriptionUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
// Move out of trials for interesting invoices adjustments
busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT);
@@ -735,7 +735,7 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
//
busHandler.pushExpectedEvents(NextEvent.CHANGE, NextEvent.INVOICE, NextEvent.INVOICE_ADJUSTMENT);
assertTrue(bpSubscription.changePlanWithPolicy(productName, BillingPeriod.MONTHLY, planSetName, clock.getUTCNow(), ActionPolicy.IMMEDIATE, callContext));
- assertEquals(entitlementUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
+ assertEquals(subscriptionUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
assertTrue(busHandler.isCompleted(DELAY));
assertListenerStatus();
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java
index 85be9f6..6eb52a2 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java
@@ -68,7 +68,7 @@ public class TestIntegrationWithAutoInvoiceOffTag extends TestIntegrationBase {
account = createAccountWithNonOsgiPaymentMethod(getAccountData(25));
assertNotNull(account);
- bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
productName = "Shotgun";
term = BillingPeriod.MONTHLY;
@@ -82,7 +82,7 @@ public class TestIntegrationWithAutoInvoiceOffTag extends TestIntegrationBase {
// set next invoice to fail and create network
busHandler.pushExpectedEvents(NextEvent.CREATE);
- final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData baseSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, callContext));
assertNotNull(baseSubscription);
assertTrue(busHandler.isCompleted(DELAY));
@@ -118,7 +118,7 @@ public class TestIntegrationWithAutoInvoiceOffTag extends TestIntegrationBase {
// set next invoice to fail and create network
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
- final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData baseSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, callContext));
assertNotNull(baseSubscription);
assertTrue(busHandler.isCompleted(DELAY));
@@ -145,15 +145,15 @@ public class TestIntegrationWithAutoInvoiceOffTag extends TestIntegrationBase {
// set next invoice to fail and create network
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
- final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData baseSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, callContext));
assertNotNull(baseSubscription);
assertTrue(busHandler.isCompleted(DELAY));
- final SubscriptionBundle bundle2 = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle2 = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
- final SubscriptionData baseSubscription2 = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle2.getId(),
+ final SubscriptionData baseSubscription2 = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle2.getId(),
new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, callContext));
assertNotNull(baseSubscription2);
assertTrue(busHandler.isCompleted(DELAY));
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoPayOff.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoPayOff.java
index 30d8049..94ffa29 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoPayOff.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoPayOff.java
@@ -76,7 +76,7 @@ public class TestIntegrationWithAutoPayOff extends TestIntegrationBase {
account = createAccountWithNonOsgiPaymentMethod(getAccountData(25));
assertNotNull(account);
- bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
productName = "Shotgun";
term = BillingPeriod.MONTHLY;
@@ -90,7 +90,7 @@ public class TestIntegrationWithAutoPayOff extends TestIntegrationBase {
busHandler.pushExpectedEvents(NextEvent.INVOICE);
busHandler.pushExpectedEvents(NextEvent.CREATE);
- final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData baseSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, callContext));
assertNotNull(baseSubscription);
assertTrue(busHandler.isCompleted(DELAY));
@@ -138,7 +138,7 @@ public class TestIntegrationWithAutoPayOff extends TestIntegrationBase {
busHandler.pushExpectedEvents(NextEvent.INVOICE);
busHandler.pushExpectedEvents(NextEvent.CREATE);
- final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData baseSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, callContext));
assertNotNull(baseSubscription);
assertTrue(busHandler.isCompleted(DELAY));
@@ -204,7 +204,7 @@ public class TestIntegrationWithAutoPayOff extends TestIntegrationBase {
busHandler.pushExpectedEvents(NextEvent.INVOICE);
busHandler.pushExpectedEvents(NextEvent.CREATE);
- final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData baseSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, callContext));
assertNotNull(baseSubscription);
assertTrue(busHandler.isCompleted(DELAY));
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestPaymentRefund.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestPaymentRefund.java
index 6703414..c9d08cc 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestPaymentRefund.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestPaymentRefund.java
@@ -103,7 +103,7 @@ public class TestPaymentRefund extends TestIntegrationBase {
// set clock to the initial start date
clock.setTime(initialCreationDate);
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
invoiceItemCount = 0;
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestPublicBus.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestPublicBus.java
index 03c9fbb..4dfeb9c 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestPublicBus.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestPublicBus.java
@@ -95,7 +95,7 @@ public class TestPublicBus extends TestIntegrationBase {
// set clock to the initial start date
clock.setDeltaFromReality(initialDate.getMillis() - clock.getUTCNow().getMillis());
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever2", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever2", callContext);
String productName = "Shotgun";
BillingPeriod term = BillingPeriod.MONTHLY;
@@ -107,7 +107,7 @@ public class TestPublicBus extends TestIntegrationBase {
busHandler.pushExpectedEvent(NextEvent.CREATE);
busHandler.pushExpectedEvent(NextEvent.INVOICE);
- SubscriptionData subscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ SubscriptionData subscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, callContext));
assertNotNull(subscription);
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestRepairIntegration.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestRepairIntegration.java
index 1bcdebd..2f16774 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestRepairIntegration.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestRepairIntegration.java
@@ -71,7 +71,7 @@ public class TestRepairIntegration extends TestIntegrationBase {
final Account account = createAccountWithNonOsgiPaymentMethod(getAccountData(25));
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
final String productName = "Shotgun";
final BillingPeriod term = BillingPeriod.MONTHLY;
@@ -79,7 +79,7 @@ public class TestRepairIntegration extends TestIntegrationBase {
busHandler.pushExpectedEvent(NextEvent.CREATE);
busHandler.pushExpectedEvent(NextEvent.INVOICE);
- final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData baseSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, callContext));
assertNotNull(baseSubscription);
assertTrue(busHandler.isCompleted(DELAY));
@@ -91,14 +91,14 @@ public class TestRepairIntegration extends TestIntegrationBase {
busHandler.pushExpectedEvent(NextEvent.CREATE);
busHandler.pushExpectedEvent(NextEvent.INVOICE);
busHandler.pushExpectedEvent(NextEvent.PAYMENT);
- final SubscriptionData aoSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData aoSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier("Telescopic-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null), null, callContext));
assertTrue(busHandler.isCompleted(DELAY));
busHandler.pushExpectedEvent(NextEvent.CREATE);
busHandler.pushExpectedEvent(NextEvent.INVOICE);
busHandler.pushExpectedEvent(NextEvent.PAYMENT);
- final SubscriptionData aoSubscription2 = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData aoSubscription2 = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
new PlanPhaseSpecifier("Laser-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null), null, callContext));
assertTrue(busHandler.isCompleted(DELAY));
@@ -151,18 +151,18 @@ public class TestRepairIntegration extends TestIntegrationBase {
repairApi.repairBundle(bundleRepair, false, callContext);
assertTrue(busHandler.isCompleted(DELAY));
- final SubscriptionData newAoSubscription = subscriptionDataFromSubscription(entitlementUserApi.getSubscriptionFromId(aoSubscription.getId(), callContext));
+ final SubscriptionData newAoSubscription = subscriptionDataFromSubscription(subscriptionUserApi.getSubscriptionFromId(aoSubscription.getId(), callContext));
assertEquals(newAoSubscription.getState(), SubscriptionState.CANCELLED);
assertEquals(newAoSubscription.getAllTransitions().size(), 2);
assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
- final SubscriptionData newAoSubscription2 = subscriptionDataFromSubscription(entitlementUserApi.getSubscriptionFromId(aoSubscription2.getId(), callContext));
+ final SubscriptionData newAoSubscription2 = subscriptionDataFromSubscription(subscriptionUserApi.getSubscriptionFromId(aoSubscription2.getId(), callContext));
assertEquals(newAoSubscription2.getState(), SubscriptionState.ACTIVE);
assertEquals(newAoSubscription2.getAllTransitions().size(), 2);
assertEquals(newAoSubscription2.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
- final SubscriptionData newBaseSubscription = subscriptionDataFromSubscription(entitlementUserApi.getSubscriptionFromId(baseSubscription.getId(), callContext));
+ final SubscriptionData newBaseSubscription = subscriptionDataFromSubscription(subscriptionUserApi.getSubscriptionFromId(baseSubscription.getId(), callContext));
assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newBaseSubscription.getAllTransitions().size(), 3);
assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestSubscription.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestSubscription.java
index 9ed2c88..029a5bc 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestSubscription.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestSubscription.java
@@ -53,7 +53,7 @@ public class TestSubscription extends TestIntegrationBase {
// Set clock to the initial start date - we implicitly assume here that the account timezone is UTC
clock.setDeltaFromReality(today.toDateTimeAtCurrentTime(DateTimeZone.UTC).getMillis() - clock.getUTCNow().getMillis());
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
final String productName = "Shotgun";
final BillingPeriod term = BillingPeriod.ANNUAL;
@@ -64,7 +64,7 @@ public class TestSubscription extends TestIntegrationBase {
//
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
final PlanPhaseSpecifier bpPlanPhaseSpecifier = new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null);
- final SubscriptionData bpSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData bpSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
bpPlanPhaseSpecifier,
null,
callContext));
@@ -73,7 +73,7 @@ public class TestSubscription extends TestIntegrationBase {
assertListenerStatus();
assertEquals(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).size(), 1);
- assertEquals(entitlementUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+ assertEquals(subscriptionUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
// Move out of trials for interesting invoices adjustments
busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT);
@@ -92,7 +92,7 @@ public class TestSubscription extends TestIntegrationBase {
//
busHandler.pushExpectedEvents(NextEvent.CHANGE, NextEvent.INVOICE, NextEvent.INVOICE_ADJUSTMENT);
assertTrue(bpSubscription.changePlanWithPolicy(productName, BillingPeriod.MONTHLY, planSetName, clock.getUTCNow(), ActionPolicy.IMMEDIATE, callContext));
- assertEquals(entitlementUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
+ assertEquals(subscriptionUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
assertTrue(busHandler.isCompleted(DELAY));
assertListenerStatus();
@@ -116,7 +116,7 @@ public class TestSubscription extends TestIntegrationBase {
//
busHandler.pushExpectedEvents(NextEvent.CHANGE, NextEvent.INVOICE, NextEvent.INVOICE_ADJUSTMENT);
assertTrue(bpSubscription.changePlanWithPolicy(productName, BillingPeriod.ANNUAL, planSetName, clock.getUTCNow(), ActionPolicy.IMMEDIATE, callContext));
- assertEquals(entitlementUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+ assertEquals(subscriptionUserApi.getSubscriptionFromId(bpSubscription.getId(), callContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
assertTrue(busHandler.isCompleted(DELAY));
assertListenerStatus();
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestTagApi.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestTagApi.java
index dd9f374..ff98762 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestTagApi.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestTagApi.java
@@ -80,7 +80,7 @@ public class TestTagApi extends TestIntegrationBase {
//
// Create necessary logic to end up with an Invoice object on that account.
//
- final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
+ final SubscriptionBundle bundle = subscriptionUserApi.createBundleForAccount(account.getId(), "whatever", callContext);
final String productName = "Shotgun";
final BillingPeriod term = BillingPeriod.ANNUAL;
@@ -88,7 +88,7 @@ public class TestTagApi extends TestIntegrationBase {
busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
final PlanPhaseSpecifier bpPlanPhaseSpecifier = new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null);
- final SubscriptionData bpSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+ final SubscriptionData bpSubscription = subscriptionDataFromSubscription(subscriptionUserApi.createSubscription(bundle.getId(),
bpPlanPhaseSpecifier,
null,
callContext));
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/util/InvoiceChecker.java b/beatrix/src/test/java/com/ning/billing/beatrix/util/InvoiceChecker.java
index 6dfd794..21b6df3 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/util/InvoiceChecker.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/util/InvoiceChecker.java
@@ -51,13 +51,13 @@ public class InvoiceChecker {
private static final Logger log = LoggerFactory.getLogger(InvoiceChecker.class);
private final InvoiceUserApi invoiceUserApi;
- private final SubscriptionUserApi entitlementApi;
+ private final SubscriptionUserApi subscriptionApi;
private final AuditChecker auditChecker;
@Inject
- public InvoiceChecker(final InvoiceUserApi invoiceUserApi, final SubscriptionUserApi entitlementApi, final AuditChecker auditChecker) {
+ public InvoiceChecker(final InvoiceUserApi invoiceUserApi, final SubscriptionUserApi subscriptionApi, final AuditChecker auditChecker) {
this.invoiceUserApi = invoiceUserApi;
- this.entitlementApi = entitlementApi;
+ this.subscriptionApi = subscriptionApi;
this.auditChecker = auditChecker;
}
@@ -126,7 +126,7 @@ public class InvoiceChecker {
public void checkChargedThroughDate(final UUID subscriptionId, final LocalDate expectedLocalCTD, final CallContext context) {
try {
- final Subscription subscription = entitlementApi.getSubscriptionFromId(subscriptionId, context);
+ final Subscription subscription = subscriptionApi.getSubscriptionFromId(subscriptionId, context);
if (expectedLocalCTD == null) {
assertNull(subscription.getChargedThroughDate());
} else {
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/util/SubscriptionChecker.java b/beatrix/src/test/java/com/ning/billing/beatrix/util/SubscriptionChecker.java
index 438853b..ec855f2 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/util/SubscriptionChecker.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/util/SubscriptionChecker.java
@@ -40,17 +40,17 @@ public class SubscriptionChecker {
private static final Logger log = LoggerFactory.getLogger(SubscriptionChecker.class);
- private final SubscriptionUserApi entitlementApi;
+ private final SubscriptionUserApi subscriptionApi;
private final AuditChecker auditChecker;
@Inject
- public SubscriptionChecker(final SubscriptionUserApi entitlementApi, final AuditChecker auditChecker) {
- this.entitlementApi = entitlementApi;
+ public SubscriptionChecker(final SubscriptionUserApi subscriptionApi, final AuditChecker auditChecker) {
+ this.subscriptionApi = subscriptionApi;
this.auditChecker = auditChecker;
}
public SubscriptionBundle checkBundleNoAudits(final UUID bundleId, final UUID expectedAccountId, final String expectedKey, final CallContext context) throws SubscriptionUserApiException {
- final SubscriptionBundle bundle = entitlementApi.getBundleFromId(bundleId, context);
+ final SubscriptionBundle bundle = subscriptionApi.getBundleFromId(bundleId, context);
Assert.assertNotNull(bundle);
Assert.assertEquals(bundle.getAccountId(), expectedAccountId);
Assert.assertEquals(bundle.getExternalKey(), expectedKey);
@@ -58,13 +58,13 @@ public class SubscriptionChecker {
}
public SubscriptionBundle checkBundleAuditUpdated(final UUID bundleId, final CallContext context) throws SubscriptionUserApiException {
- final SubscriptionBundle bundle = entitlementApi.getBundleFromId(bundleId, context);
+ final SubscriptionBundle bundle = subscriptionApi.getBundleFromId(bundleId, context);
auditChecker.checkBundleUpdated(bundle.getId(), context);
return bundle;
}
public Subscription checkSubscriptionCreated(final UUID subscriptionId, final CallContext context) throws SubscriptionUserApiException {
- final Subscription subscription = entitlementApi.getSubscriptionFromId(subscriptionId, context);
+ final Subscription subscription = subscriptionApi.getSubscriptionFromId(subscriptionId, context);
Assert.assertNotNull(subscription);
auditChecker.checkSubscriptionCreated(subscription.getBundleId(), subscriptionId, context);
diff --git a/beatrix/src/test/resources/beatrix.properties b/beatrix/src/test/resources/beatrix.properties
index 117b80a..8365fab 100644
--- a/beatrix/src/test/resources/beatrix.properties
+++ b/beatrix/src/test/resources/beatrix.properties
@@ -1,9 +1,6 @@
killbill.catalog.uri=file:src/test/resources/catalogSample.xml
-killbill.entitlement.dao.claim.time=60000
-killbill.entitlement.dao.ready.max=1
killbill.payment.engine.notifications.sleep=100
killbill.invoice.engine.notifications.sleep=100
-killbill.entitlement.engine.notifications.sleep=100
killbill.billing.persistent.bus.sleep=100
killbill.billing.persistent.bus.nbThreads=1
killbill.billing.persistent.bus.claimed=1
diff --git a/invoice/src/main/java/com/ning/billing/invoice/InvoiceDispatcher.java b/invoice/src/main/java/com/ning/billing/invoice/InvoiceDispatcher.java
index 639a935..ccb4c4e 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/InvoiceDispatcher.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/InvoiceDispatcher.java
@@ -70,7 +70,7 @@ import com.ning.billing.util.globallocker.GlobalLocker;
import com.ning.billing.util.globallocker.GlobalLocker.LockerType;
import com.ning.billing.util.globallocker.LockFailedException;
import com.ning.billing.util.svcapi.account.AccountInternalApi;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.junction.BillingEventSet;
import com.ning.billing.util.svcapi.junction.BillingInternalApi;
diff --git a/invoice/src/main/java/com/ning/billing/invoice/InvoiceListener.java b/invoice/src/main/java/com/ning/billing/invoice/InvoiceListener.java
index 896d688..9e87e37 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/InvoiceListener.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/InvoiceListener.java
@@ -47,7 +47,7 @@ public class InvoiceListener {
}
@Subscribe
- public void handleRepairEntitlementEvent(final RepairSubscriptionInternalEvent event) {
+ public void handleRepairSubscriptionEvent(final RepairSubscriptionInternalEvent event) {
try {
final InternalCallContext context = internalCallContextFactory.createInternalCallContext(event.getSearchKey2(), event.getSearchKey1(), "RepairBundle", CallOrigin.INTERNAL, UserType.SYSTEM, event.getUserToken());
diff --git a/invoice/src/main/java/com/ning/billing/invoice/notification/DefaultNextBillingDateNotifier.java b/invoice/src/main/java/com/ning/billing/invoice/notification/DefaultNextBillingDateNotifier.java
index dc45a2d..353d8e6 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/notification/DefaultNextBillingDateNotifier.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/notification/DefaultNextBillingDateNotifier.java
@@ -34,7 +34,7 @@ import com.ning.billing.notificationq.api.NotificationQueueService.NotificationQ
import com.ning.billing.notificationq.api.NotificationQueueService.NotificationQueueHandler;
import com.ning.billing.util.callcontext.InternalCallContextFactory;
import com.ning.billing.util.config.InvoiceConfig;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.google.inject.Inject;
@@ -46,7 +46,7 @@ public class DefaultNextBillingDateNotifier implements NextBillingDateNotifier {
private final NotificationQueueService notificationQueueService;
private final InvoiceConfig config;
- private final SubscriptionInternalApi entitlementApi;
+ private final SubscriptionInternalApi subscriptionApi;
private final InvoiceListener listener;
private final InternalCallContextFactory callContextFactory;
@@ -55,12 +55,12 @@ public class DefaultNextBillingDateNotifier implements NextBillingDateNotifier {
@Inject
public DefaultNextBillingDateNotifier(final NotificationQueueService notificationQueueService,
final InvoiceConfig config,
- final SubscriptionInternalApi entitlementApi,
+ final SubscriptionInternalApi subscriptionApi,
final InvoiceListener listener,
final InternalCallContextFactory callContextFactory) {
this.notificationQueueService = notificationQueueService;
this.config = config;
- this.entitlementApi = entitlementApi;
+ this.subscriptionApi = subscriptionApi;
this.listener = listener;
this.callContextFactory = callContextFactory;
}
@@ -79,7 +79,7 @@ public class DefaultNextBillingDateNotifier implements NextBillingDateNotifier {
final NextBillingDateNotificationKey key = (NextBillingDateNotificationKey) notificationKey;
try {
- final Subscription subscription = entitlementApi.getSubscriptionFromId(key.getUuidKey(), callContextFactory.createInternalTenantContext(tenantRecordId, accountRecordId));
+ final Subscription subscription = subscriptionApi.getSubscriptionFromId(key.getUuidKey(), callContextFactory.createInternalTenantContext(tenantRecordId, accountRecordId));
if (subscription == null) {
log.warn("Next Billing Date Notification Queue handled spurious notification (key: " + key + ")");
} else {
diff --git a/invoice/src/test/java/com/ning/billing/invoice/glue/TestInvoiceModule.java b/invoice/src/test/java/com/ning/billing/invoice/glue/TestInvoiceModule.java
index 188b60d..ccbea40 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/glue/TestInvoiceModule.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/glue/TestInvoiceModule.java
@@ -29,7 +29,7 @@ import com.ning.billing.util.glue.CustomFieldModule;
import com.ning.billing.util.glue.NotificationQueueModule;
import com.ning.billing.util.glue.TagStoreModule;
import com.ning.billing.util.svcapi.account.AccountInternalApi;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.junction.BillingInternalApi;
diff --git a/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteNoDB.java b/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteNoDB.java
index f9d3026..1b2d56d 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteNoDB.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteNoDB.java
@@ -39,7 +39,7 @@ import com.ning.billing.util.callcontext.InternalCallContextFactory;
import com.ning.billing.clock.Clock;
import com.ning.billing.util.globallocker.GlobalLocker;
import com.ning.billing.util.svcapi.account.AccountInternalApi;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.invoice.InvoiceInternalApi;
import com.ning.billing.util.svcapi.junction.BillingInternalApi;
import com.ning.billing.util.svcsapi.bus.BusService;
@@ -69,7 +69,7 @@ public abstract class InvoiceTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
@Inject
protected AccountInternalApi accountApi;
@Inject
- protected SubscriptionInternalApi entitlementApi;
+ protected SubscriptionInternalApi subscriptionApi;
@Inject
protected BusService busService;
@Inject
diff --git a/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteWithEmbeddedDB.java b/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteWithEmbeddedDB.java
index e7e1f68..cbb2d96 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteWithEmbeddedDB.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteWithEmbeddedDB.java
@@ -44,7 +44,7 @@ import com.ning.billing.util.callcontext.InternalCallContextFactory;
import com.ning.billing.clock.Clock;
import com.ning.billing.util.globallocker.GlobalLocker;
import com.ning.billing.util.svcapi.account.AccountInternalApi;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.invoice.InvoiceInternalApi;
import com.ning.billing.util.svcapi.junction.BillingInternalApi;
import com.ning.billing.util.svcsapi.bus.BusService;
@@ -78,7 +78,7 @@ public abstract class InvoiceTestSuiteWithEmbeddedDB extends GuicyKillbillTestSu
@Inject
protected AccountInternalApi accountApi;
@Inject
- protected SubscriptionInternalApi entitlementApi;
+ protected SubscriptionInternalApi subscriptionApi;
@Inject
protected BusService busService;
@Inject
diff --git a/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java b/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
index caa36da..467cf0a 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
@@ -88,7 +88,7 @@ public class TestInvoiceDispatcher extends InvoiceTestSuiteWithEmbeddedDB {
final DateTime target = new DateTime();
final InvoiceNotifier invoiceNotifier = new NullInvoiceNotifier();
- final InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountApi, billingApi, entitlementApi, invoiceDao,
+ final InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountApi, billingApi, subscriptionApi, invoiceDao,
invoiceNotifier, locker, busService.getBus(),
clock);
@@ -142,7 +142,7 @@ public class TestInvoiceDispatcher extends InvoiceTestSuiteWithEmbeddedDB {
Mockito.when(billingApi.getBillingEventsForAccountAndUpdateAccountBCD(Mockito.<UUID>any(), Mockito.<InternalCallContext>any())).thenReturn(events);
final InvoiceNotifier invoiceNotifier = new NullInvoiceNotifier();
- final InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountApi, billingApi, entitlementApi, invoiceDao,
+ final InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountApi, billingApi, subscriptionApi, invoiceDao,
invoiceNotifier, locker, busService.getBus(),
clock);
@@ -202,7 +202,7 @@ public class TestInvoiceDispatcher extends InvoiceTestSuiteWithEmbeddedDB {
"planName", "phaseName", startDate, endDate, new BigDecimal("23.9"), new BigDecimal("23.9"), Currency.EUR, null);
final InvoiceNotifier invoiceNotifier = new NullInvoiceNotifier();
- final InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountApi, billingApi, entitlementApi, invoiceDao,
+ final InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountApi, billingApi, subscriptionApi, invoiceDao,
invoiceNotifier, locker, busService.getBus(),
clock);
diff --git a/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceHelper.java b/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceHelper.java
index 7e7d871..653aa4e 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceHelper.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceHelper.java
@@ -62,7 +62,7 @@ import com.ning.billing.clock.Clock;
import com.ning.billing.util.entity.EntityPersistenceException;
import com.ning.billing.util.globallocker.GlobalLocker;
import com.ning.billing.util.svcapi.account.AccountInternalApi;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.junction.BillingEvent;
import com.ning.billing.util.svcapi.junction.BillingEventSet;
import com.ning.billing.util.svcapi.junction.BillingInternalApi;
@@ -129,7 +129,7 @@ public class TestInvoiceHelper {
private final InvoiceGenerator generator;
private final BillingInternalApi billingApi;
private final AccountInternalApi accountApi;
- private final SubscriptionInternalApi entitlementApi;
+ private final SubscriptionInternalApi subscriptionApi;
private final BusService busService;
private final InvoiceDao invoiceDao;
private final GlobalLocker locker;
@@ -144,12 +144,12 @@ public class TestInvoiceHelper {
@Inject
public TestInvoiceHelper(final InvoiceGenerator generator, final IDBI dbi,
- final BillingInternalApi billingApi, final AccountInternalApi accountApi, final SubscriptionInternalApi entitlementApi, final BusService busService,
+ final BillingInternalApi billingApi, final AccountInternalApi accountApi, final SubscriptionInternalApi subscriptionApi, final BusService busService,
final InvoiceDao invoiceDao, final GlobalLocker locker, final Clock clock, final InternalCallContext internalCallContext) {
this.generator = generator;
this.billingApi = billingApi;
this.accountApi = accountApi;
- this.entitlementApi = entitlementApi;
+ this.subscriptionApi = subscriptionApi;
this.busService = busService;
this.invoiceDao = invoiceDao;
this.locker = locker;
@@ -176,7 +176,7 @@ public class TestInvoiceHelper {
Mockito.when(billingApi.getBillingEventsForAccountAndUpdateAccountBCD(Mockito.<UUID>any(), Mockito.<InternalCallContext>any())).thenReturn(events);
final InvoiceNotifier invoiceNotifier = new NullInvoiceNotifier();
- final InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountApi, billingApi, entitlementApi,
+ final InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountApi, billingApi, subscriptionApi,
invoiceDao, invoiceNotifier, locker, busService.getBus(),
clock);
@@ -199,7 +199,7 @@ public class TestInvoiceHelper {
UUID uuid = UUID.randomUUID();
final Subscription subscription = Mockito.mock(Subscription.class);
Mockito.when(subscription.getId()).thenReturn(uuid);
- Mockito.when(entitlementApi.getSubscriptionFromId(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(subscription);
+ Mockito.when(subscriptionApi.getSubscriptionFromId(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(subscription);
return subscription;
}
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AnalyticsSanityJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AnalyticsSanityJson.java
index 8eade98..cd79460 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AnalyticsSanityJson.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AnalyticsSanityJson.java
@@ -28,31 +28,31 @@ import com.google.common.collect.ImmutableList;
public class AnalyticsSanityJson extends JsonBase {
- private final List<String> checkEntitlement;
+ private final List<String> checkSubscription;
private final List<String> checkInvoice;
private final List<String> checkPayment;
private final List<String> checkTag;
private final List<String> checkConsistency;
@JsonCreator
- public AnalyticsSanityJson(@JsonProperty("checkEntitlement") final List<String> checkEntitlement,
+ public AnalyticsSanityJson(@JsonProperty("checkSubscription") final List<String> checkSubscription,
@JsonProperty("checkInvoice") final List<String> checkInvoice,
@JsonProperty("checkPayment") final List<String> checkPayment,
@JsonProperty("checkTag") final List<String> checkTag,
@JsonProperty("checkConsistency") final List<String> checkConsistency) {
- this.checkEntitlement = checkEntitlement;
+ this.checkSubscription = checkSubscription;
this.checkInvoice = checkInvoice;
this.checkPayment = checkPayment;
this.checkTag = checkTag;
this.checkConsistency = checkConsistency;
}
- public AnalyticsSanityJson(final Collection<UUID> checkEntitlement,
+ public AnalyticsSanityJson(final Collection<UUID> checkSubscription,
final Collection<UUID> checkInvoice,
final Collection<UUID> checkPayment,
final Collection<UUID> checkTag,
final Collection<UUID> checkConsistency) {
- this.checkEntitlement = ImmutableList.<String>copyOf(Collections2.transform(checkEntitlement, new Function<UUID, String>() {
+ this.checkSubscription = ImmutableList.<String>copyOf(Collections2.transform(checkSubscription, new Function<UUID, String>() {
@Override
public String apply(final UUID input) {
return input.toString();
@@ -84,8 +84,8 @@ public class AnalyticsSanityJson extends JsonBase {
}));
}
- public List<String> getCheckEntitlement() {
- return checkEntitlement;
+ public List<String> getCheckSubscription() {
+ return checkSubscription;
}
public List<String> getCheckInvoice() {
@@ -108,7 +108,7 @@ public class AnalyticsSanityJson extends JsonBase {
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("AnalyticsSanityJson");
- sb.append("{checkEntitlement=").append(checkEntitlement);
+ sb.append("{checkSubscription=").append(checkSubscription);
sb.append(", checkInvoice=").append(checkInvoice);
sb.append(", checkPayment=").append(checkPayment);
sb.append(", checkTag=").append(checkTag);
@@ -131,7 +131,7 @@ public class AnalyticsSanityJson extends JsonBase {
if (checkConsistency != null ? !checkConsistency.equals(json.checkConsistency) : json.checkConsistency != null) {
return false;
}
- if (checkEntitlement != null ? !checkEntitlement.equals(json.checkEntitlement) : json.checkEntitlement != null) {
+ if (checkSubscription != null ? !checkSubscription.equals(json.checkSubscription) : json.checkSubscription != null) {
return false;
}
if (checkInvoice != null ? !checkInvoice.equals(json.checkInvoice) : json.checkInvoice != null) {
@@ -149,7 +149,7 @@ public class AnalyticsSanityJson extends JsonBase {
@Override
public int hashCode() {
- int result = checkEntitlement != null ? checkEntitlement.hashCode() : 0;
+ int result = checkSubscription != null ? checkSubscription.hashCode() : 0;
result = 31 * result + (checkInvoice != null ? checkInvoice.hashCode() : 0);
result = 31 * result + (checkPayment != null ? checkPayment.hashCode() : 0);
result = 31 * result + (checkTag != null ? checkTag.hashCode() : 0);
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/SubscriptionBillingApiExceptionMapper.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/SubscriptionBillingApiExceptionMapper.java
index 58ff248..f2615a4 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/SubscriptionBillingApiExceptionMapper.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/SubscriptionBillingApiExceptionMapper.java
@@ -23,7 +23,7 @@ import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionBillingApiException;
+import com.ning.billing.util.svcapi.subscription.SubscriptionBillingApiException;
@Singleton
@Provider
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
index 58c2ce1..241f21a 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
@@ -106,7 +106,7 @@ public class AccountResource extends JaxRsResourceBase {
private static final String ID_PARAM_NAME = "accountId";
private final AccountUserApi accountApi;
- private final SubscriptionUserApi entitlementApi;
+ private final SubscriptionUserApi subscriptionApi;
private final SubscriptionTimelineApi timelineApi;
private final InvoiceUserApi invoiceApi;
private final InvoicePaymentApi invoicePaymentApi;
@@ -115,7 +115,7 @@ public class AccountResource extends JaxRsResourceBase {
@Inject
public AccountResource(final JaxrsUriBuilder uriBuilder,
final AccountUserApi accountApi,
- final SubscriptionUserApi entitlementApi,
+ final SubscriptionUserApi subscriptionApi,
final InvoiceUserApi invoiceApi,
final InvoicePaymentApi invoicePaymentApi,
final PaymentApi paymentApi,
@@ -126,7 +126,7 @@ public class AccountResource extends JaxRsResourceBase {
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, context);
this.accountApi = accountApi;
- this.entitlementApi = entitlementApi;
+ this.subscriptionApi = subscriptionApi;
this.invoiceApi = invoiceApi;
this.invoicePaymentApi = invoicePaymentApi;
this.paymentApi = paymentApi;
@@ -157,11 +157,11 @@ public class AccountResource extends JaxRsResourceBase {
accountApi.getAccountById(uuid, tenantContext);
if (externalKey != null) {
- final SubscriptionBundle bundle = entitlementApi.getBundleForAccountAndKey(uuid, externalKey, tenantContext);
+ final SubscriptionBundle bundle = subscriptionApi.getBundleForAccountAndKey(uuid, externalKey, tenantContext);
final BundleJsonNoSubscriptions json = new BundleJsonNoSubscriptions(bundle);
return Response.status(Status.OK).entity(json).build();
} else {
- final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(uuid, tenantContext);
+ final List<SubscriptionBundle> bundles = subscriptionApi.getBundlesForAccount(uuid, tenantContext);
final Collection<BundleJsonNoSubscriptions> result = Collections2.transform(bundles, new Function<SubscriptionBundle, BundleJsonNoSubscriptions>() {
@Override
public BundleJsonNoSubscriptions apply(final SubscriptionBundle input) {
@@ -281,7 +281,7 @@ public class AccountResource extends JaxRsResourceBase {
}
// Get the bundles
- final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(account.getId(), tenantContext);
+ final List<SubscriptionBundle> bundles = subscriptionApi.getBundlesForAccount(account.getId(), tenantContext);
final List<BundleTimeline> bundlesTimeline = new LinkedList<BundleTimeline>();
for (final SubscriptionBundle bundle : bundles) {
bundlesTimeline.add(timelineApi.getBundleTimeline(bundle.getId(), tenantContext));
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/BundleResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/BundleResource.java
index edc855d..fc8d070 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/BundleResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/BundleResource.java
@@ -72,11 +72,11 @@ public class BundleResource extends JaxRsResourceBase {
private static final String CUSTOM_FIELD_URI = JaxrsResource.CUSTOM_FIELDS;
private static final String TAG_URI = JaxrsResource.TAGS;
- private final SubscriptionUserApi entitlementApi;
+ private final SubscriptionUserApi subscriptionApi;
private final SubscriptionTransferApi transferApi;
@Inject
- public BundleResource(final SubscriptionUserApi entitlementApi,
+ public BundleResource(final SubscriptionUserApi subscriptionApi,
final SubscriptionTransferApi transferApi,
final JaxrsUriBuilder uriBuilder,
final TagUserApi tagUserApi,
@@ -84,7 +84,7 @@ public class BundleResource extends JaxRsResourceBase {
final AuditUserApi auditUserApi,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, context);
- this.entitlementApi = entitlementApi;
+ this.subscriptionApi = subscriptionApi;
this.transferApi = transferApi;
}
@@ -93,7 +93,7 @@ public class BundleResource extends JaxRsResourceBase {
@Produces(APPLICATION_JSON)
public Response getBundle(@PathParam("bundleId") final String bundleId,
@javax.ws.rs.core.Context final HttpServletRequest request) throws SubscriptionUserApiException {
- final SubscriptionBundle bundle = entitlementApi.getBundleFromId(UUID.fromString(bundleId), context.createContext(request));
+ final SubscriptionBundle bundle = subscriptionApi.getBundleFromId(UUID.fromString(bundleId), context.createContext(request));
final BundleJsonNoSubscriptions json = new BundleJsonNoSubscriptions(bundle);
return Response.status(Status.OK).entity(json).build();
}
@@ -107,7 +107,7 @@ public class BundleResource extends JaxRsResourceBase {
@HeaderParam(HDR_COMMENT) final String comment,
@javax.ws.rs.core.Context final HttpServletRequest request) throws SubscriptionUserApiException {
final UUID accountId = UUID.fromString(json.getAccountId());
- final SubscriptionBundle bundle = entitlementApi.createBundleForAccount(accountId, json.getExternalKey(),
+ final SubscriptionBundle bundle = subscriptionApi.createBundleForAccount(accountId, json.getExternalKey(),
context.createContext(createdBy, reason, comment, request));
return uriBuilder.buildResponse(BundleResource.class, "getBundle", bundle.getId());
}
@@ -119,11 +119,11 @@ public class BundleResource extends JaxRsResourceBase {
@javax.ws.rs.core.Context final HttpServletRequest request) throws SubscriptionUserApiException {
final TenantContext tenantContext = context.createContext(request);
final UUID uuid = UUID.fromString(bundleId);
- final SubscriptionBundle bundle = entitlementApi.getBundleFromId(uuid, tenantContext);
+ final SubscriptionBundle bundle = subscriptionApi.getBundleFromId(uuid, tenantContext);
if (bundle == null) {
return Response.status(Status.NO_CONTENT).build();
}
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(uuid, tenantContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(uuid, tenantContext);
final Collection<SubscriptionJsonNoEvents> result = Collections2.transform(subscriptions, new Function<Subscription, SubscriptionJsonNoEvents>() {
@Override
public SubscriptionJsonNoEvents apply(final Subscription input) {
@@ -193,7 +193,7 @@ public class BundleResource extends JaxRsResourceBase {
@javax.ws.rs.core.Context final UriInfo uriInfo,
@javax.ws.rs.core.Context final HttpServletRequest request) throws SubscriptionUserApiException, SubscriptionTransferApiException {
final CallContext callContext = context.createContext(createdBy, reason, comment, request);
- final SubscriptionBundle bundle = entitlementApi.getBundleFromId(UUID.fromString(id), callContext);
+ final SubscriptionBundle bundle = subscriptionApi.getBundleFromId(UUID.fromString(id), callContext);
final DateTime inputDate = (requestedDate != null) ? DATE_TIME_FORMATTER.parseDateTime(requestedDate) : null;
final SubscriptionBundle newBundle = transferApi.transferBundle(bundle.getAccountId(), UUID.fromString(json.getAccountId()), bundle.getExternalKey(), inputDate, transferAddOn,
cancelImmediatley, callContext);
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/OverdueResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/OverdueResource.java
index 262051d..c774b8c 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/OverdueResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/OverdueResource.java
@@ -56,12 +56,12 @@ public class OverdueResource extends JaxRsResourceBase {
private final OverdueUserApi overdueApi;
private final AccountUserApi accountApi;
- private final SubscriptionUserApi entitlementApi;
+ private final SubscriptionUserApi subscriptionApi;
@Inject
public OverdueResource(final OverdueUserApi overdueApi,
final AccountUserApi accountApi,
- final SubscriptionUserApi entitlementApi,
+ final SubscriptionUserApi subscriptionApi,
final JaxrsUriBuilder uriBuilder,
final TagUserApi tagUserApi,
final CustomFieldUserApi customFieldUserApi,
@@ -70,7 +70,7 @@ public class OverdueResource extends JaxRsResourceBase {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, context);
this.overdueApi = overdueApi;
this.accountApi = accountApi;
- this.entitlementApi = entitlementApi;
+ this.subscriptionApi = subscriptionApi;
}
@GET
@@ -93,7 +93,7 @@ public class OverdueResource extends JaxRsResourceBase {
@javax.ws.rs.core.Context final HttpServletRequest request) throws SubscriptionUserApiException, OverdueException, OverdueApiException {
final TenantContext tenantContext = context.createContext(request);
- final SubscriptionBundle bundle = entitlementApi.getBundleFromId(UUID.fromString(bundleId), tenantContext);
+ final SubscriptionBundle bundle = subscriptionApi.getBundleFromId(UUID.fromString(bundleId), tenantContext);
final OverdueState<SubscriptionBundle> overdueState = overdueApi.getOverdueStateFor(bundle, tenantContext);
return Response.status(Status.OK).entity(new OverdueStateJson(overdueState)).build();
@@ -106,7 +106,7 @@ public class OverdueResource extends JaxRsResourceBase {
@javax.ws.rs.core.Context final HttpServletRequest request) throws SubscriptionUserApiException, OverdueException, OverdueApiException {
final TenantContext tenantContext = context.createContext(request);
- final Subscription subscription = entitlementApi.getSubscriptionFromId(UUID.fromString(subscriptionId), tenantContext);
+ final Subscription subscription = subscriptionApi.getSubscriptionFromId(UUID.fromString(subscriptionId), tenantContext);
final OverdueState<Subscription> overdueState = overdueApi.getOverdueStateFor(subscription, tenantContext);
return Response.status(Status.OK).entity(new OverdueStateJson(overdueState)).build();
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/SubscriptionResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/SubscriptionResource.java
index 5aba7ee..9acd9a9 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/SubscriptionResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/SubscriptionResource.java
@@ -80,11 +80,11 @@ public class SubscriptionResource extends JaxRsResourceBase {
private static final String CUSTOM_FIELD_URI = JaxrsResource.CUSTOM_FIELDS + "/{" + ID_PARAM_NAME + ":" + UUID_PATTERN + "}";
private static final String TAG_URI = JaxrsResource.TAGS + "/{" + ID_PARAM_NAME + ":" + UUID_PATTERN + "}";
- private final SubscriptionUserApi entitlementApi;
+ private final SubscriptionUserApi subscriptionApi;
private final KillbillEventHandler killbillHandler;
@Inject
- public SubscriptionResource(final SubscriptionUserApi entitlementApi,
+ public SubscriptionResource(final SubscriptionUserApi subscriptionApi,
final KillbillEventHandler killbillHandler,
final JaxrsUriBuilder uriBuilder,
final TagUserApi tagUserApi,
@@ -92,7 +92,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
final AuditUserApi auditUserApi,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, context);
- this.entitlementApi = entitlementApi;
+ this.subscriptionApi = subscriptionApi;
this.killbillHandler = killbillHandler;
}
@@ -102,7 +102,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
public Response getSubscription(@PathParam("subscriptionId") final String subscriptionId,
@javax.ws.rs.core.Context final HttpServletRequest request) throws SubscriptionUserApiException {
final UUID uuid = UUID.fromString(subscriptionId);
- final Subscription subscription = entitlementApi.getSubscriptionFromId(uuid, context.createContext(request));
+ final Subscription subscription = subscriptionApi.getSubscriptionFromId(uuid, context.createContext(request));
final SubscriptionJsonNoEvents json = new SubscriptionJsonNoEvents(subscription, null);
return Response.status(Status.OK).entity(json).build();
}
@@ -130,7 +130,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
final PlanPhaseSpecifier spec = new PlanPhaseSpecifier(subscription.getProductName(),
ProductCategory.valueOf(subscription.getProductCategory()),
BillingPeriod.valueOf(subscription.getBillingPeriod()), subscription.getPriceList(), null);
- return entitlementApi.createSubscription(uuid, spec, inputDate, ctx);
+ return subscriptionApi.createSubscription(uuid, spec, inputDate, ctx);
}
@Override
@@ -172,7 +172,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
public Response doOperation(final CallContext ctx) throws SubscriptionUserApiException, InterruptedException,
TimeoutException {
final UUID uuid = UUID.fromString(subscriptionId);
- final Subscription current = entitlementApi.getSubscriptionFromId(uuid, callContext);
+ final Subscription current = subscriptionApi.getSubscriptionFromId(uuid, callContext);
final DateTime inputDate = (requestedDate != null) ? DATE_TIME_FORMATTER.parseDateTime(requestedDate) : null;
if (policyString == null) {
@@ -215,7 +215,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
@HeaderParam(HDR_COMMENT) final String comment,
@javax.ws.rs.core.Context final HttpServletRequest request) throws SubscriptionUserApiException {
final UUID uuid = UUID.fromString(subscriptionId);
- final Subscription current = entitlementApi.getSubscriptionFromId(uuid, context.createContext(createdBy, reason, comment, request));
+ final Subscription current = subscriptionApi.getSubscriptionFromId(uuid, context.createContext(createdBy, reason, comment, request));
current.uncancel(context.createContext(createdBy, reason, comment, request));
return Response.status(Status.OK).build();
@@ -246,7 +246,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
TimeoutException {
final UUID uuid = UUID.fromString(subscriptionId);
- final Subscription current = entitlementApi.getSubscriptionFromId(uuid, callContext);
+ final Subscription current = subscriptionApi.getSubscriptionFromId(uuid, callContext);
final DateTime inputDate = (requestedDate != null) ? DATE_TIME_FORMATTER.parseDateTime(requestedDate) : null;
if (policyString == null) {
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/util/KillbillEventHandler.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/util/KillbillEventHandler.java
index f0c1aee..fdb66df 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/util/KillbillEventHandler.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/util/KillbillEventHandler.java
@@ -57,7 +57,7 @@ public class KillbillEventHandler {
* Killbill server event handler
*/
@Subscribe
- public void handleEntitlementevents(final BusInternalEvent event) {
+ public void handleSubscriptionevents(final BusInternalEvent event) {
final List<CompletionUserRequestNotifier> runningWaiters = new ArrayList<CompletionUserRequestNotifier>();
synchronized (activeWaiters) {
runningWaiters.addAll(activeWaiters);
diff --git a/junction/src/main/java/com/ning/billing/junction/block/DefaultBlockingChecker.java b/junction/src/main/java/com/ning/billing/junction/block/DefaultBlockingChecker.java
index 3be1602..a81bda3 100644
--- a/junction/src/main/java/com/ning/billing/junction/block/DefaultBlockingChecker.java
+++ b/junction/src/main/java/com/ning/billing/junction/block/DefaultBlockingChecker.java
@@ -29,7 +29,7 @@ import com.ning.billing.junction.api.BlockingState;
import com.ning.billing.junction.api.Type;
import com.ning.billing.junction.dao.BlockingStateDao;
import com.ning.billing.util.callcontext.InternalTenantContext;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.google.inject.Inject;
@@ -80,17 +80,17 @@ public class DefaultBlockingChecker implements BlockingChecker {
private static final Object ACTION_ENTITLEMENT = "Entitlement";
private static final Object ACTION_BILLING = "Billing";
- private final SubscriptionInternalApi entitlementApi;
+ private final SubscriptionInternalApi subscriptionApi;
private final BlockingStateDao dao;
@Inject
- public DefaultBlockingChecker(final SubscriptionInternalApi entitlementApi, final BlockingStateDao dao) {
- this.entitlementApi = entitlementApi;
+ public DefaultBlockingChecker(final SubscriptionInternalApi subscriptionApi, final BlockingStateDao dao) {
+ this.subscriptionApi = subscriptionApi;
this.dao = dao;
}
private BlockingAggregator getBlockedStateSubscriptionId(final UUID subscriptionId, final InternalTenantContext context) throws SubscriptionUserApiException {
- final Subscription subscription = entitlementApi.getSubscriptionFromId(subscriptionId, context);
+ final Subscription subscription = subscriptionApi.getSubscriptionFromId(subscriptionId, context);
return getBlockedStateSubscription(subscription, context);
}
@@ -111,7 +111,7 @@ public class DefaultBlockingChecker implements BlockingChecker {
private BlockingAggregator getBlockedStateBundleId(final UUID bundleId, final InternalTenantContext context) throws SubscriptionUserApiException {
- final SubscriptionBundle bundle = entitlementApi.getBundleFromId(bundleId, context);
+ final SubscriptionBundle bundle = subscriptionApi.getBundleFromId(bundleId, context);
return getBlockedStateBundle(bundle, context);
}
diff --git a/junction/src/main/java/com/ning/billing/junction/plumbing/api/BlockingSubscriptionUserApi.java b/junction/src/main/java/com/ning/billing/junction/plumbing/api/BlockingSubscriptionUserApi.java
index 2fd97ba..0e53d0b 100644
--- a/junction/src/main/java/com/ning/billing/junction/plumbing/api/BlockingSubscriptionUserApi.java
+++ b/junction/src/main/java/com/ning/billing/junction/plumbing/api/BlockingSubscriptionUserApi.java
@@ -44,7 +44,7 @@ import com.google.inject.Inject;
public class BlockingSubscriptionUserApi implements SubscriptionUserApi {
- private final SubscriptionUserApi entitlementUserApi;
+ private final SubscriptionUserApi subscriptionUserApi;
private final BlockingInternalApi blockingApi;
private final BlockingChecker checker;
private final InternalCallContextFactory internalCallContextFactory;
@@ -52,7 +52,7 @@ public class BlockingSubscriptionUserApi implements SubscriptionUserApi {
@Inject
public BlockingSubscriptionUserApi(@RealImplementation final SubscriptionUserApi userApi, final BlockingInternalApi blockingApi,
final BlockingChecker checker, final InternalCallContextFactory internalCallContextFactory) {
- this.entitlementUserApi = userApi;
+ this.subscriptionUserApi = userApi;
this.blockingApi = blockingApi;
this.checker = checker;
this.internalCallContextFactory = internalCallContextFactory;
@@ -60,26 +60,26 @@ public class BlockingSubscriptionUserApi implements SubscriptionUserApi {
@Override
public SubscriptionBundle getBundleFromId(final UUID id, final TenantContext context) throws SubscriptionUserApiException {
- final SubscriptionBundle bundle = entitlementUserApi.getBundleFromId(id, context);
+ final SubscriptionBundle bundle = subscriptionUserApi.getBundleFromId(id, context);
return new BlockingSubscriptionBundle(bundle, blockingApi, internalCallContextFactory.createInternalTenantContext(context));
}
@Override
public Subscription getSubscriptionFromId(final UUID id, final TenantContext context) throws SubscriptionUserApiException {
- final Subscription subscription = entitlementUserApi.getSubscriptionFromId(id, context);
+ final Subscription subscription = subscriptionUserApi.getSubscriptionFromId(id, context);
return new BlockingSubscription(subscription, blockingApi, checker, internalCallContextFactory.createInternalTenantContext(context), internalCallContextFactory);
}
@Override
public SubscriptionBundle getBundleForAccountAndKey(final UUID accountId, final String bundleKey, final TenantContext context) throws SubscriptionUserApiException {
- final SubscriptionBundle bundle = entitlementUserApi.getBundleForAccountAndKey(accountId, bundleKey, context);
+ final SubscriptionBundle bundle = subscriptionUserApi.getBundleForAccountAndKey(accountId, bundleKey, context);
return new BlockingSubscriptionBundle(bundle, blockingApi, internalCallContextFactory.createInternalTenantContext(context));
}
@Override
public List<SubscriptionBundle> getBundlesForAccount(final UUID accountId, final TenantContext context) {
final List<SubscriptionBundle> result = new ArrayList<SubscriptionBundle>();
- final List<SubscriptionBundle> bundles = entitlementUserApi.getBundlesForAccount(accountId, context);
+ final List<SubscriptionBundle> bundles = subscriptionUserApi.getBundlesForAccount(accountId, context);
for (final SubscriptionBundle bundle : bundles) {
result.add(new BlockingSubscriptionBundle(bundle, blockingApi, internalCallContextFactory.createInternalTenantContext(context)));
}
@@ -90,7 +90,7 @@ public class BlockingSubscriptionUserApi implements SubscriptionUserApi {
public List<SubscriptionBundle> getBundlesForKey(final String bundleKey, final TenantContext context)
throws SubscriptionUserApiException {
final List<SubscriptionBundle> result = new ArrayList<SubscriptionBundle>();
- final List<SubscriptionBundle> bundles = entitlementUserApi.getBundlesForKey(bundleKey, context);
+ final List<SubscriptionBundle> bundles = subscriptionUserApi.getBundlesForKey(bundleKey, context);
for (final SubscriptionBundle bundle : bundles) {
result.add(new BlockingSubscriptionBundle(bundle, blockingApi, internalCallContextFactory.createInternalTenantContext(context)));
}
@@ -100,7 +100,7 @@ public class BlockingSubscriptionUserApi implements SubscriptionUserApi {
@Override
public List<Subscription> getSubscriptionsForBundle(final UUID bundleId, final TenantContext context) {
final List<Subscription> result = new ArrayList<Subscription>();
- final List<Subscription> subscriptions = entitlementUserApi.getSubscriptionsForBundle(bundleId, context);
+ final List<Subscription> subscriptions = subscriptionUserApi.getSubscriptionsForBundle(bundleId, context);
for (final Subscription subscription : subscriptions) {
result.add(new BlockingSubscription(subscription, blockingApi, checker, internalCallContextFactory.createInternalTenantContext(context), internalCallContextFactory));
}
@@ -110,7 +110,7 @@ public class BlockingSubscriptionUserApi implements SubscriptionUserApi {
@Override
public List<Subscription> getSubscriptionsForAccountAndKey(final UUID accountId, final String bundleKey, final TenantContext context) {
final List<Subscription> result = new ArrayList<Subscription>();
- final List<Subscription> subscriptions = entitlementUserApi.getSubscriptionsForAccountAndKey(accountId, bundleKey, context);
+ final List<Subscription> subscriptions = subscriptionUserApi.getSubscriptionsForAccountAndKey(accountId, bundleKey, context);
for (final Subscription subscription : subscriptions) {
result.add(new BlockingSubscription(subscription, blockingApi, checker, internalCallContextFactory.createInternalTenantContext(context), internalCallContextFactory));
}
@@ -120,12 +120,12 @@ public class BlockingSubscriptionUserApi implements SubscriptionUserApi {
@Override
public List<SubscriptionStatusDryRun> getDryRunChangePlanStatus(final UUID subscriptionId, @Nullable final String productName,
final DateTime requestedDate, final TenantContext context) throws SubscriptionUserApiException {
- return entitlementUserApi.getDryRunChangePlanStatus(subscriptionId, productName, requestedDate, context);
+ return subscriptionUserApi.getDryRunChangePlanStatus(subscriptionId, productName, requestedDate, context);
}
@Override
public Subscription getBaseSubscription(final UUID bundleId, final TenantContext context) throws SubscriptionUserApiException {
- return new BlockingSubscription(entitlementUserApi.getBaseSubscription(bundleId, context), blockingApi, checker, internalCallContextFactory.createInternalTenantContext(context), internalCallContextFactory);
+ return new BlockingSubscription(subscriptionUserApi.getBaseSubscription(bundleId, context), blockingApi, checker, internalCallContextFactory.createInternalTenantContext(context), internalCallContextFactory);
}
@Override
@@ -134,7 +134,7 @@ public class BlockingSubscriptionUserApi implements SubscriptionUserApi {
try {
final InternalTenantContext internalContext = internalCallContextFactory.createInternalTenantContext(context);
checker.checkBlockedChange(accountId, Type.ACCOUNT, internalContext);
- return new BlockingSubscriptionBundle(entitlementUserApi.createBundleForAccount(accountId, bundleKey, context), blockingApi, internalContext);
+ return new BlockingSubscriptionBundle(subscriptionUserApi.createBundleForAccount(accountId, bundleKey, context), blockingApi, internalContext);
} catch (BlockingApiException e) {
throw new SubscriptionUserApiException(e, e.getCode(), e.getMessage());
}
@@ -146,7 +146,7 @@ public class BlockingSubscriptionUserApi implements SubscriptionUserApi {
try {
final InternalTenantContext internalContext = internalCallContextFactory.createInternalTenantContext(context);
checker.checkBlockedChange(bundleId, Type.SUBSCRIPTION_BUNDLE, internalContext);
- return new BlockingSubscription(entitlementUserApi.createSubscription(bundleId, spec, requestedDate, context), blockingApi, checker, internalContext, internalCallContextFactory);
+ return new BlockingSubscription(subscriptionUserApi.createSubscription(bundleId, spec, requestedDate, context), blockingApi, checker, internalContext, internalCallContextFactory);
} catch (BlockingApiException e) {
throw new SubscriptionUserApiException(e, e.getCode(), e.getMessage());
}
@@ -154,6 +154,6 @@ public class BlockingSubscriptionUserApi implements SubscriptionUserApi {
@Override
public DateTime getNextBillingDate(final UUID account, final TenantContext context) {
- return entitlementUserApi.getNextBillingDate(account, context);
+ return subscriptionUserApi.getNextBillingDate(account, context);
}
}
diff --git a/junction/src/main/java/com/ning/billing/junction/plumbing/billing/BillCycleDayCalculator.java b/junction/src/main/java/com/ning/billing/junction/plumbing/billing/BillCycleDayCalculator.java
index 94d192b..c19269f 100644
--- a/junction/src/main/java/com/ning/billing/junction/plumbing/billing/BillCycleDayCalculator.java
+++ b/junction/src/main/java/com/ning/billing/junction/plumbing/billing/BillCycleDayCalculator.java
@@ -41,7 +41,7 @@ import com.ning.billing.subscription.api.user.Subscription;
import com.ning.billing.subscription.api.user.SubscriptionBundle;
import com.ning.billing.util.callcontext.InternalCallContext;
import com.ning.billing.util.events.EffectiveSubscriptionInternalEvent;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.google.common.annotations.VisibleForTesting;
import com.google.inject.Inject;
@@ -51,12 +51,12 @@ public class BillCycleDayCalculator {
private static final Logger log = LoggerFactory.getLogger(BillCycleDayCalculator.class);
private final CatalogService catalogService;
- private final SubscriptionInternalApi entitlementApi;
+ private final SubscriptionInternalApi subscriptionApi;
@Inject
- public BillCycleDayCalculator(final CatalogService catalogService, final SubscriptionInternalApi entitlementApi) {
+ public BillCycleDayCalculator(final CatalogService catalogService, final SubscriptionInternalApi subscriptionApi) {
this.catalogService = catalogService;
- this.entitlementApi = entitlementApi;
+ this.subscriptionApi = subscriptionApi;
}
protected int calculateBcd(final SubscriptionBundle bundle, final Subscription subscription, final EffectiveSubscriptionInternalEvent transition, final Account account, final InternalCallContext context)
@@ -98,7 +98,7 @@ public class BillCycleDayCalculator {
}
break;
case BUNDLE:
- final Subscription baseSub = entitlementApi.getBaseSubscription(bundle.getId(), context);
+ final Subscription baseSub = subscriptionApi.getBaseSubscription(bundle.getId(), context);
Plan basePlan = baseSub.getCurrentPlan();
if (basePlan == null) {
// The BP has been cancelled
@@ -124,7 +124,7 @@ public class BillCycleDayCalculator {
// Retrieve the initial phase type for that subscription
// TODO - this should be extracted somewhere, along with this code above
final PhaseType initialPhaseType;
- final List<EffectiveSubscriptionInternalEvent> transitions = entitlementApi.getAllTransitions(subscription, context);
+ final List<EffectiveSubscriptionInternalEvent> transitions = subscriptionApi.getAllTransitions(subscription, context);
if (transitions.size() == 0) {
initialPhaseType = null;
} else {
diff --git a/junction/src/main/java/com/ning/billing/junction/plumbing/billing/DefaultInternalBillingApi.java b/junction/src/main/java/com/ning/billing/junction/plumbing/billing/DefaultInternalBillingApi.java
index 71a74c4..bbf3984 100644
--- a/junction/src/main/java/com/ning/billing/junction/plumbing/billing/DefaultInternalBillingApi.java
+++ b/junction/src/main/java/com/ning/billing/junction/plumbing/billing/DefaultInternalBillingApi.java
@@ -36,7 +36,7 @@ import com.ning.billing.subscription.api.user.SubscriptionBundle;
import com.ning.billing.util.callcontext.InternalCallContext;
import com.ning.billing.util.events.EffectiveSubscriptionInternalEvent;
import com.ning.billing.util.svcapi.account.AccountInternalApi;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.junction.BillingEvent;
import com.ning.billing.util.svcapi.junction.BillingEventSet;
import com.ning.billing.util.svcapi.junction.BillingInternalApi;
@@ -53,7 +53,7 @@ public class DefaultInternalBillingApi implements BillingInternalApi {
private static final Logger log = LoggerFactory.getLogger(DefaultInternalBillingApi.class);
private final AccountInternalApi accountApi;
private final BillCycleDayCalculator bcdCalculator;
- private final SubscriptionInternalApi entitlementApi;
+ private final SubscriptionInternalApi subscriptionApi;
private final CatalogService catalogService;
private final BlockingCalculator blockCalculator;
private final TagInternalApi tagApi;
@@ -61,12 +61,12 @@ public class DefaultInternalBillingApi implements BillingInternalApi {
@Inject
public DefaultInternalBillingApi(final AccountInternalApi accountApi,
final BillCycleDayCalculator bcdCalculator,
- final SubscriptionInternalApi entitlementApi,
+ final SubscriptionInternalApi subscriptionApi,
final BlockingCalculator blockCalculator,
final CatalogService catalogService, final TagInternalApi tagApi) {
this.accountApi = accountApi;
this.bcdCalculator = bcdCalculator;
- this.entitlementApi = entitlementApi;
+ this.subscriptionApi = subscriptionApi;
this.catalogService = catalogService;
this.blockCalculator = blockCalculator;
this.tagApi = tagApi;
@@ -74,7 +74,7 @@ public class DefaultInternalBillingApi implements BillingInternalApi {
@Override
public BillingEventSet getBillingEventsForAccountAndUpdateAccountBCD(final UUID accountId, final InternalCallContext context) {
- final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(accountId, context);
+ final List<SubscriptionBundle> bundles = subscriptionApi.getBundlesForAccount(accountId, context);
final DefaultBillingEventSet result = new DefaultBillingEventSet();
try {
@@ -113,7 +113,7 @@ public class DefaultInternalBillingApi implements BillingInternalApi {
private void addBillingEventsForBundles(final List<SubscriptionBundle> bundles, final Account account, final InternalCallContext context,
final DefaultBillingEventSet result) {
for (final SubscriptionBundle bundle : bundles) {
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId(), context);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(bundle.getId(), context);
//Check if billing is off for the bundle
final List<Tag> bundleTags = tagApi.getTags(bundle.getId(), ObjectType.BUNDLE, context);
@@ -130,7 +130,7 @@ public class DefaultInternalBillingApi implements BillingInternalApi {
private void addBillingEventsForSubscription(final List<Subscription> subscriptions, final SubscriptionBundle bundle, final Account account, final InternalCallContext context, final DefaultBillingEventSet result) {
for (final Subscription subscription : subscriptions) {
- for (final EffectiveSubscriptionInternalEvent transition : entitlementApi.getBillingTransitions(subscription, context)) {
+ for (final EffectiveSubscriptionInternalEvent transition : subscriptionApi.getBillingTransitions(subscription, context)) {
try {
final int bcdLocal = bcdCalculator.calculateBcd(bundle, subscription, transition, account, context);
diff --git a/junction/src/test/java/com/ning/billing/junction/blocking/TestBlockingChecker.java b/junction/src/test/java/com/ning/billing/junction/blocking/TestBlockingChecker.java
index 6848b50..b8821a9 100644
--- a/junction/src/test/java/com/ning/billing/junction/blocking/TestBlockingChecker.java
+++ b/junction/src/test/java/com/ning/billing/junction/blocking/TestBlockingChecker.java
@@ -60,7 +60,7 @@ public class TestBlockingChecker extends JunctionTestSuiteNoDB {
Mockito.when(subscription.getBundleId()).thenReturn(bundleId);
try {
- Mockito.when(entitlementUserApi.getBundleFromId(Mockito.<UUID>any(), Mockito.<TenantContext>any())).thenReturn(bundle);
+ Mockito.when(subscriptionUserApi.getBundleFromId(Mockito.<UUID>any(), Mockito.<TenantContext>any())).thenReturn(bundle);
Mockito.when(subscriptionInternalApi.getBundleFromId(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(bundle);
} catch (SubscriptionUserApiException e) {
Assert.fail(e.toString());
diff --git a/junction/src/test/java/com/ning/billing/junction/JunctionTestSuiteNoDB.java b/junction/src/test/java/com/ning/billing/junction/JunctionTestSuiteNoDB.java
index b133b7c..978268f 100644
--- a/junction/src/test/java/com/ning/billing/junction/JunctionTestSuiteNoDB.java
+++ b/junction/src/test/java/com/ning/billing/junction/JunctionTestSuiteNoDB.java
@@ -31,7 +31,7 @@ import com.ning.billing.junction.plumbing.billing.BlockingCalculator;
import com.ning.billing.subscription.api.user.SubscriptionUserApi;
import com.ning.billing.util.glue.RealImplementation;
import com.ning.billing.util.svcapi.account.AccountInternalApi;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.junction.BillingInternalApi;
import com.ning.billing.util.svcapi.junction.BlockingInternalApi;
import com.ning.billing.util.svcapi.tag.TagInternalApi;
@@ -61,7 +61,7 @@ public abstract class JunctionTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
protected CatalogService catalogService;
@Inject
@RealImplementation
- protected SubscriptionUserApi entitlementUserApi;
+ protected SubscriptionUserApi subscriptionUserApi;
@Inject
protected SubscriptionInternalApi subscriptionInternalApi;
@Inject
diff --git a/junction/src/test/java/com/ning/billing/junction/JunctionTestSuiteWithEmbeddedDB.java b/junction/src/test/java/com/ning/billing/junction/JunctionTestSuiteWithEmbeddedDB.java
index 3694f61..a4625c9 100644
--- a/junction/src/test/java/com/ning/billing/junction/JunctionTestSuiteWithEmbeddedDB.java
+++ b/junction/src/test/java/com/ning/billing/junction/JunctionTestSuiteWithEmbeddedDB.java
@@ -30,7 +30,7 @@ import com.ning.billing.junction.plumbing.billing.BlockingCalculator;
import com.ning.billing.subscription.api.user.SubscriptionUserApi;
import com.ning.billing.util.glue.RealImplementation;
import com.ning.billing.util.svcapi.account.AccountInternalApi;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.junction.BillingInternalApi;
import com.ning.billing.util.svcapi.junction.BlockingInternalApi;
import com.ning.billing.util.svcapi.tag.TagInternalApi;
@@ -58,7 +58,7 @@ public abstract class JunctionTestSuiteWithEmbeddedDB extends GuicyKillbillTestS
protected CatalogService catalogService;
@Inject
@RealImplementation
- protected SubscriptionUserApi entitlementUserApi;
+ protected SubscriptionUserApi subscriptionUserApi;
@Inject
protected SubscriptionInternalApi subscriptionInternalApi;
@Inject
diff --git a/junction/src/test/java/com/ning/billing/junction/plumbing/billing/TestBillCycleDayCalculator.java b/junction/src/test/java/com/ning/billing/junction/plumbing/billing/TestBillCycleDayCalculator.java
index c915b5b..be6a814 100644
--- a/junction/src/test/java/com/ning/billing/junction/plumbing/billing/TestBillCycleDayCalculator.java
+++ b/junction/src/test/java/com/ning/billing/junction/plumbing/billing/TestBillCycleDayCalculator.java
@@ -35,7 +35,7 @@ import com.ning.billing.subscription.api.user.Subscription;
import com.ning.billing.subscription.api.user.SubscriptionBundle;
import com.ning.billing.junction.JunctionTestSuiteNoDB;
import com.ning.billing.util.callcontext.InternalTenantContext;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
public class TestBillCycleDayCalculator extends JunctionTestSuiteNoDB {
diff --git a/junction/src/test/resources/resource.properties b/junction/src/test/resources/resource.properties
index d0bda94..40eb8f3 100644
--- a/junction/src/test/resources/resource.properties
+++ b/junction/src/test/resources/resource.properties
@@ -1,7 +1,4 @@
killbill.catalog.uri=file:src/test/resources/catalogSample.xml
-killbill.entitlement.dao.claim.time=60000
-killbill.entitlement.dao.ready.max=1
-killbill.entitlement.engine.notifications.sleep=500
killbill.billing.persistent.bus.claimed=1
user.timezone=UTC
diff --git a/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIKillbill.java b/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIKillbill.java
index 69a0573..1bb0c57 100644
--- a/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIKillbill.java
+++ b/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIKillbill.java
@@ -44,10 +44,10 @@ public class DefaultOSGIKillbill implements OSGIKillbill {
private final AccountUserApi accountUserApi;
private final CatalogUserApi catalogUserApi;
- private final SubscriptionMigrationApi entitlementMigrationApi;
- private final SubscriptionTimelineApi entitlementTimelineApi;
- private final SubscriptionTransferApi entitlementTransferApi;
- private final SubscriptionUserApi entitlementUserApi;
+ private final SubscriptionMigrationApi subscriptionMigrationApi;
+ private final SubscriptionTimelineApi subscriptionTimelineApi;
+ private final SubscriptionTransferApi subscriptionTransferApi;
+ private final SubscriptionUserApi subscriptionUserApi;
private final InvoiceMigrationApi invoiceMigrationApi;
private final InvoicePaymentApi invoicePaymentApi;
private final InvoiceUserApi invoiceUserApi;
@@ -67,10 +67,10 @@ public class DefaultOSGIKillbill implements OSGIKillbill {
@Inject
public DefaultOSGIKillbill(final AccountUserApi accountUserApi,
final CatalogUserApi catalogUserApi,
- final SubscriptionMigrationApi entitlementMigrationApi,
- final SubscriptionTimelineApi entitlementTimelineApi,
- final SubscriptionTransferApi entitlementTransferApi,
- final SubscriptionUserApi entitlementUserApi,
+ final SubscriptionMigrationApi subscriptionMigrationApi,
+ final SubscriptionTimelineApi subscriptionTimelineApi,
+ final SubscriptionTransferApi subscriptionTransferApi,
+ final SubscriptionUserApi subscriptionUserApi,
final InvoiceMigrationApi invoiceMigrationApi,
final InvoicePaymentApi invoicePaymentApi,
final InvoiceUserApi invoiceUserApi,
@@ -87,10 +87,10 @@ public class DefaultOSGIKillbill implements OSGIKillbill {
final PluginConfigServiceApi configServiceApi) {
this.accountUserApi = accountUserApi;
this.catalogUserApi = catalogUserApi;
- this.entitlementMigrationApi = entitlementMigrationApi;
- this.entitlementTimelineApi = entitlementTimelineApi;
- this.entitlementTransferApi = entitlementTransferApi;
- this.entitlementUserApi = entitlementUserApi;
+ this.subscriptionMigrationApi = subscriptionMigrationApi;
+ this.subscriptionTimelineApi = subscriptionTimelineApi;
+ this.subscriptionTransferApi = subscriptionTransferApi;
+ this.subscriptionUserApi = subscriptionUserApi;
this.invoiceMigrationApi = invoiceMigrationApi;
this.invoicePaymentApi = invoicePaymentApi;
this.invoiceUserApi = invoiceUserApi;
@@ -119,17 +119,17 @@ public class DefaultOSGIKillbill implements OSGIKillbill {
@Override
public SubscriptionTimelineApi getSubscriptionTimelineApi() {
- return entitlementTimelineApi;
+ return subscriptionTimelineApi;
}
@Override
public SubscriptionTransferApi getSubscriptionTransferApi() {
- return entitlementTransferApi;
+ return subscriptionTransferApi;
}
@Override
public SubscriptionUserApi getSubscriptionUserApi() {
- return entitlementUserApi;
+ return subscriptionUserApi;
}
@Override
diff --git a/overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueStateApplicator.java b/overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueStateApplicator.java
index 795b0bd..7bebe6d 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueStateApplicator.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueStateApplicator.java
@@ -55,7 +55,7 @@ import com.ning.billing.util.email.EmailConfig;
import com.ning.billing.util.email.EmailSender;
import com.ning.billing.util.events.OverdueChangeInternalEvent;
import com.ning.billing.util.svcapi.account.AccountInternalApi;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.junction.BlockingInternalApi;
import com.ning.billing.util.svcapi.junction.DefaultBlockingState;
import com.ning.billing.util.svcapi.tag.TagInternalApi;
@@ -75,18 +75,18 @@ public class OverdueStateApplicator<T extends Blockable> {
private final OverdueCheckPoster poster;
private final PersistentBus bus;
private final AccountInternalApi accountApi;
- private final SubscriptionInternalApi entitlementUserApi;
+ private final SubscriptionInternalApi subscriptionUserApi;
private final OverdueEmailGenerator overdueEmailGenerator;
final TagInternalApi tagApi;
private final EmailSender emailSender;
@Inject
- public OverdueStateApplicator(final BlockingInternalApi accessApi, final AccountInternalApi accountApi, final SubscriptionInternalApi entitlementUserApi,
+ public OverdueStateApplicator(final BlockingInternalApi accessApi, final AccountInternalApi accountApi, final SubscriptionInternalApi subscriptionUserApi,
final Clock clock, final OverdueCheckPoster poster, final OverdueEmailGenerator overdueEmailGenerator,
final EmailConfig config, final PersistentBus bus, final TagInternalApi tagApi) {
this.blockingApi = accessApi;
this.accountApi = accountApi;
- this.entitlementUserApi = entitlementUserApi;
+ this.subscriptionUserApi = subscriptionUserApi;
this.clock = clock;
this.poster = poster;
this.overdueEmailGenerator = overdueEmailGenerator;
@@ -234,14 +234,14 @@ public class OverdueStateApplicator<T extends Blockable> {
if (blockable instanceof Subscription) {
result.add((Subscription) blockable);
} else if (blockable instanceof SubscriptionBundle) {
- for (final Subscription cur : entitlementUserApi.getSubscriptionsForBundle(blockable.getId(), context)) {
+ for (final Subscription cur : subscriptionUserApi.getSubscriptionsForBundle(blockable.getId(), context)) {
// Entitlement is smart enough and will cancel the associated add-ons
if (!ProductCategory.ADD_ON.equals(cur.getCategory())) {
computeSubscriptionsToCancel((T) cur, result, context);
}
}
} else if (blockable instanceof Account) {
- for (final SubscriptionBundle cur : entitlementUserApi.getBundlesForAccount(blockable.getId(), context)) {
+ for (final SubscriptionBundle cur : subscriptionUserApi.getBundlesForAccount(blockable.getId(), context)) {
computeSubscriptionsToCancel((T) cur, result, context);
}
}
@@ -264,11 +264,11 @@ public class OverdueStateApplicator<T extends Blockable> {
try {
if (Type.SUBSCRIPTION.equals(overdueableType)) {
final UUID bundleId = ((Subscription) overdueable).getBundleId();
- final SubscriptionBundle bundle = entitlementUserApi.getBundleFromId(bundleId, context);
+ final SubscriptionBundle bundle = subscriptionUserApi.getBundleFromId(bundleId, context);
account = accountApi.getAccountById(bundle.getAccountId(), context);
} else if (Type.SUBSCRIPTION_BUNDLE.equals(overdueableType)) {
final UUID bundleId = ((SubscriptionBundle) overdueable).getId();
- final SubscriptionBundle bundle = entitlementUserApi.getBundleFromId(bundleId, context);
+ final SubscriptionBundle bundle = subscriptionUserApi.getBundleFromId(bundleId, context);
account = accountApi.getAccountById(bundle.getAccountId(), context);
} else if (Type.ACCOUNT.equals(overdueableType)) {
account = (Account) overdueable;
diff --git a/overdue/src/main/java/com/ning/billing/overdue/calculator/BillingStateCalculatorBundle.java b/overdue/src/main/java/com/ning/billing/overdue/calculator/BillingStateCalculatorBundle.java
index 39bc889..be3e4b0 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/calculator/BillingStateCalculatorBundle.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/calculator/BillingStateCalculatorBundle.java
@@ -42,7 +42,7 @@ import com.ning.billing.overdue.config.api.PaymentResponse;
import com.ning.billing.util.callcontext.InternalTenantContext;
import com.ning.billing.clock.Clock;
import com.ning.billing.util.svcapi.account.AccountInternalApi;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.invoice.InvoiceInternalApi;
import com.ning.billing.util.tag.Tag;
@@ -50,14 +50,14 @@ import com.google.inject.Inject;
public class BillingStateCalculatorBundle extends BillingStateCalculator<SubscriptionBundle> {
- private final SubscriptionInternalApi entitlementApi;
+ private final SubscriptionInternalApi subscriptionApi;
private final AccountInternalApi accountApi;
@Inject
- public BillingStateCalculatorBundle(final SubscriptionInternalApi entitlementApi, final InvoiceInternalApi invoiceApi,
+ public BillingStateCalculatorBundle(final SubscriptionInternalApi subscriptionApi, final InvoiceInternalApi invoiceApi,
final AccountInternalApi accountApi, final Clock clock) {
super(invoiceApi, clock);
- this.entitlementApi = entitlementApi;
+ this.subscriptionApi = subscriptionApi;
this.accountApi = accountApi;
}
@@ -135,7 +135,7 @@ public class BillingStateCalculatorBundle extends BillingStateCalculator<Subscri
private Subscription getBasePlanIfExist(UUID bundleId, final InternalTenantContext context) throws SubscriptionUserApiException {
try {
- final Subscription basePlan = entitlementApi.getBaseSubscription(bundleId, context);
+ final Subscription basePlan = subscriptionApi.getBaseSubscription(bundleId, context);
return basePlan;
} catch (SubscriptionUserApiException e) {
if (e.getCode() == ErrorCode.SUB_GET_NO_SUCH_BASE_SUBSCRIPTION.getCode()) {
diff --git a/overdue/src/main/java/com/ning/billing/overdue/listener/OverdueDispatcher.java b/overdue/src/main/java/com/ning/billing/overdue/listener/OverdueDispatcher.java
index 9944ed1..b6c1a13 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/listener/OverdueDispatcher.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/listener/OverdueDispatcher.java
@@ -27,7 +27,7 @@ import com.ning.billing.subscription.api.user.SubscriptionBundle;
import com.ning.billing.junction.api.Type;
import com.ning.billing.overdue.wrapper.OverdueWrapperFactory;
import com.ning.billing.util.callcontext.InternalCallContext;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.google.inject.Inject;
@@ -35,25 +35,25 @@ public class OverdueDispatcher {
Logger log = LoggerFactory.getLogger(OverdueDispatcher.class);
- private final SubscriptionInternalApi entitlementApi;
+ private final SubscriptionInternalApi subscriptionApi;
private final OverdueWrapperFactory factory;
@Inject
- public OverdueDispatcher(final SubscriptionInternalApi entitlementApi,
+ public OverdueDispatcher(final SubscriptionInternalApi subscriptionApi,
final OverdueWrapperFactory factory) {
- this.entitlementApi = entitlementApi;
+ this.subscriptionApi = subscriptionApi;
this.factory = factory;
}
public void processOverdueForAccount(final UUID accountId, final InternalCallContext context) {
- final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(accountId, context);
+ final List<SubscriptionBundle> bundles = subscriptionApi.getBundlesForAccount(accountId, context);
for (final SubscriptionBundle bundle : bundles) {
processOverdue(Type.SUBSCRIPTION_BUNDLE, bundle.getId(), context);
}
}
public void clearOverdueForAccount(final UUID accountId, final InternalCallContext context) {
- final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(accountId, context);
+ final List<SubscriptionBundle> bundles = subscriptionApi.getBundlesForAccount(accountId, context);
for (final SubscriptionBundle bundle : bundles) {
clearOverdue(Type.SUBSCRIPTION_BUNDLE, bundle.getId(), context);
}
diff --git a/overdue/src/main/java/com/ning/billing/overdue/wrapper/OverdueWrapperFactory.java b/overdue/src/main/java/com/ning/billing/overdue/wrapper/OverdueWrapperFactory.java
index 963973e..2b198df 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/wrapper/OverdueWrapperFactory.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/wrapper/OverdueWrapperFactory.java
@@ -35,7 +35,7 @@ import com.ning.billing.overdue.config.api.OverdueException;
import com.ning.billing.overdue.config.api.OverdueStateSet;
import com.ning.billing.util.callcontext.InternalTenantContext;
import com.ning.billing.clock.Clock;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.junction.BlockingInternalApi;
import com.google.inject.Inject;
@@ -43,7 +43,7 @@ import com.google.inject.Inject;
public class OverdueWrapperFactory {
private static final Logger log = LoggerFactory.getLogger(OverdueWrapperFactory.class);
- private final SubscriptionInternalApi entitlementApi;
+ private final SubscriptionInternalApi subscriptionApi;
private final BillingStateCalculatorBundle billingStateCalcuatorBundle;
private final OverdueStateApplicator<SubscriptionBundle> overdueStateApplicatorBundle;
private final BlockingInternalApi api;
@@ -54,10 +54,10 @@ public class OverdueWrapperFactory {
public OverdueWrapperFactory(final BlockingInternalApi api, final Clock clock,
final BillingStateCalculatorBundle billingStateCalcuatorBundle,
final OverdueStateApplicator<SubscriptionBundle> overdueStateApplicatorBundle,
- final SubscriptionInternalApi entitlementApi) {
+ final SubscriptionInternalApi subscriptionApi) {
this.billingStateCalcuatorBundle = billingStateCalcuatorBundle;
this.overdueStateApplicatorBundle = overdueStateApplicatorBundle;
- this.entitlementApi = entitlementApi;
+ this.subscriptionApi = subscriptionApi;
this.api = api;
this.clock = clock;
}
@@ -78,7 +78,7 @@ public class OverdueWrapperFactory {
try {
switch (type) {
case SUBSCRIPTION_BUNDLE: {
- final SubscriptionBundle bundle = entitlementApi.getBundleFromId(id, context);
+ final SubscriptionBundle bundle = subscriptionApi.getBundleFromId(id, context);
return (OverdueWrapper<T>) new OverdueWrapper<SubscriptionBundle>(bundle, api, getOverdueStateSetBundle(),
clock, billingStateCalcuatorBundle, overdueStateApplicatorBundle);
}
diff --git a/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculatorBundle.java b/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculatorBundle.java
index e9b420d..1766d7f 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculatorBundle.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculatorBundle.java
@@ -41,7 +41,7 @@ import com.ning.billing.invoice.api.InvoiceItem;
import com.ning.billing.overdue.config.api.BillingStateBundle;
import com.ning.billing.overdue.config.api.PaymentResponse;
import com.ning.billing.util.callcontext.InternalTenantContext;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
@@ -67,11 +67,11 @@ public class TestBillingStateCalculatorBundle extends TestBillingStateCalculator
final SubscriptionBundle bundle = Mockito.mock(SubscriptionBundle.class);
Mockito.when(bundle.getId()).thenReturn(bundleId);
- final SubscriptionInternalApi entitlementApi = Mockito.mock(SubscriptionInternalApi.class);
+ final SubscriptionInternalApi subscriptionApi = Mockito.mock(SubscriptionInternalApi.class);
final Subscription subscription = Mockito.mock(Subscription.class);
- Mockito.when(entitlementApi.getBaseSubscription(Mockito.eq(bundleId), Mockito.<InternalTenantContext>any())).thenReturn(subscription);
+ Mockito.when(subscriptionApi.getBaseSubscription(Mockito.eq(bundleId), Mockito.<InternalTenantContext>any())).thenReturn(subscription);
- final BillingStateCalculatorBundle calc = new BillingStateCalculatorBundle(entitlementApi, invoiceApi, accountApi, clock);
+ final BillingStateCalculatorBundle calc = new BillingStateCalculatorBundle(subscriptionApi, invoiceApi, accountApi, clock);
final BillingStateBundle billingStateBundle = calc.calculateBillingState(bundle, internalCallContext);
Assert.assertNull(billingStateBundle.getBasePlanBillingPeriod());
Assert.assertNull(billingStateBundle.getBasePlanPhaseType());
@@ -100,7 +100,7 @@ public class TestBillingStateCalculatorBundle extends TestBillingStateCalculator
}
}));
- final BillingStateCalculatorBundle calc = new BillingStateCalculatorBundle(entitlementApi, invoiceApi, accountApi, clock);
+ final BillingStateCalculatorBundle calc = new BillingStateCalculatorBundle(subscriptionApi, invoiceApi, accountApi, clock);
final SortedSet<Invoice> resultinvoices = calc.unpaidInvoicesForBundle(thisBundleId, new UUID(0L, 0L), DateTimeZone.UTC, internalCallContext);
Assert.assertEquals(resultinvoices.size(), 3);
@@ -128,7 +128,7 @@ public class TestBillingStateCalculatorBundle extends TestBillingStateCalculator
Mockito.when(bundle.getAccountId()).thenReturn(UUID.randomUUID());
final Subscription subscription = Mockito.mock(Subscription.class);
- Mockito.when(entitlementApi.getBaseSubscription(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(subscription);
+ Mockito.when(subscriptionApi.getBaseSubscription(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(subscription);
final Plan plan = MockPlan.createBicycleNoTrialEvergreen1USD();
final PriceList pricelist = new MockPriceList();
@@ -163,7 +163,7 @@ public class TestBillingStateCalculatorBundle extends TestBillingStateCalculator
Mockito.when(bundle.getAccountId()).thenReturn(UUID.randomUUID());
final Subscription subscription = Mockito.mock(Subscription.class);
- Mockito.when(entitlementApi.getBaseSubscription(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(subscription);
+ Mockito.when(subscriptionApi.getBaseSubscription(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(subscription);
final Plan plan = MockPlan.createBicycleNoTrialEvergreen1USD();
final PriceList pricelist = new MockPriceList();
diff --git a/overdue/src/test/java/com/ning/billing/overdue/notification/TestOverdueCheckNotifier.java b/overdue/src/test/java/com/ning/billing/overdue/notification/TestOverdueCheckNotifier.java
index 49a7a1d..373e550 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/notification/TestOverdueCheckNotifier.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/notification/TestOverdueCheckNotifier.java
@@ -79,7 +79,7 @@ public class TestOverdueCheckNotifier extends OverdueTestSuiteWithEmbeddedDB {
Mockito.when(accountApi.getAccountById(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(account);
final Subscription subscription = Mockito.mock(Subscription.class);
- Mockito.when(entitlementApi.getSubscriptionFromId(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(subscription);
+ Mockito.when(subscriptionApi.getSubscriptionFromId(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(subscription);
mockListener = new OverdueListenerMock(internalCallContextFactory);
notifierForMock = new DefaultOverdueCheckNotifier(notificationQueueService, overdueProperties, mockListener);
diff --git a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteNoDB.java b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteNoDB.java
index d1a6741..d61b8bf 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteNoDB.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteNoDB.java
@@ -34,7 +34,7 @@ import com.ning.billing.overdue.service.DefaultOverdueService;
import com.ning.billing.overdue.wrapper.OverdueWrapperFactory;
import com.ning.billing.util.callcontext.InternalCallContextFactory;
import com.ning.billing.util.svcapi.account.AccountInternalApi;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.invoice.InvoiceInternalApi;
import com.ning.billing.util.svcapi.junction.BlockingInternalApi;
import com.ning.billing.util.svcsapi.bus.BusService;
@@ -56,7 +56,7 @@ public abstract class OverdueTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
@Inject
protected DefaultOverdueService service;
@Inject
- protected SubscriptionInternalApi entitlementApi;
+ protected SubscriptionInternalApi subscriptionApi;
@Inject
protected PersistentBus bus;
@Inject
diff --git a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteWithEmbeddedDB.java b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteWithEmbeddedDB.java
index ce1e57c..c7194dc 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteWithEmbeddedDB.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteWithEmbeddedDB.java
@@ -36,7 +36,7 @@ import com.ning.billing.util.cache.CacheControllerDispatcher;
import com.ning.billing.util.callcontext.InternalCallContextFactory;
import com.ning.billing.util.dao.NonEntityDao;
import com.ning.billing.util.svcapi.account.AccountInternalApi;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.invoice.InvoiceInternalApi;
import com.ning.billing.util.svcapi.junction.BlockingInternalApi;
import com.ning.billing.util.svcsapi.bus.BusService;
@@ -58,7 +58,7 @@ public abstract class OverdueTestSuiteWithEmbeddedDB extends GuicyKillbillTestSu
@Inject
protected DefaultOverdueService service;
@Inject
- protected SubscriptionInternalApi entitlementApi;
+ protected SubscriptionInternalApi subscriptionApi;
@Inject
protected CacheControllerDispatcher cacheControllerDispatcher;
@Inject
diff --git a/overdue/src/test/java/com/ning/billing/overdue/TestOverdueHelper.java b/overdue/src/test/java/com/ning/billing/overdue/TestOverdueHelper.java
index 918f117..dc74a20 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/TestOverdueHelper.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/TestOverdueHelper.java
@@ -39,7 +39,7 @@ import com.ning.billing.overdue.glue.ApplicatorMockJunctionModule.ApplicatorBloc
import com.ning.billing.subscription.api.user.SubscriptionUserApiException;
import com.ning.billing.util.callcontext.InternalTenantContext;
import com.ning.billing.util.svcapi.account.AccountInternalApi;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcapi.invoice.InvoiceInternalApi;
import com.ning.billing.util.svcapi.junction.BlockingInternalApi;
diff --git a/overdue/src/test/resources/resource.properties b/overdue/src/test/resources/resource.properties
index d0bda94..40eb8f3 100644
--- a/overdue/src/test/resources/resource.properties
+++ b/overdue/src/test/resources/resource.properties
@@ -1,7 +1,4 @@
killbill.catalog.uri=file:src/test/resources/catalogSample.xml
-killbill.entitlement.dao.claim.time=60000
-killbill.entitlement.dao.ready.max=1
-killbill.entitlement.engine.notifications.sleep=500
killbill.billing.persistent.bus.claimed=1
user.timezone=UTC
diff --git a/server/src/test/resources/killbill.properties b/server/src/test/resources/killbill.properties
index 5ca83a4..6a30a5c 100644
--- a/server/src/test/resources/killbill.properties
+++ b/server/src/test/resources/killbill.properties
@@ -29,7 +29,6 @@ com.ning.core.server.jetty.logPath=/var/tmp/.logs
killbill.payment.engine.notifications.sleep=100
killbill.invoice.engine.notifications.sleep=100
-killbill.entitlement.engine.notifications.sleep=100
killbill.billing.persistent.bus.sleep=100
killbill.billing.persistent.bus.nbThreads=1
killbill.billing.persistent.bus.claimed=1
diff --git a/subscription/src/main/java/com/ning/billing/subscription/alignment/MigrationPlanAligner.java b/subscription/src/main/java/com/ning/billing/subscription/alignment/MigrationPlanAligner.java
index 3cf40b7..bd8ddd9 100644
--- a/subscription/src/main/java/com/ning/billing/subscription/alignment/MigrationPlanAligner.java
+++ b/subscription/src/main/java/com/ning/billing/subscription/alignment/MigrationPlanAligner.java
@@ -25,7 +25,7 @@ import com.ning.billing.catalog.api.PhaseType;
import com.ning.billing.catalog.api.Plan;
import com.ning.billing.catalog.api.PlanPhase;
import com.ning.billing.catalog.api.PlanPhaseSpecifier;
-import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.EntitlementSubscriptionMigrationCase;
+import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.SubscriptionMigrationCase;
import com.ning.billing.subscription.api.migration.SubscriptionMigrationApiException;
import com.ning.billing.subscription.events.SubscriptionEvent.EventType;
import com.ning.billing.subscription.events.user.ApiEventType;
@@ -42,7 +42,7 @@ public class MigrationPlanAligner extends BaseAligner {
}
- public TimedMigration[] getEventsMigration(final EntitlementSubscriptionMigrationCase[] input, final DateTime now)
+ public TimedMigration[] getEventsMigration(final SubscriptionMigrationCase[] input, final DateTime now)
throws SubscriptionMigrationApiException {
try {
@@ -169,15 +169,15 @@ public class MigrationPlanAligner extends BaseAligner {
throw new SubscriptionMigrationApiException(String.format("Cannot find PlanPhase from Plan %s and type %s", plan.getName(), phaseType));
}
- private boolean isRegularMigratedSubscription(final EntitlementSubscriptionMigrationCase[] input) {
+ private boolean isRegularMigratedSubscription(final SubscriptionMigrationCase[] input) {
return (input.length == 1 && input[0].getCancelledDate() == null);
}
- private boolean isRegularFutureCancelledMigratedSubscription(final EntitlementSubscriptionMigrationCase[] input) {
+ private boolean isRegularFutureCancelledMigratedSubscription(final SubscriptionMigrationCase[] input) {
return (input.length == 1 && input[0].getCancelledDate() != null);
}
- private boolean isPhaseChangeMigratedSubscription(final EntitlementSubscriptionMigrationCase[] input) {
+ private boolean isPhaseChangeMigratedSubscription(final SubscriptionMigrationCase[] input) {
if (input.length != 2) {
return false;
}
@@ -185,7 +185,7 @@ public class MigrationPlanAligner extends BaseAligner {
!isSamePhase(input[0].getPlanPhaseSpecifier(), input[1].getPlanPhaseSpecifier()));
}
- private boolean isPlanChangeMigratedSubscription(final EntitlementSubscriptionMigrationCase[] input) {
+ private boolean isPlanChangeMigratedSubscription(final SubscriptionMigrationCase[] input) {
if (input.length != 2) {
return false;
}
diff --git a/subscription/src/main/java/com/ning/billing/subscription/api/migration/DefaultSubscriptionMigrationApi.java b/subscription/src/main/java/com/ning/billing/subscription/api/migration/DefaultSubscriptionMigrationApi.java
index 1c3f836..f56e93b 100644
--- a/subscription/src/main/java/com/ning/billing/subscription/api/migration/DefaultSubscriptionMigrationApi.java
+++ b/subscription/src/main/java/com/ning/billing/subscription/api/migration/DefaultSubscriptionMigrationApi.java
@@ -74,30 +74,30 @@ public class DefaultSubscriptionMigrationApi extends SubscriptionApiBase impleme
}
@Override
- public void migrate(final EntitlementAccountMigration toBeMigrated, final CallContext context)
+ public void migrate(final AccountMigration toBeMigrated, final CallContext context)
throws SubscriptionMigrationApiException {
final AccountMigrationData accountMigrationData = createAccountMigrationData(toBeMigrated, context);
dao.migrate(toBeMigrated.getAccountKey(), accountMigrationData, internalCallContextFactory.createInternalCallContext(toBeMigrated.getAccountKey(), context));
}
- private AccountMigrationData createAccountMigrationData(final EntitlementAccountMigration toBeMigrated, final CallContext context)
+ private AccountMigrationData createAccountMigrationData(final AccountMigration toBeMigrated, final CallContext context)
throws SubscriptionMigrationApiException {
final UUID accountId = toBeMigrated.getAccountKey();
final DateTime now = clock.getUTCNow();
final List<BundleMigrationData> accountBundleData = new LinkedList<BundleMigrationData>();
- for (final EntitlementBundleMigration curBundle : toBeMigrated.getBundles()) {
+ for (final BundleMigration curBundle : toBeMigrated.getBundles()) {
final SubscriptionBundleData bundleData = new SubscriptionBundleData(curBundle.getBundleKey(), accountId, clock.getUTCNow());
final List<SubscriptionMigrationData> bundleSubscriptionData = new LinkedList<AccountMigrationData.SubscriptionMigrationData>();
- final List<EntitlementSubscriptionMigration> sortedSubscriptions = Lists.newArrayList(curBundle.getSubscriptions());
+ final List<SubscriptionMigration> sortedSubscriptions = Lists.newArrayList(curBundle.getSubscriptions());
// Make sure we have first BASE or STANDALONE, then ADDON and for each category order by CED
- Collections.sort(sortedSubscriptions, new Comparator<EntitlementSubscriptionMigration>() {
+ Collections.sort(sortedSubscriptions, new Comparator<SubscriptionMigration>() {
@Override
- public int compare(final EntitlementSubscriptionMigration o1,
- final EntitlementSubscriptionMigration o2) {
+ public int compare(final SubscriptionMigration o1,
+ final SubscriptionMigration o2) {
if (o1.getCategory().equals(o2.getCategory())) {
return o1.getSubscriptionCases()[0].getEffectiveDate().compareTo(o2.getSubscriptionCases()[0].getEffectiveDate());
} else {
@@ -113,7 +113,7 @@ public class DefaultSubscriptionMigrationApi extends SubscriptionApiBase impleme
});
DateTime bundleStartDate = null;
- for (final EntitlementSubscriptionMigration curSub : sortedSubscriptions) {
+ for (final SubscriptionMigration curSub : sortedSubscriptions) {
SubscriptionMigrationData data = null;
if (bundleStartDate == null) {
data = createInitialSubscription(bundleData.getId(), curSub.getCategory(), curSub.getSubscriptionCases(), now, curSub.getChargedThroughDate(), context);
@@ -134,7 +134,7 @@ public class DefaultSubscriptionMigrationApi extends SubscriptionApiBase impleme
}
private SubscriptionMigrationData createInitialSubscription(final UUID bundleId, final ProductCategory productCategory,
- final EntitlementSubscriptionMigrationCase[] input, final DateTime now, final DateTime ctd, final CallContext context)
+ final SubscriptionMigrationCase[] input, final DateTime now, final DateTime ctd, final CallContext context)
throws SubscriptionMigrationApiException {
final TimedMigration[] events = migrationAligner.getEventsMigration(input, now);
final DateTime migrationStartDate = events[0].getEventTime();
@@ -150,7 +150,7 @@ public class DefaultSubscriptionMigrationApi extends SubscriptionApiBase impleme
}
private SubscriptionMigrationData createSubscriptionMigrationDataWithBundleDate(final UUID bundleId, final ProductCategory productCategory,
- final EntitlementSubscriptionMigrationCase[] input, final DateTime now, final DateTime bundleStartDate, final DateTime ctd, final CallContext context)
+ final SubscriptionMigrationCase[] input, final DateTime now, final DateTime bundleStartDate, final DateTime ctd, final CallContext context)
throws SubscriptionMigrationApiException {
final TimedMigration[] events = migrationAligner.getEventsMigration(input, now);
final DateTime migrationStartDate = events[0].getEventTime();
diff --git a/subscription/src/main/java/com/ning/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java b/subscription/src/main/java/com/ning/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java
index f9eaf12..0d3a128 100644
--- a/subscription/src/main/java/com/ning/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java
+++ b/subscription/src/main/java/com/ning/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java
@@ -42,7 +42,7 @@ import com.ning.billing.subscription.api.user.SubscriptionUserApiException;
import com.ning.billing.util.callcontext.InternalCallContext;
import com.ning.billing.util.callcontext.InternalTenantContext;
import com.ning.billing.util.events.EffectiveSubscriptionInternalEvent;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
diff --git a/subscription/src/main/java/com/ning/billing/subscription/api/user/SubscriptionData.java b/subscription/src/main/java/com/ning/billing/subscription/api/user/SubscriptionData.java
index a7aa2dc..6df3571 100644
--- a/subscription/src/main/java/com/ning/billing/subscription/api/user/SubscriptionData.java
+++ b/subscription/src/main/java/com/ning/billing/subscription/api/user/SubscriptionData.java
@@ -194,7 +194,7 @@ public class SubscriptionData extends EntityBase implements Subscription {
}
final SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
- clock, transitions, Order.ASC_FROM_PAST, Kind.ENTITLEMENT,
+ clock, transitions, Order.ASC_FROM_PAST, Kind.SUBSCRIPTION,
Visibility.ALL, TimeLimit.FUTURE_ONLY);
while (it.hasNext()) {
final SubscriptionTransition cur = it.next();
@@ -250,7 +250,7 @@ public class SubscriptionData extends EntityBase implements Subscription {
return null;
}
final SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
- clock, transitions, Order.ASC_FROM_PAST, Kind.ENTITLEMENT,
+ clock, transitions, Order.ASC_FROM_PAST, Kind.SUBSCRIPTION,
Visibility.ALL, TimeLimit.FUTURE_ONLY);
return it.hasNext() ? it.next() : null;
}
@@ -311,7 +311,7 @@ public class SubscriptionData extends EntityBase implements Subscription {
return null;
}
final SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
- clock, transitions, Order.DESC_FROM_FUTURE, Kind.ENTITLEMENT,
+ clock, transitions, Order.DESC_FROM_FUTURE, Kind.SUBSCRIPTION,
Visibility.FROM_DISK_ONLY, TimeLimit.PAST_OR_PRESENT_ONLY);
return it.hasNext() ? it.next() : null;
}
@@ -411,7 +411,7 @@ public class SubscriptionData extends EntityBase implements Subscription {
public long getLastEventOrderedId() {
final SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
- clock, transitions, Order.DESC_FROM_FUTURE, Kind.ENTITLEMENT,
+ clock, transitions, Order.DESC_FROM_FUTURE, Kind.SUBSCRIPTION,
Visibility.FROM_DISK_ONLY, TimeLimit.ALL);
return it.hasNext() ? ((SubscriptionTransitionData)it.next()).getTotalOrdering() : -1L;
}
@@ -455,7 +455,7 @@ public class SubscriptionData extends EntityBase implements Subscription {
final SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(clock,
transitions,
Order.DESC_FROM_FUTURE,
- Kind.ENTITLEMENT,
+ Kind.SUBSCRIPTION,
Visibility.ALL,
TimeLimit.PAST_OR_PRESENT_ONLY);
@@ -503,7 +503,7 @@ public class SubscriptionData extends EntityBase implements Subscription {
"No transitions for subscription %s", getId()));
}
final SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
- clock, transitions, Order.DESC_FROM_FUTURE, Kind.ENTITLEMENT,
+ clock, transitions, Order.DESC_FROM_FUTURE, Kind.SUBSCRIPTION,
Visibility.ALL, TimeLimit.PAST_OR_PRESENT_ONLY);
while (it.hasNext()) {
final SubscriptionTransitionData cur = (SubscriptionTransitionData) it.next();
diff --git a/subscription/src/main/java/com/ning/billing/subscription/api/user/SubscriptionTransitionDataIterator.java b/subscription/src/main/java/com/ning/billing/subscription/api/user/SubscriptionTransitionDataIterator.java
index e1cc308..cdc4b00 100644
--- a/subscription/src/main/java/com/ning/billing/subscription/api/user/SubscriptionTransitionDataIterator.java
+++ b/subscription/src/main/java/com/ning/billing/subscription/api/user/SubscriptionTransitionDataIterator.java
@@ -39,7 +39,7 @@ public class SubscriptionTransitionDataIterator implements Iterator<Subscription
}
public enum Kind {
- ENTITLEMENT,
+ SUBSCRIPTION,
BILLING,
ALL
}
@@ -81,7 +81,7 @@ public class SubscriptionTransitionDataIterator implements Iterator<Subscription
if (visibility == Visibility.FROM_DISK_ONLY && ! ((SubscriptionTransitionData) input).isFromDisk()) {
return true;
}
- if ((kind == Kind.ENTITLEMENT && shouldSkipForEntitlementEvents((SubscriptionTransitionData)input)) ||
+ if ((kind == Kind.SUBSCRIPTION && shouldSkipForSubscriptionEvents((SubscriptionTransitionData) input)) ||
(kind == Kind.BILLING && shouldSkipForBillingEvents((SubscriptionTransitionData) input))) {
return true;
}
@@ -92,8 +92,8 @@ public class SubscriptionTransitionDataIterator implements Iterator<Subscription
return false;
}
- private boolean shouldSkipForEntitlementEvents(final SubscriptionTransitionData input) {
- // Entitlement system knows about all events except for MIGRATE_BILLING
+ private boolean shouldSkipForSubscriptionEvents(final SubscriptionTransitionData input) {
+ // Subscription system knows about all events except for MIGRATE_BILLING
return (input.getTransitionType() == SubscriptionTransitionType.MIGRATE_BILLING);
}
diff --git a/subscription/src/main/java/com/ning/billing/subscription/engine/core/DefaultSubscriptionService.java b/subscription/src/main/java/com/ning/billing/subscription/engine/core/DefaultSubscriptionService.java
index c74f61a..3db6358 100644
--- a/subscription/src/main/java/com/ning/billing/subscription/engine/core/DefaultSubscriptionService.java
+++ b/subscription/src/main/java/com/ning/billing/subscription/engine/core/DefaultSubscriptionService.java
@@ -60,7 +60,7 @@ import com.google.inject.Inject;
public class DefaultSubscriptionService implements EventListener, SubscriptionService {
public static final String NOTIFICATION_QUEUE_NAME = "subscription-events";
- public static final String ENTITLEMENT_SERVICE_NAME = "subscription-service";
+ public static final String SUBSCRIPTION_SERVICE_NAME = "subscription-service";
private static final Logger log = LoggerFactory.getLogger(DefaultSubscriptionService.class);
@@ -92,7 +92,7 @@ public class DefaultSubscriptionService implements EventListener, SubscriptionSe
@Override
public String getName() {
- return ENTITLEMENT_SERVICE_NAME;
+ return SUBSCRIPTION_SERVICE_NAME;
}
@LifecycleHandlerType(LifecycleLevel.INIT_SERVICE)
@@ -102,7 +102,7 @@ public class DefaultSubscriptionService implements EventListener, SubscriptionSe
@Override
public void handleReadyNotification(final NotificationEvent inputKey, final DateTime eventDateTime, final UUID fromNotificationQueueUserToken, final Long accountRecordId, final Long tenantRecordId) {
if (!(inputKey instanceof SubscriptionNotificationKey)) {
- log.error("Entitlement service received an unexpected event type {}" + inputKey.getClass().getName());
+ log.error("Subscription service received an unexpected event type {}" + inputKey.getClass().getName());
return;
}
@@ -119,7 +119,7 @@ public class DefaultSubscriptionService implements EventListener, SubscriptionSe
}
};
- subscriptionEventQueue = notificationQueueService.createNotificationQueue(ENTITLEMENT_SERVICE_NAME,
+ subscriptionEventQueue = notificationQueueService.createNotificationQueue(SUBSCRIPTION_SERVICE_NAME,
NOTIFICATION_QUEUE_NAME,
queueHandler);
} catch (NotificationQueueAlreadyExists e) {
diff --git a/subscription/src/main/java/com/ning/billing/subscription/engine/dao/DefaultSubscriptionDao.java b/subscription/src/main/java/com/ning/billing/subscription/engine/dao/DefaultSubscriptionDao.java
index d4512f0..7dcd9c7 100644
--- a/subscription/src/main/java/com/ning/billing/subscription/engine/dao/DefaultSubscriptionDao.java
+++ b/subscription/src/main/java/com/ning/billing/subscription/engine/dao/DefaultSubscriptionDao.java
@@ -312,7 +312,7 @@ public class DefaultSubscriptionDao implements SubscriptionDao {
@Override
public SubscriptionEvent inTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory) throws Exception {
SubscriptionEventModelDao model = entitySqlDaoWrapperFactory.become(SubscriptionEventSqlDao.class).getById(eventId.toString(), context);
- return SubscriptionEventModelDao.toEntitlementEvent(model);
+ return SubscriptionEventModelDao.toSubscriptionEvent(model);
}
});
}
@@ -333,7 +333,7 @@ public class DefaultSubscriptionDao implements SubscriptionDao {
return new ArrayList<SubscriptionEvent>(Collections2.transform(filteredModels, new Function<SubscriptionEventModelDao, SubscriptionEvent>() {
@Override
public SubscriptionEvent apply(@Nullable final SubscriptionEventModelDao input) {
- return SubscriptionEventModelDao.toEntitlementEvent(input);
+ return SubscriptionEventModelDao.toSubscriptionEvent(input);
}
}));
}
@@ -359,7 +359,7 @@ public class DefaultSubscriptionDao implements SubscriptionDao {
final List<SubscriptionEvent> events = new ArrayList<SubscriptionEvent>(Collections2.transform(eventModels, new Function<SubscriptionEventModelDao, SubscriptionEvent>() {
@Override
public SubscriptionEvent apply(@Nullable final SubscriptionEventModelDao input) {
- return SubscriptionEventModelDao.toEntitlementEvent(input);
+ return SubscriptionEventModelDao.toSubscriptionEvent(input);
}
}));
result.put(cur.getId(), events);
@@ -380,7 +380,7 @@ public class DefaultSubscriptionDao implements SubscriptionDao {
final List<SubscriptionEvent> events = new ArrayList<SubscriptionEvent>(Collections2.transform(eventModels, new Function<SubscriptionEventModelDao, SubscriptionEvent>() {
@Override
public SubscriptionEvent apply(@Nullable final SubscriptionEventModelDao input) {
- return SubscriptionEventModelDao.toEntitlementEvent(input);
+ return SubscriptionEventModelDao.toSubscriptionEvent(input);
}
}));
return events;
@@ -929,7 +929,7 @@ public class DefaultSubscriptionDao implements SubscriptionDao {
private void recordFutureNotificationFromTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory, final DateTime effectiveDate,
final NotificationEvent notificationKey, final InternalCallContext context) {
try {
- final NotificationQueue subscriptionEventQueue = notificationQueueService.getNotificationQueue(DefaultSubscriptionService.ENTITLEMENT_SERVICE_NAME,
+ final NotificationQueue subscriptionEventQueue = notificationQueueService.getNotificationQueue(DefaultSubscriptionService.SUBSCRIPTION_SERVICE_NAME,
DefaultSubscriptionService.NOTIFICATION_QUEUE_NAME);
subscriptionEventQueue.recordFutureNotificationFromTransaction(entitySqlDaoWrapperFactory.getSqlDao(), effectiveDate, notificationKey, context.getUserToken(), context.getAccountRecordId(), context.getTenantRecordId());
} catch (NoSuchNotificationQueue e) {
diff --git a/subscription/src/main/java/com/ning/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java b/subscription/src/main/java/com/ning/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java
index 441924b..3f5c454 100644
--- a/subscription/src/main/java/com/ning/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java
+++ b/subscription/src/main/java/com/ning/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java
@@ -142,7 +142,7 @@ public class SubscriptionEventModelDao extends EntityBase implements EntityModel
return isActive;
}
- public static SubscriptionEvent toEntitlementEvent(final SubscriptionEventModelDao src) {
+ public static SubscriptionEvent toSubscriptionEvent(final SubscriptionEventModelDao src) {
if (src == null) {
return null;
diff --git a/subscription/src/main/java/com/ning/billing/subscription/engine/dao/RepairSubscriptionDao.java b/subscription/src/main/java/com/ning/billing/subscription/engine/dao/RepairSubscriptionDao.java
index 60c492e..4a3a2d7 100644
--- a/subscription/src/main/java/com/ning/billing/subscription/engine/dao/RepairSubscriptionDao.java
+++ b/subscription/src/main/java/com/ning/billing/subscription/engine/dao/RepairSubscriptionDao.java
@@ -50,12 +50,12 @@ public class RepairSubscriptionDao implements SubscriptionDao, RepairSubscriptio
private final ThreadLocal<Map<UUID, SubscriptionRepairEvent>> preThreadsInRepairSubscriptions = new ThreadLocal<Map<UUID, SubscriptionRepairEvent>>();
- private static final class EntitlementEventWithOrderingId {
+ private static final class SubscriptionEventWithOrderingId {
private final SubscriptionEvent event;
private final long orderingId;
- public EntitlementEventWithOrderingId(final SubscriptionEvent event, final long orderingId) {
+ public SubscriptionEventWithOrderingId(final SubscriptionEvent event, final long orderingId) {
this.event = event;
this.orderingId = orderingId;
}
@@ -86,13 +86,13 @@ public class RepairSubscriptionDao implements SubscriptionDao, RepairSubscriptio
private static final class SubscriptionRepairEvent {
- private final Set<EntitlementEventWithOrderingId> events;
+ private final Set<SubscriptionEventWithOrderingId> events;
private long curOrderingId;
public SubscriptionRepairEvent(final List<SubscriptionEvent> initialEvents) {
- this.events = new TreeSet<EntitlementEventWithOrderingId>(new Comparator<EntitlementEventWithOrderingId>() {
+ this.events = new TreeSet<SubscriptionEventWithOrderingId>(new Comparator<SubscriptionEventWithOrderingId>() {
@Override
- public int compare(final EntitlementEventWithOrderingId o1, final EntitlementEventWithOrderingId o2) {
+ public int compare(final SubscriptionEventWithOrderingId o1, final SubscriptionEventWithOrderingId o2) {
// Work around jdk7 change: compare(o1, o1) is now invoked when inserting the first element
// See:
// - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5045147
@@ -123,9 +123,9 @@ public class RepairSubscriptionDao implements SubscriptionDao, RepairSubscriptio
}
public List<SubscriptionEvent> getEvents() {
- return new ArrayList<SubscriptionEvent>(Collections2.transform(events, new Function<EntitlementEventWithOrderingId, SubscriptionEvent>() {
+ return new ArrayList<SubscriptionEvent>(Collections2.transform(events, new Function<SubscriptionEventWithOrderingId, SubscriptionEvent>() {
@Override
- public SubscriptionEvent apply(EntitlementEventWithOrderingId in) {
+ public SubscriptionEvent apply(SubscriptionEventWithOrderingId in) {
return in.getEvent();
}
}));
@@ -133,7 +133,7 @@ public class RepairSubscriptionDao implements SubscriptionDao, RepairSubscriptio
public void addEvents(final List<SubscriptionEvent> newEvents) {
for (final SubscriptionEvent cur : newEvents) {
- events.add(new EntitlementEventWithOrderingId(cur, curOrderingId++));
+ events.add(new SubscriptionEventWithOrderingId(cur, curOrderingId++));
}
}
}
diff --git a/subscription/src/main/java/com/ning/billing/subscription/glue/DefaultSubscriptionModule.java b/subscription/src/main/java/com/ning/billing/subscription/glue/DefaultSubscriptionModule.java
index 7f482c9..693ba36 100644
--- a/subscription/src/main/java/com/ning/billing/subscription/glue/DefaultSubscriptionModule.java
+++ b/subscription/src/main/java/com/ning/billing/subscription/glue/DefaultSubscriptionModule.java
@@ -43,7 +43,7 @@ import com.ning.billing.subscription.api.transfer.SubscriptionTransferApi;
import com.ning.billing.subscription.api.user.SubscriptionUserApi;
import com.ning.billing.util.config.SubscriptionConfig;
import com.ning.billing.util.glue.RealImplementation;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.google.inject.AbstractModule;
import com.google.inject.name.Names;
@@ -63,14 +63,14 @@ public class DefaultSubscriptionModule extends AbstractModule implements Subscri
bind(SubscriptionConfig.class).toInstance(config);
}
- protected void installEntitlementDao() {
+ protected void installSubscriptionDao() {
bind(SubscriptionDao.class).to(DefaultSubscriptionDao.class).asEagerSingleton();
bind(SubscriptionDao.class).annotatedWith(Names.named(REPAIR_NAMED)).to(RepairSubscriptionDao.class);
bind(RepairSubscriptionLifecycleDao.class).annotatedWith(Names.named(REPAIR_NAMED)).to(RepairSubscriptionDao.class);
bind(RepairSubscriptionDao.class).asEagerSingleton();
}
- protected void installEntitlementCore() {
+ protected void installSubscriptionCore() {
bind(SubscriptionApiService.class).annotatedWith(Names.named(REPAIR_NAMED)).to(RepairSubscriptionApiService.class).asEagerSingleton();
bind(SubscriptionApiService.class).to(DefaultSubscriptionApiService.class).asEagerSingleton();
@@ -91,8 +91,8 @@ public class DefaultSubscriptionModule extends AbstractModule implements Subscri
@Override
protected void configure() {
installConfig();
- installEntitlementDao();
- installEntitlementCore();
+ installSubscriptionDao();
+ installSubscriptionCore();
}
@Override
diff --git a/subscription/src/main/resources/com/ning/billing/subscription/ddl.sql b/subscription/src/main/resources/com/ning/billing/subscription/ddl.sql
index a510b75..0e4c617 100644
--- a/subscription/src/main/resources/com/ning/billing/subscription/ddl.sql
+++ b/subscription/src/main/resources/com/ning/billing/subscription/ddl.sql
@@ -1,7 +1,5 @@
/*! SET storage_engine=INNODB */;
-DROP TABLE IF EXISTS events;
-DROP TABLE IF EXISTS entitlement_events;
DROP TABLE IF EXISTS subscription_events;
CREATE TABLE subscription_events (
record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
diff --git a/subscription/src/test/java/com/ning/billing/subscription/alignment/TestPlanAligner.java b/subscription/src/test/java/com/ning/billing/subscription/alignment/TestPlanAligner.java
index fd757fa..e3cf356 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/alignment/TestPlanAligner.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/alignment/TestPlanAligner.java
@@ -174,11 +174,11 @@ public class TestPlanAligner extends SubscriptionTestSuiteNoDB {
// Create the transitions
final SubscriptionData subscriptionData = new SubscriptionData(builder, null, clock);
- final SubscriptionEvent event = createEntitlementEvent(builder.getAlignStartDate(),
- productName,
- phaseType,
- ApiEventType.CREATE,
- subscriptionData.getActiveVersion());
+ final SubscriptionEvent event = createSubscriptionEvent(builder.getAlignStartDate(),
+ productName,
+ phaseType,
+ ApiEventType.CREATE,
+ subscriptionData.getActiveVersion());
subscriptionData.rebuildTransitions(ImmutableList.<SubscriptionEvent>of(event), catalogService.getFullCatalog());
Assert.assertEquals(subscriptionData.getAllTransitions().size(), 1);
@@ -193,16 +193,16 @@ public class TestPlanAligner extends SubscriptionTestSuiteNoDB {
final String previousProductName,
final String newProductName,
final PhaseType commonPhaseType) {
- final SubscriptionEvent previousEvent = createEntitlementEvent(subscriptionData.getStartDate(),
- previousProductName,
- commonPhaseType,
- ApiEventType.CREATE,
- subscriptionData.getActiveVersion());
- final SubscriptionEvent event = createEntitlementEvent(effectiveChangeDate,
- newProductName,
- commonPhaseType,
- ApiEventType.CHANGE,
- subscriptionData.getActiveVersion());
+ final SubscriptionEvent previousEvent = createSubscriptionEvent(subscriptionData.getStartDate(),
+ previousProductName,
+ commonPhaseType,
+ ApiEventType.CREATE,
+ subscriptionData.getActiveVersion());
+ final SubscriptionEvent event = createSubscriptionEvent(effectiveChangeDate,
+ newProductName,
+ commonPhaseType,
+ ApiEventType.CHANGE,
+ subscriptionData.getActiveVersion());
subscriptionData.rebuildTransitions(ImmutableList.<SubscriptionEvent>of(previousEvent, event), catalogService.getFullCatalog());
@@ -213,11 +213,11 @@ public class TestPlanAligner extends SubscriptionTestSuiteNoDB {
Assert.assertNotNull(newTransitions.get(1).getNextPhase());
}
- private SubscriptionEvent createEntitlementEvent(final DateTime effectiveDate,
- final String productName,
- final PhaseType phaseType,
- final ApiEventType apiEventType,
- final long activeVersion) {
+ private SubscriptionEvent createSubscriptionEvent(final DateTime effectiveDate,
+ final String productName,
+ final PhaseType phaseType,
+ final ApiEventType apiEventType,
+ final long activeVersion) {
final ApiEventBuilder eventBuilder = new ApiEventBuilder();
eventBuilder.setEffectiveDate(effectiveDate);
eventBuilder.setEventPlan(productName);
diff --git a/subscription/src/test/java/com/ning/billing/subscription/api/migration/TestMigration.java b/subscription/src/test/java/com/ning/billing/subscription/api/migration/TestMigration.java
index b373eb4..d5529aa 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/api/migration/TestMigration.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/api/migration/TestMigration.java
@@ -29,7 +29,7 @@ import com.ning.billing.catalog.api.PhaseType;
import com.ning.billing.catalog.api.PriceListSet;
import com.ning.billing.catalog.api.ProductCategory;
import com.ning.billing.subscription.SubscriptionTestSuiteWithEmbeddedDB;
-import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.EntitlementAccountMigration;
+import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.AccountMigration;
import com.ning.billing.subscription.api.user.SubscriptionData;
import com.ning.billing.subscription.api.user.SubscriptionTransitionData;
import com.ning.billing.subscription.events.user.ApiEventType;
@@ -51,18 +51,18 @@ public class TestMigration extends SubscriptionTestSuiteWithEmbeddedDB {
try {
final DateTime startDate = clock.getUTCNow().minusMonths(2);
final DateTime beforeMigration = clock.getUTCNow();
- final EntitlementAccountMigration toBeMigrated = testUtil.createAccountForMigrationWithRegularBasePlan(startDate);
+ final AccountMigration toBeMigrated = testUtil.createAccountForMigrationWithRegularBasePlan(startDate);
final DateTime afterMigration = clock.getUTCNow();
testListener.pushExpectedEvent(NextEvent.MIGRATE_ENTITLEMENT);
migrationApi.migrate(toBeMigrated, callContext);
assertTrue(testListener.isCompleted(5000));
- final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
+ final List<SubscriptionBundle> bundles = subscriptionApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
assertEquals(bundles.size(), 1);
final SubscriptionBundle bundle = bundles.get(0);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(bundle.getId(), callContext);
assertEquals(subscriptions.size(), 1);
final Subscription subscription = subscriptions.get(0);
assertTrue(subscription.getStartDate().compareTo(startDate) == 0);
@@ -85,7 +85,7 @@ public class TestMigration extends SubscriptionTestSuiteWithEmbeddedDB {
final DateTime beforeMigration = clock.getUTCNow();
final DateTime initalBPStart = clock.getUTCNow().minusMonths(3);
final DateTime initalAddonStart = clock.getUTCNow().minusMonths(1).plusDays(7);
- final EntitlementAccountMigration toBeMigrated = testUtil.createAccountForMigrationWithRegularBasePlanAndAddons(initalBPStart, initalAddonStart);
+ final AccountMigration toBeMigrated = testUtil.createAccountForMigrationWithRegularBasePlanAndAddons(initalBPStart, initalAddonStart);
final DateTime afterMigration = clock.getUTCNow();
testListener.pushExpectedEvent(NextEvent.MIGRATE_ENTITLEMENT);
@@ -93,11 +93,11 @@ public class TestMigration extends SubscriptionTestSuiteWithEmbeddedDB {
migrationApi.migrate(toBeMigrated, callContext);
assertTrue(testListener.isCompleted(5000));
- final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
+ final List<SubscriptionBundle> bundles = subscriptionApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
assertEquals(bundles.size(), 1);
final SubscriptionBundle bundle = bundles.get(0);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(bundle.getId(), callContext);
assertEquals(subscriptions.size(), 2);
final Subscription baseSubscription = (subscriptions.get(0).getCurrentPlan().getProduct().getCategory() == ProductCategory.BASE) ?
@@ -134,19 +134,19 @@ public class TestMigration extends SubscriptionTestSuiteWithEmbeddedDB {
try {
final DateTime startDate = clock.getUTCNow().minusMonths(1);
final DateTime beforeMigration = clock.getUTCNow();
- final EntitlementAccountMigration toBeMigrated = testUtil.createAccountForMigrationWithRegularBasePlanFutreCancelled(startDate);
+ final AccountMigration toBeMigrated = testUtil.createAccountForMigrationWithRegularBasePlanFutreCancelled(startDate);
final DateTime afterMigration = clock.getUTCNow();
testListener.pushExpectedEvent(NextEvent.MIGRATE_ENTITLEMENT);
migrationApi.migrate(toBeMigrated, callContext);
assertTrue(testListener.isCompleted(5000));
- final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
+ final List<SubscriptionBundle> bundles = subscriptionApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
assertEquals(bundles.size(), 1);
final SubscriptionBundle bundle = bundles.get(0);
//assertEquals(bundle.getStartDate(), effectiveDate);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(bundle.getId(), callContext);
assertEquals(subscriptions.size(), 1);
final Subscription subscription = subscriptions.get(0);
assertTrue(subscription.getStartDate().compareTo(startDate) == 0);
@@ -181,17 +181,17 @@ public class TestMigration extends SubscriptionTestSuiteWithEmbeddedDB {
public void testSingleBasePlanWithPendingPhase() {
try {
final DateTime trialDate = clock.getUTCNow().minusDays(10);
- final EntitlementAccountMigration toBeMigrated = testUtil.createAccountForMigrationFuturePendingPhase(trialDate);
+ final AccountMigration toBeMigrated = testUtil.createAccountForMigrationFuturePendingPhase(trialDate);
testListener.pushExpectedEvent(NextEvent.MIGRATE_ENTITLEMENT);
migrationApi.migrate(toBeMigrated, callContext);
assertTrue(testListener.isCompleted(5000));
- final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
+ final List<SubscriptionBundle> bundles = subscriptionApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
assertEquals(bundles.size(), 1);
final SubscriptionBundle bundle = bundles.get(0);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(bundle.getId(), callContext);
assertEquals(subscriptions.size(), 1);
final Subscription subscription = subscriptions.get(0);
@@ -228,18 +228,18 @@ public class TestMigration extends SubscriptionTestSuiteWithEmbeddedDB {
public void testSingleBasePlanWithPendingChange() {
try {
final DateTime beforeMigration = clock.getUTCNow();
- final EntitlementAccountMigration toBeMigrated = testUtil.createAccountForMigrationFuturePendingChange();
+ final AccountMigration toBeMigrated = testUtil.createAccountForMigrationFuturePendingChange();
final DateTime afterMigration = clock.getUTCNow();
testListener.pushExpectedEvent(NextEvent.MIGRATE_ENTITLEMENT);
migrationApi.migrate(toBeMigrated, callContext);
assertTrue(testListener.isCompleted(5000));
- final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
+ final List<SubscriptionBundle> bundles = subscriptionApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
assertEquals(bundles.size(), 1);
final SubscriptionBundle bundle = bundles.get(0);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(bundle.getId(), callContext);
assertEquals(subscriptions.size(), 1);
final Subscription subscription = subscriptions.get(0);
//assertDateWithin(subscription.getStartDate(), beforeMigration, afterMigration);
@@ -276,7 +276,7 @@ public class TestMigration extends SubscriptionTestSuiteWithEmbeddedDB {
try {
final DateTime startDate = clock.getUTCNow().minusMonths(2);
final DateTime beforeMigration = clock.getUTCNow();
- final EntitlementAccountMigration toBeMigrated = testUtil.createAccountForMigrationWithRegularBasePlan(startDate);
+ final AccountMigration toBeMigrated = testUtil.createAccountForMigrationWithRegularBasePlan(startDate);
final DateTime afterMigration = clock.getUTCNow();
testListener.pushExpectedEvent(NextEvent.MIGRATE_ENTITLEMENT);
@@ -284,10 +284,10 @@ public class TestMigration extends SubscriptionTestSuiteWithEmbeddedDB {
assertTrue(testListener.isCompleted(5000));
assertListenerStatus();
- final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
+ final List<SubscriptionBundle> bundles = subscriptionApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
assertEquals(bundles.size(), 1);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundles.get(0).getId(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(bundles.get(0).getId(), callContext);
assertEquals(subscriptions.size(), 1);
final SubscriptionData subscription = (SubscriptionData) subscriptions.get(0);
diff --git a/subscription/src/test/java/com/ning/billing/subscription/api/TestEventJson.java b/subscription/src/test/java/com/ning/billing/subscription/api/TestEventJson.java
index bca28c1..608bdba 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/api/TestEventJson.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/api/TestEventJson.java
@@ -49,7 +49,7 @@ public class TestEventJson extends GuicyKillbillTestSuiteNoDB {
}
@Test(groups = "fast")
- public void testRepairEntitlementEvent() throws Exception {
+ public void testRepairSubscriptionEvent() throws Exception {
final RepairSubscriptionInternalEvent e = new DefaultRepairSubscriptionEvent(UUID.randomUUID(), UUID.randomUUID(), new DateTime(), 1L, 2L, null);
final String json = mapper.writeValueAsString(e);
diff --git a/subscription/src/test/java/com/ning/billing/subscription/api/timeline/TestRepairBP.java b/subscription/src/test/java/com/ning/billing/subscription/api/timeline/TestRepairBP.java
index e843bcc..58a1faa 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/api/timeline/TestRepairBP.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/api/timeline/TestRepairBP.java
@@ -160,7 +160,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
testUtil.validateExistingEventForAssertion(e, events.get(index++));
}
- final SubscriptionData dryRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ final SubscriptionData dryRunBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(dryRunBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
assertEquals(dryRunBaseSubscription.getBundleId(), bundle.getId());
@@ -190,7 +190,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
for (final ExistingEvent e : expected) {
testUtil.validateExistingEventForAssertion(e, events.get(index++));
}
- final SubscriptionData realRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ final SubscriptionData realRunBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(realRunBaseSubscription.getAllTransitions().size(), 2);
assertEquals(realRunBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
@@ -244,7 +244,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
assertTrue(testListener.isCompleted(5000));
// CHECK WHAT"S GOING ON AFTER WE MOVE CLOCK-- FUTURE MOTIFICATION SHOULD KICK IN
- final SubscriptionData subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscriptionId, callContext);
+ final SubscriptionData subscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscriptionId, callContext);
assertEquals(subscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
assertEquals(subscription.getBundleId(), bundle.getId());
@@ -331,7 +331,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
for (final ExistingEvent e : expectedEvents) {
testUtil.validateExistingEventForAssertion(e, events.get(index++));
}
- final SubscriptionData dryRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ final SubscriptionData dryRunBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(dryRunBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
assertEquals(dryRunBaseSubscription.getBundleId(), bundle.getId());
@@ -370,7 +370,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
for (final ExistingEvent e : expectedEvents) {
testUtil.validateExistingEventForAssertion(e, events.get(index++));
}
- final SubscriptionData realRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ final SubscriptionData realRunBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(realRunBaseSubscription.getAllTransitions().size(), 2);
assertEquals(realRunBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
@@ -414,7 +414,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(32));
clock.addDeltaFromReality(it.toDurationMillis());
assertTrue(testListener.isCompleted(5000));
- final SubscriptionData subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscriptionId, callContext);
+ final SubscriptionData subscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscriptionId, callContext);
assertEquals(subscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
assertEquals(subscription.getBundleId(), bundle.getId());
@@ -502,7 +502,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
for (final ExistingEvent e : expectedEvents) {
testUtil.validateExistingEventForAssertion(e, events.get(index++));
}
- final SubscriptionData dryRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ final SubscriptionData dryRunBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(dryRunBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
assertEquals(dryRunBaseSubscription.getBundleId(), bundle.getId());
@@ -539,7 +539,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
for (final ExistingEvent e : expectedEvents) {
testUtil.validateExistingEventForAssertion(e, events.get(index++));
}
- final SubscriptionData realRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ final SubscriptionData realRunBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(realRunBaseSubscription.getAllTransitions().size(), expectedTransitions);
assertEquals(realRunBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
@@ -579,7 +579,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
// SET CTD to BASE SUBSCRIPTION SP CANCEL OCCURS EOT
final DateTime newChargedThroughDate = baseSubscription.getStartDate().plusDays(30).plusMonths(1);
subscriptionInternalApi.setChargedThroughDate(baseSubscription.getId(), newChargedThroughDate, internalCallContext);
- baseSubscription = entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ baseSubscription = subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
final DateTime requestedChange = clock.getUTCNow();
baseSubscription.changePlan("Pistol", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, requestedChange, callContext);
@@ -611,7 +611,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
repairApi.repairBundle(bRepair, dryRun, callContext);
assertTrue(testListener.isCompleted(5000));
- baseSubscription = entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ baseSubscription = subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(((SubscriptionData) baseSubscription).getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
assertEquals(baseSubscription.getBundleId(), bundle.getId());
@@ -692,7 +692,7 @@ public class TestRepairBP extends SubscriptionTestSuiteWithEmbeddedDB {
clock.setDeltaFromReality(1000);
subscriptionInternalApi.setChargedThroughDate(baseSubscription.getId(), newChargedThroughDate, internalCallContext);
- entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
repairApi.repairBundle(bRepair, true, callContext);
diff --git a/subscription/src/test/java/com/ning/billing/subscription/api/timeline/TestRepairWithAO.java b/subscription/src/test/java/com/ning/billing/subscription/api/timeline/TestRepairWithAO.java
index 0e899e8..9e1c5ea 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/api/timeline/TestRepairWithAO.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/api/timeline/TestRepairWithAO.java
@@ -140,17 +140,17 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
testUtil.validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));
}
- SubscriptionData newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ SubscriptionData newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newAoSubscription.getAllTransitions().size(), 2);
assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
- SubscriptionData newAoSubscription2 = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription2.getId(), callContext);
+ SubscriptionData newAoSubscription2 = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription2.getId(), callContext);
assertEquals(newAoSubscription2.getState(), SubscriptionState.ACTIVE);
assertEquals(newAoSubscription2.getAllTransitions().size(), 2);
assertEquals(newAoSubscription2.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
- SubscriptionData newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ SubscriptionData newBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newBaseSubscription.getAllTransitions().size(), 2);
assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
@@ -181,17 +181,17 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
testUtil.validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));
}
- newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(newAoSubscription.getState(), SubscriptionState.CANCELLED);
assertEquals(newAoSubscription.getAllTransitions().size(), 2);
assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
- newAoSubscription2 = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription2.getId(), callContext);
+ newAoSubscription2 = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription2.getId(), callContext);
assertEquals(newAoSubscription2.getState(), SubscriptionState.ACTIVE);
assertEquals(newAoSubscription2.getAllTransitions().size(), 2);
assertEquals(newAoSubscription2.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
- newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ newBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newBaseSubscription.getAllTransitions().size(), 3);
assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
@@ -274,12 +274,12 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
testUtil.validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));
}
- SubscriptionData newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ SubscriptionData newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newAoSubscription.getAllTransitions().size(), 2);
assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
- SubscriptionData newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ SubscriptionData newBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newBaseSubscription.getAllTransitions().size(), 2);
assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
@@ -305,12 +305,12 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
testUtil.validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));
}
- newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(newAoSubscription.getState(), SubscriptionState.CANCELLED);
assertEquals(newAoSubscription.getAllTransitions().size(), 3);
assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
- newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ newBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newBaseSubscription.getAllTransitions().size(), 3);
assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
@@ -342,7 +342,7 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
// SET CTD to BASE SUBSCRIPTION SP CANCEL OCCURS EOT
final DateTime newChargedThroughDate = baseSubscription.getStartDate().plusDays(30).plusMonths(1);
subscriptionInternalApi.setChargedThroughDate(baseSubscription.getId(), newChargedThroughDate, internalCallContext);
- baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ baseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
BundleTimeline bundleRepair = repairApi.getBundleTimeline(bundle.getId(), callContext);
testUtil.sortEventsOnBundle(bundleRepair);
@@ -395,12 +395,12 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
testUtil.validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));
}
- SubscriptionData newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ SubscriptionData newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newAoSubscription.getAllTransitions().size(), 2);
assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
- SubscriptionData newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ SubscriptionData newBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newBaseSubscription.getAllTransitions().size(), 2);
assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
@@ -426,12 +426,12 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
testUtil.validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));
}
- newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newAoSubscription.getAllTransitions().size(), 3);
assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
- newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ newBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newBaseSubscription.getAllTransitions().size(), 3);
assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
@@ -444,12 +444,12 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
clock.addDeltaFromReality(it.toDurationMillis());
assertTrue(testListener.isCompleted(7000));
- newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(newAoSubscription.getState(), SubscriptionState.CANCELLED);
assertEquals(newAoSubscription.getAllTransitions().size(), 3);
assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
- newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ newBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(newBaseSubscription.getState(), SubscriptionState.CANCELLED);
assertEquals(newBaseSubscription.getAllTransitions().size(), 3);
assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
@@ -512,12 +512,12 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
for (final ExistingEvent e : expected) {
testUtil.validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
}
- SubscriptionData newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ SubscriptionData newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newAoSubscription.getAllTransitions().size(), 2);
assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
- SubscriptionData newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ SubscriptionData newBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newBaseSubscription.getAllTransitions().size(), 2);
assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
@@ -534,12 +534,12 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
testUtil.validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
}
- newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(newAoSubscription.getState(), SubscriptionState.CANCELLED);
assertEquals(newAoSubscription.getAllTransitions().size(), 2);
assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
- newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ newBaseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newBaseSubscription.getAllTransitions().size(), 2);
assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
@@ -601,7 +601,7 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
for (final ExistingEvent e : expected) {
testUtil.validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
}
- SubscriptionData newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ SubscriptionData newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newAoSubscription.getAllTransitions().size(), 2);
assertEquals(newAoSubscription.getStartDate(), aoSubscription.getStartDate());
@@ -620,7 +620,7 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
testUtil.validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
}
- newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newAoSubscription.getAllTransitions().size(), 2);
assertEquals(newAoSubscription.getStartDate(), aoRecreateDate);
@@ -694,7 +694,7 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
for (final ExistingEvent e : expected) {
testUtil.validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
}
- SubscriptionData newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ SubscriptionData newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newAoSubscription.getAllTransitions().size(), 2);
@@ -711,7 +711,7 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
testUtil.validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
}
- newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
assertEquals(newAoSubscription.getAllTransitions().size(), 3);
@@ -735,7 +735,7 @@ public class TestRepairWithAO extends SubscriptionTestSuiteWithEmbeddedDB {
clock.addDeltaFromReality(it.toDurationMillis());
assertTrue(testListener.isCompleted(5000));
- newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ newAoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
currentPhase = newAoSubscription.getCurrentPhase();
assertNotNull(currentPhase);
assertEquals(currentPhase.getPhaseType(), PhaseType.EVERGREEN);
diff --git a/subscription/src/test/java/com/ning/billing/subscription/api/transfer/TestDefaultSubscriptionTransferApi.java b/subscription/src/test/java/com/ning/billing/subscription/api/transfer/TestDefaultSubscriptionTransferApi.java
index 5b4134b..802fe6b 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/api/transfer/TestDefaultSubscriptionTransferApi.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/api/transfer/TestDefaultSubscriptionTransferApi.java
@@ -106,9 +106,9 @@ public class TestDefaultSubscriptionTransferApi extends SubscriptionTestSuiteNoD
public void testEventsAfterTransferForMigratedBundle1() throws Exception {
// MIGRATE_ENTITLEMENT then MIGRATE_BILLING (both in the past)
final DateTime transferDate = clock.getUTCNow();
- final DateTime migrateEntitlementEventEffectiveDate = transferDate.minusDays(10);
- final DateTime migrateBillingEventEffectiveDate = migrateEntitlementEventEffectiveDate.plusDays(1);
- final List<SubscriptionEvent> events = transferBundle(migrateEntitlementEventEffectiveDate, migrateBillingEventEffectiveDate, transferDate);
+ final DateTime migrateSubscriptionEventEffectiveDate = transferDate.minusDays(10);
+ final DateTime migrateBillingEventEffectiveDate = migrateSubscriptionEventEffectiveDate.plusDays(1);
+ final List<SubscriptionEvent> events = transferBundle(migrateSubscriptionEventEffectiveDate, migrateBillingEventEffectiveDate, transferDate);
Assert.assertEquals(events.size(), 1);
Assert.assertEquals(events.get(0).getType(), EventType.API_USER);
@@ -120,9 +120,9 @@ public class TestDefaultSubscriptionTransferApi extends SubscriptionTestSuiteNoD
public void testEventsAfterTransferForMigratedBundle2() throws Exception {
// MIGRATE_ENTITLEMENT and MIGRATE_BILLING at the same time (both in the past)
final DateTime transferDate = clock.getUTCNow();
- final DateTime migrateEntitlementEventEffectiveDate = transferDate.minusDays(10);
- final DateTime migrateBillingEventEffectiveDate = migrateEntitlementEventEffectiveDate;
- final List<SubscriptionEvent> events = transferBundle(migrateEntitlementEventEffectiveDate, migrateBillingEventEffectiveDate, transferDate);
+ final DateTime migrateSubscriptionEventEffectiveDate = transferDate.minusDays(10);
+ final DateTime migrateBillingEventEffectiveDate = migrateSubscriptionEventEffectiveDate;
+ final List<SubscriptionEvent> events = transferBundle(migrateSubscriptionEventEffectiveDate, migrateBillingEventEffectiveDate, transferDate);
Assert.assertEquals(events.size(), 1);
Assert.assertEquals(events.get(0).getType(), EventType.API_USER);
@@ -134,9 +134,9 @@ public class TestDefaultSubscriptionTransferApi extends SubscriptionTestSuiteNoD
public void testEventsAfterTransferForMigratedBundle3() throws Exception {
// MIGRATE_ENTITLEMENT then MIGRATE_BILLING (the latter in the future)
final DateTime transferDate = clock.getUTCNow();
- final DateTime migrateEntitlementEventEffectiveDate = transferDate.minusDays(10);
- final DateTime migrateBillingEventEffectiveDate = migrateEntitlementEventEffectiveDate.plusDays(20);
- final List<SubscriptionEvent> events = transferBundle(migrateEntitlementEventEffectiveDate, migrateBillingEventEffectiveDate, transferDate);
+ final DateTime migrateSubscriptionEventEffectiveDate = transferDate.minusDays(10);
+ final DateTime migrateBillingEventEffectiveDate = migrateSubscriptionEventEffectiveDate.plusDays(20);
+ final List<SubscriptionEvent> events = transferBundle(migrateSubscriptionEventEffectiveDate, migrateBillingEventEffectiveDate, transferDate);
Assert.assertEquals(events.size(), 1);
Assert.assertEquals(events.get(0).getType(), EventType.API_USER);
@@ -148,19 +148,19 @@ public class TestDefaultSubscriptionTransferApi extends SubscriptionTestSuiteNoD
public void testEventsAfterTransferForMigratedBundle4() throws Exception {
// MIGRATE_ENTITLEMENT then MIGRATE_BILLING (both in the future)
final DateTime transferDate = clock.getUTCNow();
- final DateTime migrateEntitlementEventEffectiveDate = transferDate.plusDays(10);
- final DateTime migrateBillingEventEffectiveDate = migrateEntitlementEventEffectiveDate.plusDays(20);
- final List<SubscriptionEvent> events = transferBundle(migrateEntitlementEventEffectiveDate, migrateBillingEventEffectiveDate, transferDate);
+ final DateTime migrateSubscriptionEventEffectiveDate = transferDate.plusDays(10);
+ final DateTime migrateBillingEventEffectiveDate = migrateSubscriptionEventEffectiveDate.plusDays(20);
+ final List<SubscriptionEvent> events = transferBundle(migrateSubscriptionEventEffectiveDate, migrateBillingEventEffectiveDate, transferDate);
Assert.assertEquals(events.size(), 1);
Assert.assertEquals(events.get(0).getType(), EventType.API_USER);
- Assert.assertEquals(events.get(0).getEffectiveDate(), migrateEntitlementEventEffectiveDate);
+ Assert.assertEquals(events.get(0).getEffectiveDate(), migrateSubscriptionEventEffectiveDate);
Assert.assertEquals(((ApiEventTransfer) events.get(0)).getEventType(), ApiEventType.TRANSFER);
}
- private List<SubscriptionEvent> transferBundle(final DateTime migrateEntitlementEventEffectiveDate, final DateTime migrateBillingEventEffectiveDate,
+ private List<SubscriptionEvent> transferBundle(final DateTime migrateSubscriptionEventEffectiveDate, final DateTime migrateBillingEventEffectiveDate,
final DateTime transferDate) throws SubscriptionTransferApiException {
- final ImmutableList<ExistingEvent> existingEvents = createMigrateEvents(migrateEntitlementEventEffectiveDate, migrateBillingEventEffectiveDate);
+ final ImmutableList<ExistingEvent> existingEvents = createMigrateEvents(migrateSubscriptionEventEffectiveDate, migrateBillingEventEffectiveDate);
final SubscriptionBuilder subscriptionBuilder = new SubscriptionBuilder();
final SubscriptionData subscription = new SubscriptionData(subscriptionBuilder);
@@ -203,11 +203,11 @@ public class TestDefaultSubscriptionTransferApi extends SubscriptionTestSuiteNoD
};
}
- private ImmutableList<ExistingEvent> createMigrateEvents(final DateTime migrateEntitlementEventEffectiveDate, final DateTime migrateBillingEventEffectiveDate) {
+ private ImmutableList<ExistingEvent> createMigrateEvents(final DateTime migrateSubscriptionEventEffectiveDate, final DateTime migrateBillingEventEffectiveDate) {
final ExistingEvent migrateEntitlementEvent = new ExistingEvent() {
@Override
public DateTime getEffectiveDate() {
- return migrateEntitlementEventEffectiveDate;
+ return migrateSubscriptionEventEffectiveDate;
}
@Override
diff --git a/subscription/src/test/java/com/ning/billing/subscription/api/transfer/TestTransfer.java b/subscription/src/test/java/com/ning/billing/subscription/api/transfer/TestTransfer.java
index 52f5818..35a3142 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/api/transfer/TestTransfer.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/api/transfer/TestTransfer.java
@@ -32,7 +32,7 @@ import com.ning.billing.catalog.api.Plan;
import com.ning.billing.catalog.api.PriceListSet;
import com.ning.billing.catalog.api.Product;
import com.ning.billing.subscription.SubscriptionTestSuiteWithEmbeddedDB;
-import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.EntitlementAccountMigration;
+import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.AccountMigration;
import com.ning.billing.subscription.api.migration.SubscriptionMigrationApiException;
import com.ning.billing.subscription.api.user.SubscriptionData;
import com.ning.billing.subscription.api.SubscriptionTransitionType;
@@ -58,18 +58,18 @@ public class TestTransfer extends SubscriptionTestSuiteWithEmbeddedDB {
try {
final DateTime startDate = clock.getUTCNow().minusMonths(2);
final DateTime beforeMigration = clock.getUTCNow();
- final EntitlementAccountMigration toBeMigrated = testUtil.createAccountForMigrationWithRegularBasePlan(startDate);
+ final AccountMigration toBeMigrated = testUtil.createAccountForMigrationWithRegularBasePlan(startDate);
final DateTime afterMigration = clock.getUTCNow();
testListener.pushExpectedEvent(NextEvent.MIGRATE_ENTITLEMENT);
migrationApi.migrate(toBeMigrated, callContext);
assertTrue(testListener.isCompleted(5000));
- final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
+ final List<SubscriptionBundle> bundles = subscriptionApi.getBundlesForAccount(toBeMigrated.getAccountKey(), callContext);
assertEquals(bundles.size(), 1);
final SubscriptionBundle bundle = bundles.get(0);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(bundle.getId(), callContext);
assertEquals(subscriptions.size(), 1);
final Subscription subscription = subscriptions.get(0);
testUtil.assertDateWithin(subscription.getStartDate(), beforeMigration.minusMonths(2), afterMigration.minusMonths(2));
@@ -96,7 +96,7 @@ public class TestTransfer extends SubscriptionTestSuiteWithEmbeddedDB {
transferApi.transferBundle(bundle.getAccountId(), newAccountId, bundle.getExternalKey(), transferRequestedDate, false, true, callContext);
assertTrue(testListener.isCompleted(3000));
- final Subscription oldBaseSubscription = entitlementApi.getBaseSubscription(bundle.getId(), callContext);
+ final Subscription oldBaseSubscription = subscriptionApi.getBaseSubscription(bundle.getId(), callContext);
assertTrue(oldBaseSubscription.getState() == SubscriptionState.CANCELLED);
// The MIGRATE_BILLING event should have been invalidated
assertEquals(subscriptionInternalApi.getBillingTransitions(oldBaseSubscription, internalCallContext).size(), 0);
@@ -136,15 +136,15 @@ public class TestTransfer extends SubscriptionTestSuiteWithEmbeddedDB {
final DateTime afterTransferDate = clock.getUTCNow();
// CHECK OLD BASE IS CANCEL AT THE TRANSFER DATE
- final Subscription oldBaseSubscription = entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ final Subscription oldBaseSubscription = subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertNotNull(oldBaseSubscription.getEndDate());
testUtil.assertDateWithin(oldBaseSubscription.getEndDate(), beforeTransferDate, afterTransferDate);
assertTrue(oldBaseSubscription.getEndDate().compareTo(transferRequestedDate) == 0);
// CHECK NEW BUNDLE EXIST, WITH ONE SUBSCRIPTION STARTING ON TRANSFER_DATE
- final SubscriptionBundle newBundle = entitlementApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
+ final SubscriptionBundle newBundle = subscriptionApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
assertEquals(subscriptions.size(), 1);
final Subscription newBaseSubscription = subscriptions.get(0);
@@ -186,14 +186,14 @@ public class TestTransfer extends SubscriptionTestSuiteWithEmbeddedDB {
assertTrue(testListener.isCompleted(3000));
// CHECK OLD BASE IS CANCEL AT THE TRANSFER DATE
- final Subscription oldBaseSubscription = entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ final Subscription oldBaseSubscription = subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertNotNull(oldBaseSubscription.getFutureEndDate());
assertTrue(oldBaseSubscription.getFutureEndDate().compareTo(ctd) == 0);
// CHECK NEW BUNDLE EXIST, WITH ONE SUBSCRIPTION STARTING ON TRANSFER_DATE
- final SubscriptionBundle newBundle = entitlementApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
+ final SubscriptionBundle newBundle = subscriptionApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
assertEquals(subscriptions.size(), 1);
final Subscription newBaseSubscription = subscriptions.get(0);
@@ -235,15 +235,15 @@ public class TestTransfer extends SubscriptionTestSuiteWithEmbeddedDB {
final DateTime afterTransferDate = clock.getUTCNow();
// CHECK OLD BASE IS CANCEL AT THE TRANSFER DATE
- final Subscription oldBaseSubscription = entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ final Subscription oldBaseSubscription = subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertNotNull(oldBaseSubscription.getEndDate());
testUtil.assertDateWithin(oldBaseSubscription.getEndDate(), beforeTransferDate, afterTransferDate);
assertTrue(oldBaseSubscription.getEndDate().compareTo(transferRequestedDate) == 0);
// CHECK NEW BUNDLE EXIST, WITH ONE SUBSCRIPTION STARTING ON TRANSFER_DATE
- final SubscriptionBundle newBundle = entitlementApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
+ final SubscriptionBundle newBundle = subscriptionApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
assertEquals(subscriptions.size(), 1);
final Subscription newBaseSubscription = subscriptions.get(0);
@@ -285,14 +285,14 @@ public class TestTransfer extends SubscriptionTestSuiteWithEmbeddedDB {
assertTrue(testListener.isCompleted(3000));
// CHECK OLD BASE IS CANCEL AT THE TRANSFER DATE
- final Subscription oldBaseSubscription = entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ final Subscription oldBaseSubscription = subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertNotNull(oldBaseSubscription.getFutureEndDate());
assertTrue(oldBaseSubscription.getFutureEndDate().compareTo(ctd) == 0);
// CHECK NEW BUNDLE EXIST, WITH ONE SUBSCRIPTION STARTING ON TRANSFER_DATE
- final SubscriptionBundle newBundle = entitlementApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
+ final SubscriptionBundle newBundle = subscriptionApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
assertEquals(subscriptions.size(), 1);
final Subscription newBaseSubscription = subscriptions.get(0);
@@ -322,7 +322,7 @@ public class TestTransfer extends SubscriptionTestSuiteWithEmbeddedDB {
final DateTime newCtd = newBaseSubscription.getStartDate().plusYears(1);
subscriptionInternalApi.setChargedThroughDate(newBaseSubscription.getId(), newCtd, internalCallContext);
- final Subscription newBaseSubscriptionWithCtd = entitlementApi.getSubscriptionFromId(newBaseSubscription.getId(), callContext);
+ final Subscription newBaseSubscriptionWithCtd = subscriptionApi.getSubscriptionFromId(newBaseSubscription.getId(), callContext);
final String newBaseProduct2 = "Pistol";
final BillingPeriod newBaseTerm2 = BillingPeriod.ANNUAL;
@@ -380,8 +380,8 @@ public class TestTransfer extends SubscriptionTestSuiteWithEmbeddedDB {
assertTrue(testListener.isCompleted(3000));
// RETRIEVE NEW BUNDLE AND CHECK SUBSCRIPTIONS
- final SubscriptionBundle newBundle = entitlementApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
+ final SubscriptionBundle newBundle = subscriptionApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
assertEquals(subscriptions.size(), 3);
boolean foundBP = false;
boolean foundAO1 = false;
@@ -468,8 +468,8 @@ public class TestTransfer extends SubscriptionTestSuiteWithEmbeddedDB {
transferApi.transferBundle(bundle.getAccountId(), newAccountId, bundle.getExternalKey(), transferRequestedDate, true, false, callContext);
assertTrue(testListener.isCompleted(3000));
- final SubscriptionBundle newBundle = entitlementApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
+ final SubscriptionBundle newBundle = subscriptionApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
assertEquals(subscriptions.size(), 1);
}
@@ -495,7 +495,7 @@ public class TestTransfer extends SubscriptionTestSuiteWithEmbeddedDB {
// CANCEL BP
- baseSubscription = entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ baseSubscription = subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
baseSubscription.cancel(clock.getUTCNow(), callContext);
// MOVE CLOCK one day AHEAD AND UNCANCEL BP
@@ -511,8 +511,8 @@ public class TestTransfer extends SubscriptionTestSuiteWithEmbeddedDB {
transferApi.transferBundle(bundle.getAccountId(), newAccountId, bundle.getExternalKey(), transferRequestedDate, true, false, callContext);
assertTrue(testListener.isCompleted(3000));
- final SubscriptionBundle newBundle = entitlementApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
- final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
+ final SubscriptionBundle newBundle = subscriptionApi.getBundleForAccountAndKey(newAccountId, bundle.getExternalKey(), callContext);
+ final List<Subscription> subscriptions = subscriptionApi.getSubscriptionsForBundle(newBundle.getId(), callContext);
assertEquals(subscriptions.size(), 1);
}
}
diff --git a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestSubscriptionHelper.java b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestSubscriptionHelper.java
index 5d63403..6aa9351 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestSubscriptionHelper.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestSubscriptionHelper.java
@@ -43,10 +43,10 @@ import com.ning.billing.catalog.api.PriceListSet;
import com.ning.billing.catalog.api.ProductCategory;
import com.ning.billing.catalog.api.TimeUnit;
import com.ning.billing.clock.Clock;
-import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.EntitlementAccountMigration;
-import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.EntitlementBundleMigration;
-import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.EntitlementSubscriptionMigration;
-import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.EntitlementSubscriptionMigrationCase;
+import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.AccountMigration;
+import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.BundleMigration;
+import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.SubscriptionMigration;
+import com.ning.billing.subscription.api.migration.SubscriptionMigrationApi.SubscriptionMigrationCase;
import com.ning.billing.subscription.engine.dao.SubscriptionDao;
import com.ning.billing.subscription.events.SubscriptionEvent;
import com.ning.billing.subscription.events.phase.PhaseEvent;
@@ -71,7 +71,7 @@ public class TestSubscriptionHelper {
private final Logger log = LoggerFactory.getLogger(TestSubscriptionHelper.class);
- private final SubscriptionUserApi entitlementApi;
+ private final SubscriptionUserApi subscriptionApi;
private final Clock clock;
@@ -83,8 +83,8 @@ public class TestSubscriptionHelper {
@Inject
- public TestSubscriptionHelper(final SubscriptionUserApi entitlementApi, final Clock clock, final InternalCallContext callContext, final TestApiListener testListener, final SubscriptionDao dao) {
- this.entitlementApi = entitlementApi;
+ public TestSubscriptionHelper(final SubscriptionUserApi subscriptionApi, final Clock clock, final InternalCallContext callContext, final TestApiListener testListener, final SubscriptionDao dao) {
+ this.subscriptionApi = subscriptionApi;
this.clock = clock;
this.callContext = callContext;
this.testListener = testListener;
@@ -105,7 +105,7 @@ public class TestSubscriptionHelper {
public SubscriptionData createSubscriptionWithBundle(final UUID bundleId, final String productName, final BillingPeriod term, final String planSet, final DateTime requestedDate)
throws SubscriptionUserApiException {
testListener.pushExpectedEvent(NextEvent.CREATE);
- final SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundleId,
+ final SubscriptionData subscription = (SubscriptionData) subscriptionApi.createSubscription(bundleId,
new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSet, null),
requestedDate == null ? clock.getUTCNow() : requestedDate, callContext.toCallContext());
assertNotNull(subscription);
@@ -244,24 +244,24 @@ public class TestSubscriptionHelper {
* *************************************************************
*/
- public EntitlementAccountMigration createAccountForMigrationTest(final List<List<EntitlementSubscriptionMigrationCaseWithCTD>> cases) {
- return new EntitlementAccountMigration() {
+ public AccountMigration createAccountForMigrationTest(final List<List<SubscriptionMigrationCaseWithCTD>> cases) {
+ return new AccountMigration() {
private final UUID accountId = UUID.randomUUID();
@Override
- public EntitlementBundleMigration[] getBundles() {
- final List<EntitlementBundleMigration> bundles = new ArrayList<EntitlementBundleMigration>();
- final EntitlementBundleMigration bundle0 = new EntitlementBundleMigration() {
+ public BundleMigration[] getBundles() {
+ final List<BundleMigration> bundles = new ArrayList<BundleMigration>();
+ final BundleMigration bundle0 = new BundleMigration() {
@Override
- public EntitlementSubscriptionMigration[] getSubscriptions() {
- final EntitlementSubscriptionMigration[] result = new EntitlementSubscriptionMigration[cases.size()];
+ public SubscriptionMigration[] getSubscriptions() {
+ final SubscriptionMigration[] result = new SubscriptionMigration[cases.size()];
for (int i = 0; i < cases.size(); i++) {
- final List<EntitlementSubscriptionMigrationCaseWithCTD> curCases = cases.get(i);
- final EntitlementSubscriptionMigration subscription = new EntitlementSubscriptionMigration() {
+ final List<SubscriptionMigrationCaseWithCTD> curCases = cases.get(i);
+ final SubscriptionMigration subscription = new SubscriptionMigration() {
@Override
- public EntitlementSubscriptionMigrationCaseWithCTD[] getSubscriptionCases() {
- return curCases.toArray(new EntitlementSubscriptionMigrationCaseWithCTD[curCases.size()]);
+ public SubscriptionMigrationCaseWithCTD[] getSubscriptionCases() {
+ return curCases.toArray(new SubscriptionMigrationCaseWithCTD[curCases.size()]);
}
@Override
@@ -271,7 +271,7 @@ public class TestSubscriptionHelper {
@Override
public DateTime getChargedThroughDate() {
- for (final EntitlementSubscriptionMigrationCaseWithCTD cur : curCases) {
+ for (final SubscriptionMigrationCaseWithCTD cur : curCases) {
if (cur.getChargedThroughDate() != null) {
return cur.getChargedThroughDate();
}
@@ -290,7 +290,7 @@ public class TestSubscriptionHelper {
}
};
bundles.add(bundle0);
- return bundles.toArray(new EntitlementBundleMigration[bundles.size()]);
+ return bundles.toArray(new BundleMigration[bundles.size()]);
}
@Override
@@ -300,88 +300,88 @@ public class TestSubscriptionHelper {
};
}
- public EntitlementAccountMigration createAccountForMigrationWithRegularBasePlanAndAddons(final DateTime initialBPstart, final DateTime initalAddonStart) {
+ public AccountMigration createAccountForMigrationWithRegularBasePlanAndAddons(final DateTime initialBPstart, final DateTime initalAddonStart) {
- final List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
- cases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
+ final List<SubscriptionMigrationCaseWithCTD> cases = new LinkedList<SubscriptionMigrationCaseWithCTD>();
+ cases.add(new SubscriptionMigrationCaseWithCTD(
new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.ANNUAL, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN),
initialBPstart,
null,
initialBPstart.plusYears(1)));
- final List<EntitlementSubscriptionMigrationCaseWithCTD> firstAddOnCases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
- firstAddOnCases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
+ final List<SubscriptionMigrationCaseWithCTD> firstAddOnCases = new LinkedList<SubscriptionMigrationCaseWithCTD>();
+ firstAddOnCases.add(new SubscriptionMigrationCaseWithCTD(
new PlanPhaseSpecifier("Telescopic-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.DISCOUNT),
initalAddonStart,
initalAddonStart.plusMonths(1),
initalAddonStart.plusMonths(1)));
- firstAddOnCases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
+ firstAddOnCases.add(new SubscriptionMigrationCaseWithCTD(
new PlanPhaseSpecifier("Telescopic-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN),
initalAddonStart.plusMonths(1),
null,
null));
- final List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
+ final List<List<SubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<SubscriptionMigrationCaseWithCTD>>();
input.add(cases);
input.add(firstAddOnCases);
return createAccountForMigrationTest(input);
}
- public EntitlementAccountMigration createAccountForMigrationWithRegularBasePlan(final DateTime startDate) {
- final List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
- cases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
+ public AccountMigration createAccountForMigrationWithRegularBasePlan(final DateTime startDate) {
+ final List<SubscriptionMigrationCaseWithCTD> cases = new LinkedList<SubscriptionMigrationCaseWithCTD>();
+ cases.add(new SubscriptionMigrationCaseWithCTD(
new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.ANNUAL, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN),
startDate,
null,
startDate.plusYears(1)));
- final List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
+ final List<List<SubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<SubscriptionMigrationCaseWithCTD>>();
input.add(cases);
return createAccountForMigrationTest(input);
}
- public EntitlementAccountMigration createAccountForMigrationWithRegularBasePlanFutreCancelled(final DateTime startDate) {
- final List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
- cases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
+ public AccountMigration createAccountForMigrationWithRegularBasePlanFutreCancelled(final DateTime startDate) {
+ final List<SubscriptionMigrationCaseWithCTD> cases = new LinkedList<SubscriptionMigrationCaseWithCTD>();
+ cases.add(new SubscriptionMigrationCaseWithCTD(
new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.ANNUAL, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN),
startDate,
startDate.plusYears(1),
startDate.plusYears(1)));
- final List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
+ final List<List<SubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<SubscriptionMigrationCaseWithCTD>>();
input.add(cases);
return createAccountForMigrationTest(input);
}
- public EntitlementAccountMigration createAccountForMigrationFuturePendingPhase(final DateTime trialDate) {
- final List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
- cases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
+ public AccountMigration createAccountForMigrationFuturePendingPhase(final DateTime trialDate) {
+ final List<SubscriptionMigrationCaseWithCTD> cases = new LinkedList<SubscriptionMigrationCaseWithCTD>();
+ cases.add(new SubscriptionMigrationCaseWithCTD(
new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL),
trialDate,
trialDate.plusDays(30),
trialDate.plusDays(30)));
- cases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
+ cases.add(new SubscriptionMigrationCaseWithCTD(
new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN),
trialDate.plusDays(30),
null,
null));
- final List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
+ final List<List<SubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<SubscriptionMigrationCaseWithCTD>>();
input.add(cases);
return createAccountForMigrationTest(input);
}
- public EntitlementAccountMigration createAccountForMigrationFuturePendingChange() {
- final List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
+ public AccountMigration createAccountForMigrationFuturePendingChange() {
+ final List<SubscriptionMigrationCaseWithCTD> cases = new LinkedList<SubscriptionMigrationCaseWithCTD>();
final DateTime effectiveDate = clock.getUTCNow().minusDays(10);
- cases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
+ cases.add(new SubscriptionMigrationCaseWithCTD(
new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN),
effectiveDate,
effectiveDate.plusMonths(1),
effectiveDate.plusMonths(1)));
- cases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
+ cases.add(new SubscriptionMigrationCaseWithCTD(
new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.ANNUAL, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN),
effectiveDate.plusMonths(1).plusDays(1),
null,
null));
- final List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
+ final List<List<SubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<SubscriptionMigrationCaseWithCTD>>();
input.add(cases);
return createAccountForMigrationTest(input);
}
@@ -627,14 +627,14 @@ public class TestSubscriptionHelper {
}
- public static class EntitlementSubscriptionMigrationCaseWithCTD implements EntitlementSubscriptionMigrationCase {
+ public static class SubscriptionMigrationCaseWithCTD implements SubscriptionMigrationCase {
private final PlanPhaseSpecifier pps;
private final DateTime effDt;
private final DateTime cancelDt;
private final DateTime ctd;
- public EntitlementSubscriptionMigrationCaseWithCTD(final PlanPhaseSpecifier pps, final DateTime effDt, final DateTime cancelDt, final DateTime ctd) {
+ public SubscriptionMigrationCaseWithCTD(final PlanPhaseSpecifier pps, final DateTime effDt, final DateTime cancelDt, final DateTime ctd) {
this.pps = pps;
this.cancelDt = cancelDt;
this.effDt = effDt;
diff --git a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiAddOn.java b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiAddOn.java
index bf31404..ed0ed91 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiAddOn.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiAddOn.java
@@ -68,7 +68,7 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
testListener.reset();
testListener.pushExpectedEvent(NextEvent.CANCEL);
assertTrue(testListener.isCompleted(5000));
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(aoSubscription.getState(), SubscriptionState.CANCELLED);
@@ -112,25 +112,25 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
final DateTime newBPChargedThroughDate = TestSubscriptionHelper.addDuration(now, bpCtd);
subscriptionInternalApi.setChargedThroughDate(baseSubscription.getId(), newBPChargedThroughDate, internalCallContext);
- baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ baseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(1));
clock.addDeltaFromReality(it.toDurationMillis());
// CANCEL AO
aoSubscription.cancel(clock.getUTCNow(), callContext);
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(aoSubscription.getState(), SubscriptionState.ACTIVE);
assertTrue(aoSubscription.isSubscriptionFutureCancelled());
// CANCEL BASE NOW
baseSubscription.cancel(clock.getUTCNow(), callContext);
- baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ baseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(baseSubscription.getState(), SubscriptionState.ACTIVE);
assertTrue(baseSubscription.isSubscriptionFutureCancelled());
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
List<SubscriptionTransition> aoTransitions = aoSubscription.getAllTransitions();
assertEquals(aoTransitions.size(), 3);
assertEquals(aoTransitions.get(0).getTransitionType(), SubscriptionTransitionType.CREATE);
@@ -142,7 +142,7 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
aoSubscription.uncancel(callContext);
assertTrue(testListener.isCompleted(5000));
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
aoTransitions = aoSubscription.getAllTransitions();
assertEquals(aoTransitions.size(), 3);
assertEquals(aoTransitions.get(0).getTransitionType(), SubscriptionTransitionType.CREATE);
@@ -190,13 +190,13 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
// Why not just use clock.getUTCNow().plusMonths(1) ?
final DateTime newChargedThroughDate = TestSubscriptionHelper.addDuration(now, ctd);
subscriptionInternalApi.setChargedThroughDate(baseSubscription.getId(), newChargedThroughDate, internalCallContext);
- baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ baseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
// FUTURE CANCELLATION
baseSubscription.cancel(now, callContext);
// REFETCH AO SUBSCRIPTION AND CHECK THIS IS ACTIVE
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(aoSubscription.getState(), SubscriptionState.ACTIVE);
assertTrue(aoSubscription.isSubscriptionFutureCancelled());
@@ -210,7 +210,7 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
assertTrue(testListener.isCompleted(5000));
// REFETCH AO SUBSCRIPTION AND CHECK THIS IS CANCELLED
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(aoSubscription.getState(), SubscriptionState.CANCELLED);
assertListenerStatus();
@@ -252,24 +252,24 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
// Why not just use clock.getUTCNow().plusMonths(1) ?
final DateTime newChargedThroughDate = TestSubscriptionHelper.addDuration(now, ctd);
subscriptionInternalApi.setChargedThroughDate(baseSubscription.getId(), newChargedThroughDate, internalCallContext);
- baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ baseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
// FUTURE CANCELLATION
baseSubscription.cancel(now, callContext);
// REFETCH AO SUBSCRIPTION AND CHECK THIS IS ACTIVE
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(aoSubscription.getState(), SubscriptionState.ACTIVE);
assertTrue(aoSubscription.isSubscriptionFutureCancelled());
testListener.reset();
testListener.pushExpectedEvent(NextEvent.UNCANCEL);
- baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ baseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
baseSubscription.uncancel(callContext);
assertTrue(testListener.isCompleted(5000));
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(aoSubscription.getState(), SubscriptionState.ACTIVE);
assertFalse(aoSubscription.isSubscriptionFutureCancelled());
@@ -277,13 +277,13 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(1));
clock.addDeltaFromReality(it.toDurationMillis());
- baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ baseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
baseSubscription.cancel(clock.getUTCNow(), callContext);
- baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ baseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
assertEquals(baseSubscription.getState(), SubscriptionState.ACTIVE);
assertTrue(baseSubscription.isSubscriptionFutureCancelled());
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(aoSubscription.getState(), SubscriptionState.ACTIVE);
assertTrue(aoSubscription.isSubscriptionFutureCancelled());
assertListenerStatus();
@@ -326,14 +326,14 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
final Duration ctd = testUtil.getDurationMonth(1);
final DateTime newChargedThroughDate = TestSubscriptionHelper.addDuration(now, ctd);
subscriptionInternalApi.setChargedThroughDate(baseSubscription.getId(), newChargedThroughDate, internalCallContext);
- baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ baseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
// CHANGE IMMEDIATELY WITH TO BP WITH NON INCLUDED ADDON
final String newBaseProduct = "Assault-Rifle";
final BillingPeriod newBaseTerm = BillingPeriod.MONTHLY;
final String newBasePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
- final List<SubscriptionStatusDryRun> aoStatus = entitlementApi.getDryRunChangePlanStatus(baseSubscription.getId(),
+ final List<SubscriptionStatusDryRun> aoStatus = subscriptionApi.getDryRunChangePlanStatus(baseSubscription.getId(),
newBaseProduct, now, callContext);
assertEquals(aoStatus.size(), 1);
assertEquals(aoStatus.get(0).getId(), aoSubscription.getId());
@@ -350,7 +350,7 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
assertTrue(testListener.isCompleted(5000));
// REFETCH AO SUBSCRIPTION AND CHECK THIS CANCELLED
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(aoSubscription.getState(), SubscriptionState.CANCELLED);
assertListenerStatus();
@@ -389,14 +389,14 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
final Duration ctd = testUtil.getDurationMonth(1);
final DateTime newChargedThroughDate = TestSubscriptionHelper.addDuration(now, ctd);
subscriptionInternalApi.setChargedThroughDate(baseSubscription.getId(), newChargedThroughDate, internalCallContext);
- baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
+ baseSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(baseSubscription.getId(), callContext);
// CHANGE IMMEDIATELY WITH TO BP WITH NON AVAILABLE ADDON
final String newBaseProduct = "Pistol";
final BillingPeriod newBaseTerm = BillingPeriod.MONTHLY;
final String newBasePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
- final List<SubscriptionStatusDryRun> aoStatus = entitlementApi.getDryRunChangePlanStatus(baseSubscription.getId(),
+ final List<SubscriptionStatusDryRun> aoStatus = subscriptionApi.getDryRunChangePlanStatus(baseSubscription.getId(),
newBaseProduct, now, callContext);
assertEquals(aoStatus.size(), 1);
assertEquals(aoStatus.get(0).getId(), aoSubscription.getId());
@@ -409,7 +409,7 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
baseSubscription.changePlan(newBaseProduct, newBaseTerm, newBasePriceList, now, callContext);
// REFETCH AO SUBSCRIPTION AND CHECK THIS IS ACTIVE
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(aoSubscription.getState(), SubscriptionState.ACTIVE);
assertTrue(aoSubscription.isSubscriptionFutureCancelled());
@@ -422,7 +422,7 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
assertTrue(testListener.isCompleted(5000));
// REFETCH AO SUBSCRIPTION AND CHECK THIS CANCELLED
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
assertEquals(aoSubscription.getState(), SubscriptionState.CANCELLED);
assertListenerStatus();
@@ -528,7 +528,7 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
assertTrue(testListener.isCompleted(5000));
// CHECK EVERYTHING AGAIN
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
aoCurrentPlan = aoSubscription.getCurrentPlan();
assertNotNull(aoCurrentPlan);
@@ -540,7 +540,7 @@ public class TestUserApiAddOn extends SubscriptionTestSuiteWithEmbeddedDB {
assertNotNull(aoCurrentPhase);
assertEquals(aoCurrentPhase.getPhaseType(), PhaseType.EVERGREEN);
- aoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
+ aoSubscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(aoSubscription.getId(), callContext);
aoPendingTranstion = aoSubscription.getPendingTransition();
assertNull(aoPendingTranstion);
} catch (SubscriptionUserApiException e) {
diff --git a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiCancel.java b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiCancel.java
index 03bd072..5248360 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiCancel.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiCancel.java
@@ -29,7 +29,7 @@ import com.ning.billing.catalog.api.Plan;
import com.ning.billing.catalog.api.PlanPhase;
import com.ning.billing.catalog.api.PriceListSet;
import com.ning.billing.subscription.SubscriptionTestSuiteWithEmbeddedDB;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionBillingApiException;
+import com.ning.billing.util.svcapi.subscription.SubscriptionBillingApiException;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -114,7 +114,7 @@ public class TestUserApiCancel extends SubscriptionTestSuiteWithEmbeddedDB {
final Duration ctd = testUtil.getDurationMonth(1);
final DateTime newChargedThroughDate = TestSubscriptionHelper.addDuration(expectedPhaseTrialChange, ctd);
subscriptionInternalApi.setChargedThroughDate(subscription.getId(), newChargedThroughDate, internalCallContext);
- subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId(), callContext);
+ subscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(subscription.getId(), callContext);
assertEquals(subscription.getLastActiveProductName(), prod);
assertEquals(subscription.getLastActivePriceListName(), planSet);
@@ -234,7 +234,7 @@ public class TestUserApiCancel extends SubscriptionTestSuiteWithEmbeddedDB {
final Duration ctd = testUtil.getDurationMonth(1);
final DateTime newChargedThroughDate = TestSubscriptionHelper.addDuration(expectedPhaseTrialChange, ctd);
subscriptionInternalApi.setChargedThroughDate(subscription.getId(), newChargedThroughDate, internalCallContext);
- subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId(), callContext);
+ subscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(subscription.getId(), callContext);
// CANCEL EOT
subscription.cancel(clock.getUTCNow(), callContext);
diff --git a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiChangePlan.java b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiChangePlan.java
index 713a9f4..0776848 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiChangePlan.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiChangePlan.java
@@ -35,7 +35,7 @@ import com.ning.billing.catalog.api.ProductCategory;
import com.ning.billing.subscription.SubscriptionTestSuiteWithEmbeddedDB;
import com.ning.billing.subscription.events.SubscriptionEvent;
import com.ning.billing.subscription.events.user.ApiEvent;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionBillingApiException;
+import com.ning.billing.util.svcapi.subscription.SubscriptionBillingApiException;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -126,7 +126,7 @@ public class TestUserApiChangePlan extends SubscriptionTestSuiteWithEmbeddedDB {
// RE READ SUBSCRIPTION + CHANGE PLAN
testListener.setNonExpectedMode();
testListener.pushExpectedEvent(NextEvent.CHANGE);
- subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId(), callContext);
+ subscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(subscription.getId(), callContext);
subscription.changePlan(toProd, toTerm, toPlanSet, clock.getUTCNow(), callContext);
assertFalse(testListener.isCompleted(3000));
testListener.reset();
@@ -149,7 +149,7 @@ public class TestUserApiChangePlan extends SubscriptionTestSuiteWithEmbeddedDB {
clock.addDeltaFromReality(it.toDurationMillis());
assertTrue(testListener.isCompleted(5000));
- subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId(), callContext);
+ subscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(subscription.getId(), callContext);
currentPhase = subscription.getCurrentPhase();
checkChangePlan(subscription, toProd, ProductCategory.BASE, toTerm, PhaseType.DISCOUNT);
@@ -229,7 +229,7 @@ public class TestUserApiChangePlan extends SubscriptionTestSuiteWithEmbeddedDB {
subscriptionInternalApi.setChargedThroughDate(subscription.getId(), newChargedThroughDate, internalCallContext);
// RE READ SUBSCRIPTION + CHECK CURRENT PHASE
- subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId(), callContext);
+ subscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(subscription.getId(), callContext);
PlanPhase currentPhase = subscription.getCurrentPhase();
assertNotNull(currentPhase);
assertEquals(currentPhase.getPhaseType(), PhaseType.EVERGREEN);
@@ -309,7 +309,7 @@ public class TestUserApiChangePlan extends SubscriptionTestSuiteWithEmbeddedDB {
final Duration ctd = testUtil.getDurationMonth(1);
final DateTime newChargedThroughDate = TestSubscriptionHelper.addDuration(startDiscountPhase, ctd);
subscriptionInternalApi.setChargedThroughDate(subscription.getId(), newChargedThroughDate, internalCallContext);
- subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId(), callContext);
+ subscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(subscription.getId(), callContext);
// CHANGE EOT
testListener.setNonExpectedMode();
@@ -358,7 +358,7 @@ public class TestUserApiChangePlan extends SubscriptionTestSuiteWithEmbeddedDB {
final Duration ctd = testUtil.getDurationMonth(1);
final DateTime newChargedThroughDate = TestSubscriptionHelper.addDuration(startDiscountPhase, ctd);
subscriptionInternalApi.setChargedThroughDate(subscription.getId(), newChargedThroughDate, internalCallContext);
- subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId(), callContext);
+ subscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(subscription.getId(), callContext);
// CHANGE EOT
testListener.setNonExpectedMode();
@@ -407,7 +407,7 @@ public class TestUserApiChangePlan extends SubscriptionTestSuiteWithEmbeddedDB {
it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusMonths(6));
clock.addDeltaFromReality(it.toDurationMillis());
assertTrue(testListener.isCompleted(5000));
- subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId(), callContext);
+ subscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(subscription.getId(), callContext);
currentPlan = subscription.getCurrentPlan();
assertNotNull(currentPlan);
@@ -464,7 +464,7 @@ public class TestUserApiChangePlan extends SubscriptionTestSuiteWithEmbeddedDB {
trialPhase = subscription.getCurrentPhase();
assertEquals(trialPhase.getPhaseType(), PhaseType.DISCOUNT);
- subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId(), callContext);
+ subscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(subscription.getId(), callContext);
final DateTime expectedNextPhaseDate = subscription.getStartDate().plusDays(30).plusMonths(6);
final SubscriptionTransition nextPhase = subscription.getPendingTransition();
diff --git a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiCreate.java b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiCreate.java
index 0d3a718..84a8bbe 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiCreate.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiCreate.java
@@ -57,7 +57,7 @@ public class TestUserApiCreate extends SubscriptionTestSuiteWithEmbeddedDB {
testListener.pushExpectedEvent(NextEvent.PHASE);
testListener.pushExpectedEvent(NextEvent.CREATE);
- final SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
+ final SubscriptionData subscription = (SubscriptionData) subscriptionApi.createSubscription(bundle.getId(),
testUtil.getProductSpecifier(productName, planSetName, term, null), requestedDate, callContext);
assertNotNull(subscription);
@@ -105,7 +105,7 @@ public class TestUserApiCreate extends SubscriptionTestSuiteWithEmbeddedDB {
testListener.pushExpectedEvent(NextEvent.CREATE);
- final SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
+ final SubscriptionData subscription = (SubscriptionData) subscriptionApi.createSubscription(bundle.getId(),
testUtil.getProductSpecifier(productName, planSetName, term, PhaseType.EVERGREEN), clock.getUTCNow(), callContext);
assertNotNull(subscription);
@@ -143,7 +143,7 @@ public class TestUserApiCreate extends SubscriptionTestSuiteWithEmbeddedDB {
testListener.pushExpectedEvent(NextEvent.CREATE);
- final SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
+ final SubscriptionData subscription = (SubscriptionData) subscriptionApi.createSubscription(bundle.getId(),
testUtil.getProductSpecifier(productName, planSetName, term, null),
clock.getUTCNow(), callContext);
assertNotNull(subscription);
@@ -199,7 +199,7 @@ public class TestUserApiCreate extends SubscriptionTestSuiteWithEmbeddedDB {
testListener.pushExpectedEvent(NextEvent.CREATE);
// CREATE SUBSCRIPTION
- SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
+ SubscriptionData subscription = (SubscriptionData) subscriptionApi.createSubscription(bundle.getId(),
testUtil.getProductSpecifier(productName, planSetName, term, null), clock.getUTCNow(), callContext);
assertNotNull(subscription);
@@ -223,7 +223,7 @@ public class TestUserApiCreate extends SubscriptionTestSuiteWithEmbeddedDB {
clock.addDeltaFromReality(it.toDurationMillis());
assertTrue(testListener.isCompleted(5000));
- subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId(), callContext);
+ subscription = (SubscriptionData) subscriptionApi.getSubscriptionFromId(subscription.getId(), callContext);
currentPhase = subscription.getCurrentPhase();
assertNotNull(currentPhase);
assertEquals(currentPhase.getPhaseType(), PhaseType.EVERGREEN);
@@ -243,7 +243,7 @@ public class TestUserApiCreate extends SubscriptionTestSuiteWithEmbeddedDB {
testListener.pushExpectedEvent(NextEvent.CREATE);
- final SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
+ final SubscriptionData subscription = (SubscriptionData) subscriptionApi.createSubscription(bundle.getId(),
testUtil.getProductSpecifier(productName, planSetName, term, null), clock.getUTCNow(), callContext);
assertNotNull(subscription);
diff --git a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiError.java b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiError.java
index 8e3c271..e3cb0a3 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiError.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiError.java
@@ -98,7 +98,7 @@ public class TestUserApiError extends SubscriptionTestSuiteNoDB {
public void testCreateSubscriptionAddOnNotAvailable() {
try {
final UUID accountId = UUID.randomUUID();
- final SubscriptionBundle aoBundle = entitlementApi.createBundleForAccount(accountId, "myAOBundle", callContext);
+ final SubscriptionBundle aoBundle = subscriptionApi.createBundleForAccount(accountId, "myAOBundle", callContext);
testUtil.createSubscriptionWithBundle(aoBundle.getId(), "Pistol", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null);
tCreateSubscriptionInternal(aoBundle.getId(), "Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, ErrorCode.SUB_CREATE_AO_NOT_AVAILABLE);
} catch (Exception e) {
@@ -111,7 +111,7 @@ public class TestUserApiError extends SubscriptionTestSuiteNoDB {
log.info("Starting testCreateSubscriptionAddOnIncluded");
try {
final UUID accountId = UUID.randomUUID();
- final SubscriptionBundle aoBundle = entitlementApi.createBundleForAccount(accountId, "myAOBundle", callContext);
+ final SubscriptionBundle aoBundle = subscriptionApi.createBundleForAccount(accountId, "myAOBundle", callContext);
testUtil.createSubscriptionWithBundle(aoBundle.getId(), "Assault-Rifle", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null);
tCreateSubscriptionInternal(aoBundle.getId(), "Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, ErrorCode.SUB_CREATE_AO_ALREADY_INCLUDED);
} catch (Exception e) {
@@ -122,7 +122,7 @@ public class TestUserApiError extends SubscriptionTestSuiteNoDB {
private void tCreateSubscriptionInternal(@Nullable final UUID bundleId, @Nullable final String productName,
@Nullable final BillingPeriod term, final String planSet, final ErrorCode expected) {
try {
- entitlementApi.createSubscription(bundleId,
+ subscriptionApi.createSubscription(bundleId,
testUtil.getProductSpecifier(productName, planSet, term, null),
clock.getUTCNow(), callContext);
Assert.fail("Exception expected, error code: " + expected);
@@ -167,11 +167,11 @@ public class TestUserApiError extends SubscriptionTestSuiteNoDB {
Assert.fail();
} catch (SubscriptionError error) {
assertTrue(true);
- assertEquals(entitlementApi.getSubscriptionFromId(subscription.getId(), tenantContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
+ assertEquals(subscriptionApi.getSubscriptionFromId(subscription.getId(), tenantContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.ANNUAL);
}
assertTrue(subscription.changePlanWithPolicy("Shotgun", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, clock.getUTCNow(), ActionPolicy.IMMEDIATE, callContext));
- assertEquals(entitlementApi.getSubscriptionFromId(subscription.getId(), tenantContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
+ assertEquals(subscriptionApi.getSubscriptionFromId(subscription.getId(), tenantContext).getCurrentPlan().getBillingPeriod(), BillingPeriod.MONTHLY);
}
@Test(groups = "fast")
@@ -193,7 +193,7 @@ public class TestUserApiError extends SubscriptionTestSuiteNoDB {
final DateTime newChargedThroughDate = TestSubscriptionHelper.addDuration(expectedPhaseTrialChange, ctd);
subscriptionInternalApi.setChargedThroughDate(subscription.getId(), newChargedThroughDate, internalCallContext);
- subscription = entitlementApi.getSubscriptionFromId(subscription.getId(), tenantContext);
+ subscription = subscriptionApi.getSubscriptionFromId(subscription.getId(), tenantContext);
subscription.cancel(clock.getUTCNow(), callContext);
try {
diff --git a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiRecreate.java b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiRecreate.java
index b4bd75f..dd0a092 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiRecreate.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiRecreate.java
@@ -67,7 +67,7 @@ public abstract class TestUserApiRecreate extends SubscriptionTestSuiteWithEmbed
testListener.pushExpectedEvent(NextEvent.PHASE);
testListener.pushExpectedEvent(NextEvent.CREATE);
- SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
+ SubscriptionData subscription = (SubscriptionData) subscriptionApi.createSubscription(bundle.getId(),
testUtil.getProductSpecifier(productName, planSetName, term, null), requestedDate, callContext);
assertNotNull(subscription);
assertEquals(subscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
@@ -84,7 +84,7 @@ public abstract class TestUserApiRecreate extends SubscriptionTestSuiteWithEmbed
try {
if (fromUserAPi) {
- subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
+ subscription = (SubscriptionData) subscriptionApi.createSubscription(bundle.getId(),
testUtil.getProductSpecifier(productName, planSetName, term, null), requestedDate, callContext);
} else {
subscription.recreate(testUtil.getProductSpecifier(productName, planSetName, term, null), requestedDate, callContext);
@@ -109,7 +109,7 @@ public abstract class TestUserApiRecreate extends SubscriptionTestSuiteWithEmbed
}
if (fromUserAPi) {
- subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
+ subscription = (SubscriptionData) subscriptionApi.createSubscription(bundle.getId(),
testUtil.getProductSpecifier(productName, planSetName, term, null), requestedDate, callContext);
} else {
subscription.recreate(testUtil.getProductSpecifier(productName, planSetName, term, null), clock.getUTCNow(), callContext);
diff --git a/subscription/src/test/java/com/ning/billing/subscription/DefaultSubscriptionTestInitializer.java b/subscription/src/test/java/com/ning/billing/subscription/DefaultSubscriptionTestInitializer.java
index dfef319..5888589 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/DefaultSubscriptionTestInitializer.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/DefaultSubscriptionTestInitializer.java
@@ -76,9 +76,9 @@ public class DefaultSubscriptionTestInitializer implements SubscriptionTestIniti
return accountData;
}
- public SubscriptionBundle initBundle(final SubscriptionUserApi entitlementApi, final CallContext callContext) throws Exception {
+ public SubscriptionBundle initBundle(final SubscriptionUserApi subscriptionApi, final CallContext callContext) throws Exception {
final UUID accountId = UUID.randomUUID();
- final SubscriptionBundle bundle = entitlementApi.createBundleForAccount(accountId, "myDefaultBundle", callContext);
+ final SubscriptionBundle bundle = subscriptionApi.createBundleForAccount(accountId, "myDefaultBundle", callContext);
assertNotNull(bundle);
return bundle;
}
@@ -88,7 +88,7 @@ public class DefaultSubscriptionTestInitializer implements SubscriptionTestIniti
final TestListenerStatus testListenerStatus,
final ClockMock clock,
final BusService busService,
- final SubscriptionService entitlementService) throws Exception {
+ final SubscriptionService subscriptionService) throws Exception {
log.warn("STARTING TEST FRAMEWORK");
resetTestListener(testListener, testListenerStatus);
@@ -97,18 +97,18 @@ public class DefaultSubscriptionTestInitializer implements SubscriptionTestIniti
startBusAndRegisterListener(busService, testListener);
- restartEntitlementService(entitlementService);
+ restartSubscriptionService(subscriptionService);
log.warn("STARTED TEST FRAMEWORK");
}
public void stopTestFramework(final TestApiListener testListener,
final BusService busService,
- final SubscriptionService entitlementService) throws Exception {
+ final SubscriptionService subscriptionService) throws Exception {
log.warn("STOPPING TEST FRAMEWORK");
stopBusAndUnregisterListener(busService, testListener);
- stopEntitlementService(entitlementService);
+ stopSubscriptionService(subscriptionService);
log.warn("STOPPED TEST FRAMEWORK");
}
@@ -135,10 +135,10 @@ public class DefaultSubscriptionTestInitializer implements SubscriptionTestIniti
busService.getBus().register(testListener);
}
- private void restartEntitlementService(final SubscriptionService entitlementService) {
- // START NOTIFICATION QUEUE FOR ENTITLEMENT
- ((DefaultSubscriptionService) entitlementService).initialize();
- ((DefaultSubscriptionService) entitlementService).start();
+ private void restartSubscriptionService(final SubscriptionService subscriptionService) {
+ // START NOTIFICATION QUEUE FOR SUBSCRIPTION
+ ((DefaultSubscriptionService) subscriptionService).initialize();
+ ((DefaultSubscriptionService) subscriptionService).start();
}
private void stopBusAndUnregisterListener(final BusService busService, final TestApiListener testListener) throws Exception {
@@ -146,7 +146,7 @@ public class DefaultSubscriptionTestInitializer implements SubscriptionTestIniti
busService.getBus().stop();
}
- private void stopEntitlementService(final SubscriptionService entitlementService) throws Exception {
- ((DefaultSubscriptionService) entitlementService).stop();
+ private void stopSubscriptionService(final SubscriptionService subscriptionService) throws Exception {
+ ((DefaultSubscriptionService) subscriptionService).stop();
}
}
diff --git a/subscription/src/test/java/com/ning/billing/subscription/engine/dao/MockSubscriptionDaoMemory.java b/subscription/src/test/java/com/ning/billing/subscription/engine/dao/MockSubscriptionDaoMemory.java
index fdc2369..206f5ac 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/engine/dao/MockSubscriptionDaoMemory.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/engine/dao/MockSubscriptionDaoMemory.java
@@ -415,7 +415,7 @@ public class MockSubscriptionDaoMemory implements SubscriptionDao {
private void recordFutureNotificationFromTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> transactionalDao, final DateTime effectiveDate,
final NotificationEvent notificationKey, final InternalCallContext context) {
try {
- final NotificationQueue subscriptionEventQueue = notificationQueueService.getNotificationQueue(DefaultSubscriptionService.ENTITLEMENT_SERVICE_NAME,
+ final NotificationQueue subscriptionEventQueue = notificationQueueService.getNotificationQueue(DefaultSubscriptionService.SUBSCRIPTION_SERVICE_NAME,
DefaultSubscriptionService.NOTIFICATION_QUEUE_NAME);
subscriptionEventQueue.recordFutureNotificationFromTransaction(null, effectiveDate, notificationKey, context.getUserToken(), context.getAccountRecordId(), context.getTenantRecordId());
} catch (NoSuchNotificationQueue e) {
diff --git a/subscription/src/test/java/com/ning/billing/subscription/glue/TestDefaultSubscriptionModuleNoDB.java b/subscription/src/test/java/com/ning/billing/subscription/glue/TestDefaultSubscriptionModuleNoDB.java
index 167903a..555b121 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/glue/TestDefaultSubscriptionModuleNoDB.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/glue/TestDefaultSubscriptionModuleNoDB.java
@@ -39,7 +39,7 @@ public class TestDefaultSubscriptionModuleNoDB extends TestDefaultSubscriptionMo
}
@Override
- protected void installEntitlementDao() {
+ protected void installSubscriptionDao() {
bind(SubscriptionDao.class).to(MockSubscriptionDaoMemory.class).asEagerSingleton();
bind(SubscriptionDao.class).annotatedWith(Names.named(REPAIR_NAMED)).to(RepairSubscriptionDao.class);
bind(RepairSubscriptionLifecycleDao.class).annotatedWith(Names.named(REPAIR_NAMED)).to(RepairSubscriptionDao.class);
diff --git a/subscription/src/test/java/com/ning/billing/subscription/glue/TestDefaultSubscriptionModuleWithEmbeddedDB.java b/subscription/src/test/java/com/ning/billing/subscription/glue/TestDefaultSubscriptionModuleWithEmbeddedDB.java
index efdb0b4..98e4a71 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/glue/TestDefaultSubscriptionModuleWithEmbeddedDB.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/glue/TestDefaultSubscriptionModuleWithEmbeddedDB.java
@@ -37,7 +37,7 @@ public class TestDefaultSubscriptionModuleWithEmbeddedDB extends TestDefaultSubs
}
@Override
- protected void installEntitlementDao() {
+ protected void installSubscriptionDao() {
bind(SubscriptionDao.class).to(MockSubscriptionDaoSql.class).asEagerSingleton();
bind(SubscriptionDao.class).annotatedWith(Names.named(REPAIR_NAMED)).to(RepairSubscriptionDao.class);
bind(RepairSubscriptionLifecycleDao.class).annotatedWith(Names.named(REPAIR_NAMED)).to(RepairSubscriptionDao.class);
diff --git a/subscription/src/test/java/com/ning/billing/subscription/SubscriptionTestInitializer.java b/subscription/src/test/java/com/ning/billing/subscription/SubscriptionTestInitializer.java
index 9b1dd93..42920b8 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/SubscriptionTestInitializer.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/SubscriptionTestInitializer.java
@@ -34,15 +34,15 @@ public interface SubscriptionTestInitializer {
public AccountData initAccountData();
- public SubscriptionBundle initBundle(final SubscriptionUserApi entitlementApi, final CallContext callContext) throws Exception;
+ public SubscriptionBundle initBundle(final SubscriptionUserApi subscriptionApi, final CallContext callContext) throws Exception;
public void startTestFamework(final TestApiListener testListener,
final TestListenerStatus testListenerStatus,
final ClockMock clock,
final BusService busService,
- final SubscriptionService entitlementService) throws Exception;
+ final SubscriptionService subscriptionService) throws Exception;
public void stopTestFramework(final TestApiListener testListener,
final BusService busService,
- final SubscriptionService entitlementService) throws Exception;
+ final SubscriptionService subscriptionService) throws Exception;
}
diff --git a/subscription/src/test/java/com/ning/billing/subscription/SubscriptionTestSuiteNoDB.java b/subscription/src/test/java/com/ning/billing/subscription/SubscriptionTestSuiteNoDB.java
index 366d66b..cd35c3c 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/SubscriptionTestSuiteNoDB.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/SubscriptionTestSuiteNoDB.java
@@ -45,7 +45,7 @@ import com.ning.billing.subscription.api.transfer.SubscriptionTransferApi;
import com.ning.billing.subscription.api.user.SubscriptionBundle;
import com.ning.billing.subscription.api.user.SubscriptionUserApi;
import com.ning.billing.util.config.SubscriptionConfig;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcsapi.bus.BusService;
import com.google.inject.Guice;
@@ -57,9 +57,9 @@ public class SubscriptionTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
protected static final Logger log = LoggerFactory.getLogger(SubscriptionTestSuiteNoDB.class);
@Inject
- protected SubscriptionService entitlementService;
+ protected SubscriptionService subscriptionService;
@Inject
- protected SubscriptionUserApi entitlementApi;
+ protected SubscriptionUserApi subscriptionApi;
@Inject
protected SubscriptionInternalApi subscriptionInternalApi;
@Inject
@@ -104,7 +104,7 @@ public class SubscriptionTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
@BeforeClass(groups = "fast")
public void beforeClass() throws Exception {
- loadSystemPropertiesFromClasspath("/entitlement.properties");
+ loadSystemPropertiesFromClasspath("/subscription.properties");
final Injector g = Guice.createInjector(Stage.PRODUCTION, new TestDefaultSubscriptionModuleNoDB(configSource));
g.injectMembers(this);
@@ -116,16 +116,16 @@ public class SubscriptionTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
// CLEANUP ALL DB TABLES OR IN MEMORY STRUCTURES
((MockSubscriptionDaoMemory) dao).reset();
- subscriptionTestInitializer.startTestFamework(testListener, testListenerStatus, clock, busService, entitlementService);
+ subscriptionTestInitializer.startTestFamework(testListener, testListenerStatus, clock, busService, subscriptionService);
this.catalog = subscriptionTestInitializer.initCatalog(catalogService);
this.accountData = subscriptionTestInitializer.initAccountData();
- this.bundle = subscriptionTestInitializer.initBundle(entitlementApi, callContext);
+ this.bundle = subscriptionTestInitializer.initBundle(subscriptionApi, callContext);
}
@AfterMethod(groups = "fast")
public void afterMethod() throws Exception {
- subscriptionTestInitializer.stopTestFramework(testListener, busService, entitlementService);
+ subscriptionTestInitializer.stopTestFramework(testListener, busService, subscriptionService);
}
protected void assertListenerStatus() {
diff --git a/subscription/src/test/java/com/ning/billing/subscription/SubscriptionTestSuiteWithEmbeddedDB.java b/subscription/src/test/java/com/ning/billing/subscription/SubscriptionTestSuiteWithEmbeddedDB.java
index 88037f7..71a146a 100644
--- a/subscription/src/test/java/com/ning/billing/subscription/SubscriptionTestSuiteWithEmbeddedDB.java
+++ b/subscription/src/test/java/com/ning/billing/subscription/SubscriptionTestSuiteWithEmbeddedDB.java
@@ -44,7 +44,7 @@ import com.ning.billing.subscription.api.transfer.SubscriptionTransferApi;
import com.ning.billing.subscription.api.user.SubscriptionBundle;
import com.ning.billing.subscription.api.user.SubscriptionUserApi;
import com.ning.billing.util.config.SubscriptionConfig;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.ning.billing.util.svcsapi.bus.BusService;
import com.google.inject.Guice;
@@ -56,9 +56,9 @@ public class SubscriptionTestSuiteWithEmbeddedDB extends GuicyKillbillTestSuiteW
protected static final Logger log = LoggerFactory.getLogger(SubscriptionTestSuiteWithEmbeddedDB.class);
@Inject
- protected SubscriptionService entitlementService;
+ protected SubscriptionService subscriptionService;
@Inject
- protected SubscriptionUserApi entitlementApi;
+ protected SubscriptionUserApi subscriptionApi;
@Inject
protected SubscriptionInternalApi subscriptionInternalApi;
@Inject
@@ -102,7 +102,7 @@ public class SubscriptionTestSuiteWithEmbeddedDB extends GuicyKillbillTestSuiteW
@BeforeClass(groups = "slow")
public void beforeClass() throws Exception {
- loadSystemPropertiesFromClasspath("/entitlement.properties");
+ loadSystemPropertiesFromClasspath("/subscription.properties");
final Injector g = Guice.createInjector(Stage.PRODUCTION, new TestDefaultSubscriptionModuleWithEmbeddedDB(configSource));
g.injectMembers(this);
@@ -112,16 +112,16 @@ public class SubscriptionTestSuiteWithEmbeddedDB extends GuicyKillbillTestSuiteW
@BeforeMethod(groups = "slow")
public void beforeMethod() throws Exception {
super.beforeMethod();
- subscriptionTestInitializer.startTestFamework(testListener, testListenerStatus, clock, busService, entitlementService);
+ subscriptionTestInitializer.startTestFamework(testListener, testListenerStatus, clock, busService, subscriptionService);
this.catalog = subscriptionTestInitializer.initCatalog(catalogService);
this.accountData = subscriptionTestInitializer.initAccountData();
- this.bundle = subscriptionTestInitializer.initBundle(entitlementApi, callContext);
+ this.bundle = subscriptionTestInitializer.initBundle(subscriptionApi, callContext);
}
@AfterMethod(groups = "slow")
public void afterMethod() throws Exception {
- subscriptionTestInitializer.stopTestFramework(testListener, busService, entitlementService);
+ subscriptionTestInitializer.stopTestFramework(testListener, busService, subscriptionService);
}
protected void assertListenerStatus() {
diff --git a/util/src/test/java/com/ning/billing/api/TestApiListener.java b/util/src/test/java/com/ning/billing/api/TestApiListener.java
index 38a9de7..82553da 100644
--- a/util/src/test/java/com/ning/billing/api/TestApiListener.java
+++ b/util/src/test/java/com/ning/billing/api/TestApiListener.java
@@ -89,14 +89,14 @@ public class TestApiListener {
}
@Subscribe
- public void handleRepairEntitlementEvents(final RepairSubscriptionInternalEvent event) {
- log.info(String.format("Got RepairEntitlementEvent event %s", event.toString()));
+ public void handleRepairSubscriptionEvents(final RepairSubscriptionInternalEvent event) {
+ log.info(String.format("Got RepairSubscriptionEvent event %s", event.toString()));
assertEqualsNicely(NextEvent.REPAIR_BUNDLE);
notifyIfStackEmpty();
}
@Subscribe
- public void handleEntitlementEvents(final EffectiveSubscriptionInternalEvent eventEffective) {
+ public void handleSubscriptionEvents(final EffectiveSubscriptionInternalEvent eventEffective) {
log.info(String.format("Got subscription event %s", eventEffective.toString()));
switch (eventEffective.getTransitionType()) {
diff --git a/util/src/test/java/com/ning/billing/mock/glue/MockSubscriptionModule.java b/util/src/test/java/com/ning/billing/mock/glue/MockSubscriptionModule.java
index a1d115c..3dbb6fb 100644
--- a/util/src/test/java/com/ning/billing/mock/glue/MockSubscriptionModule.java
+++ b/util/src/test/java/com/ning/billing/mock/glue/MockSubscriptionModule.java
@@ -25,7 +25,7 @@ import com.ning.billing.subscription.api.timeline.SubscriptionTimelineApi;
import com.ning.billing.subscription.api.transfer.SubscriptionTransferApi;
import com.ning.billing.subscription.api.user.SubscriptionUserApi;
import com.ning.billing.util.glue.RealImplementation;
-import com.ning.billing.util.svcapi.entitlement.SubscriptionInternalApi;
+import com.ning.billing.util.svcapi.subscription.SubscriptionInternalApi;
import com.google.inject.AbstractModule;