killbill-aplcache

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/user/EffectiveSubscriptionEvent.java b/api/src/main/java/com/ning/billing/entitlement/api/user/EffectiveSubscriptionEvent.java
index 6f79f5e..84b03b4 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/user/EffectiveSubscriptionEvent.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/user/EffectiveSubscriptionEvent.java
@@ -16,48 +16,5 @@
 
 package com.ning.billing.entitlement.api.user;
 
-import java.util.UUID;
-
-import org.joda.time.DateTime;
-
-import com.ning.billing.entitlement.api.SubscriptionTransitionType;
-import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
-import com.ning.billing.util.bus.BusEvent;
-
-public interface EffectiveSubscriptionEvent extends BusEvent {
-
-    UUID getId();
-
-    SubscriptionTransitionType getTransitionType();
-
-    UUID getBundleId();
-
-    UUID getSubscriptionId();
-
-    DateTime getSubscriptionStartDate();
-
-    DateTime getRequestedTransitionTime();
-
-    DateTime getEffectiveTransitionTime();
-
-    SubscriptionState getPreviousState();
-
-    String getPreviousPlan();
-
-    String getPreviousPriceList();
-
-    String getPreviousPhase();
-
-    String getNextPlan();
-
-    String getNextPhase();
-
-    SubscriptionState getNextState();
-
-    String getNextPriceList();
-
-    Integer getRemainingEventsForUserOperation();
-
-    Long getTotalOrdering();
-
+public interface EffectiveSubscriptionEvent extends SubscriptionEvent {
 }

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/user/RequestedSubscriptionEvent.java b/api/src/main/java/com/ning/billing/entitlement/api/user/RequestedSubscriptionEvent.java
new file mode 100644
index 0000000..8baaf5b
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/entitlement/api/user/RequestedSubscriptionEvent.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2012 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.entitlement.api.user;
+
+public interface RequestedSubscriptionEvent extends SubscriptionEvent {
+}

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvent.java b/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvent.java
new file mode 100644
index 0000000..f5a345d
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvent.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2010-2012 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.entitlement.api.user;
+
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+
+import com.ning.billing.entitlement.api.SubscriptionTransitionType;
+import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
+import com.ning.billing.util.bus.BusEvent;
+
+public interface SubscriptionEvent extends BusEvent {
+    UUID getId();
+
+    SubscriptionTransitionType getTransitionType();
+
+    UUID getBundleId();
+
+    UUID getSubscriptionId();
+
+    DateTime getSubscriptionStartDate();
+
+    DateTime getRequestedTransitionTime();
+
+    DateTime getEffectiveTransitionTime();
+
+    SubscriptionState getPreviousState();
+
+    String getPreviousPlan();
+
+    String getPreviousPriceList();
+
+    String getPreviousPhase();
+
+    String getNextPlan();
+
+    String getNextPhase();
+
+    SubscriptionState getNextState();
+
+    String getNextPriceList();
+
+    Integer getRemainingEventsForUserOperation();
+
+    Long getTotalOrdering();
+}