killbill-aplcache

More cleanup around Blockable

8/16/2013 12:10:30 AM

Details

diff --git a/overdue/src/main/java/com/ning/billing/overdue/api/DefaultOverdueUserApi.java b/overdue/src/main/java/com/ning/billing/overdue/api/DefaultOverdueUserApi.java
index e31d87c..2edd5bb 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/api/DefaultOverdueUserApi.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/api/DefaultOverdueUserApi.java
@@ -22,7 +22,6 @@ import org.slf4j.LoggerFactory;
 import com.ning.billing.ErrorCode;
 import com.ning.billing.ObjectType;
 import com.ning.billing.account.api.Account;
-import com.ning.billing.entitlement.api.Blockable;
 import com.ning.billing.overdue.OverdueApiException;
 import com.ning.billing.overdue.OverdueService;
 import com.ning.billing.overdue.OverdueState;
@@ -84,7 +83,7 @@ public class DefaultOverdueUserApi implements OverdueUserApi {
         return wrapper.refresh(createInternalCallContext(blockable, context));
     }
 
-    private <T extends Blockable> InternalCallContext createInternalCallContext(final Account blockable, final CallContext context) {
+    private InternalCallContext createInternalCallContext(final Account blockable, final CallContext context) {
         return internalCallContextFactory.createInternalCallContext(blockable.getId(), ObjectType.ACCOUNT, context);
     }
 
diff --git a/overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueEmailGenerator.java b/overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueEmailGenerator.java
index 8d72f1b..4525fda 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueEmailGenerator.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueEmailGenerator.java
@@ -40,8 +40,8 @@ public class OverdueEmailGenerator {
         this.overdueEmailFormatterFactory = overdueEmailFormatterFactory;
     }
 
-    public <T extends Blockable> String generateEmail(final Account account, final BillingState billingState,
-                                                      final T overdueable, final OverdueState nextOverdueState) throws IOException {
+    public String generateEmail(final Account account, final BillingState billingState,
+                                                      final Account overdueable, final OverdueState nextOverdueState) throws IOException {
         final Map<String, Object> data = new HashMap<String, Object>();
 
         // TODO raw objects for now. We eventually should respect the account locale and support translations
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 c11a3d2..21a489f 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
@@ -34,7 +34,6 @@ import com.ning.billing.account.api.AccountApiException;
 import com.ning.billing.bus.api.PersistentBus;
 import com.ning.billing.catalog.api.BillingActionPolicy;
 import com.ning.billing.clock.Clock;
-import com.ning.billing.entitlement.api.Blockable;
 import com.ning.billing.entitlement.api.BlockingApiException;
 import com.ning.billing.entitlement.api.BlockingStateType;
 import com.ning.billing.entitlement.api.Entitlement;
@@ -65,7 +64,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.inject.Inject;
 import com.samskivert.mustache.MustacheException;
 
-public class OverdueStateApplicator<T extends Blockable> {
+public class OverdueStateApplicator {
 
     private static final Logger log = LoggerFactory.getLogger(OverdueStateApplicator.class);
 
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 44726d3..fcc4ea7 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
@@ -33,7 +33,6 @@ import com.ning.billing.overdue.config.DefaultOverdueStateSet;
 import com.ning.billing.overdue.config.OverdueConfig;
 import com.ning.billing.overdue.config.api.OverdueException;
 import com.ning.billing.overdue.config.api.OverdueStateSet;
-import com.ning.billing.subscription.api.user.SubscriptionBaseBundle;
 import com.ning.billing.util.callcontext.InternalTenantContext;
 import com.ning.billing.util.svcapi.junction.BlockingInternalApi;
 
@@ -53,7 +52,7 @@ public class OverdueWrapperFactory {
     @Inject
     public OverdueWrapperFactory(final BlockingInternalApi api, final Clock clock,
                                  final BillingStateCalculator billingStateCalculator,
-                                 final OverdueStateApplicator<SubscriptionBaseBundle> overdueStateApplicatorBundle,
+                                 final OverdueStateApplicator overdueStateApplicatorBundle,
                                  final AccountUserApi accountUserApi) {
         this.billingStateCalculator = billingStateCalculator;
         this.overdueStateApplicator = overdueStateApplicatorBundle;
@@ -69,7 +68,7 @@ public class OverdueWrapperFactory {
     }
 
     @SuppressWarnings("unchecked")
-    public <T extends Blockable> OverdueWrapper createOverdueWrapperFor(final UUID id, final InternalTenantContext context) throws OverdueException {
+    public OverdueWrapper createOverdueWrapperFor(final UUID id, final InternalTenantContext context) throws OverdueException {
 
         try {
             Account account = accountUserApi.getAccountById(id, context.toTenantContext());
diff --git a/overdue/src/test/java/com/ning/billing/ovedue/notification/TestDefaultOverdueCheckPoster.java b/overdue/src/test/java/com/ning/billing/ovedue/notification/TestDefaultOverdueCheckPoster.java
index 9ca7582..94e40ed 100644
--- a/overdue/src/test/java/com/ning/billing/ovedue/notification/TestDefaultOverdueCheckPoster.java
+++ b/overdue/src/test/java/com/ning/billing/ovedue/notification/TestDefaultOverdueCheckPoster.java
@@ -26,6 +26,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import com.ning.billing.account.api.Account;
 import com.ning.billing.entitlement.api.Blockable;
 import com.ning.billing.notificationq.api.NotificationEventWithMetadata;
 import com.ning.billing.notificationq.api.NotificationQueue;
@@ -62,9 +63,9 @@ public class TestDefaultOverdueCheckPoster extends OverdueTestSuiteWithEmbeddedD
 
     @Test(groups = "slow")
     public void testShouldntInsertMultipleNotificationsPerOverdueable() throws Exception {
-        final UUID subscriptionId = UUID.randomUUID();
-        final Blockable overdueable = Mockito.mock(SubscriptionBase.class);
-        Mockito.when(overdueable.getId()).thenReturn(subscriptionId);
+        final UUID accountId = UUID.randomUUID();
+        final Blockable overdueable = Mockito.mock(Account.class);
+        Mockito.when(overdueable.getId()).thenReturn(accountId);
 
         insertOverdueCheckAndVerifyQueueContent(overdueable, 10, 10);
         insertOverdueCheckAndVerifyQueueContent(overdueable, 5, 5);
@@ -72,7 +73,7 @@ public class TestDefaultOverdueCheckPoster extends OverdueTestSuiteWithEmbeddedD
 
         // Check we don't conflict with other overdueables
         final UUID bundleId = UUID.randomUUID();
-        final Blockable otherOverdueable = Mockito.mock(SubscriptionBaseBundle.class);
+        final Blockable otherOverdueable = Mockito.mock(Account.class);
         Mockito.when(otherOverdueable.getId()).thenReturn(bundleId);
 
         insertOverdueCheckAndVerifyQueueContent(otherOverdueable, 10, 10);
diff --git a/overdue/src/test/java/com/ning/billing/overdue/glue/ApplicatorMockJunctionModule.java b/overdue/src/test/java/com/ning/billing/overdue/glue/ApplicatorMockJunctionModule.java
index f37d8b9..cb27a8e 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/glue/ApplicatorMockJunctionModule.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/glue/ApplicatorMockJunctionModule.java
@@ -21,6 +21,7 @@ import java.util.UUID;
 
 import org.joda.time.DateTime;
 
+import com.ning.billing.account.api.Account;
 import com.ning.billing.entitlement.api.Blockable;
 import com.ning.billing.entitlement.api.BlockingState;
 import com.ning.billing.entitlement.api.BlockingStateType;
@@ -47,12 +48,12 @@ public class ApplicatorMockJunctionModule extends AbstractModule {
         }
 
         @Override
-        public BlockingState getBlockingStateForService(final Blockable overdueable, final String serviceName, final InternalTenantContext context) {
+        public BlockingState getBlockingStateForService(final Blockable blockable, final String serviceName, final InternalTenantContext context) {
             return new BlockingState() {
 
                 @Override
                 public UUID getBlockedId() {
-                    return overdueable.getId();
+                    return blockable.getId();
                 }
 
                 @Override
@@ -118,37 +119,37 @@ public class ApplicatorMockJunctionModule extends AbstractModule {
         }
 
         @Override
-        public BlockingState getBlockingStateForService(final UUID overdueableId, final String serviceName, final InternalTenantContext context) {
+        public BlockingState getBlockingStateForService(final UUID blockableId, final String serviceName, final InternalTenantContext context) {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public List<BlockingState> getBlockingHistoryForService(final Blockable overdueable, final String serviceName, final InternalTenantContext context) {
+        public List<BlockingState> getBlockingHistoryForService(final Blockable blockable, final String serviceName, final InternalTenantContext context) {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public List<BlockingState> getBlockingHistoryForService(final UUID overdueableId, final String serviceName, final InternalTenantContext context) {
+        public List<BlockingState> getBlockingHistoryForService(final UUID blockableId, final String serviceName, final InternalTenantContext context) {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public List<BlockingState> getBlockingHistory(final Blockable overdueable, final InternalTenantContext context) {
+        public List<BlockingState> getBlockingHistory(final Blockable blockable, final InternalTenantContext context) {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public List<BlockingState> getBlockingHistory(final UUID overdueableId, final InternalTenantContext context) {
+        public List<BlockingState> getBlockingHistory(final UUID blockableId, final InternalTenantContext context) {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public List<BlockingState> getBlockingAll(final Blockable overdueable, final InternalTenantContext context) {
+        public List<BlockingState> getBlockingAll(final Blockable blockable, final InternalTenantContext context) {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public List<BlockingState> getBlockingAll(final UUID overdueableId, final InternalTenantContext context) {
+        public List<BlockingState> getBlockingAll(final UUID blockableId, final InternalTenantContext context) {
             throw new UnsupportedOperationException();
         }
 
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 712f0a0..7b86fd5 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
@@ -95,7 +95,7 @@ public class TestOverdueCheckNotifier extends OverdueTestSuiteWithEmbeddedDB {
     @Test(groups = "slow")
     public void test() throws Exception {
         final UUID subscriptionId = new UUID(0L, 1L);
-        final Blockable blockable = Mockito.mock(SubscriptionBase.class);
+        final Account blockable = Mockito.mock(Account.class);
         Mockito.when(blockable.getId()).thenReturn(subscriptionId);
         final DateTime now = clock.getUTCNow();
         final DateTime readyTime = now.plusMillis(2000);
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 abeb54b..76c6b4a 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteNoDB.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteNoDB.java
@@ -70,7 +70,7 @@ public abstract class OverdueTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
     @Inject
     protected OverdueCheckPoster poster;
     @Inject
-    protected OverdueStateApplicator<SubscriptionBaseBundle> applicator;
+    protected OverdueStateApplicator applicator;
     @Inject
     protected OverdueUserApi overdueApi;
     @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 4068188..9a637db 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteWithEmbeddedDB.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteWithEmbeddedDB.java
@@ -74,7 +74,7 @@ public abstract class OverdueTestSuiteWithEmbeddedDB extends GuicyKillbillTestSu
     @Inject
     protected OverdueCheckPoster poster;
     @Inject
-    protected OverdueStateApplicator<SubscriptionBaseBundle> applicator;
+    protected OverdueStateApplicator applicator;
     @Inject
     protected OverdueUserApi overdueApi;
     @Inject
diff --git a/util/src/main/java/com/ning/billing/util/svcapi/junction/BlockingInternalApi.java b/util/src/main/java/com/ning/billing/util/svcapi/junction/BlockingInternalApi.java
index 1833a36..21eba97 100644
--- a/util/src/main/java/com/ning/billing/util/svcapi/junction/BlockingInternalApi.java
+++ b/util/src/main/java/com/ning/billing/util/svcapi/junction/BlockingInternalApi.java
@@ -19,6 +19,7 @@ package com.ning.billing.util.svcapi.junction;
 import java.util.List;
 import java.util.UUID;
 
+import com.ning.billing.account.api.Account;
 import com.ning.billing.entitlement.api.Blockable;
 import com.ning.billing.entitlement.api.BlockingState;
 import com.ning.billing.util.callcontext.InternalCallContext;
@@ -26,21 +27,21 @@ import com.ning.billing.util.callcontext.InternalTenantContext;
 
 public interface BlockingInternalApi {
 
-    public BlockingState getBlockingStateForService(Blockable overdueable, String serviceName, InternalTenantContext context);
+    public BlockingState getBlockingStateForService(Blockable blockable, String serviceName, InternalTenantContext context);
 
-    public BlockingState getBlockingStateForService(UUID overdueableId, String serviceName, InternalTenantContext context);
+    public BlockingState getBlockingStateForService(UUID blockableId, String serviceName, InternalTenantContext context);
 
-    public List<BlockingState> getBlockingHistoryForService(Blockable overdueable, String serviceName, InternalTenantContext context);
+    public List<BlockingState> getBlockingHistoryForService(Blockable blockable, String serviceName, InternalTenantContext context);
 
-    public List<BlockingState> getBlockingHistoryForService(UUID overdueableId, String serviceName, InternalTenantContext context);
+    public List<BlockingState> getBlockingHistoryForService(UUID blockableId, String serviceName, InternalTenantContext context);
 
-    public List<BlockingState> getBlockingHistory(Blockable overdueable, InternalTenantContext context);
+    public List<BlockingState> getBlockingHistory(Blockable blockable, InternalTenantContext context);
 
-    public List<BlockingState> getBlockingHistory(UUID overdueableId, InternalTenantContext context);
+    public List<BlockingState> getBlockingHistory(UUID blockableId, InternalTenantContext context);
 
-    public List<BlockingState> getBlockingAll(Blockable overdueable, InternalTenantContext context);
+    public List<BlockingState> getBlockingAll(Blockable blockable, InternalTenantContext context);
 
-    public List<BlockingState> getBlockingAll(UUID overdueableId, InternalTenantContext context);
+    public List<BlockingState> getBlockingAll(UUID blockableId, InternalTenantContext context);
 
     public void setBlockingState(BlockingState state, InternalCallContext context);
 
diff --git a/util/src/test/java/com/ning/billing/mock/MockSubscription.java b/util/src/test/java/com/ning/billing/mock/MockSubscription.java
index eafc219..3ea3c4d 100644
--- a/util/src/test/java/com/ning/billing/mock/MockSubscription.java
+++ b/util/src/test/java/com/ning/billing/mock/MockSubscription.java
@@ -115,6 +115,11 @@ public class MockSubscription implements SubscriptionBase {
     }
 
     @Override
+    public BlockingState getBlockingState() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
     public DateTime getCreatedDate() {
         throw new UnsupportedOperationException();
     }
@@ -150,11 +155,6 @@ public class MockSubscription implements SubscriptionBase {
     }
 
     @Override
-    public BlockingState getBlockingState() {
-        return sub.getBlockingState();
-    }
-
-    @Override
     public PriceList getCurrentPriceList() {
         return new MockPriceList();
     }