Details
diff --git a/analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java b/analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java
index 34892c4..ba48be8 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java
@@ -22,7 +22,7 @@ import com.ning.billing.account.glue.AccountModule;
import com.ning.billing.analytics.setup.AnalyticsModule;
import com.ning.billing.dbi.MysqlTestingHelper;
import com.ning.billing.entitlement.glue.DefaultEntitlementModule;
-import com.ning.billing.invoice.glue.InvoiceModule;
+import com.ning.billing.invoice.glue.DefaultInvoiceModule;
import com.ning.billing.junction.MockBlockingModule;
import com.ning.billing.junction.glue.DefaultJunctionModule;
import com.ning.billing.payment.setup.PaymentModule;
@@ -49,7 +49,7 @@ public class AnalyticsTestModule extends AnalyticsModule
install(new AccountModule());
install(new BusModule());
install(new DefaultEntitlementModule());
- install(new InvoiceModule());
+ install(new DefaultInvoiceModule());
install(new PaymentModule());
install(new TagStoreModule());
install(new NotificationQueueModule());
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/MockModule.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/MockModule.java
index 7ca5586..60434e1 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/MockModule.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/MockModule.java
@@ -41,7 +41,7 @@ import com.ning.billing.dbi.MysqlTestingHelper;
import com.ning.billing.entitlement.api.EntitlementService;
import com.ning.billing.entitlement.glue.DefaultEntitlementModule;
import com.ning.billing.invoice.api.InvoiceService;
-import com.ning.billing.invoice.glue.InvoiceModule;
+import com.ning.billing.invoice.glue.DefaultInvoiceModule;
import com.ning.billing.junction.glue.DefaultJunctionModule;
import com.ning.billing.lifecycle.KillbillService;
import com.ning.billing.payment.api.PaymentService;
@@ -92,7 +92,7 @@ public class MockModule extends AbstractModule {
install(new AccountModule());
install(new CatalogModule());
install(new DefaultEntitlementModule());
- install(new InvoiceModule());
+ install(new DefaultInvoiceModule());
install(new PaymentMockModule());
install(new DefaultJunctionModule());
}
diff --git a/invoice/src/test/java/com/ning/billing/invoice/api/migration/MockModuleNoEntitlement.java b/invoice/src/test/java/com/ning/billing/invoice/api/migration/MockModuleNoEntitlement.java
index 0486238..7b3423c 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/api/migration/MockModuleNoEntitlement.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/api/migration/MockModuleNoEntitlement.java
@@ -18,7 +18,7 @@ package com.ning.billing.invoice.api.migration;
import com.ning.billing.entitlement.api.billing.ChargeThruApi;
import com.ning.billing.invoice.MockModule;
-import com.ning.billing.invoice.glue.InvoiceModule;
+import com.ning.billing.invoice.glue.DefaultInvoiceModule;
import com.ning.billing.invoice.notification.NextBillingDateNotifier;
import com.ning.billing.invoice.notification.NextBillingDatePoster;
import com.ning.billing.junction.api.BillingApi;
@@ -41,7 +41,7 @@ public class MockModuleNoEntitlement extends MockModule {
@Override
protected void installInvoiceModule() {
- install(new InvoiceModule(){
+ install(new DefaultInvoiceModule(){
@Override
protected void installNotifier() {
diff --git a/invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithEmbeddedDb.java b/invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithEmbeddedDb.java
index fa873d4..2d46604 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithEmbeddedDb.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithEmbeddedDb.java
@@ -48,7 +48,7 @@ import com.ning.billing.util.glue.TagStoreModule;
import com.ning.billing.util.notificationq.MockNotificationQueueService;
import com.ning.billing.util.notificationq.NotificationQueueService;
-public class InvoiceModuleWithEmbeddedDb extends InvoiceModule {
+public class InvoiceModuleWithEmbeddedDb extends DefaultInvoiceModule {
private final MysqlTestingHelper helper = new MysqlTestingHelper();
private IDBI dbi;
diff --git a/invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithMocks.java b/invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithMocks.java
index a6366b8..741fa5a 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithMocks.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithMocks.java
@@ -23,7 +23,7 @@ import com.ning.billing.util.globallocker.MockGlobalLocker;
import com.ning.billing.util.glue.FieldStoreModule;
-public class InvoiceModuleWithMocks extends InvoiceModule {
+public class InvoiceModuleWithMocks extends DefaultInvoiceModule {
@Override
protected void installInvoiceDao() {
bind(MockInvoiceDao.class).asEagerSingleton();
@@ -31,7 +31,6 @@ public class InvoiceModuleWithMocks extends InvoiceModule {
bind(GlobalLocker.class).to(MockGlobalLocker.class).asEagerSingleton();
}
- @Override
protected void installGlobalLocker() {
bind(GlobalLocker.class).to(MockGlobalLocker.class).asEagerSingleton();
}
@@ -52,7 +51,7 @@ public class InvoiceModuleWithMocks extends InvoiceModule {
}
@Override
- protected void installInvoiceMigrationApi() {
+ public void installInvoiceMigrationApi() {
}
diff --git a/invoice/src/test/java/com/ning/billing/invoice/MockModule.java b/invoice/src/test/java/com/ning/billing/invoice/MockModule.java
index 80346b4..e57ea87 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/MockModule.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/MockModule.java
@@ -26,7 +26,7 @@ import com.ning.billing.dbi.DBIProvider;
import com.ning.billing.dbi.DbiConfig;
import com.ning.billing.dbi.MysqlTestingHelper;
import com.ning.billing.entitlement.glue.DefaultEntitlementModule;
-import com.ning.billing.invoice.glue.InvoiceModule;
+import com.ning.billing.invoice.glue.DefaultInvoiceModule;
import com.ning.billing.mock.BrainDeadProxyFactory;
import com.ning.billing.mock.glue.MockJunctionModule;
import com.ning.billing.util.callcontext.CallContextFactory;
@@ -76,7 +76,7 @@ public class MockModule extends AbstractModule {
}
protected void installInvoiceModule() {
- install(new InvoiceModule());
+ install(new DefaultInvoiceModule());
}
}
diff --git a/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java b/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
index 330ceec..8de0e2e 100644
--- a/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
+++ b/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
@@ -25,7 +25,7 @@ import com.ning.billing.analytics.setup.AnalyticsModule;
import com.ning.billing.beatrix.glue.BeatrixModule;
import com.ning.billing.catalog.glue.CatalogModule;
import com.ning.billing.entitlement.glue.DefaultEntitlementModule;
-import com.ning.billing.invoice.glue.InvoiceModule;
+import com.ning.billing.invoice.glue.DefaultInvoiceModule;
import com.ning.billing.jaxrs.resources.AccountResource;
import com.ning.billing.jaxrs.resources.BundleResource;
import com.ning.billing.jaxrs.resources.BundleTimelineResource;
@@ -79,7 +79,7 @@ public class KillbillServerModule extends AbstractModule
install(new NotificationQueueModule());
install(new CallContextModule());
install(new AccountModule());
- install(new InvoiceModule());
+ install(new DefaultInvoiceModule());
install(new DefaultEntitlementModule());
install(new AnalyticsModule());
install(new PaymentModule());
diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java b/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
index 4ca7459..012f88c 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
@@ -56,7 +56,7 @@ import com.ning.billing.dbi.DBIProvider;
import com.ning.billing.dbi.DbiConfig;
import com.ning.billing.dbi.MysqlTestingHelper;
import com.ning.billing.entitlement.glue.DefaultEntitlementModule;
-import com.ning.billing.invoice.glue.InvoiceModule;
+import com.ning.billing.invoice.glue.DefaultInvoiceModule;
import com.ning.billing.jaxrs.json.AccountJson;
import com.ning.billing.jaxrs.json.BundleJsonNoSubsciptions;
import com.ning.billing.jaxrs.json.SubscriptionJsonNoEvents;
@@ -184,7 +184,7 @@ public class TestJaxrsBase {
install(new NotificationQueueModule());
install(new CallContextModule());
install(new AccountModule());
- install(new InvoiceModule());
+ install(new DefaultInvoiceModule());
install(new DefaultEntitlementModule());
install(new AnalyticsModule());
install(new PaymentMockModule());
