killbill-memoizeit

diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockAccount.java b/analytics/src/test/java/com/ning/billing/analytics/MockAccount.java
new file mode 100644
index 0000000..704b3da
--- /dev/null
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockAccount.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.analytics;
+
+import java.util.UUID;
+
+import com.ning.billing.account.api.IAccount;
+import com.ning.billing.account.api.IFieldStore;
+import com.ning.billing.catalog.api.Currency;
+
+public class MockAccount implements IAccount
+{
+    private final UUID id;
+    private final String accountKey;
+    private final Currency currency;
+
+    public MockAccount(final UUID id, final String accountKey, final Currency currency)
+    {
+        this.id = id;
+        this.accountKey = accountKey;
+        this.currency = currency;
+    }
+
+    @Override
+    public String getName()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public String getEmail()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public String getPhone()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public String getKey()
+    {
+        return accountKey;
+    }
+
+    @Override
+    public int getBillCycleDay()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Currency getCurrency()
+    {
+        return currency;
+    }
+
+    @Override
+    public UUID getId()
+    {
+        return id;
+    }
+
+    @Override
+    public IFieldStore getFields() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public String getFieldValue(final String fieldName)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setFieldValue(final String fieldName, final String fieldValue)
+    {
+        throw new UnsupportedOperationException();
+    }
+}

diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentError.java b/api/src/main/java/com/ning/billing/payment/api/PaymentError.java
index 5dcde5c..85b5ecd 100644
--- a/api/src/main/java/com/ning/billing/payment/api/PaymentError.java
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentError.java
@@ -15,9 +15,9 @@
  */
 
 package com.ning.billing.payment.api;
-import com.ning.billing.util.eventbus.IEventBusType;
+import com.ning.billing.util.eventbus.EventBusNotification;
 
