Fix regression introduced by ec0877b

killbill · Jul 10, 2015 · 7a48354 · 7a48354 · pierre · Jul 11, 2015
1 parent 9ecb47c
commit 7a48354
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/payment/src/main/java/org/killbill/billing/payment/api/DefaultPaymentErrorEvent.java b/payment/src/main/java/org/killbill/billing/payment/api/DefaultPaymentErrorEvent.java
@@ -24,6 +24,7 @@
 import org.killbill.billing.events.PaymentErrorInternalEvent;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class DefaultPaymentErrorEvent extends DefaultPaymentInternalEvent implements PaymentErrorInternalEvent {
@@ -47,6 +48,12 @@ public DefaultPaymentErrorEvent(@JsonProperty("accountId") final UUID accountId,
         this.message = message;
     }
 
+    @JsonIgnore
+    @Override
+    public BusInternalEventType getBusEventType() {
+        return BusInternalEventType.PAYMENT_ERROR;
+    }
+
     @Override
     public String getMessage() {
         return message;

diff --git a/payment/src/main/java/org/killbill/billing/payment/api/DefaultPaymentInfoEvent.java b/payment/src/main/java/org/killbill/billing/payment/api/DefaultPaymentInfoEvent.java
@@ -23,6 +23,7 @@
 import org.killbill.billing.catalog.api.Currency;
 import org.killbill.billing.events.PaymentInfoInternalEvent;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class DefaultPaymentInfoEvent extends DefaultPaymentInternalEvent implements PaymentInfoInternalEvent {
@@ -41,6 +42,13 @@ public DefaultPaymentInfoEvent(@JsonProperty("accountId") final UUID accountId,
         super(accountId, paymentId, paymentTransactionId, amount, currency, status, transactionType, effectiveDate, searchKey1, searchKey2, userToken);
     }
 
+    @JsonIgnore
+    @Override
+    public BusInternalEventType getBusEventType() {
+        return BusInternalEventType.PAYMENT_INFO;
+    }
+
+
     @Override
     protected Class getPaymentInternalEventClass() {
         return DefaultPaymentInfoEvent.class;

diff --git a/payment/src/main/java/org/killbill/billing/payment/api/DefaultPaymentInternalEvent.java b/payment/src/main/java/org/killbill/billing/payment/api/DefaultPaymentInternalEvent.java
@@ -63,12 +63,6 @@ public DefaultPaymentInternalEvent(@JsonProperty("accountId") final UUID account
         this.effectiveDate = effectiveDate;
     }
 
-    @JsonIgnore
-    @Override
-    public BusInternalEventType getBusEventType() {
-        return BusInternalEventType.PAYMENT_INFO;
-    }
-
     @Override
     public UUID getAccountId() {
         return accountId;

diff --git a/payment/src/main/java/org/killbill/billing/payment/api/DefaultPaymentPluginErrorEvent.java b/payment/src/main/java/org/killbill/billing/payment/api/DefaultPaymentPluginErrorEvent.java
@@ -24,6 +24,7 @@
 import org.killbill.billing.events.PaymentPluginErrorInternalEvent;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class DefaultPaymentPluginErrorEvent extends DefaultPaymentInternalEvent implements PaymentPluginErrorInternalEvent {
@@ -47,6 +48,12 @@ public DefaultPaymentPluginErrorEvent(@JsonProperty("accountId") final UUID acco
         this.message = message;
     }
 
+    @JsonIgnore
+    @Override
+    public BusInternalEventType getBusEventType() {
+        return BusInternalEventType.PAYMENT_PLUGIN_ERROR;
+    }
+
     @Override
     public String getMessage() {
         return message;