killbill-aplcache
Changes
analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionDao.java 20(+10 -10)
analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionBinder.java 6(+3 -3)
analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionMapper.java 8(+4 -4)
analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.java 10(+5 -5)
analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionModelDao.java 16(+8 -8)
analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java 4(+2 -2)
analytics/src/test/java/com/ning/billing/analytics/MockBusinessSubscriptionTransitionSqlDao.java 20(+10 -10)
analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransition.java 24(+12 -12)
Details
diff --git a/analytics/src/main/java/com/ning/billing/analytics/api/user/DefaultAnalyticsUserApi.java b/analytics/src/main/java/com/ning/billing/analytics/api/user/DefaultAnalyticsUserApi.java
index 8cfe4e0..49cc1db 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/api/user/DefaultAnalyticsUserApi.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/api/user/DefaultAnalyticsUserApi.java
@@ -45,7 +45,7 @@ import com.ning.billing.analytics.model.BusinessInvoiceModelDao;
import com.ning.billing.analytics.model.BusinessInvoiceItemModelDao;
import com.ning.billing.analytics.model.BusinessInvoicePaymentModelDao;
import com.ning.billing.analytics.model.BusinessOverdueStatusModelDao;
-import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
+import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
import com.ning.billing.entitlement.api.user.SubscriptionBundle;
import com.ning.billing.junction.api.Blockable.Type;
import com.ning.billing.payment.api.Payment;
@@ -164,9 +164,9 @@ public class DefaultAnalyticsUserApi implements AnalyticsUserApi {
// Find the current state of bundles in analytics
final Collection<UUID> analyticsBundlesId = Collections2.transform(analyticsDao.getTransitionsForAccount(account.getExternalKey(), internalCallContext),
- new Function<BusinessSubscriptionTransition, UUID>() {
+ new Function<BusinessSubscriptionTransitionModelDao, UUID>() {
@Override
- public UUID apply(@Nullable final BusinessSubscriptionTransition input) {
+ public UUID apply(@Nullable final BusinessSubscriptionTransitionModelDao input) {
if (input == null) {
return null;
} else {
@@ -284,7 +284,7 @@ public class DefaultAnalyticsUserApi implements AnalyticsUserApi {
return analyticsDao.getAccountByKey(accountKey, internalCallContextFactory.createInternalTenantContext(context));
}
- public List<BusinessSubscriptionTransition> getTransitionsForBundle(final String externalKey, final TenantContext context) {
+ public List<BusinessSubscriptionTransitionModelDao> getTransitionsForBundle(final String externalKey, final TenantContext context) {
return analyticsDao.getTransitionsByKey(externalKey, internalCallContextFactory.createInternalTenantContext(context));
}
diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionDao.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionDao.java
index 5afe9a9..7a08253 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionDao.java
@@ -30,7 +30,7 @@ import com.ning.billing.account.api.AccountApiException;
import com.ning.billing.analytics.dao.BusinessSubscriptionTransitionSqlDao;
import com.ning.billing.analytics.model.BusinessSubscription;
import com.ning.billing.analytics.model.BusinessSubscriptionEvent;
-import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
+import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
import com.ning.billing.catalog.api.CatalogService;
import com.ning.billing.catalog.api.Currency;
import com.ning.billing.entitlement.api.SubscriptionTransitionType;
@@ -96,7 +96,7 @@ public class BusinessSubscriptionTransitionDao {
log.info("Started rebuilding transitions for bundle id {}", bundleId);
transactional.deleteTransitionsForBundle(bundleId.toString(), context);
- final ArrayList<BusinessSubscriptionTransition> transitions = new ArrayList<BusinessSubscriptionTransition>();
+ final ArrayList<BusinessSubscriptionTransitionModelDao> transitions = new ArrayList<BusinessSubscriptionTransitionModelDao>();
for (final Subscription subscription : subscriptions) {
// TODO remove API call from within transaction, although this is NOT a real issue as this call wil not hit the DB
for (final EffectiveSubscriptionInternalEvent event : entitlementApi.getAllTransitions(subscription, context)) {
@@ -107,7 +107,7 @@ public class BusinessSubscriptionTransitionDao {
final BusinessSubscription prevSubscription = createPreviousBusinessSubscription(event, businessEvent, transitions, currency);
final BusinessSubscription nextSubscription = createNextBusinessSubscription(event, businessEvent, currency);
- final BusinessSubscriptionTransition transition = new BusinessSubscriptionTransition(
+ final BusinessSubscriptionTransitionModelDao transition = new BusinessSubscriptionTransitionModelDao(
event.getTotalOrdering(),
bundleId,
bundle.getKey(),
@@ -127,7 +127,7 @@ public class BusinessSubscriptionTransitionDao {
// We need to manually add the system cancel event
if (SubscriptionTransitionType.CANCEL.equals(event.getTransitionType()) &&
clock.getUTCNow().isAfter(event.getEffectiveTransitionTime())) {
- final BusinessSubscriptionTransition systemCancelTransition = new BusinessSubscriptionTransition(
+ final BusinessSubscriptionTransitionModelDao systemCancelTransition = new BusinessSubscriptionTransitionModelDao(
event.getTotalOrdering(),
bundleId,
bundle.getKey(),
@@ -226,7 +226,7 @@ public class BusinessSubscriptionTransitionDao {
private BusinessSubscription createPreviousBusinessSubscription(final EffectiveSubscriptionInternalEvent event,
final BusinessSubscriptionEvent businessEvent,
- final ArrayList<BusinessSubscriptionTransition> transitions,
+ final ArrayList<BusinessSubscriptionTransitionModelDao> transitions,
final Currency currency) {
if (BusinessSubscriptionEvent.EventType.MIGRATE.equals(businessEvent.getEventType()) ||
BusinessSubscriptionEvent.EventType.ADD.equals(businessEvent.getEventType()) ||
@@ -235,16 +235,16 @@ public class BusinessSubscriptionTransitionDao {
return null;
}
- final BusinessSubscriptionTransition prevTransition = getPreviousBusinessSubscriptionTransitionForEvent(event, transitions);
+ final BusinessSubscriptionTransitionModelDao prevTransition = getPreviousBusinessSubscriptionTransitionForEvent(event, transitions);
return new BusinessSubscription(event.getPreviousPriceList(), event.getPreviousPlan(), event.getPreviousPhase(),
currency, prevTransition.getNextSubscription().getStartDate(), event.getPreviousState(),
catalogService.getFullCatalog());
}
- private BusinessSubscriptionTransition getPreviousBusinessSubscriptionTransitionForEvent(final EffectiveSubscriptionInternalEvent event,
- final ArrayList<BusinessSubscriptionTransition> transitions) {
- BusinessSubscriptionTransition transition = null;
- for (final BusinessSubscriptionTransition candidate : transitions) {
+ private BusinessSubscriptionTransitionModelDao getPreviousBusinessSubscriptionTransitionForEvent(final EffectiveSubscriptionInternalEvent event,
+ final ArrayList<BusinessSubscriptionTransitionModelDao> transitions) {
+ BusinessSubscriptionTransitionModelDao transition = null;
+ for (final BusinessSubscriptionTransitionModelDao candidate : transitions) {
final BusinessSubscription nextSubscription = candidate.getNextSubscription();
if (nextSubscription == null || !nextSubscription.getStartDate().isBefore(event.getEffectiveTransitionTime())) {
continue;
diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/AnalyticsDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/AnalyticsDao.java
index 52ce200..3eb0b83 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/AnalyticsDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/AnalyticsDao.java
@@ -25,7 +25,7 @@ import com.ning.billing.analytics.model.BusinessInvoiceItemModelDao;
import com.ning.billing.analytics.model.BusinessInvoiceModelDao;
import com.ning.billing.analytics.model.BusinessInvoicePaymentModelDao;
import com.ning.billing.analytics.model.BusinessOverdueStatusModelDao;
-import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
+import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
import com.ning.billing.util.callcontext.InternalTenantContext;
public interface AnalyticsDao {
@@ -36,9 +36,9 @@ public interface AnalyticsDao {
BusinessAccountModelDao getAccountByKey(String accountKey, InternalTenantContext context);
- List<BusinessSubscriptionTransition> getTransitionsByKey(String externalKey, InternalTenantContext context);
+ List<BusinessSubscriptionTransitionModelDao> getTransitionsByKey(String externalKey, InternalTenantContext context);
- List<BusinessSubscriptionTransition> getTransitionsForAccount(String accountKey, InternalTenantContext context);
+ List<BusinessSubscriptionTransitionModelDao> getTransitionsForAccount(String accountKey, InternalTenantContext context);
List<BusinessInvoiceModelDao> getInvoicesByKey(String accountKey, InternalTenantContext context);
diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionBinder.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionBinder.java
index 73804a3..e25c604 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionBinder.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionBinder.java
@@ -29,7 +29,7 @@ import org.skife.jdbi.v2.sqlobject.BinderFactory;
import org.skife.jdbi.v2.sqlobject.BindingAnnotation;
import com.ning.billing.analytics.model.BusinessSubscription;
-import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
+import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
@BindingAnnotation(BusinessSubscriptionTransitionBinder.BstBinderFactory.class)
@Retention(RetentionPolicy.RUNTIME)
@@ -37,8 +37,8 @@ import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
public @interface BusinessSubscriptionTransitionBinder {
public static class BstBinderFactory implements BinderFactory {
public Binder build(final Annotation annotation) {
- return new Binder<BusinessSubscriptionTransitionBinder, BusinessSubscriptionTransition>() {
- public void bind(final SQLStatement q, final BusinessSubscriptionTransitionBinder bind, final BusinessSubscriptionTransition arg) {
+ return new Binder<BusinessSubscriptionTransitionBinder, BusinessSubscriptionTransitionModelDao>() {
+ public void bind(final SQLStatement q, final BusinessSubscriptionTransitionBinder bind, final BusinessSubscriptionTransitionModelDao arg) {
q.bind("total_ordering", arg.getTotalOrdering());
q.bind("bundle_id", arg.getBundleId().toString());
q.bind("external_key", arg.getExternalKey());
diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionMapper.java
index 97ecc5b..bc67aeb 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionMapper.java
@@ -28,14 +28,14 @@ import org.skife.jdbi.v2.tweak.ResultSetMapper;
import com.ning.billing.analytics.model.BusinessSubscription;
import com.ning.billing.analytics.model.BusinessSubscriptionEvent;
-import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
+import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
import com.ning.billing.catalog.api.ProductCategory;
import static com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
-public class BusinessSubscriptionTransitionMapper implements ResultSetMapper<BusinessSubscriptionTransition> {
+public class BusinessSubscriptionTransitionMapper implements ResultSetMapper<BusinessSubscriptionTransitionModelDao> {
@Override
- public BusinessSubscriptionTransition map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
+ public BusinessSubscriptionTransitionModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
BusinessSubscription prev = new BusinessSubscription(
r.getString(9), // productName
r.getString(10), // productType
@@ -78,7 +78,7 @@ public class BusinessSubscriptionTransitionMapper implements ResultSetMapper<Bus
final BusinessSubscriptionEvent event = BusinessSubscriptionEvent.valueOf(r.getString(8));
- return new BusinessSubscriptionTransition(
+ return new BusinessSubscriptionTransitionModelDao(
r.getLong(1),
UUID.fromString(r.getString(2)),
r.getString(3),
diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.java
index 0e65c7b..7f20e21 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.java
@@ -25,7 +25,7 @@ import org.skife.jdbi.v2.sqlobject.customizers.RegisterMapper;
import org.skife.jdbi.v2.sqlobject.mixins.Transactional;
import org.skife.jdbi.v2.sqlobject.stringtemplate.ExternalizedSqlViaStringTemplate3;
-import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
+import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
import com.ning.billing.util.callcontext.InternalCallContext;
import com.ning.billing.util.callcontext.InternalTenantContext;
import com.ning.billing.util.callcontext.InternalTenantContextBinder;
@@ -40,19 +40,19 @@ public interface BusinessSubscriptionTransitionSqlDao extends Transactional<Busi
@InternalTenantContextBinder final InternalTenantContext context);
@SqlQuery
- List<BusinessSubscriptionTransition> getTransitionsByKey(@Bind("external_key") final String externalKey,
+ List<BusinessSubscriptionTransitionModelDao> getTransitionsByKey(@Bind("external_key") final String externalKey,
@InternalTenantContextBinder final InternalTenantContext context);
@SqlQuery
- List<BusinessSubscriptionTransition> getTransitionForSubscription(@Bind("subscription_id") final String subscriptionId,
+ List<BusinessSubscriptionTransitionModelDao> getTransitionForSubscription(@Bind("subscription_id") final String subscriptionId,
@InternalTenantContextBinder final InternalTenantContext context);
@SqlQuery
- List<BusinessSubscriptionTransition> getTransitionsForAccount(@Bind("account_key") final String accountKey,
+ List<BusinessSubscriptionTransitionModelDao> getTransitionsForAccount(@Bind("account_key") final String accountKey,
@InternalTenantContextBinder final InternalTenantContext context);
@SqlUpdate
- int createTransition(@BusinessSubscriptionTransitionBinder final BusinessSubscriptionTransition transition,
+ int createTransition(@BusinessSubscriptionTransitionBinder final BusinessSubscriptionTransitionModelDao transition,
@InternalTenantContextBinder final InternalCallContext context);
@SqlUpdate
diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsDao.java
index e14fd83..81d3f9d 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsDao.java
@@ -28,7 +28,7 @@ import com.ning.billing.analytics.model.BusinessInvoiceModelDao;
import com.ning.billing.analytics.model.BusinessInvoiceItemModelDao;
import com.ning.billing.analytics.model.BusinessInvoicePaymentModelDao;
import com.ning.billing.analytics.model.BusinessOverdueStatusModelDao;
-import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
+import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
import com.ning.billing.util.callcontext.InternalTenantContext;
public class DefaultAnalyticsDao implements AnalyticsDao {
@@ -74,12 +74,12 @@ public class DefaultAnalyticsDao implements AnalyticsDao {
}
@Override
- public List<BusinessSubscriptionTransition> getTransitionsByKey(final String externalKey, final InternalTenantContext context) {
+ public List<BusinessSubscriptionTransitionModelDao> getTransitionsByKey(final String externalKey, final InternalTenantContext context) {
return subscriptionTransitionSqlDao.getTransitionsByKey(externalKey, context);
}
@Override
- public List<BusinessSubscriptionTransition> getTransitionsForAccount(final String accountKey, final InternalTenantContext context) {
+ public List<BusinessSubscriptionTransitionModelDao> getTransitionsForAccount(final String accountKey, final InternalTenantContext context) {
return subscriptionTransitionSqlDao.getTransitionsForAccount(accountKey, context);
}
diff --git a/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java b/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
index e9bc472..a5220a7 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
@@ -44,7 +44,7 @@ import com.ning.billing.analytics.dao.BusinessAccountSqlDao;
import com.ning.billing.analytics.dao.BusinessSubscriptionTransitionSqlDao;
import com.ning.billing.analytics.model.BusinessSubscription;
import com.ning.billing.analytics.model.BusinessSubscriptionEvent;
-import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
+import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
import com.ning.billing.catalog.MockPriceList;
import com.ning.billing.catalog.api.Catalog;
import com.ning.billing.catalog.api.CatalogApiException;
@@ -128,7 +128,7 @@ public class TestAnalyticsService extends AnalyticsTestSuiteWithEmbeddedDB {
private BusinessAccountSqlDao accountSqlDao;
private EffectiveSubscriptionInternalEvent transition;
- private BusinessSubscriptionTransition expectedTransition;
+ private BusinessSubscriptionTransitionModelDao expectedTransition;
private AccountCreationInternalEvent accountCreationNotification;
private InvoiceCreationInternalEvent invoiceCreationNotification;
@@ -204,7 +204,7 @@ public class TestAnalyticsService extends AnalyticsTestSuiteWithEmbeddedDB {
TOTAL_ORDERING,
null,
true), null, 1L, 1L);
- expectedTransition = new BusinessSubscriptionTransition(
+ expectedTransition = new BusinessSubscriptionTransitionModelDao(
TOTAL_ORDERING,
transition.getBundleId(),
BUNDLE_EXTERNAL_KEY,
diff --git a/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java b/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java
index 91274b3..97f447a 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java
@@ -49,7 +49,7 @@ import com.ning.billing.analytics.dao.DefaultAnalyticsDao;
import com.ning.billing.analytics.model.BusinessAccountModelDao;
import com.ning.billing.analytics.model.BusinessSubscription;
import com.ning.billing.analytics.model.BusinessSubscriptionEvent;
-import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
+import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
import com.ning.billing.catalog.api.Catalog;
import com.ning.billing.catalog.api.Currency;
import com.ning.billing.catalog.api.PhaseType;
@@ -129,7 +129,7 @@ public class TestDefaultAnalyticsUserApi extends AnalyticsTestSuiteWithEmbeddedD
final Catalog catalog = Mockito.mock(Catalog.class);
Mockito.when(catalog.findPlan(Mockito.anyString(), Mockito.<DateTime>any(), Mockito.<DateTime>any())).thenReturn(plan);
Mockito.when(catalog.findPhase(Mockito.anyString(), Mockito.<DateTime>any(), Mockito.<DateTime>any())).thenReturn(phase);
- final BusinessSubscriptionTransition transition = new BusinessSubscriptionTransition(
+ final BusinessSubscriptionTransitionModelDao transition = new BusinessSubscriptionTransitionModelDao(
3L,
UUID.randomUUID(),
UUID.randomUUID().toString(),
diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java
index 8211c2d..d0a5032 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java
@@ -36,7 +36,7 @@ import com.ning.billing.analytics.MockProduct;
import com.ning.billing.analytics.model.BusinessAccountModelDao;
import com.ning.billing.analytics.model.BusinessSubscription;
import com.ning.billing.analytics.model.BusinessSubscriptionEvent;
-import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
+import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
import com.ning.billing.analytics.utils.Rounder;
import com.ning.billing.catalog.api.Catalog;
import com.ning.billing.catalog.api.CatalogApiException;
@@ -67,7 +67,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
private final PlanPhase phase = new MockPhase(PhaseType.EVERGREEN, plan, MockDuration.UNLIMITED(), 25.95);
private BusinessSubscriptionTransitionSqlDao businessSubscriptionTransitionSqlDao;
- private BusinessSubscriptionTransition transition;
+ private BusinessSubscriptionTransitionModelDao transition;
private BusinessAccountSqlDao businessAccountSqlDao;
private BusinessAccountModelDao account;
@@ -91,7 +91,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
final BusinessSubscription nextSubscription = new BusinessSubscription(null, plan.getName(), phase.getName(), Currency.USD, clock.getUTCNow(), Subscription.SubscriptionState.CANCELLED, catalog);
final BusinessSubscriptionEvent event = BusinessSubscriptionEvent.subscriptionCancelled(plan.getName(), catalog, requestedTimestamp, requestedTimestamp);
- transition = new BusinessSubscriptionTransition(TOTAL_ORDERING, BUNDLE_ID, EXTERNAL_KEY, ACCOUNT_ID, ACCOUNT_KEY,
+ transition = new BusinessSubscriptionTransitionModelDao(TOTAL_ORDERING, BUNDLE_ID, EXTERNAL_KEY, ACCOUNT_ID, ACCOUNT_KEY,
UUID.randomUUID(), requestedTimestamp, event, prevSubscription, nextSubscription);
final IDBI dbi = helper.getDBI();
@@ -122,7 +122,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
@Test(groups = "slow")
public void testTransitionsWithNullPrevSubscription() {
- final BusinessSubscriptionTransition transitionWithNullPrev = new BusinessSubscriptionTransition(
+ final BusinessSubscriptionTransitionModelDao transitionWithNullPrev = new BusinessSubscriptionTransitionModelDao(
transition.getTotalOrdering(),
transition.getBundleId(),
transition.getExternalKey(),
@@ -136,14 +136,14 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
);
businessSubscriptionTransitionSqlDao.createTransition(transitionWithNullPrev, internalCallContext);
- final List<BusinessSubscriptionTransition> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
Assert.assertEquals(transitions.size(), 1);
Assert.assertEquals(transitions.get(0), transitionWithNullPrev);
}
@Test(groups = "slow")
public void testTransitionsWithNullNextSubscription() {
- final BusinessSubscriptionTransition transitionWithNullNext = new BusinessSubscriptionTransition(
+ final BusinessSubscriptionTransitionModelDao transitionWithNullNext = new BusinessSubscriptionTransitionModelDao(
transition.getTotalOrdering(),
transition.getBundleId(),
transition.getExternalKey(),
@@ -157,7 +157,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
);
businessSubscriptionTransitionSqlDao.createTransition(transitionWithNullNext, internalCallContext);
- final List<BusinessSubscriptionTransition> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
Assert.assertEquals(transitions.size(), 1);
Assert.assertEquals(transitions.get(0), transitionWithNullNext);
}
@@ -165,7 +165,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
@Test(groups = "slow")
public void testTransitionsWithNullFieldsInSubscription() {
final BusinessSubscription subscriptionWithNullFields = new BusinessSubscription(null, plan.getName(), phase.getName(), Currency.USD, null, null, catalog);
- final BusinessSubscriptionTransition transitionWithNullFields = new BusinessSubscriptionTransition(
+ final BusinessSubscriptionTransitionModelDao transitionWithNullFields = new BusinessSubscriptionTransitionModelDao(
transition.getTotalOrdering(),
transition.getBundleId(),
transition.getExternalKey(),
@@ -179,7 +179,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
);
businessSubscriptionTransitionSqlDao.createTransition(transitionWithNullFields, internalCallContext);
- final List<BusinessSubscriptionTransition> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
Assert.assertEquals(transitions.size(), 1);
Assert.assertEquals(transitions.get(0), transitionWithNullFields);
}
@@ -187,7 +187,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
@Test(groups = "slow")
public void testTransitionsWithNullPlanAndPhase() throws Exception {
final BusinessSubscription subscriptionWithNullPlanAndPhase = new BusinessSubscription(null, null, null, Currency.USD, null, null, catalog);
- final BusinessSubscriptionTransition transitionWithNullPlanAndPhase = new BusinessSubscriptionTransition(
+ final BusinessSubscriptionTransitionModelDao transitionWithNullPlanAndPhase = new BusinessSubscriptionTransitionModelDao(
transition.getTotalOrdering(),
transition.getBundleId(),
transition.getExternalKey(),
@@ -201,7 +201,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
);
businessSubscriptionTransitionSqlDao.createTransition(transitionWithNullPlanAndPhase, internalCallContext);
- final List<BusinessSubscriptionTransition> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
Assert.assertEquals(transitions.size(), 1);
Assert.assertEquals(transitions.get(0).getExternalKey(), transition.getExternalKey());
Assert.assertEquals(transitions.get(0).getRequestedTimestamp(), transition.getRequestedTimestamp());
@@ -213,7 +213,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
@Test(groups = "slow")
public void testTransitionsWithNullPlan() throws Exception {
final BusinessSubscription subscriptionWithNullPlan = new BusinessSubscription(null, null, phase.getName(), Currency.USD, null, null, catalog);
- final BusinessSubscriptionTransition transitionWithNullPlan = new BusinessSubscriptionTransition(
+ final BusinessSubscriptionTransitionModelDao transitionWithNullPlan = new BusinessSubscriptionTransitionModelDao(
transition.getTotalOrdering(),
transition.getBundleId(),
transition.getExternalKey(),
@@ -227,7 +227,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
);
businessSubscriptionTransitionSqlDao.createTransition(transitionWithNullPlan, internalCallContext);
- final List<BusinessSubscriptionTransition> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
Assert.assertEquals(transitions.size(), 1);
// Null Plan but Phase - we don't turn the subscription into a null
Assert.assertEquals(transitions.get(0), transitionWithNullPlan);
@@ -236,7 +236,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
@Test(groups = "slow")
public void testTransitionsWithNullPhase() throws Exception {
final BusinessSubscription subscriptionWithNullPhase = new BusinessSubscription(null, plan.getName(), null, Currency.USD, null, null, catalog);
- final BusinessSubscriptionTransition transitionWithNullPhase = new BusinessSubscriptionTransition(
+ final BusinessSubscriptionTransitionModelDao transitionWithNullPhase = new BusinessSubscriptionTransitionModelDao(
transition.getTotalOrdering(),
transition.getBundleId(),
transition.getExternalKey(),
@@ -250,7 +250,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
);
businessSubscriptionTransitionSqlDao.createTransition(transitionWithNullPhase, internalCallContext);
- final List<BusinessSubscriptionTransition> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
Assert.assertEquals(transitions.size(), 1);
Assert.assertEquals(transitions.get(0).getExternalKey(), transition.getExternalKey());
Assert.assertEquals(transitions.get(0).getRequestedTimestamp(), transition.getRequestedTimestamp());
@@ -266,7 +266,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
public void testCreateAndRetrieveTransitions() {
businessSubscriptionTransitionSqlDao.createTransition(transition, internalCallContext);
- final List<BusinessSubscriptionTransition> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = businessSubscriptionTransitionSqlDao.getTransitionsByKey(EXTERNAL_KEY, internalCallContext);
Assert.assertEquals(transitions.size(), 1);
Assert.assertEquals(transitions.get(0), transition);
diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockBusinessSubscriptionTransitionSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/MockBusinessSubscriptionTransitionSqlDao.java
index c677d82..286342f 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockBusinessSubscriptionTransitionSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockBusinessSubscriptionTransitionSqlDao.java
@@ -29,7 +29,7 @@ import org.testng.Assert;
import com.ning.billing.analytics.dao.BusinessSubscriptionTransitionBinder;
import com.ning.billing.analytics.dao.BusinessSubscriptionTransitionSqlDao;
import com.ning.billing.analytics.dao.TimeSeriesTuple;
-import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
+import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
import com.ning.billing.util.callcontext.InternalCallContext;
import com.ning.billing.util.callcontext.InternalTenantContext;
import com.ning.billing.util.callcontext.InternalTenantContextBinder;
@@ -38,7 +38,7 @@ import com.google.common.collect.ImmutableList;
public class MockBusinessSubscriptionTransitionSqlDao implements BusinessSubscriptionTransitionSqlDao {
- private final Map<String, List<BusinessSubscriptionTransition>> content = new HashMap<String, List<BusinessSubscriptionTransition>>();
+ private final Map<String, List<BusinessSubscriptionTransitionModelDao>> content = new HashMap<String, List<BusinessSubscriptionTransitionModelDao>>();
private final Map<String, String> keyForBundleId = new HashMap<String, String>();
@Override
@@ -49,27 +49,27 @@ public class MockBusinessSubscriptionTransitionSqlDao implements BusinessSubscri
}
@Override
- public List<BusinessSubscriptionTransition> getTransitionsByKey(@Bind("event_key") final String key,
+ public List<BusinessSubscriptionTransitionModelDao> getTransitionsByKey(@Bind("event_key") final String key,
@InternalTenantContextBinder final InternalTenantContext context) {
return content.get(key);
}
@Override
- public List<BusinessSubscriptionTransition> getTransitionForSubscription(@Bind("subscription_id") final String subscriptionId,
+ public List<BusinessSubscriptionTransitionModelDao> getTransitionForSubscription(@Bind("subscription_id") final String subscriptionId,
@InternalTenantContextBinder final InternalTenantContext context) {
- return ImmutableList.<BusinessSubscriptionTransition>of();
+ return ImmutableList.<BusinessSubscriptionTransitionModelDao>of();
}
@Override
- public List<BusinessSubscriptionTransition> getTransitionsForAccount(@Bind("account_id") final String accountId, @InternalTenantContextBinder final InternalTenantContext context) {
- return ImmutableList.<BusinessSubscriptionTransition>of();
+ public List<BusinessSubscriptionTransitionModelDao> getTransitionsForAccount(@Bind("account_id") final String accountId, @InternalTenantContextBinder final InternalTenantContext context) {
+ return ImmutableList.<BusinessSubscriptionTransitionModelDao>of();
}
@Override
- public int createTransition(@BusinessSubscriptionTransitionBinder final BusinessSubscriptionTransition transition,
+ public int createTransition(@BusinessSubscriptionTransitionBinder final BusinessSubscriptionTransitionModelDao transition,
@InternalTenantContextBinder final InternalCallContext context) {
if (content.get(transition.getExternalKey()) == null) {
- content.put(transition.getExternalKey(), new ArrayList<BusinessSubscriptionTransition>());
+ content.put(transition.getExternalKey(), new ArrayList<BusinessSubscriptionTransitionModelDao>());
}
content.get(transition.getExternalKey()).add(transition);
keyForBundleId.put(transition.getBundleId().toString(), transition.getExternalKey());
@@ -79,7 +79,7 @@ public class MockBusinessSubscriptionTransitionSqlDao implements BusinessSubscri
@Override
public void deleteTransitionsForBundle(@Bind("bundle_id") final String bundleId,
@InternalTenantContextBinder final InternalCallContext context) {
- content.put(keyForBundleId.get(bundleId), new ArrayList<BusinessSubscriptionTransition>());
+ content.put(keyForBundleId.get(bundleId), new ArrayList<BusinessSubscriptionTransitionModelDao>());
}
@Override
diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransition.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransition.java
index 3e237bc..c757084 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransition.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransition.java
@@ -53,7 +53,7 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
private UUID accountId;
private String accountKey;
private UUID subscriptionId;
- private BusinessSubscriptionTransition transition;
+ private BusinessSubscriptionTransitionModelDao transition;
private final CatalogService catalogService = Mockito.mock(CatalogService.class);
private final Catalog catalog = Mockito.mock(Catalog.class);
@@ -82,7 +82,7 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
accountId = UUID.randomUUID();
accountKey = "pierre-1234";
subscriptionId = UUID.randomUUID();
- transition = new BusinessSubscriptionTransition(totalOrdering, bundleId, externalKey, accountId, accountKey,
+ transition = new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
subscriptionId, requestedTimestamp, event, prevSubscription, nextSubscription);
}
@@ -100,25 +100,25 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
Assert.assertEquals(transition, transition);
Assert.assertTrue(transition.equals(transition));
- BusinessSubscriptionTransition otherTransition;
+ BusinessSubscriptionTransitionModelDao otherTransition;
- otherTransition = new BusinessSubscriptionTransition(totalOrdering, bundleId, externalKey, accountId, accountKey,
+ otherTransition = new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
subscriptionId, new DateTime(), event, prevSubscription, nextSubscription);
Assert.assertTrue(!transition.equals(otherTransition));
- otherTransition = new BusinessSubscriptionTransition(totalOrdering, bundleId, "12345", accountId, accountKey,
+ otherTransition = new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, "12345", accountId, accountKey,
subscriptionId, requestedTimestamp, event, prevSubscription, nextSubscription);
Assert.assertTrue(!transition.equals(otherTransition));
- otherTransition = new BusinessSubscriptionTransition(totalOrdering, bundleId, externalKey, accountId, accountKey,
+ otherTransition = new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
subscriptionId, requestedTimestamp, event, prevSubscription, prevSubscription);
Assert.assertTrue(!transition.equals(otherTransition));
- otherTransition = new BusinessSubscriptionTransition(totalOrdering, bundleId, externalKey, accountId, accountKey,
+ otherTransition = new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
subscriptionId, requestedTimestamp, event, nextSubscription, nextSubscription);
Assert.assertTrue(!transition.equals(otherTransition));
- otherTransition = new BusinessSubscriptionTransition(totalOrdering, bundleId, externalKey, accountId, accountKey,
+ otherTransition = new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
subscriptionId, requestedTimestamp, event, nextSubscription, prevSubscription);
Assert.assertTrue(!transition.equals(otherTransition));
}
@@ -126,7 +126,7 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
@Test(groups = "fast")
public void testRejectInvalidTransitions() throws Exception {
try {
- new BusinessSubscriptionTransition(null, bundleId, externalKey, accountId, accountKey,
+ new BusinessSubscriptionTransitionModelDao(null, bundleId, externalKey, accountId, accountKey,
subscriptionId, requestedTimestamp, event, prevSubscription, nextSubscription);
Assert.fail();
} catch (IllegalArgumentException e) {
@@ -134,7 +134,7 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
}
try {
- new BusinessSubscriptionTransition(totalOrdering, bundleId, null, accountId, accountKey,
+ new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, null, accountId, accountKey,
subscriptionId, requestedTimestamp, event, prevSubscription, nextSubscription);
Assert.fail();
} catch (IllegalArgumentException e) {
@@ -142,7 +142,7 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
}
try {
- new BusinessSubscriptionTransition(totalOrdering, bundleId, externalKey, accountId, accountKey,
+ new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
subscriptionId, null, event, prevSubscription, nextSubscription);
Assert.fail();
} catch (IllegalArgumentException e) {
@@ -150,7 +150,7 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
}
try {
- new BusinessSubscriptionTransition(totalOrdering, bundleId, externalKey, accountId, accountKey,
+ new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
subscriptionId, requestedTimestamp, null, prevSubscription, nextSubscription);
Assert.fail();
} catch (IllegalArgumentException e) {
diff --git a/analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscriptionTransitionRecorder.java b/analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscriptionTransitionRecorder.java
index 78dbe98..e80ba57 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscriptionTransitionRecorder.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscriptionTransitionRecorder.java
@@ -26,7 +26,7 @@ import org.testng.annotations.Test;
import com.ning.billing.account.api.Account;
import com.ning.billing.analytics.dao.BusinessSubscriptionTransitionSqlDao;
-import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
+import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
import com.ning.billing.catalog.api.Catalog;
import com.ning.billing.catalog.api.CatalogService;
import com.ning.billing.entitlement.api.SubscriptionTransitionType;
@@ -92,7 +92,7 @@ public class TestBusinessSubscriptionTransitionRecorder extends AnalyticsTestSui
dao.rebuildTransitionsForBundle(bundle.getId(), internalCallContext);
Assert.assertEquals(sqlDao.getTransitionsByKey(externalKey.toString(), internalCallContext).size(), 1);
- final BusinessSubscriptionTransition transition = sqlDao.getTransitionsByKey(externalKey.toString(), internalCallContext).get(0);
+ final BusinessSubscriptionTransitionModelDao transition = sqlDao.getTransitionsByKey(externalKey.toString(), internalCallContext).get(0);
Assert.assertEquals(transition.getTotalOrdering(), (long) eventEffective.getTotalOrdering());
Assert.assertEquals(transition.getAccountKey(), externalKey.toString());
// Make sure all the prev_ columns are null
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java
index 77a9043..a118b93 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java
@@ -41,7 +41,7 @@ import com.ning.billing.analytics.model.BusinessInvoiceModelDao;
import com.ning.billing.analytics.model.BusinessInvoicePaymentModelDao;
import com.ning.billing.analytics.model.BusinessOverdueStatusModelDao;
import com.ning.billing.analytics.model.BusinessSubscriptionEvent;
-import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
+import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
import com.ning.billing.analytics.utils.Rounder;
import com.ning.billing.api.TestApiListener;
import com.ning.billing.catalog.api.BillingPeriod;
@@ -491,7 +491,7 @@ public class TestAnalytics extends TestIntegrationBase {
private void verifyBSTWithTrialAndEvergreenPhases(final Account account, final SubscriptionBundle bundle, final Subscription subscription) throws CatalogApiException {
// BST should have two transitions
- final List<BusinessSubscriptionTransition> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
Assert.assertEquals(transitions.size(), 2);
verifyTrialAndEvergreenPhases(account, bundle, subscription);
@@ -499,7 +499,7 @@ public class TestAnalytics extends TestIntegrationBase {
private void verifyBSTWithTrialAndEvergreenPhasesAndCancellation(final Account account, final SubscriptionBundle bundle, final Subscription subscription) throws CatalogApiException {
// BST should have three transitions
- final List<BusinessSubscriptionTransition> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
Assert.assertEquals(transitions.size(), 3);
verifyTrialAndEvergreenPhases(account, bundle, subscription);
@@ -508,7 +508,7 @@ public class TestAnalytics extends TestIntegrationBase {
private void verifyBSTWithTrialAndEvergreenPhasesAndCancellationAndSystemCancellation(final Account account, final SubscriptionBundle bundle, final Subscription subscription) throws CatalogApiException {
// BST should have four transitions
- final List<BusinessSubscriptionTransition> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
Assert.assertEquals(transitions.size(), 4);
verifyTrialAndEvergreenPhases(account, bundle, subscription);
@@ -518,10 +518,10 @@ public class TestAnalytics extends TestIntegrationBase {
private void verifyTrialAndEvergreenPhases(final Account account, final SubscriptionBundle bundle, final Subscription subscription) throws CatalogApiException {
final Product currentProduct = subscriptionPlan.getProduct();
- final List<BusinessSubscriptionTransition> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
// Check the first transition (into trial phase)
- final BusinessSubscriptionTransition initialTransition = transitions.get(0);
+ final BusinessSubscriptionTransitionModelDao initialTransition = transitions.get(0);
Assert.assertEquals(initialTransition.getBundleId(), bundle.getId());
Assert.assertEquals(initialTransition.getExternalKey(), bundle.getKey());
Assert.assertEquals(initialTransition.getAccountId(), account.getId());
@@ -547,7 +547,7 @@ public class TestAnalytics extends TestIntegrationBase {
Assert.assertEquals(initialTransition.getNextSubscription().getState(), Subscription.SubscriptionState.ACTIVE);
// Check the second transition (from trial to evergreen)
- final BusinessSubscriptionTransition futureTransition = transitions.get(1);
+ final BusinessSubscriptionTransitionModelDao futureTransition = transitions.get(1);
Assert.assertEquals(futureTransition.getExternalKey(), bundle.getKey());
Assert.assertEquals(futureTransition.getAccountKey(), account.getExternalKey());
Assert.assertEquals(futureTransition.getEvent().getCategory(), currentProduct.getCategory());
@@ -573,9 +573,9 @@ public class TestAnalytics extends TestIntegrationBase {
private void verifyCancellationTransition(final Account account, final SubscriptionBundle bundle) throws CatalogApiException {
final Product currentProduct = subscriptionPlan.getProduct();
- final List<BusinessSubscriptionTransition> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
- final BusinessSubscriptionTransition cancellationRequest = transitions.get(2);
+ final BusinessSubscriptionTransitionModelDao cancellationRequest = transitions.get(2);
Assert.assertEquals(cancellationRequest.getExternalKey(), bundle.getKey());
Assert.assertEquals(cancellationRequest.getAccountKey(), account.getExternalKey());
Assert.assertEquals(cancellationRequest.getEvent().getCategory(), currentProduct.getCategory());
@@ -587,9 +587,9 @@ public class TestAnalytics extends TestIntegrationBase {
}
private void verifySystemCancellationTransition(final Account account, final SubscriptionBundle bundle) throws CatalogApiException {
- final List<BusinessSubscriptionTransition> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
- final BusinessSubscriptionTransition systemCancellation = transitions.get(3);
+ final BusinessSubscriptionTransitionModelDao systemCancellation = transitions.get(3);
Assert.assertEquals(systemCancellation.getExternalKey(), bundle.getKey());
Assert.assertEquals(systemCancellation.getAccountKey(), account.getExternalKey());
Assert.assertEquals(systemCancellation.getEvent().getCategory(), ProductCategory.BASE);
@@ -610,10 +610,10 @@ public class TestAnalytics extends TestIntegrationBase {
waitALittle();
// BST should have three transitions (a ADD_BASE, CHANGE_BASE and SYSTEM_CHANGE_BASE)
- final List<BusinessSubscriptionTransition> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
+ final List<BusinessSubscriptionTransitionModelDao> transitions = analyticsUserApi.getTransitionsForBundle(bundle.getKey(), callContext);
Assert.assertEquals(transitions.size(), 3);
- final BusinessSubscriptionTransition previousTransition = transitions.get(0);
- final BusinessSubscriptionTransition transition = transitions.get(1);
+ final BusinessSubscriptionTransitionModelDao previousTransition = transitions.get(0);
+ final BusinessSubscriptionTransitionModelDao transition = transitions.get(1);
Assert.assertEquals(transition.getBundleId(), bundle.getId());
Assert.assertEquals(transition.getExternalKey(), bundle.getKey());
Assert.assertEquals(transition.getAccountId(), account.getId());