-public class PaymentError implements IEventBusType {
+public class PaymentError implements EventBusNotification {
     private final String type;
     private final String message;
 

diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentService.java b/api/src/main/java/com/ning/billing/payment/api/PaymentService.java
index c923c46..988a00a 100644
--- a/api/src/main/java/com/ning/billing/payment/api/PaymentService.java
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentService.java
@@ -16,9 +16,9 @@
 
 package com.ning.billing.payment.api;
 
-import com.ning.billing.lifecycle.IService;
+import com.ning.billing.lifecycle.KillbillService;
 
-public interface PaymentService extends IService {
+public interface PaymentService extends KillbillService {
     @Override
     String getName();
 

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiBase.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiBase.java
index 644e699..9f1f69b 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiBase.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiBase.java
@@ -16,10 +16,36 @@
 
 package com.ning.billing.entitlement.api.user;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.List;
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+
 import com.google.inject.Injector;
 import com.ning.billing.account.api.IAccount;
+import com.ning.billing.account.api.IFieldStore;
 import com.ning.billing.catalog.DefaultCatalogService;
-import com.ning.billing.catalog.api.*;
+import com.ning.billing.catalog.api.BillingPeriod;
+import com.ning.billing.catalog.api.Catalog;
+import com.ning.billing.catalog.api.CatalogService;
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.catalog.api.Duration;
+import com.ning.billing.catalog.api.TimeUnit;
 import com.ning.billing.config.EntitlementConfig;
 import com.ning.billing.entitlement.api.ApiTestListener;
 import com.ning.billing.entitlement.api.ApiTestListener.NextEvent;
@@ -30,29 +56,13 @@ import com.ning.billing.entitlement.engine.dao.EntitlementDao;
 import com.ning.billing.entitlement.engine.dao.MockEntitlementDao;
 import com.ning.billing.entitlement.events.EntitlementEvent;
 import com.ning.billing.entitlement.events.phase.PhaseEvent;
-import com.ning.billing.entitlement.events.user.ApiEventType;
 import com.ning.billing.entitlement.events.user.ApiEvent;
+import com.ning.billing.entitlement.events.user.ApiEventType;
 import com.ning.billing.lifecycle.KillbillService.ServiceException;
-import com.ning.billing.util.clock.ClockMock;
 import com.ning.billing.util.clock.Clock;
+import com.ning.billing.util.clock.ClockMock;
 import com.ning.billing.util.eventbus.DefaultEventBusService;
 import com.ning.billing.util.eventbus.EventBusService;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.List;
-import java.util.UUID;
-
-import static org.testng.Assert.*;
 
 
 public abstract class TestUserApiBase {
@@ -307,10 +317,9 @@ public abstract class TestUserApiBase {
             }
 
             @Override
-            public void load() {}
-
-            @Override
-            public void save() {}
+            public IFieldStore getFields() {
+                return null;
+            }
 
             @Override
             public String getFieldValue(String fieldName) {

diff --git a/invoice/src/main/java/com/ning/billing/invoice/model/Invoice.java b/invoice/src/main/java/com/ning/billing/invoice/model/Invoice.java
index a5d7d58..6032aff 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/model/Invoice.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/model/Invoice.java
@@ -23,9 +23,9 @@ import java.util.UUID;
 import org.joda.time.DateTime;
 
 import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.util.eventbus.IEventBusType;
+import com.ning.billing.util.eventbus.EventBusNotification;
 
-public class Invoice implements IEventBusType {
+public class Invoice implements EventBusNotification {
     private final InvoiceItemList items = new InvoiceItemList();
     private final UUID invoiceId;
     private UUID accountId;

diff --git a/payment/src/main/java/com/ning/billing/payment/PaymentInfo.java b/payment/src/main/java/com/ning/billing/payment/PaymentInfo.java
index 1a6f15d..a4129fb 100644
--- a/payment/src/main/java/com/ning/billing/payment/PaymentInfo.java
+++ b/payment/src/main/java/com/ning/billing/payment/PaymentInfo.java
@@ -21,9 +21,9 @@ import java.math.BigDecimal;
 import org.joda.time.DateTime;
 
 import com.google.common.base.Objects;
-import com.ning.billing.util.eventbus.IEventBusType;
+import com.ning.billing.util.eventbus.EventBusNotification;
 
-public class PaymentInfo implements IEventBusType {
+public class PaymentInfo implements EventBusNotification {
     public static class Builder {
         private String id;
         private BigDecimal amount;

diff --git a/payment/src/main/java/com/ning/billing/payment/PaymentInfoRequest.java b/payment/src/main/java/com/ning/billing/payment/PaymentInfoRequest.java
index fa26242..d719829 100644
--- a/payment/src/main/java/com/ning/billing/payment/PaymentInfoRequest.java
+++ b/payment/src/main/java/com/ning/billing/payment/PaymentInfoRequest.java
@@ -18,9 +18,9 @@ package com.ning.billing.payment;
 
 import java.util.UUID;
 
-import com.ning.billing.util.eventbus.IEventBusType;
+import com.ning.billing.util.eventbus.EventBusNotification;
 
-public class PaymentInfoRequest implements IEventBusType {
+public class PaymentInfoRequest implements EventBusNotification {
     private final UUID accountId;
     private final String paymentId;
 

diff --git a/payment/src/main/java/com/ning/billing/payment/RequestProcessor.java b/payment/src/main/java/com/ning/billing/payment/RequestProcessor.java
index 8b21412..6e33ffb 100644
--- a/payment/src/main/java/com/ning/billing/payment/RequestProcessor.java
+++ b/payment/src/main/java/com/ning/billing/payment/RequestProcessor.java
@@ -25,19 +25,19 @@ import com.ning.billing.payment.api.Either;
 import com.ning.billing.payment.api.PaymentError;
 import com.ning.billing.payment.provider.PaymentProviderPlugin;
 import com.ning.billing.payment.provider.PaymentProviderPluginRegistry;
-import com.ning.billing.util.eventbus.IEventBus;
-import com.ning.billing.util.eventbus.IEventBus.EventBusException;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.EventBus.EventBusException;
 
 public class RequestProcessor {
     public static final String PAYMENT_PROVIDER_KEY = "paymentProvider";
     private final IAccountUserApi accountUserApi;
     private final PaymentProviderPluginRegistry pluginRegistry;
-    private final IEventBus eventBus;
+    private final EventBus eventBus;
 
     @Inject
     public RequestProcessor(IAccountUserApi accountUserApi,
                             PaymentProviderPluginRegistry pluginRegistry,
-                            IEventBus eventBus) {
+                            EventBus eventBus) {
         this.accountUserApi = accountUserApi;
         this.pluginRegistry = pluginRegistry;
         this.eventBus = eventBus;

diff --git a/payment/src/main/java/com/ning/billing/payment/util/EventBusFuture.java b/payment/src/main/java/com/ning/billing/payment/util/EventBusFuture.java
index 2072dff..d82a9a7 100644
--- a/payment/src/main/java/com/ning/billing/payment/util/EventBusFuture.java
+++ b/payment/src/main/java/com/ning/billing/payment/util/EventBusFuture.java
@@ -20,11 +20,11 @@ import javax.annotation.Nullable;
 
 import com.google.common.eventbus.Subscribe;
 import com.google.common.util.concurrent.AbstractFuture;
-import com.ning.billing.util.eventbus.IEventBus;
-import com.ning.billing.util.eventbus.IEventBus.EventBusException;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.EventBus.EventBusException;
 
-public class EventBusFuture<T, V extends IEventBusResponseType<T>> extends AbstractFuture<V> {
-    public static <V, W extends IEventBusRequestType<V>, X extends IEventBusResponseType<V>> EventBusFuture<V, X> post(final IEventBus eventBus, final W event) throws EventBusException {
+public class EventBusFuture<T, V extends EventBusResponse<T>> extends AbstractFuture<V> {
+    public static <V, W extends EventBusRequest<V>, X extends EventBusResponse<V>> EventBusFuture<V, X> post(final EventBus eventBus, final W event) throws EventBusException {
         final EventBusFuture<V, X> responseFuture = new EventBusFuture<V, X>(eventBus, event.getId());
 
         eventBus.register(responseFuture);
@@ -32,10 +32,10 @@ public class EventBusFuture<T, V extends IEventBusResponseType<T>> extends Abstr
         return responseFuture;
     }
 
-    private final IEventBus eventBus;
+    private final EventBus eventBus;
     private final T requestId;
 
-    private EventBusFuture(IEventBus eventBus, T requestId) {
+    private EventBusFuture(EventBus eventBus, T requestId) {
         this.eventBus = eventBus;
         this.requestId = requestId;
     }

diff --git a/payment/src/test/java/com/ning/billing/payment/setup/PaymentTestModule.java b/payment/src/test/java/com/ning/billing/payment/setup/PaymentTestModule.java
index 16cfdbd..9516c33 100644
--- a/payment/src/test/java/com/ning/billing/payment/setup/PaymentTestModule.java
+++ b/payment/src/test/java/com/ning/billing/payment/setup/PaymentTestModule.java
@@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableMap;
 import com.ning.billing.account.api.IAccountUserApi;
 import com.ning.billing.account.api.MockAccountUserApi;
 import com.ning.billing.payment.provider.MockPaymentProviderPluginModule;
-import com.ning.billing.util.eventbus.IEventBus;
+import com.ning.billing.util.eventbus.EventBus;
 import com.ning.billing.util.eventbus.MemoryEventBus;
 
 public class PaymentTestModule extends PaymentModule {
@@ -38,7 +38,7 @@ public class PaymentTestModule extends PaymentModule {
     @Override
     protected void configure() {
         super.configure();
-        bind(IEventBus.class).to(MemoryEventBus.class).asEagerSingleton();
+        bind(EventBus.class).to(MemoryEventBus.class).asEagerSingleton();
         bind(IAccountUserApi.class).to(MockAccountUserApi.class).asEagerSingleton();
     }
 }

diff --git a/payment/src/test/java/com/ning/billing/payment/TestPaymentProvider.java b/payment/src/test/java/com/ning/billing/payment/TestPaymentProvider.java
index eb882a8..b401a96 100644
--- a/payment/src/test/java/com/ning/billing/payment/TestPaymentProvider.java
+++ b/payment/src/test/java/com/ning/billing/payment/TestPaymentProvider.java
@@ -43,13 +43,13 @@ import com.ning.billing.invoice.model.Invoice;
 import com.ning.billing.invoice.model.InvoiceItem;
 import com.ning.billing.payment.api.PaymentError;
 import com.ning.billing.payment.setup.PaymentTestModule;
-import com.ning.billing.util.eventbus.IEventBus;
-import com.ning.billing.util.eventbus.IEventBus.EventBusException;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.EventBus.EventBusException;
 
 @Guice(modules = PaymentTestModule.class)
 public class TestPaymentProvider {
     @Inject
-    private IEventBus eventBus;
+    private EventBus eventBus;
     @Inject
     private RequestProcessor invoiceProcessor;
     @Inject

diff --git a/payment/src/test/java/com/ning/billing/payment/util/TestSyncWaitOnEventBus.java b/payment/src/test/java/com/ning/billing/payment/util/TestSyncWaitOnEventBus.java
index a65ec61..3e446cf 100644
--- a/payment/src/test/java/com/ning/billing/payment/util/TestSyncWaitOnEventBus.java
+++ b/payment/src/test/java/com/ning/billing/payment/util/TestSyncWaitOnEventBus.java
@@ -27,12 +27,12 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import com.google.common.eventbus.Subscribe;
-import com.ning.billing.util.eventbus.IEventBus;
+import com.ning.billing.util.eventbus.EventBus;
 import com.ning.billing.util.eventbus.MemoryEventBus;
 
 @Test
 public class TestSyncWaitOnEventBus {
-    private static final class TestEvent implements IEventBusRequestType<UUID> {
+    private static final class TestEvent implements EventBusRequest<UUID> {
         private final UUID id;
         private final String msg;
 
@@ -51,7 +51,7 @@ public class TestSyncWaitOnEventBus {
         }
     }
 
-    private static final class TestResponse implements IEventBusResponseType<UUID> {
+    private static final class TestResponse implements EventBusResponse<UUID> {
         private final UUID id;
         private final String msg;
 
@@ -70,7 +70,7 @@ public class TestSyncWaitOnEventBus {
         }
     }
 
-    private IEventBus eventBus;
+    private EventBus eventBus;
 
     @BeforeMethod(alwaysRun = true)
     public void setUp() throws Exception {

diff --git a/util/src/test/java/com/ning/billing/util/eventbus/TestEventBus.java b/util/src/test/java/com/ning/billing/util/eventbus/TestEventBus.java
index f65525b..02f7261 100644
--- a/util/src/test/java/com/ning/billing/util/eventbus/TestEventBus.java
+++ b/util/src/test/java/com/ning/billing/util/eventbus/TestEventBus.java
@@ -53,7 +53,7 @@ public class TestEventBus {
         }
     }
 
-    public static final class MyOtherEvent implements IEventBusType {
+    public static final class MyOtherEvent implements EventBusNotification {
         String name;
         Long value;