killbill-uncached

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestPublicBus.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestPublicBus.java
index 020eadd..4a6a909 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestPublicBus.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestPublicBus.java
@@ -23,6 +23,7 @@ import org.testng.annotations.Test;
 
 import com.ning.billing.account.api.Account;
 import com.ning.billing.api.TestApiListener.NextEvent;
+import com.ning.billing.bus.api.BusEventWithMetadata;
 import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.PlanPhaseSpecifier;
 import com.ning.billing.catalog.api.PriceListSet;
@@ -43,7 +44,7 @@ public class TestPublicBus extends TestIntegrationBase {
 
     public class PublicListener {
         @Subscribe
-        public void handleExternalEvents(final ExtBusEvent event) {
+        public void handleExternalEvents(final BusEventWithMetadata<ExtBusEvent> event) {
             log.info("GOT EXT EVENT " + event.toString());
         }
     }

diff --git a/osgi/src/main/java/com/ning/billing/osgi/KillbillEventObservable.java b/osgi/src/main/java/com/ning/billing/osgi/KillbillEventObservable.java
index 034faa4..18d01d7 100644
--- a/osgi/src/main/java/com/ning/billing/osgi/KillbillEventObservable.java
+++ b/osgi/src/main/java/com/ning/billing/osgi/KillbillEventObservable.java
@@ -23,6 +23,7 @@ import javax.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.ning.billing.bus.api.BusEventWithMetadata;
 import com.ning.billing.bus.api.PersistentBus;
 import com.ning.billing.bus.api.PersistentBus.EventBusException;
 import com.ning.billing.notification.plugin.api.ExtBusEvent;
@@ -53,7 +54,9 @@ public class KillbillEventObservable extends Observable {
     }
 
     @Subscribe
-    public void handleKillbillEvent(final ExtBusEvent killbillEvent) {
+    public void handleKillbillEvent(final BusEventWithMetadata<ExtBusEvent> eventWithMetadata) {
+
+        final ExtBusEvent killbillEvent = eventWithMetadata.getEvent();
         logger.debug("Received external event " + killbillEvent.toString());
         setChanged();
         notifyObservers(killbillEvent);

diff --git a/overdue/src/test/java/com/ning/billing/overdue/applicator/OverdueBusListenerTester.java b/overdue/src/test/java/com/ning/billing/overdue/applicator/OverdueBusListenerTester.java
index db7b405..490da0f 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/applicator/OverdueBusListenerTester.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/applicator/OverdueBusListenerTester.java
@@ -22,6 +22,7 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.ning.billing.bus.api.BusEventWithMetadata;
 import com.ning.billing.util.events.OverdueChangeInternalEvent;
 
 import com.google.common.eventbus.Subscribe;
@@ -33,7 +34,9 @@ public class OverdueBusListenerTester {
     private final List<OverdueChangeInternalEvent> eventsReceived = new ArrayList<OverdueChangeInternalEvent>();
 
     @Subscribe
-    public void handleOverdueChange(final OverdueChangeInternalEvent changeEvent) {
+    public void handleOverdueChange(final BusEventWithMetadata<OverdueChangeInternalEvent> eventWithMetadata) {
+
+        final OverdueChangeInternalEvent changeEvent = eventWithMetadata.getEvent();
         log.info("Received subscription transition.");
         eventsReceived.add(changeEvent);
     }

diff --git a/payment/src/main/java/com/ning/billing/payment/bus/PaymentTagHandler.java b/payment/src/main/java/com/ning/billing/payment/bus/PaymentTagHandler.java
index 389ed2a..a009fec 100644
--- a/payment/src/main/java/com/ning/billing/payment/bus/PaymentTagHandler.java
+++ b/payment/src/main/java/com/ning/billing/payment/bus/PaymentTagHandler.java
@@ -24,6 +24,7 @@ import org.slf4j.LoggerFactory;
 import com.ning.billing.ObjectType;
 import com.ning.billing.account.api.Account;
 import com.ning.billing.account.api.AccountApiException;
+import com.ning.billing.bus.api.BusEventWithMetadata;
 import com.ning.billing.payment.api.PaymentApiException;
 import com.ning.billing.payment.core.PaymentProcessor;
 import com.ning.billing.util.callcontext.CallContext;
@@ -61,10 +62,11 @@ public class PaymentTagHandler {
     }
 
     @Subscribe
-    public void process_AUTO_PAY_OFF_removal(final ControlTagDeletionInternalEvent event) {
+    public void process_AUTO_PAY_OFF_removal(final BusEventWithMetadata<ControlTagDeletionInternalEvent> eventWithMetadata) {
+
+        final ControlTagDeletionInternalEvent event = eventWithMetadata.getEvent();
         if (event.getTagDefinition().getName().equals(ControlTagType.AUTO_PAY_OFF.toString()) && event.getObjectType() == ObjectType.ACCOUNT) {
             final UUID accountId = event.getObjectId();
-            // STEPH_BUS
             processUnpaid_AUTO_PAY_OFF_payments(accountId, null);
         }
     }

diff --git a/server/src/main/java/com/ning/billing/server/notifications/PushNotificationListener.java b/server/src/main/java/com/ning/billing/server/notifications/PushNotificationListener.java
index a7a41a4..0245c43 100644
--- a/server/src/main/java/com/ning/billing/server/notifications/PushNotificationListener.java
+++ b/server/src/main/java/com/ning/billing/server/notifications/PushNotificationListener.java
@@ -25,6 +25,7 @@ import javax.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.ning.billing.bus.api.BusEventWithMetadata;
 import com.ning.billing.jaxrs.json.NotificationJson;
 import com.ning.billing.notification.plugin.api.ExtBusEvent;
 import com.ning.billing.tenant.api.TenantApiException;
@@ -63,7 +64,9 @@ public class PushNotificationListener {
     }
 
     @Subscribe
-    public void triggerPushNotifications(final ExtBusEvent event) {
+    public void triggerPushNotifications(final BusEventWithMetadata<ExtBusEvent> eventWithMetadata) {
+
+        final ExtBusEvent event = eventWithMetadata.getEvent();
         final TenantContext context = contextFactory.createTenantContext(event.getTenantId());
         try {
             final List<String> callbacks = getCallbacksForTenant(context);

diff --git a/util/src/test/java/com/ning/billing/api/TestApiListener.java b/util/src/test/java/com/ning/billing/api/TestApiListener.java
index d09806b..695a351 100644
--- a/util/src/test/java/com/ning/billing/api/TestApiListener.java
+++ b/util/src/test/java/com/ning/billing/api/TestApiListener.java
@@ -26,6 +26,7 @@ import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.ning.billing.bus.api.BusEventWithMetadata;
 import com.ning.billing.util.events.CustomFieldEvent;
 import com.ning.billing.util.events.EffectiveSubscriptionInternalEvent;
 import com.ning.billing.util.events.InvoiceAdjustmentInternalEvent;
@@ -88,24 +89,26 @@ public class TestApiListener {
     }
 
     @Subscribe
-    public void handleEntitlementEvents(final RepairEntitlementInternalEvent event) {
-        log.info(String.format("Got RepairEntitlementEvent event %s", event.toString()));
+    public void handleRepairEntitlementEvents(final BusEventWithMetadata<RepairEntitlementInternalEvent> eventWithMetadata) {
+        log.info(String.format("Got RepairEntitlementEvent event %s", eventWithMetadata.toString()));
         assertEqualsNicely(NextEvent.REPAIR_BUNDLE);
         notifyIfStackEmpty();
     }
 
     @Subscribe
-    public void handleEntitlementEvents(final EffectiveSubscriptionInternalEvent eventEffective) {
+    public void handleEntitlementEvents(final BusEventWithMetadata<EffectiveSubscriptionInternalEvent> eventWithMetadata) {
+
+        final EffectiveSubscriptionInternalEvent eventEffective = eventWithMetadata.getEvent();
         log.info(String.format("Got subscription event %s", eventEffective.toString()));
         switch (eventEffective.getTransitionType()) {
-        case TRANSFER:
-            assertEqualsNicely(NextEvent.TRANSFER);
-            notifyIfStackEmpty();
-            break;
-        case MIGRATE_ENTITLEMENT:
-            assertEqualsNicely(NextEvent.MIGRATE_ENTITLEMENT);
-            notifyIfStackEmpty();
-            break;
+            case TRANSFER:
+                assertEqualsNicely(NextEvent.TRANSFER);
+                notifyIfStackEmpty();
+                break;
+            case MIGRATE_ENTITLEMENT:
+                assertEqualsNicely(NextEvent.MIGRATE_ENTITLEMENT);
+                notifyIfStackEmpty();
+                break;
             case MIGRATE_BILLING:
                 assertEqualsNicely(NextEvent.MIGRATE_BILLING);
                 notifyIfStackEmpty();
@@ -140,14 +143,14 @@ public class TestApiListener {
     }
 
     @Subscribe
-    public synchronized void processTagEvent(final TagInternalEvent event) {
+    public synchronized void processTagEvent(final BusEventWithMetadata<TagInternalEvent> event) {
         log.info(String.format("Got TagInternalEvent event %s", event.toString()));
         assertEqualsNicely(NextEvent.TAG);
         notifyIfStackEmpty();
     }
 
     @Subscribe
-    public synchronized void processCustomFieldEvent(final CustomFieldEvent event) {
+    public synchronized void processCustomFieldEvent(final BusEventWithMetadata<CustomFieldEvent> event) {
         log.info(String.format("Got CustomFieldEvent event %s", event.toString()));
         assertEqualsNicely(NextEvent.CUSTOM_FIELD);
         notifyIfStackEmpty();
@@ -155,35 +158,35 @@ public class TestApiListener {
 
 
     @Subscribe
-    public synchronized void processTagDefinitonEvent(final TagDefinitionInternalEvent event) {
+    public synchronized void processTagDefinitonEvent(final BusEventWithMetadata<TagDefinitionInternalEvent> event) {
         log.info(String.format("Got TagDefinitionInternalEvent event %s", event.toString()));
         assertEqualsNicely(NextEvent.TAG_DEFINITION);
         notifyIfStackEmpty();
     }
 
     @Subscribe
-    public void handleInvoiceEvents(final InvoiceCreationInternalEvent event) {
+    public void handleInvoiceEvents(final BusEventWithMetadata<InvoiceCreationInternalEvent> event) {
         log.info(String.format("Got Invoice event %s", event.toString()));
         assertEqualsNicely(NextEvent.INVOICE);
         notifyIfStackEmpty();
     }
 
     @Subscribe
-    public void handleInvoiceAdjustmentEvents(final InvoiceAdjustmentInternalEvent event) {
+    public void handleInvoiceAdjustmentEvents(final BusEventWithMetadata<InvoiceAdjustmentInternalEvent> event) {
         log.info(String.format("Got Invoice adjustment event %s", event.toString()));
         assertEqualsNicely(NextEvent.INVOICE_ADJUSTMENT);
         notifyIfStackEmpty();
     }
 
     @Subscribe
-    public void handlePaymentEvents(final PaymentInfoInternalEvent event) {
+    public void handlePaymentEvents(final BusEventWithMetadata<PaymentInfoInternalEvent> event) {
         log.info(String.format("Got PaymentInfo event %s", event.toString()));
         assertEqualsNicely(NextEvent.PAYMENT);
         notifyIfStackEmpty();
     }
 
     @Subscribe
-    public void handlePaymentErrorEvents(final PaymentErrorInternalEvent event) {
+    public void handlePaymentErrorEvents(final BusEventWithMetadata<PaymentErrorInternalEvent> event) {
         log.info(String.format("Got PaymentError event %s", event.toString()));
         assertEqualsNicely(NextEvent.PAYMENT_ERROR);
         notifyIfStackEmpty();

diff --git a/util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDefinitionDao.java b/util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDefinitionDao.java
index 13947ad..29f83e4 100644
--- a/util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDefinitionDao.java
+++ b/util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDefinitionDao.java
@@ -27,6 +27,7 @@ import org.testng.annotations.Test;
 
 import com.ning.billing.api.TestApiListener;
 import com.ning.billing.api.TestApiListener.NextEvent;
+import com.ning.billing.bus.api.BusEventWithMetadata;
 import com.ning.billing.util.UtilTestSuiteWithEmbeddedDB;
 import com.ning.billing.util.events.BusInternalEvent;
 import com.ning.billing.util.events.TagDefinitionInternalEvent;
@@ -106,12 +107,14 @@ public class TestDefaultTagDefinitionDao extends UtilTestSuiteWithEmbeddedDB {
         private final List<TagDefinitionInternalEvent> tagDefinitionEvents = new ArrayList<TagDefinitionInternalEvent>();
 
         @Subscribe
-        public synchronized void processEvent(final BusInternalEvent event) {
+        public synchronized void processEvent(final BusEventWithMetadata<BusInternalEvent> eventWithMetadata) {
+            final BusInternalEvent event = eventWithMetadata.getEvent();
             events.add(event);
         }
 
         @Subscribe
-        public synchronized void processTagDefinitionEvent(final TagDefinitionInternalEvent tagDefinitionEvent) {
+        public synchronized void processTagDefinitionEvent(final BusEventWithMetadata<TagDefinitionInternalEvent> eventWithMetadata) {
+            final TagDefinitionInternalEvent tagDefinitionEvent = eventWithMetadata.getEvent();
             tagDefinitionEvents.add(tagDefinitionEvent);
         }