killbill-aplcache

Merge branch 'integration' of github.com:ning/killbill

5/2/2012 6:44:02 PM

Details

diff --git a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java
index 2a1b54a..898729f 100644
--- a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java
+++ b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java
@@ -20,7 +20,6 @@ import com.ning.billing.account.api.Account;
 import com.ning.billing.account.api.AccountCreationEvent;
 import com.ning.billing.account.api.AccountData;
 import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.util.bus.BusEvent.BusEventType;
 
 import java.util.UUID;
 
@@ -129,6 +128,8 @@ public class DefaultAccountCreationEvent implements AccountCreationEvent {
         private final String postalCode;
         private final String country;
         private final String phone;
+        private final boolean isMigrated;
+        private final boolean isNotifiedForInvoices;
         
         @JsonCreator
         public DefaultAccountData(@JsonProperty("externalKey") String externalKey,
@@ -147,7 +148,9 @@ public class DefaultAccountCreationEvent implements AccountCreationEvent {
                 @JsonProperty("stateOrProvince") String stateOrProvince,
                 @JsonProperty("postalCode") String postalCode,
                 @JsonProperty("country") String country,
-                @JsonProperty("phone") String phone) {
+                @JsonProperty("phone") String phone,
+                @JsonProperty("isMigrated") boolean isMigrated,
+                @JsonProperty("isNotifiedForInvoices") boolean isNotifiedForInvoices) {
             super();
             this.externalKey = externalKey;
             this.name = name;
@@ -166,6 +169,8 @@ public class DefaultAccountCreationEvent implements AccountCreationEvent {
             this.postalCode = postalCode;
             this.country = country;
             this.phone = phone;
+            this.isMigrated = isMigrated;
+            this.isNotifiedForInvoices = isNotifiedForInvoices;
         }
 
         @Override
@@ -214,7 +219,6 @@ public class DefaultAccountCreationEvent implements AccountCreationEvent {
             return timeZone;
         }
 
-
         @Override
         public String getLocale() {
             return locale;
@@ -261,6 +265,16 @@ public class DefaultAccountCreationEvent implements AccountCreationEvent {
         }
 
         @Override
+        public boolean isMigrated() {
+            return isMigrated;
+        }
+
+        @Override
+        public boolean isNotifiedForInvoices() {
+            return isNotifiedForInvoices;
+        }
+
+        @Override
         public int hashCode() {
             final int prime = 31;
             int result = 1;
diff --git a/account/src/test/java/com/ning/billing/account/api/user/TestEventJson.java b/account/src/test/java/com/ning/billing/account/api/user/TestEventJson.java
index d6f9f96..6518355 100644
--- a/account/src/test/java/com/ning/billing/account/api/user/TestEventJson.java
+++ b/account/src/test/java/com/ning/billing/account/api/user/TestEventJson.java
@@ -59,7 +59,7 @@ public class TestEventJson {
     public void testAccountCreationEvent() throws Exception {
         
         DefaultAccountData data = new DefaultAccountData("dsfdsf", "bobo", 3, "bobo@yahoo.com", 12, "USD", "paypal", 
-                "UTC", "US", "21 avenue", "", "Gling", "San Franciso", "CA", "94110", "USA", "4126789887");
+                "UTC", "US", "21 avenue", "", "Gling", "San Franciso", "CA", "94110", "USA", "4126789887", false, false);
         DefaultAccountCreationEvent e = new DefaultAccountCreationEvent(data, UUID.randomUUID(), UUID.randomUUID());
         
         String json = mapper.writeValueAsString(e);