killbill-uncached
Changes
entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransition.java 2(+1 -1)
entitlement/src/main/java/com/ning/billing/entitlement/engine/core/ApiEventProcessorBase.java 16(+8 -8)
entitlement/src/test/java/com/ning/billing/entitlement/engine/core/ApiEventProcessorMemoryMock.java 8(+4 -4)
Details
diff --git a/account/src/main/java/com/ning/billing/account/api/AccountService.java b/account/src/main/java/com/ning/billing/account/api/AccountService.java
index 0ce4941..2424118 100644
--- a/account/src/main/java/com/ning/billing/account/api/AccountService.java
+++ b/account/src/main/java/com/ning/billing/account/api/AccountService.java
@@ -17,8 +17,8 @@
package com.ning.billing.account.api;
import com.google.inject.Inject;
-import com.ning.billing.lifecycle.LyfecycleHandlerType;
-import com.ning.billing.lifecycle.LyfecycleHandlerType.LyfecycleLevel;
+import com.ning.billing.lifecycle.LifecycleHandlerType;
+import com.ning.billing.lifecycle.LifecycleHandlerType.LifecycleLevel;
public class AccountService implements IAccountService {
@@ -41,7 +41,7 @@ public class AccountService implements IAccountService {
return accountApi;
}
- @LyfecycleHandlerType(LyfecycleLevel.INIT_SERVICE)
+ @LifecycleHandlerType(LifecycleLevel.INIT_SERVICE)
public void initialize() {
}
}
diff --git a/analytics/src/main/java/com/ning/billing/analytics/api/AnalyticsService.java b/analytics/src/main/java/com/ning/billing/analytics/api/AnalyticsService.java
index 216ff9b..35e123f 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/api/AnalyticsService.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/api/AnalyticsService.java
@@ -18,7 +18,7 @@ package com.ning.billing.analytics.api;
import com.google.inject.Inject;
import com.ning.billing.analytics.AnalyticsListener;
-import com.ning.billing.lifecycle.LyfecycleHandlerType;
+import com.ning.billing.lifecycle.LifecycleHandlerType;
import com.ning.billing.util.eventbus.IEventBus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,7 +45,7 @@ public class AnalyticsService implements IAnalyticsService
return ANALYTICS_SERVICE;
}
- @LyfecycleHandlerType(LyfecycleHandlerType.LyfecycleLevel.REGISTER_EVENTS)
+ @LifecycleHandlerType(LifecycleHandlerType.LifecycleLevel.REGISTER_EVENTS)
public void registerForNotifications()
{
try {
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 faaf2b2..827a183 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
@@ -42,7 +42,7 @@ import com.ning.billing.entitlement.api.user.ISubscription;
import com.ning.billing.entitlement.api.user.ISubscriptionBundle;
import com.ning.billing.entitlement.api.user.ISubscriptionTransition;
import com.ning.billing.entitlement.api.user.SubscriptionTransition;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
import com.ning.billing.entitlement.events.user.ApiEventType;
import com.ning.billing.util.eventbus.IEventBus;
import org.apache.commons.io.IOUtils;
@@ -119,7 +119,7 @@ public class TestAnalyticsService
UUID.randomUUID(),
subscriptionId,
bundle.getId(),
- IEvent.EventType.API_USER,
+ IEntitlementEvent.EventType.API_USER,
ApiEventType.CREATE,
requestedTransitionTime,
effectiveTransitionTime,
diff --git a/analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java b/analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java
index c0c93aa..86d32b1 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java
@@ -24,7 +24,7 @@ import com.ning.billing.catalog.api.PhaseType;
import com.ning.billing.catalog.api.ProductCategory;
import com.ning.billing.entitlement.api.user.ISubscription;
import com.ning.billing.entitlement.api.user.SubscriptionTransition;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
import com.ning.billing.entitlement.events.user.ApiEventType;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
@@ -159,7 +159,7 @@ public class TestAnalyticsListener
UUID.randomUUID(),
subscriptionId,
bundleUUID,
- IEvent.EventType.API_USER,
+ IEntitlementEvent.EventType.API_USER,
eventType,
requestedTransitionTime,
effectiveTransitionTime,
@@ -207,7 +207,7 @@ public class TestAnalyticsListener
UUID.randomUUID(),
subscriptionId,
bundleUUID,
- IEvent.EventType.API_USER,
+ IEntitlementEvent.EventType.API_USER,
eventType,
requestedTransitionTime,
effectiveTransitionTime,
diff --git a/api/src/main/java/com/ning/billing/util/eventbus/IEventBus.java b/api/src/main/java/com/ning/billing/util/eventbus/IEventBus.java
index 90ab0bc..4789348 100644
--- a/api/src/main/java/com/ning/billing/util/eventbus/IEventBus.java
+++ b/api/src/main/java/com/ning/billing/util/eventbus/IEventBus.java
@@ -98,7 +98,7 @@ public interface IEventBus {
*
*
* @param event to be posted
- * @param dao a valid DAO object obtained through the DBI.onDeamand() API.
+ * @param dao a valid DAO object obtained through the DBI.onDemand() API.
*
* @throws EventBusException if bus not been started yet
*/
diff --git a/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/Lifecycle.java b/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/Lifecycle.java
index f091a81..97aa0be 100644
--- a/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/Lifecycle.java
+++ b/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/Lifecycle.java
@@ -36,15 +36,15 @@ import com.google.common.collect.SetMultimap;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.ning.billing.lifecycle.IService;
-import com.ning.billing.lifecycle.LyfecycleHandlerType;
-import com.ning.billing.lifecycle.LyfecycleHandlerType.LyfecycleLevel;
-import com.ning.billing.lifecycle.LyfecycleHandlerType.LyfecycleLevel.Sequence;
+import com.ning.billing.lifecycle.LifecycleHandlerType;
+import com.ning.billing.lifecycle.LifecycleHandlerType.LifecycleLevel;
+import com.ning.billing.lifecycle.LifecycleHandlerType.LifecycleLevel.Sequence;
public class Lifecycle {
private final static Logger log = LoggerFactory.getLogger(Lifecycle.class);
- private final SetMultimap<LyfecycleLevel, LifecycleHandler<? extends IService>> handlersByLevel;
+ private final SetMultimap<LifecycleLevel, LifecycleHandler<? extends IService>> handlersByLevel;
private final ServiceFinder serviceFinder;
@@ -54,7 +54,7 @@ public class Lifecycle {
public Lifecycle(Injector injector) {
this.serviceFinder = new ServiceFinder(Lifecycle.class.getClassLoader());
- this.handlersByLevel = Multimaps.newSetMultimap(new ConcurrentHashMap<LyfecycleLevel, Collection<LifecycleHandler<? extends IService>>>(),
+ this.handlersByLevel = Multimaps.newSetMultimap(new ConcurrentHashMap<LifecycleLevel, Collection<LifecycleHandler<? extends IService>>>(),
new Supplier<Set<LifecycleHandler<? extends IService>>>() {
@Override
@@ -85,21 +85,21 @@ public class Lifecycle {
}
public void fireShutdownSequencePriorEventUnRegistration() {
- fireSequence(Sequence.SHUTOWN_PRE_EVENT_UNREGISTRATION);
+ fireSequence(Sequence.SHUTDOWN_PRE_EVENT_UNREGISTRATION);
}
public void fireShutdownSequencePostEventUnRegistration() {
- fireSequence(Sequence.SHUTOWN_POST_EVENT_UNREGISTRATION);
+ fireSequence(Sequence.SHUTDOWN_POST_EVENT_UNREGISTRATION);
}
private void fireSequence(Sequence seq) {
- List<LyfecycleLevel> levels = LyfecycleLevel.getLevelsForSequence(seq);
- for (LyfecycleLevel cur : levels) {
+ List<LifecycleLevel> levels = LifecycleLevel.getLevelsForSequence(seq);
+ for (LifecycleLevel cur : levels) {
doFireStage(cur);
}
}
- private void doFireStage(LyfecycleLevel level) {
+ private void doFireStage(LifecycleLevel level) {
log.info("Killbill lifecycle firing stage {}", level);
Set<LifecycleHandler<? extends IService>> handlers = handlersByLevel.get(level);
for (LifecycleHandler<? extends IService> cur : handlers) {
@@ -141,13 +141,13 @@ public class Lifecycle {
log.warn(msg, e);
}
- public Multimap<LyfecycleLevel, LifecycleHandler<? extends IService>> findAllHandlers(IService service) {
- Multimap<LyfecycleLevel, LifecycleHandler<? extends IService>> methodsInService = HashMultimap.create();
+ public Multimap<LifecycleLevel, LifecycleHandler<? extends IService>> findAllHandlers(IService service) {
+ Multimap<LifecycleLevel, LifecycleHandler<? extends IService>> methodsInService = HashMultimap.create();
Class<? extends IService> clazz = service.getClass();
for (Method method : clazz.getMethods()) {
- LyfecycleHandlerType annotation = method.getAnnotation(LyfecycleHandlerType.class);
+ LifecycleHandlerType annotation = method.getAnnotation(LifecycleHandlerType.class);
if (annotation != null) {
- LyfecycleLevel level = annotation.value();
+ LifecycleLevel level = annotation.value();
LifecycleHandler<? extends IService> handler = new LifecycleHandler<IService>(service, method);
methodsInService.put(level, handler);
}
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/lifecycle/TestLifecycle.java b/beatrix/src/test/java/com/ning/billing/beatrix/lifecycle/TestLifecycle.java
index 791b2fe..b6cc153 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/lifecycle/TestLifecycle.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/lifecycle/TestLifecycle.java
@@ -28,8 +28,8 @@ import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Stage;
import com.ning.billing.lifecycle.IService;
-import com.ning.billing.lifecycle.LyfecycleHandlerType;
-import com.ning.billing.lifecycle.LyfecycleHandlerType.LyfecycleLevel;
+import com.ning.billing.lifecycle.LifecycleHandlerType;
+import com.ning.billing.lifecycle.LifecycleHandlerType.LifecycleLevel;
public class TestLifecycle {
@@ -64,19 +64,19 @@ public class TestLifecycle {
public static class Service1 extends ServiceBase implements IService {
- @LyfecycleHandlerType(LyfecycleLevel.INIT_BUS)
+ @LifecycleHandlerType(LifecycleLevel.INIT_BUS)
public void initBus() {
log.info("Service1 : got INIT_BUS");
incrementCount();
}
- @LyfecycleHandlerType(LyfecycleLevel.START_SERVICE)
+ @LifecycleHandlerType(LifecycleLevel.START_SERVICE)
public void startService() {
log.info("Service1 : got START_SERVICE");
incrementCount();
}
- @LyfecycleHandlerType(LyfecycleLevel.SHUTDOWN)
+ @LifecycleHandlerType(LifecycleLevel.SHUTDOWN)
public void shutdownService() {
log.info("Service1 : got SHUTDOWN");
incrementCount();
@@ -90,25 +90,25 @@ public class TestLifecycle {
public static class Service2 extends ServiceBase implements IService {
- @LyfecycleHandlerType(LyfecycleLevel.LOAD_CATALOG)
+ @LifecycleHandlerType(LifecycleLevel.LOAD_CATALOG)
public void loadCatalog() {
log.info("Service2 : got LOAD_CATALOG");
incrementCount();
}
- @LyfecycleHandlerType(LyfecycleLevel.REGISTER_EVENTS)
+ @LifecycleHandlerType(LifecycleLevel.REGISTER_EVENTS)
public void registerEvents() {
log.info("Service2 : got REGISTER_EVENTS");
incrementCount();
}
- @LyfecycleHandlerType(LyfecycleLevel.UNREGISTER_EVENTS)
+ @LifecycleHandlerType(LifecycleLevel.UNREGISTER_EVENTS)
public void unregisterEvents() {
log.info("Service2 : got UNREGISTER_EVENTS");
incrementCount();
}
- @LyfecycleHandlerType(LyfecycleLevel.START_SERVICE)
+ @LifecycleHandlerType(LifecycleLevel.START_SERVICE)
public void startService() {
log.info("Service2 : got START_SERVICE");
incrementCount();
diff --git a/catalog/src/main/java/com/ning/billing/catalog/CatalogService.java b/catalog/src/main/java/com/ning/billing/catalog/CatalogService.java
index f1d01c8..b0d099a 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/CatalogService.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/CatalogService.java
@@ -22,8 +22,8 @@ import com.ning.billing.catalog.api.ICatalog;
import com.ning.billing.catalog.api.ICatalogService;
import com.ning.billing.config.ICatalogConfig;
import com.ning.billing.lifecycle.IService;
-import com.ning.billing.lifecycle.LyfecycleHandlerType;
-import com.ning.billing.lifecycle.LyfecycleHandlerType.LyfecycleLevel;
+import com.ning.billing.lifecycle.LifecycleHandlerType;
+import com.ning.billing.lifecycle.LifecycleHandlerType.LifecycleLevel;
import com.ning.billing.util.config.XMLLoader;
public class CatalogService implements IService, Provider<ICatalog>, ICatalogService {
@@ -43,7 +43,7 @@ public class CatalogService implements IService, Provider<ICatalog>, ICatalogSer
this.isInitialized = false;
}
- @LyfecycleHandlerType(LyfecycleLevel.LOAD_CATALOG)
+ @LifecycleHandlerType(LifecycleLevel.LOAD_CATALOG)
public synchronized void loadCatalog() throws ServiceException {
if (!isInitialized) {
try {
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java
index 0a2715f..83339a8 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java
@@ -37,7 +37,7 @@ import com.ning.billing.entitlement.api.user.ISubscription;
import com.ning.billing.entitlement.api.user.ISubscriptionBundle;
import com.ning.billing.entitlement.api.user.IEntitlementUserApi;
import com.ning.billing.entitlement.engine.dao.IEntitlementDao;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
import com.ning.billing.entitlement.events.phase.IPhaseEvent;
import com.ning.billing.entitlement.events.phase.PhaseEvent;
import com.ning.billing.entitlement.events.user.ApiEventBuilder;
@@ -167,7 +167,7 @@ public class EntitlementUserApi implements IEntitlementUserApi {
TimedPhase nextTimedPhase = planAligner.getNextTimedPhaseOnCreate(subscription, plan, realPriceList, effectiveDate);
IPhaseEvent nextPhaseEvent = PhaseEvent.getNextPhaseEvent(nextTimedPhase, subscription, now);
- List<IEvent> events = new ArrayList<IEvent>();
+ List<IEntitlementEvent> events = new ArrayList<IEntitlementEvent>();
events.add(creationEvent);
if (nextPhaseEvent != null) {
events.add(nextPhaseEvent);
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java
index a87e73c..7348894 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java
@@ -43,8 +43,8 @@ import com.ning.billing.entitlement.alignment.IPlanAligner;
import com.ning.billing.entitlement.alignment.IPlanAligner.TimedPhase;
import com.ning.billing.entitlement.engine.core.Engine;
import com.ning.billing.entitlement.engine.dao.IEntitlementDao;
-import com.ning.billing.entitlement.events.IEvent;
-import com.ning.billing.entitlement.events.IEvent.EventType;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent.EventType;
import com.ning.billing.entitlement.events.phase.IPhaseEvent;
import com.ning.billing.entitlement.events.phase.PhaseEvent;
import com.ning.billing.entitlement.events.user.ApiEventBuilder;
@@ -85,7 +85,7 @@ public class Subscription extends PrivateFields implements ISubscription {
private final DateTime paidThroughDate;
//
- // User APIs (createm chnage, cancel,...) will recompute those each time,
+ // User APIs (create, change, cancel,...) will recompute those each time,
// so the user holding that subscription object get the correct state when
// the call completes
//
@@ -183,7 +183,7 @@ public class Subscription extends PrivateFields implements ISubscription {
ActionPolicy policy = catalog.getPlanCancelPolicy(planPhase);
DateTime effectiveDate = getPlanChangeEffectiveDate(policy, now);
- IEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
+ IEntitlementEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
.setSubscriptionId(id)
.setActiveVersion(activeVersion)
.setProcessedDate(now)
@@ -200,14 +200,14 @@ public class Subscription extends PrivateFields implements ISubscription {
throw new EntitlementUserApiException(ErrorCode.ENT_UNCANCEL_BAD_STATE, id.toString());
}
DateTime now = clock.getUTCNow();
- IEvent uncancelEvent = new ApiEventUncancel(new ApiEventBuilder()
+ IEntitlementEvent uncancelEvent = new ApiEventUncancel(new ApiEventBuilder()
.setSubscriptionId(id)
.setActiveVersion(activeVersion)
.setProcessedDate(now)
.setRequestedDate(now)
.setEffectiveDate(now));
- List<IEvent> uncancelEvents = new ArrayList<IEvent>();
+ List<IEntitlementEvent> uncancelEvents = new ArrayList<IEntitlementEvent>();
uncancelEvents.add(uncancelEvent);
DateTime planStartDate = getCurrentPlanStart();
@@ -275,7 +275,7 @@ public class Subscription extends PrivateFields implements ISubscription {
TimedPhase currentTimedPhase = planAligner.getCurrentTimedPhaseOnChange(this, newPlan, newPriceList.getName(), effectiveDate);
- IEvent changeEvent = new ApiEventChange(new ApiEventBuilder()
+ IEntitlementEvent changeEvent = new ApiEventChange(new ApiEventBuilder()
.setSubscriptionId(id)
.setEventPlan(newPlan.getName())
.setEventPlanPhase(currentTimedPhase.getPhase().getName())
@@ -287,7 +287,7 @@ public class Subscription extends PrivateFields implements ISubscription {
TimedPhase nextTimedPhase = planAligner.getNextTimedPhaseOnChange(this, newPlan, newPriceList.getName(), effectiveDate);
IPhaseEvent nextPhaseEvent = PhaseEvent.getNextPhaseEvent(nextTimedPhase, this, now);
- List<IEvent> changeEvents = new ArrayList<IEvent>();
+ List<IEntitlementEvent> changeEvents = new ArrayList<IEntitlementEvent>();
// Only add the PHASE if it does not coincide with the CHANGE, if not this is 'just' a CHANGE.
if (nextPhaseEvent != null && ! nextPhaseEvent.getEffectiveDate().equals(changeEvent.getEffectiveDate())) {
changeEvents.add(nextPhaseEvent);
@@ -323,7 +323,7 @@ public class Subscription extends PrivateFields implements ISubscription {
return latestSubscription;
}
- public ISubscriptionTransition getTransitionFromEvent(IEvent event) {
+ public ISubscriptionTransition getTransitionFromEvent(IEntitlementEvent event) {
if (transitions == null || event == null) {
return null;
}
@@ -452,7 +452,7 @@ public class Subscription extends PrivateFields implements ISubscription {
private void rebuildTransitions() {
- List<IEvent> events = dao.getEventsForSubscription(id);
+ List<IEntitlementEvent> events = dao.getEventsForSubscription(id);
if (events == null) {
return;
}
@@ -469,7 +469,7 @@ public class Subscription extends PrivateFields implements ISubscription {
this.transitions = new LinkedList<SubscriptionTransition>();
- for (final IEvent cur : events) {
+ for (final IEntitlementEvent cur : events) {
if (!cur.isActive() || cur.getActiveVersion() < activeVersion) {
continue;
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundle.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundle.java
index cc990a9..34d42a2 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundle.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundle.java
@@ -21,7 +21,7 @@ import java.util.UUID;
import org.joda.time.DateTime;
import com.ning.billing.catalog.api.BillingPeriod;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
import com.ning.billing.entitlement.events.user.ApiEventCreate;
public class SubscriptionBundle extends PrivateFields implements ISubscriptionBundle {
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvents.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvents.java
index 02b7c74..cefaf05 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvents.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvents.java
@@ -19,36 +19,36 @@ package com.ning.billing.entitlement.api.user;
import java.util.LinkedList;
import java.util.UUID;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
public class SubscriptionEvents {
public static final long INITIAL_VERSION = 1;
private final UUID subscriptionId;
- private final LinkedList<IEvent> events;
+ private final LinkedList<IEntitlementEvent> events;
private long activeVersion;
public SubscriptionEvents(UUID subscriptionId) {
super();
this.subscriptionId = subscriptionId;
- this.events = new LinkedList<IEvent>();
+ this.events = new LinkedList<IEntitlementEvent>();
this.activeVersion = INITIAL_VERSION;
}
- public void addEvent(IEvent ev) {
+ public void addEvent(IEntitlementEvent ev) {
events.add(ev);
}
- public LinkedList<IEvent> getCurrentView() {
+ public LinkedList<IEntitlementEvent> getCurrentView() {
return getViewForVersion(activeVersion);
}
- public LinkedList<IEvent> getViewForVersion(final long version) {
+ public LinkedList<IEntitlementEvent> getViewForVersion(final long version) {
- LinkedList<IEvent> result = new LinkedList<IEvent>();
- for (IEvent cur : events) {
+ LinkedList<IEntitlementEvent> result = new LinkedList<IEntitlementEvent>();
+ for (IEntitlementEvent cur : events) {
if (cur.getActiveVersion() == version) {
result.add(cur);
}
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransition.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransition.java
index 7f8bc8c..81adab2 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransition.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransition.java
@@ -23,7 +23,7 @@ import org.joda.time.DateTime;
import com.ning.billing.catalog.api.IPlan;
import com.ning.billing.catalog.api.IPlanPhase;
import com.ning.billing.entitlement.api.user.ISubscription.SubscriptionState;
-import com.ning.billing.entitlement.events.IEvent.EventType;
+import com.ning.billing.entitlement.events.IEntitlementEvent.EventType;
import com.ning.billing.entitlement.events.user.ApiEventType;
import com.ning.billing.entitlement.exceptions.EntitlementError;
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/ApiEventProcessor.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/ApiEventProcessor.java
index 73eb863..734ded2 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/ApiEventProcessor.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/ApiEventProcessor.java
@@ -22,7 +22,7 @@ import java.util.List;
import com.google.inject.Inject;
import com.ning.billing.config.IEntitlementConfig;
import com.ning.billing.entitlement.engine.dao.IEntitlementDao;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
import com.ning.billing.util.clock.IClock;
public class ApiEventProcessor extends ApiEventProcessorBase {
@@ -35,7 +35,7 @@ public class ApiEventProcessor extends ApiEventProcessorBase {
@Override
protected boolean doProcessEvents(int sequenceId) {
- List<IEvent> claimedEvents = dao.getEventsReady(apiProcessorId, sequenceId);
+ List<IEntitlementEvent> claimedEvents = dao.getEventsReady(apiProcessorId, sequenceId);
if (claimedEvents.size() == 0) {
return false;
}
@@ -44,9 +44,9 @@ public class ApiEventProcessor extends ApiEventProcessorBase {
}
- protected boolean doProcessEventsFromList(int sequenceId, Collection<IEvent> claimedEvents) {
+ protected boolean doProcessEventsFromList(int sequenceId, Collection<IEntitlementEvent> claimedEvents) {
long prev = nbProcessedEvents;
- for (IEvent cur : claimedEvents) {
+ for (IEntitlementEvent cur : claimedEvents) {
log.debug(String.format("ApiEventProcessor seq = %d got event %s", sequenceId, cur.getId()));
listener.processEventReady(cur);
nbProcessedEvents++;
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/ApiEventProcessorBase.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/ApiEventProcessorBase.java
index acaa7ad..04daa21 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/ApiEventProcessorBase.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/ApiEventProcessorBase.java
@@ -38,7 +38,7 @@ import com.google.inject.Inject;
import com.ning.billing.config.IEntitlementConfig;
import com.ning.billing.entitlement.api.user.ISubscription;
import com.ning.billing.entitlement.engine.dao.IEntitlementDao;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
import com.ning.billing.util.clock.IClock;
public abstract class ApiEventProcessorBase implements IApiEventProcessor {
@@ -206,9 +206,9 @@ public abstract class ApiEventProcessorBase implements IApiEventProcessor {
int curSequenceId = sequenceId.getAndIncrement();
//Get all current ready events
- List<IEvent> claimedEvents = new LinkedList<IEvent>();
+ List<IEntitlementEvent> claimedEvents = new LinkedList<IEntitlementEvent>();
do {
- List<IEvent> tmpEvents = dao.getEventsReady(apiProcessorId, curSequenceId);
+ List<IEntitlementEvent> tmpEvents = dao.getEventsReady(apiProcessorId, curSequenceId);
if (tmpEvents.size() == 0) {
break;
}
@@ -219,14 +219,14 @@ public abstract class ApiEventProcessorBase implements IApiEventProcessor {
}
// Filter for specific subscriptions if needed
- Collection<IEvent> claimedEventsFiltered = null;
+ Collection<IEntitlementEvent> claimedEventsFiltered = null;
if (subscriptionsIds.length == 0) {
claimedEventsFiltered = claimedEvents;
} else {
- claimedEventsFiltered = Collections2.filter(claimedEvents, new Predicate<IEvent>() {
+ claimedEventsFiltered = Collections2.filter(claimedEvents, new Predicate<IEntitlementEvent>() {
@Override
- public boolean apply(IEvent input) {
+ public boolean apply(IEntitlementEvent input) {
for (UUID cur : subscriptionsIds) {
if (cur.equals(input.getSubscriptionId())) {
return true;
@@ -242,7 +242,7 @@ public abstract class ApiEventProcessorBase implements IApiEventProcessor {
// If only one event is requested extract it
if (oneEventOnly) {
- List<IEvent> oneEventList = new ArrayList<IEvent>(1);
+ List<IEntitlementEvent> oneEventList = new ArrayList<IEntitlementEvent>(1);
oneEventList.add(claimedEventsFiltered.iterator().next());
claimedEventsFiltered = oneEventList;
}
@@ -257,5 +257,5 @@ public abstract class ApiEventProcessorBase implements IApiEventProcessor {
}
protected abstract boolean doProcessEvents(int sequenceId);
- protected abstract boolean doProcessEventsFromList(int sequenceId, Collection<IEvent> events);
+ protected abstract boolean doProcessEventsFromList(int sequenceId, Collection<IEntitlementEvent> events);
}
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java
index 2b47f9c..bf6f0ae 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java
@@ -34,13 +34,13 @@ import com.ning.billing.entitlement.api.user.EntitlementUserApi;
import com.ning.billing.entitlement.api.user.IEntitlementUserApi;
import com.ning.billing.entitlement.api.user.Subscription;
import com.ning.billing.entitlement.engine.dao.IEntitlementDao;
-import com.ning.billing.entitlement.events.IEvent;
-import com.ning.billing.entitlement.events.IEvent.EventType;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent.EventType;
import com.ning.billing.entitlement.events.phase.IPhaseEvent;
import com.ning.billing.entitlement.events.phase.PhaseEvent;
import com.ning.billing.entitlement.exceptions.EntitlementError;
-import com.ning.billing.lifecycle.LyfecycleHandlerType;
-import com.ning.billing.lifecycle.LyfecycleHandlerType.LyfecycleLevel;
+import com.ning.billing.lifecycle.LifecycleHandlerType;
+import com.ning.billing.lifecycle.LifecycleHandlerType.LifecycleLevel;
import com.ning.billing.util.clock.IClock;
import com.ning.billing.util.eventbus.IEventBus;
import com.ning.billing.util.eventbus.IEventBus.EventBusException;
@@ -89,17 +89,17 @@ public class Engine implements IEventListener, IEntitlementService {
}
- @LyfecycleHandlerType(LyfecycleLevel.INIT_SERVICE)
+ @LifecycleHandlerType(LifecycleLevel.INIT_SERVICE)
public void initialize() {
}
- @LyfecycleHandlerType(LyfecycleLevel.START_SERVICE)
+ @LifecycleHandlerType(LifecycleLevel.START_SERVICE)
public void start() {
apiEventProcessor.startNotifications(this);
waitForNotificationStartCompletion();
}
- @LyfecycleHandlerType(LyfecycleLevel.STOP_SERVICE)
+ @LifecycleHandlerType(LifecycleLevel.STOP_SERVICE)
public void stop() {
apiEventProcessor.stopNotifications();
startedNotificationThread = false;
@@ -122,7 +122,7 @@ public class Engine implements IEventListener, IEntitlementService {
}
@Override
- public void processEventReady(IEvent event) {
+ public void processEventReady(IEntitlementEvent event) {
Subscription subscription = (Subscription) dao.getSubscriptionFromId(event.getSubscriptionId());
if (subscription == null) {
log.warn("Failed to retrieve subscription for id %s", event.getSubscriptionId());
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/IEventListener.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/IEventListener.java
index 651f8a9..8b0c586 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/IEventListener.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/IEventListener.java
@@ -16,13 +16,13 @@
package com.ning.billing.entitlement.engine.core;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
public interface IEventListener {
- public void processEventReady(IEvent event);
+ public void processEventReady(IEntitlementEvent event);
public void completedNotificationStart();
}
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java
index 943a0dc..e312ccc 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java
@@ -39,8 +39,8 @@ import com.ning.billing.entitlement.api.user.ISubscriptionBundle;
import com.ning.billing.entitlement.api.user.Subscription;
import com.ning.billing.entitlement.api.user.SubscriptionBuilder;
import com.ning.billing.entitlement.api.user.SubscriptionBundle;
-import com.ning.billing.entitlement.events.IEvent;
-import com.ning.billing.entitlement.events.IEvent.EventType;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent.EventType;
import com.ning.billing.entitlement.events.user.ApiEventType;
import com.ning.billing.entitlement.events.user.IApiEvent;
import com.ning.billing.entitlement.exceptions.EntitlementError;
@@ -124,7 +124,7 @@ public class EntitlementDao implements IEntitlementDao {
}
@Override
- public void createNextPhaseEvent(final UUID subscriptionId, final IEvent nextPhase) {
+ public void createNextPhaseEvent(final UUID subscriptionId, final IEntitlementEvent nextPhase) {
eventsDao.inTransaction(new Transaction<Void, IEventSqlDao>() {
@Override
@@ -139,35 +139,35 @@ public class EntitlementDao implements IEntitlementDao {
@Override
- public List<IEvent> getEventsForSubscription(UUID subscriptionId) {
- List<IEvent> events = eventsDao.getEventsForSubscription(subscriptionId.toString());
+ public List<IEntitlementEvent> getEventsForSubscription(UUID subscriptionId) {
+ List<IEntitlementEvent> events = eventsDao.getEventsForSubscription(subscriptionId.toString());
return events;
}
@Override
- public List<IEvent> getPendingEventsForSubscription(UUID subscriptionId) {
+ public List<IEntitlementEvent> getPendingEventsForSubscription(UUID subscriptionId) {
Date now = clock.getUTCNow().toDate();
- List<IEvent> results = eventsDao.getFutureActiveEventForSubscription(subscriptionId.toString(), now);
+ List<IEntitlementEvent> results = eventsDao.getFutureActiveEventForSubscription(subscriptionId.toString(), now);
return results;
}
@Override
- public List<IEvent> getEventsReady(final UUID ownerId, final int sequenceId) {
+ public List<IEntitlementEvent> getEventsReady(final UUID ownerId, final int sequenceId) {
final Date now = clock.getUTCNow().toDate();
final Date nextAvailable = clock.getUTCNow().plus(config.getDaoClaimTimeMs()).toDate();
log.debug(String.format("EntitlementDao getEventsReady START effectiveNow = %s", now));
- List<IEvent> events = eventsDao.inTransaction(new Transaction<List<IEvent>, IEventSqlDao>() {
+ List<IEntitlementEvent> events = eventsDao.inTransaction(new Transaction<List<IEntitlementEvent>, IEventSqlDao>() {
@Override
- public List<IEvent> inTransaction(IEventSqlDao dao,
+ public List<IEntitlementEvent> inTransaction(IEventSqlDao dao,
TransactionStatus status) throws Exception {
- List<IEvent> claimedEvents = new ArrayList<IEvent>();
- List<IEvent> input = dao.getReadyEvents(now, config.getDaoMaxReadyEvents());
- for (IEvent cur : input) {
+ List<IEntitlementEvent> claimedEvents = new ArrayList<IEntitlementEvent>();
+ List<IEntitlementEvent> input = dao.getReadyEvents(now, config.getDaoMaxReadyEvents());
+ for (IEntitlementEvent cur : input) {
final boolean claimed = (dao.claimEvent(ownerId.toString(), nextAvailable, cur.getId().toString(), now) == 1);
if (claimed) {
claimedEvents.add(cur);
@@ -178,7 +178,7 @@ public class EntitlementDao implements IEntitlementDao {
}
});
- for (IEvent cur : events) {
+ for (IEntitlementEvent cur : events) {
log.debug(String.format("EntitlementDao %s [host %s] claimed events %s", ownerId, hostname, cur.getId()));
if (cur.getOwner() != null && !cur.getOwner().equals(ownerId)) {
log.warn(String.format("EventProcessor %s stealing event %s from %s", ownerId, cur, cur.getOwner()));
@@ -188,7 +188,7 @@ public class EntitlementDao implements IEntitlementDao {
}
@Override
- public void clearEventsReady(final UUID ownerId, final Collection<IEvent> cleared) {
+ public void clearEventsReady(final UUID ownerId, final Collection<IEntitlementEvent> cleared) {
log.debug(String.format("EntitlementDao clearEventsReady START cleared size = %d", cleared.size()));
@@ -198,7 +198,7 @@ public class EntitlementDao implements IEntitlementDao {
public Void inTransaction(IEventSqlDao dao,
TransactionStatus status) throws Exception {
// STEPH Same here batch would nice
- for (IEvent cur : cleared) {
+ for (IEntitlementEvent cur : cleared) {
dao.clearEvent(cur.getId().toString(), ownerId.toString());
log.debug(String.format("EntitlementDao %s [host %s] cleared events %s", ownerId, hostname, cur.getId()));
}
@@ -209,7 +209,7 @@ public class EntitlementDao implements IEntitlementDao {
@Override
public ISubscription createSubscription(final Subscription subscription,
- final List<IEvent> initialEvents) {
+ final List<IEntitlementEvent> initialEvents) {
subscriptionsDao.inTransaction(new Transaction<Void, ISubscriptionSqlDao>() {
@@ -220,7 +220,7 @@ public class EntitlementDao implements IEntitlementDao {
dao.insertSubscription(subscription);
// STEPH batch as well
IEventSqlDao eventsDaoFromSameTranscation = dao.become(IEventSqlDao.class);
- for (IEvent cur : initialEvents) {
+ for (IEntitlementEvent cur : initialEvents) {
eventsDaoFromSameTranscation.insertEvent(cur);
}
return null;
@@ -230,7 +230,7 @@ public class EntitlementDao implements IEntitlementDao {
}
@Override
- public void cancelSubscription(final UUID subscriptionId, final IEvent cancelEvent) {
+ public void cancelSubscription(final UUID subscriptionId, final IEntitlementEvent cancelEvent) {
eventsDao.inTransaction(new Transaction<Void, IEventSqlDao>() {
@Override
@@ -245,7 +245,7 @@ public class EntitlementDao implements IEntitlementDao {
}
@Override
- public void uncancelSubscription(final UUID subscriptionId, final List<IEvent> uncancelEvents) {
+ public void uncancelSubscription(final UUID subscriptionId, final List<IEntitlementEvent> uncancelEvents) {
eventsDao.inTransaction(new Transaction<Void, IEventSqlDao>() {
@@ -255,9 +255,9 @@ public class EntitlementDao implements IEntitlementDao {
UUID existingCancelId = null;
Date now = clock.getUTCNow().toDate();
- List<IEvent> events = dao.getFutureActiveEventForSubscription(subscriptionId.toString(), now);
+ List<IEntitlementEvent> events = dao.getFutureActiveEventForSubscription(subscriptionId.toString(), now);
- for (IEvent cur : events) {
+ for (IEntitlementEvent cur : events) {
if (cur.getType() == EventType.API_USER && ((IApiEvent) cur).getEventType() == ApiEventType.CANCEL) {
if (existingCancelId != null) {
throw new EntitlementError(String.format("Found multiple cancel active events for subscriptions %s", subscriptionId.toString()));
@@ -268,7 +268,7 @@ public class EntitlementDao implements IEntitlementDao {
if (existingCancelId != null) {
dao.unactiveEvent(existingCancelId.toString(), now);
- for (IEvent cur : uncancelEvents) {
+ for (IEntitlementEvent cur : uncancelEvents) {
dao.insertEvent(cur);
}
}
@@ -278,14 +278,14 @@ public class EntitlementDao implements IEntitlementDao {
}
@Override
- public void changePlan(final UUID subscriptionId, final List<IEvent> changeEvents) {
+ public void changePlan(final UUID subscriptionId, final List<IEntitlementEvent> changeEvents) {
eventsDao.inTransaction(new Transaction<Void, IEventSqlDao>() {
@Override
public Void inTransaction(IEventSqlDao dao,
TransactionStatus status) throws Exception {
cancelNextChangeEventFromTransaction(subscriptionId, dao);
cancelNextPhaseEventFromTransaction(subscriptionId, dao);
- for (IEvent cur : changeEvents) {
+ for (IEntitlementEvent cur : changeEvents) {
dao.insertEvent(cur);
}
return null;
@@ -305,8 +305,8 @@ public class EntitlementDao implements IEntitlementDao {
UUID futureEventId = null;
Date now = clock.getUTCNow().toDate();
- List<IEvent> events = dao.getFutureActiveEventForSubscription(subscriptionId.toString(), now);
- for (IEvent cur : events) {
+ List<IEntitlementEvent> events = dao.getFutureActiveEventForSubscription(subscriptionId.toString(), now);
+ for (IEntitlementEvent cur : events) {
if (cur.getType() == type &&
(apiType == null || apiType == ((IApiEvent) cur).getEventType() )) {
if (futureEventId != null) {
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/IEntitlementDao.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/IEntitlementDao.java
index 2d46439..17210ae 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/IEntitlementDao.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/IEntitlementDao.java
@@ -24,7 +24,7 @@ import com.ning.billing.entitlement.api.user.ISubscription;
import com.ning.billing.entitlement.api.user.ISubscriptionBundle;
import com.ning.billing.entitlement.api.user.Subscription;
import com.ning.billing.entitlement.api.user.SubscriptionBundle;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
public interface IEntitlementDao {
@@ -50,22 +50,22 @@ public interface IEntitlementDao {
public void updateSubscription(Subscription subscription);
// Event apis
- public void createNextPhaseEvent(UUID subscriptionId, IEvent nextPhase);
+ public void createNextPhaseEvent(UUID subscriptionId, IEntitlementEvent nextPhase);
- public List<IEvent> getEventsForSubscription(UUID subscriptionId);
+ public List<IEntitlementEvent> getEventsForSubscription(UUID subscriptionId);
- public List<IEvent> getPendingEventsForSubscription(UUID subscriptionId);
+ public List<IEntitlementEvent> getPendingEventsForSubscription(UUID subscriptionId);
- public List<IEvent> getEventsReady(UUID ownerId, int sequenceId);
+ public List<IEntitlementEvent> getEventsReady(UUID ownerId, int sequenceId);
- public void clearEventsReady(UUID ownerId, Collection<IEvent> cleared);
+ public void clearEventsReady(UUID ownerId, Collection<IEntitlementEvent> cleared);
// Subscription creation, cancellation, changePlan apis
- public ISubscription createSubscription(Subscription subscription, List<IEvent> initialEvents);
+ public ISubscription createSubscription(Subscription subscription, List<IEntitlementEvent> initialEvents);
- public void cancelSubscription(UUID subscriptionId, IEvent cancelEvent);
+ public void cancelSubscription(UUID subscriptionId, IEntitlementEvent cancelEvent);
- public void uncancelSubscription(UUID subscriptionId, List<IEvent> uncancelEvents);
+ public void uncancelSubscription(UUID subscriptionId, List<IEntitlementEvent> uncancelEvents);
- public void changePlan(UUID subscriptionId, List<IEvent> changeEvents);
+ public void changePlan(UUID subscriptionId, List<IEntitlementEvent> changeEvents);
}
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/IEventSqlDao.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/IEventSqlDao.java
index ff53ef2..8211f61 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/IEventSqlDao.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/IEventSqlDao.java
@@ -39,9 +39,9 @@ import org.skife.jdbi.v2.sqlobject.stringtemplate.ExternalizedSqlViaStringTempla
import org.skife.jdbi.v2.tweak.ResultSetMapper;
import com.ning.billing.entitlement.events.EventBaseBuilder;
-import com.ning.billing.entitlement.events.IEvent;
-import com.ning.billing.entitlement.events.IEvent.EventType;
-import com.ning.billing.entitlement.events.IEventLyfecycle.IEventLyfecycleState;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent.EventType;
+import com.ning.billing.entitlement.events.IEventLifecycle.IEventLifecycleState;
import com.ning.billing.entitlement.events.phase.IPhaseEvent;
import com.ning.billing.entitlement.events.phase.PhaseEvent;
import com.ning.billing.entitlement.events.phase.PhaseEventBuilder;
@@ -64,7 +64,7 @@ public interface IEventSqlDao extends Transactional<IEventSqlDao>, CloseMe, Tran
//
@SqlQuery
@Mapper(IEventSqlMapper.class)
- public List<IEvent> getReadyEvents(@Bind("now") Date now, @Bind("max") int max);
+ public List<IEntitlementEvent> getReadyEvents(@Bind("now") Date now, @Bind("max") int max);
@SqlUpdate
public int claimEvent(@Bind("owner") String owner, @Bind("next_available") Date nextAvailable, @Bind("event_id") String eventId, @Bind("now") Date now);
@@ -73,7 +73,7 @@ public interface IEventSqlDao extends Transactional<IEventSqlDao>, CloseMe, Tran
public void clearEvent(@Bind("event_id") String eventId, @Bind("owner") String owner);
@SqlUpdate
- public void insertEvent(@Bind(binder = IEventSqlDaoBinder.class) IEvent evt);
+ public void insertEvent(@Bind(binder = IEventSqlDaoBinder.class) IEntitlementEvent evt);
@SqlUpdate
public void insertClaimedHistory(@Bind("sequence_id") int sequenceId, @Bind("owner_id") String ownerId, @Bind("hostname") String hostname, @Bind("claimed_dt") Date clainedDate, @Bind("event_id") String eventId);
@@ -86,20 +86,20 @@ public interface IEventSqlDao extends Transactional<IEventSqlDao>, CloseMe, Tran
@SqlQuery
@Mapper(IEventSqlMapper.class)
- public List<IEvent> getFutureActiveEventForSubscription(@Bind("subscription_id") String subscriptionId, @Bind("now") Date now);
+ public List<IEntitlementEvent> getFutureActiveEventForSubscription(@Bind("subscription_id") String subscriptionId, @Bind("now") Date now);
@SqlQuery
@Mapper(IEventSqlMapper.class)
- public List<IEvent> getEventsForSubscription(@Bind("subscription_id") String subscriptionId);
+ public List<IEntitlementEvent> getEventsForSubscription(@Bind("subscription_id") String subscriptionId);
- public static class IEventSqlDaoBinder implements Binder<Bind, IEvent> {
+ public static class IEventSqlDaoBinder implements Binder<Bind, IEntitlementEvent> {
private Date getDate(DateTime dateTime) {
return dateTime == null ? null : dateTime.toDate();
}
@Override
- public void bind(@SuppressWarnings("rawtypes") SQLStatement stmt, Bind bind, IEvent evt) {
+ public void bind(@SuppressWarnings("rawtypes") SQLStatement stmt, Bind bind, IEntitlementEvent evt) {
stmt.bind("event_id", evt.getId().toString());
stmt.bind("event_type", evt.getType().toString());
stmt.bind("user_type", (evt.getType() == EventType.API_USER) ? ((IApiEvent) evt).getEventType().toString() : null);
@@ -115,11 +115,11 @@ public interface IEventSqlDao extends Transactional<IEventSqlDao>, CloseMe, Tran
stmt.bind("is_active", evt.isActive());
stmt.bind("processing_available_dt", getDate(evt.getNextAvailableDate()));
stmt.bind("processing_owner", (String) null);
- stmt.bind("processing_state", IEventLyfecycleState.AVAILABLE.toString());
+ stmt.bind("processing_state", IEventLifecycleState.AVAILABLE.toString());
}
}
- public static class IEventSqlMapper implements ResultSetMapper<IEvent> {
+ public static class IEventSqlMapper implements ResultSetMapper<IEntitlementEvent> {
private DateTime getDate(ResultSet r, String fieldName) throws SQLException {
final Timestamp resultStamp = r.getTimestamp(fieldName);
@@ -127,7 +127,7 @@ public interface IEventSqlDao extends Transactional<IEventSqlDao>, CloseMe, Tran
}
@Override
- public IEvent map(int index, ResultSet r, StatementContext ctx)
+ public IEntitlementEvent map(int index, ResultSet r, StatementContext ctx)
throws SQLException {
UUID id = UUID.fromString(r.getString("event_id"));
@@ -144,7 +144,7 @@ public interface IEventSqlDao extends Transactional<IEventSqlDao>, CloseMe, Tran
boolean isActive = r.getBoolean("is_active");
DateTime nextAvailableDate = getDate(r, "processing_available_dt");
UUID processingOwner = (r.getString("processing_owner") != null) ? UUID.fromString(r.getString("processing_owner")) : null;
- IEventLyfecycleState processingState = IEventLyfecycleState.valueOf(r.getString("processing_state"));
+ IEventLifecycleState processingState = IEventLifecycleState.valueOf(r.getString("processing_state"));
EventBaseBuilder<?> base = ((eventType == EventType.PHASE) ?
new PhaseEventBuilder() :
@@ -161,7 +161,7 @@ public interface IEventSqlDao extends Transactional<IEventSqlDao>, CloseMe, Tran
.setProcessingState(processingState);
- IEvent result = null;
+ IEntitlementEvent result = null;
if (eventType == EventType.PHASE) {
EventBaseBuilder<PhaseEventBuilder> realBase = (EventBaseBuilder<PhaseEventBuilder>) base;
result = new PhaseEvent(new PhaseEventBuilder(realBase).setPhaseName(phaseName));
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBase.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBase.java
index 84e0b50..845455d 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBase.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBase.java
@@ -21,11 +21,11 @@ import java.util.UUID;
import org.joda.time.DateTime;
import com.ning.billing.catalog.api.IPlan;
-import com.ning.billing.entitlement.events.IEventLyfecycle.IEventLyfecycleState;
+import com.ning.billing.entitlement.events.IEventLifecycle.IEventLifecycleState;
import com.ning.billing.entitlement.events.user.IApiEvent;
import com.ning.billing.entitlement.exceptions.EntitlementError;
-public abstract class EventBase implements IEvent {
+public abstract class EventBase implements IEntitlementEvent {
private final UUID uuid;
private final UUID subscriptionId;
@@ -38,7 +38,7 @@ public abstract class EventBase implements IEvent {
private boolean isActive;
private UUID processingOwner;
private DateTime nextAvailableProcessingTime;
- private IEventLyfecycleState processingState;
+ private IEventLifecycleState processingState;
public EventBase(EventBaseBuilder builder) {
this.uuid = builder.getUuid();
@@ -57,14 +57,14 @@ public abstract class EventBase implements IEvent {
public EventBase(UUID subscriptionId, DateTime requestedDate,
DateTime effectiveDate, DateTime processedDate,
long activeVersion, boolean isActive) {
- this(subscriptionId, requestedDate, effectiveDate, processedDate, activeVersion, isActive, null, null, IEventLyfecycleState.AVAILABLE);
+ this(subscriptionId, requestedDate, effectiveDate, processedDate, activeVersion, isActive, null, null, IEventLifecycleState.AVAILABLE);
}
private EventBase(UUID subscriptionId, DateTime requestedDate,
DateTime effectiveDate, DateTime processedDate,
long activeVersion, boolean isActive,
UUID processingOwner, DateTime nextAvailableProcessingTime,
- IEventLyfecycleState processingState) {
+ IEventLifecycleState processingState) {
this(UUID.randomUUID(), subscriptionId, requestedDate, effectiveDate, processedDate, activeVersion, isActive,
processingOwner, nextAvailableProcessingTime, processingState);
}
@@ -73,7 +73,7 @@ public abstract class EventBase implements IEvent {
DateTime effectiveDate, DateTime processedDate,
long activeVersion, boolean isActive,
UUID processingOwner, DateTime nextAvailableProcessingTime,
- IEventLyfecycleState processingState) {
+ IEventLifecycleState processingState) {
this.uuid = id;
this.subscriptionId = subscriptionId;
this.requestedDate = requestedDate;
@@ -163,12 +163,12 @@ public abstract class EventBase implements IEvent {
@Override
- public IEventLyfecycleState getProcessingState() {
+ public IEventLifecycleState getProcessingState() {
return processingState;
}
@Override
- public void setProcessingState(IEventLyfecycleState processingState) {
+ public void setProcessingState(IEventLifecycleState processingState) {
this.processingState = processingState;
}
@@ -207,7 +207,7 @@ public abstract class EventBase implements IEvent {
// - If all that is not enough return consistent by random ordering based on UUID
//
@Override
- public int compareTo(IEvent other) {
+ public int compareTo(IEntitlementEvent other) {
if (other == null) {
throw new NullPointerException("IEvent is compared to a null instance");
}
@@ -236,10 +236,10 @@ public abstract class EventBase implements IEvent {
@Override
public boolean equals(Object other) {
- if (! (other instanceof IEvent)) {
+ if (! (other instanceof IEntitlementEvent)) {
return false;
}
- return (this.compareTo((IEvent) other) == 0);
+ return (this.compareTo((IEntitlementEvent) other) == 0);
}
@Override
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBaseBuilder.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBaseBuilder.java
index 69980a3..a66b101 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBaseBuilder.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBaseBuilder.java
@@ -20,7 +20,7 @@ import java.util.UUID;
import org.joda.time.DateTime;
-import com.ning.billing.entitlement.events.IEventLyfecycle.IEventLyfecycleState;
+import com.ning.billing.entitlement.events.IEventLifecycle.IEventLifecycleState;
@SuppressWarnings("unchecked")
public class EventBaseBuilder<T extends EventBaseBuilder<T>> {
@@ -35,13 +35,13 @@ public class EventBaseBuilder<T extends EventBaseBuilder<T>> {
private boolean isActive;
private UUID processingOwner;
private DateTime nextAvailableProcessingTime;
- private IEventLyfecycleState processingState;
+ private IEventLifecycleState processingState;
public EventBaseBuilder() {
this.uuid = UUID.randomUUID();
this.isActive = true;
- this.processingState = IEventLyfecycleState.AVAILABLE;
+ this.processingState = IEventLifecycleState.AVAILABLE;
}
public EventBaseBuilder(EventBaseBuilder<?> copy) {
@@ -103,7 +103,7 @@ public class EventBaseBuilder<T extends EventBaseBuilder<T>> {
return (T) this;
}
- public T setProcessingState(IEventLyfecycleState processingState) {
+ public T setProcessingState(IEventLifecycleState processingState) {
this.processingState = processingState;
return (T) this;
}
@@ -144,7 +144,7 @@ public class EventBaseBuilder<T extends EventBaseBuilder<T>> {
return nextAvailableProcessingTime;
}
- public IEventLyfecycleState getProcessingState() {
+ public IEventLifecycleState getProcessingState() {
return processingState;
}
}
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/phase/IPhaseEvent.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/phase/IPhaseEvent.java
index 456171c..b0c3ce2 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/phase/IPhaseEvent.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/phase/IPhaseEvent.java
@@ -16,9 +16,9 @@
package com.ning.billing.entitlement.events.phase;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
-public interface IPhaseEvent extends IEvent {
+public interface IPhaseEvent extends IEntitlementEvent {
public String getPhase();
}
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventBase.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventBase.java
index d4012dd..e2be49c 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventBase.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventBase.java
@@ -25,7 +25,7 @@ import com.ning.billing.entitlement.alignment.IPlanAligner;
import com.ning.billing.entitlement.alignment.PlanAligner;
import com.ning.billing.entitlement.engine.core.Engine;
import com.ning.billing.entitlement.events.EventBase;
-import com.ning.billing.entitlement.events.IEventLyfecycle.IEventLyfecycleState;
+import com.ning.billing.entitlement.events.IEventLifecycle.IEventLifecycleState;
public class ApiEventBase extends EventBase implements IApiEvent {
@@ -66,7 +66,7 @@ public class ApiEventBase extends EventBase implements IApiEvent {
public ApiEventBase(UUID id, UUID subscriptionId, DateTime processed, String eventPlan, String eventPhase,
String priceList, DateTime requestedDate, ApiEventType eventType, DateTime effectiveDate, long activeVersion,
- boolean isActive, UUID processingOwner, DateTime nextAvailableProcessingTime,IEventLyfecycleState processingState) {
+ boolean isActive, UUID processingOwner, DateTime nextAvailableProcessingTime,IEventLifecycleState processingState) {
super(id, subscriptionId, requestedDate, effectiveDate, processed, activeVersion, isActive, processingOwner, nextAvailableProcessingTime, processingState);
this.eventType = eventType;
this.eventPlan = eventPlan;
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/IApiEvent.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/IApiEvent.java
index 97b0027..5a6c892 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/IApiEvent.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/IApiEvent.java
@@ -16,10 +16,10 @@
package com.ning.billing.entitlement.events.user;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
-public interface IApiEvent extends IEvent {
+public interface IApiEvent extends IEntitlementEvent {
public String getEventPlan();
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 5306ba8..4ba28c3 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
@@ -28,7 +28,7 @@ import com.ning.billing.entitlement.api.billing.IEntitlementBillingApi;
import com.ning.billing.entitlement.engine.core.Engine;
import com.ning.billing.entitlement.engine.dao.IEntitlementDao;
import com.ning.billing.entitlement.engine.dao.IEntitlementDaoMock;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
import com.ning.billing.entitlement.events.phase.IPhaseEvent;
import com.ning.billing.entitlement.events.user.ApiEventType;
import com.ning.billing.entitlement.events.user.IApiEvent;
@@ -203,7 +203,7 @@ public abstract class TestUserApiBase {
protected void checkNextPhaseChange(Subscription subscription, int expPendingEvents, DateTime expPhaseChange) {
- List<IEvent> events = dao.getPendingEventsForSubscription(subscription.getId());
+ List<IEntitlementEvent> events = dao.getPendingEventsForSubscription(subscription.getId());
assertNotNull(events);
printEvents(events);
assertEquals(events.size(), expPendingEvents);
@@ -211,7 +211,7 @@ public abstract class TestUserApiBase {
boolean foundPhase = false;
boolean foundChange = false;
- for (IEvent cur : events) {
+ for (IEntitlementEvent cur : events) {
if (cur instanceof IPhaseEvent) {
assertEquals(foundPhase, false);
foundPhase = true;
@@ -327,8 +327,8 @@ public abstract class TestUserApiBase {
}
- protected void printEvents(List<IEvent> events) {
- for (IEvent cur : events) {
+ protected void printEvents(List<IEntitlementEvent> events) {
+ for (IEntitlementEvent cur : events) {
log.debug("Inspect event " + cur);
}
}
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlan.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlan.java
index 32f1dc9..83c8eef 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlan.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlan.java
@@ -35,7 +35,7 @@ import com.ning.billing.catalog.api.IPriceListSet;
import com.ning.billing.catalog.api.PhaseType;
import com.ning.billing.catalog.api.ProductCategory;
import com.ning.billing.entitlement.api.ApiTestListener.NextEvent;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
import com.ning.billing.entitlement.events.user.IApiEvent;
import com.ning.billing.util.clock.Clock;
@@ -144,7 +144,7 @@ public abstract class TestUserApiChangePlan extends TestUserApiBase {
checkNextPhaseChange(subscription, 2, nextExpectedPhaseChange);
// ALSO VERIFY PENDING CHANGE EVENT
- List<IEvent> events = dao.getPendingEventsForSubscription(subscription.getId());
+ List<IEntitlementEvent> events = dao.getPendingEventsForSubscription(subscription.getId());
assertTrue(events.get(0) instanceof IApiEvent);
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCreate.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCreate.java
index 538d5dd..b2c215c 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCreate.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCreate.java
@@ -32,7 +32,7 @@ import com.ning.billing.catalog.api.IPriceListSet;
import com.ning.billing.catalog.api.PhaseType;
import com.ning.billing.catalog.api.ProductCategory;
import com.ning.billing.entitlement.api.ApiTestListener.NextEvent;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
import com.ning.billing.entitlement.events.phase.IPhaseEvent;
import com.ning.billing.util.clock.Clock;
@@ -111,7 +111,7 @@ public abstract class TestUserApiCreate extends TestUserApiBase {
assertTrue(testListener.isCompleted(5000));
- List<IEvent> events = dao.getPendingEventsForSubscription(subscription.getId());
+ List<IEntitlementEvent> events = dao.getPendingEventsForSubscription(subscription.getId());
assertNotNull(events);
printEvents(events);
assertTrue(events.size() == 1);
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/engine/core/ApiEventProcessorMemoryMock.java b/entitlement/src/test/java/com/ning/billing/entitlement/engine/core/ApiEventProcessorMemoryMock.java
index b5848ce..85d0caa 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/engine/core/ApiEventProcessorMemoryMock.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/engine/core/ApiEventProcessorMemoryMock.java
@@ -22,7 +22,7 @@ import java.util.List;
import com.google.inject.Inject;
import com.ning.billing.config.IEntitlementConfig;
import com.ning.billing.entitlement.engine.dao.IEntitlementDao;
-import com.ning.billing.entitlement.events.IEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
import com.ning.billing.entitlement.exceptions.EntitlementError;
import com.ning.billing.util.clock.IClock;
@@ -38,12 +38,12 @@ public class ApiEventProcessorMemoryMock extends ApiEventProcessorBase {
@Override
protected boolean doProcessEvents(int sequenceId) {
- List<IEvent> events = dao.getEventsReady(apiProcessorId, sequenceId);
+ List<IEntitlementEvent> events = dao.getEventsReady(apiProcessorId, sequenceId);
if (events.size() == 0) {
return false;
}
log.info(String.format("doProcessEvents : Got %d event(s)", events.size() ));
- for (IEvent cur : events) {
+ for (IEntitlementEvent cur : events) {
log.info(String.format("doProcessEvents : (clock = %s) CALLING Engine with event %s", clock.getUTCNow(), cur));
listener.processEventReady(cur);
log.info(String.format("doProcessEvents : PROCESSED event %s", cur));
@@ -57,7 +57,7 @@ public class ApiEventProcessorMemoryMock extends ApiEventProcessorBase {
@Override
protected boolean doProcessEventsFromList(int sequenceId,
- Collection<IEvent> events) {
+ Collection<IEntitlementEvent> events) {
throw new EntitlementError("Method not implemented");
}
}
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/EntitlementDaoMemoryMock.java b/entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/EntitlementDaoMemoryMock.java
index e4d2559..f44db25 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/EntitlementDaoMemoryMock.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/EntitlementDaoMemoryMock.java
@@ -38,9 +38,9 @@ import com.ning.billing.entitlement.api.user.ISubscriptionBundle;
import com.ning.billing.entitlement.api.user.Subscription;
import com.ning.billing.entitlement.api.user.SubscriptionBuilder;
import com.ning.billing.entitlement.api.user.SubscriptionBundle;
-import com.ning.billing.entitlement.events.IEvent;
-import com.ning.billing.entitlement.events.IEvent.EventType;
-import com.ning.billing.entitlement.events.IEventLyfecycle.IEventLyfecycleState;
+import com.ning.billing.entitlement.events.IEntitlementEvent;
+import com.ning.billing.entitlement.events.IEntitlementEvent.EventType;
+import com.ning.billing.entitlement.events.IEventLifecycle.IEventLifecycleState;
import com.ning.billing.entitlement.events.user.ApiEventType;
import com.ning.billing.entitlement.events.user.IApiEvent;
import com.ning.billing.util.clock.IClock;
@@ -51,7 +51,7 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
private final List<ISubscriptionBundle> bundles;
private final List<ISubscription> subscriptions;
- private final TreeSet<IEvent> events;
+ private final TreeSet<IEntitlementEvent> events;
private final IClock clock;
private final IEntitlementConfig config;
@@ -64,7 +64,7 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
this.config = config;
this.bundles = new ArrayList<ISubscriptionBundle>();
this.subscriptions = new ArrayList<ISubscription>();
- this.events = new TreeSet<IEvent>();
+ this.events = new TreeSet<IEntitlementEvent>();
}
@Override
@@ -124,7 +124,7 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
@Override
- public ISubscription createSubscription(Subscription subscription, List<IEvent> initalEvents) {
+ public ISubscription createSubscription(Subscription subscription, List<IEntitlementEvent> initalEvents) {
synchronized(events) {
events.addAll(initalEvents);
@@ -147,10 +147,10 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
}
@Override
- public List<IEvent> getEventsForSubscription(UUID subscriptionId) {
+ public List<IEntitlementEvent> getEventsForSubscription(UUID subscriptionId) {
synchronized(events) {
- List<IEvent> results = new LinkedList<IEvent>();
- for (IEvent cur : events) {
+ List<IEntitlementEvent> results = new LinkedList<IEntitlementEvent>();
+ for (IEntitlementEvent cur : events) {
if (cur.getSubscriptionId().equals(subscriptionId)) {
results.add(cur);
}
@@ -160,12 +160,12 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
}
@Override
- public List<IEvent> getPendingEventsForSubscription(UUID subscriptionId) {
+ public List<IEntitlementEvent> getPendingEventsForSubscription(UUID subscriptionId) {
synchronized(events) {
- List<IEvent> results = new LinkedList<IEvent>();
- for (IEvent cur : events) {
+ List<IEntitlementEvent> results = new LinkedList<IEntitlementEvent>();
+ for (IEntitlementEvent cur : events) {
if (cur.isActive() &&
- cur.getProcessingState() == IEventLyfecycleState.AVAILABLE &&
+ cur.getProcessingState() == IEventLifecycleState.AVAILABLE &&
cur.getSubscriptionId().equals(subscriptionId)) {
results.add(cur);
}
@@ -187,17 +187,17 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
}
@Override
- public void createNextPhaseEvent(UUID subscriptionId, IEvent nextPhase) {
+ public void createNextPhaseEvent(UUID subscriptionId, IEntitlementEvent nextPhase) {
cancelNextPhaseEvent(subscriptionId);
insertEvent(nextPhase);
}
@Override
- public List<IEvent> getEventsReady(UUID ownerId, int sequenceId) {
+ public List<IEntitlementEvent> getEventsReady(UUID ownerId, int sequenceId) {
synchronized(events) {
- List<IEvent> readyList = new LinkedList<IEvent>();
- for (IEvent cur : events) {
+ List<IEntitlementEvent> readyList = new LinkedList<IEntitlementEvent>();
+ for (IEntitlementEvent cur : events) {
if (cur.isAvailableForProcessing(clock.getUTCNow())) {
if (cur.getOwner() != null) {
@@ -205,7 +205,7 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
}
cur.setOwner(ownerId);
cur.setNextAvailableDate(clock.getUTCNow().plus(config.getDaoClaimTimeMs()));
- cur.setProcessingState(IEventLyfecycleState.IN_PROCESSING);
+ cur.setProcessingState(IEventLifecycleState.IN_PROCESSING);
readyList.add(cur);
}
}
@@ -215,11 +215,11 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
}
@Override
- public void clearEventsReady(UUID ownerId, Collection<IEvent> cleared) {
+ public void clearEventsReady(UUID ownerId, Collection<IEntitlementEvent> cleared) {
synchronized(events) {
- for (IEvent cur : cleared) {
+ for (IEntitlementEvent cur : cleared) {
if (cur.getOwner().equals(ownerId)) {
- cur.setProcessingState(IEventLyfecycleState.PROCESSED);
+ cur.setProcessingState(IEventLifecycleState.PROCESSED);
} else {
log.warn(String.format("EventProcessor %s trying to clear event %s that it does not own", ownerId, cur));
}
@@ -250,7 +250,7 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
}
@Override
- public void cancelSubscription(UUID subscriptionId, IEvent cancelEvent) {
+ public void cancelSubscription(UUID subscriptionId, IEntitlementEvent cancelEvent) {
synchronized (cancelEvent) {
cancelNextPhaseEvent(subscriptionId);
insertEvent(cancelEvent);
@@ -258,7 +258,7 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
}
@Override
- public void changePlan(UUID subscriptionId, List<IEvent> changeEvents) {
+ public void changePlan(UUID subscriptionId, List<IEntitlementEvent> changeEvents) {
synchronized(events) {
cancelNextChangeEvent(subscriptionId);
cancelNextPhaseEvent(subscriptionId);
@@ -266,7 +266,7 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
}
}
- private void insertEvent(IEvent event) {
+ private void insertEvent(IEntitlementEvent event) {
synchronized(events) {
events.add(event);
}
@@ -282,14 +282,14 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
synchronized(events) {
- Iterator<IEvent> it = events.descendingIterator();
+ Iterator<IEntitlementEvent> it = events.descendingIterator();
while (it.hasNext()) {
- IEvent cur = it.next();
+ IEntitlementEvent cur = it.next();
if (cur.getSubscriptionId() != subscriptionId) {
continue;
}
if (cur.getType() == EventType.PHASE &&
- cur.getProcessingState() == IEventLyfecycleState.AVAILABLE) {
+ cur.getProcessingState() == IEventLifecycleState.AVAILABLE) {
cur.deactivate();
break;
}
@@ -302,15 +302,15 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
synchronized(events) {
- Iterator<IEvent> it = events.descendingIterator();
+ Iterator<IEntitlementEvent> it = events.descendingIterator();
while (it.hasNext()) {
- IEvent cur = it.next();
+ IEntitlementEvent cur = it.next();
if (cur.getSubscriptionId() != subscriptionId) {
continue;
}
if (cur.getType() == EventType.API_USER &&
ApiEventType.CHANGE == ((IApiEvent) cur).getEventType() &&
- cur.getProcessingState() == IEventLyfecycleState.AVAILABLE) {
+ cur.getProcessingState() == IEventLifecycleState.AVAILABLE) {
cur.deactivate();
break;
}
@@ -319,13 +319,13 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
}
@Override
- public void uncancelSubscription(UUID subscriptionId, List<IEvent> uncancelEvents) {
+ public void uncancelSubscription(UUID subscriptionId, List<IEntitlementEvent> uncancelEvents) {
synchronized (events) {
boolean foundCancel = false;
- Iterator<IEvent> it = events.descendingIterator();
+ Iterator<IEntitlementEvent> it = events.descendingIterator();
while (it.hasNext()) {
- IEvent cur = it.next();
+ IEntitlementEvent cur = it.next();
if (cur.getSubscriptionId() != subscriptionId) {
continue;
}
@@ -337,7 +337,7 @@ public class EntitlementDaoMemoryMock implements IEntitlementDao, IEntitlementDa
}
}
if (foundCancel) {
- for (IEvent cur : uncancelEvents) {
+ for (IEntitlementEvent cur : uncancelEvents) {
insertEvent(cur);
}
}
diff --git a/util/src/main/java/com/ning/billing/util/eventbus/EventBusService.java b/util/src/main/java/com/ning/billing/util/eventbus/EventBusService.java
index 53c07c9..a77e3b4 100644
--- a/util/src/main/java/com/ning/billing/util/eventbus/EventBusService.java
+++ b/util/src/main/java/com/ning/billing/util/eventbus/EventBusService.java
@@ -17,8 +17,8 @@
package com.ning.billing.util.eventbus;
import com.google.inject.Inject;
-import com.ning.billing.lifecycle.LyfecycleHandlerType;
-import com.ning.billing.lifecycle.LyfecycleHandlerType.LyfecycleLevel;
+import com.ning.billing.lifecycle.LifecycleHandlerType;
+import com.ning.billing.lifecycle.LifecycleHandlerType.LifecycleLevel;
public class EventBusService implements IEventBusService {
@@ -36,12 +36,12 @@ public class EventBusService implements IEventBusService {
return EVENT_BUS_SERVICE;
}
- @LyfecycleHandlerType(LyfecycleLevel.INIT_BUS)
+ @LifecycleHandlerType(LifecycleLevel.INIT_BUS)
public void startBus() {
eventBus.start();
}
- @LyfecycleHandlerType(LyfecycleLevel.STOP_BUS)
+ @LifecycleHandlerType(LifecycleLevel.STOP_BUS)
public void stopBus() {
eventBus.stop();
}