JAV-336 simplified events

WillemJiang · Sep 5, 2017 · c41550b · c41550b
1 parent 4ef6d72
commit c41550b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 51 deletions.
diff --git a/...l-event-store/src/main/java/io/servicecomb/poc/demo/seckill/event/CouponGrabbedEvent.java b/...l-event-store/src/main/java/io/servicecomb/poc/demo/seckill/event/CouponGrabbedEvent.java
@@ -22,24 +22,19 @@
 
 public class CouponGrabbedEvent<T> extends SecKillEvent {
 
-  protected CouponEntity<T> coupon;
+  private final CouponEntity<T> coupon;
 
-  public CouponGrabbedEvent() {
-    super();
-    this.type = CouponGrabbedEvent.class.getSimpleName();
-  }
-
-  public CouponGrabbedEvent(Format format, String content) {
-    this();
-    coupon = format.deserialize(content, CouponEntity.class);
-    this.promotionId = coupon.getPromotionId();
+  public CouponGrabbedEvent(CouponEntity<T> coupon) {
+    super(coupon.getPromotionId(), CouponGrabbedEvent.class.getSimpleName());
+    this.coupon = coupon;
   }
 
   public CouponGrabbedEvent(PromotionEntity promotion, T customerId) {
-    this();
-    this.promotionId = promotion.getPromotionId();
-    this.coupon = new CouponEntity<>(promotion.getPromotionId(), System.currentTimeMillis(), promotion.getDiscount(),
-        customerId);
+    this(new CouponEntity<>(
+        promotion.getPromotionId(),
+        System.currentTimeMillis(),
+        promotion.getDiscount(),
+        customerId));
   }
 
   public CouponEntity<T> getCoupon() {

diff --git a/...event-store/src/main/java/io/servicecomb/poc/demo/seckill/event/PromotionFinishEvent.java b/...event-store/src/main/java/io/servicecomb/poc/demo/seckill/event/PromotionFinishEvent.java
@@ -21,22 +21,10 @@
 
 public class PromotionFinishEvent extends SecKillEvent {
 
-  protected PromotionEntity promotion;
-
-  public PromotionFinishEvent() {
-    super();
-    this.type = PromotionFinishEvent.class.getSimpleName();
-  }
-
-  public PromotionFinishEvent(Format format, String content) {
-    this();
-    promotion = format.deserialize(content, PromotionEntity.class);
-    this.promotionId = promotion.getPromotionId();
-  }
+  private final PromotionEntity promotion;
 
   public PromotionFinishEvent(PromotionEntity promotion) {
-    this();
-    this.promotionId = promotion.getPromotionId();
+    super(promotion.getPromotionId(), PromotionFinishEvent.class.getSimpleName());
     this.promotion = promotion;
   }
 

diff --git a/...-event-store/src/main/java/io/servicecomb/poc/demo/seckill/event/PromotionStartEvent.java b/...-event-store/src/main/java/io/servicecomb/poc/demo/seckill/event/PromotionStartEvent.java
@@ -21,29 +21,17 @@
 
 public class PromotionStartEvent extends SecKillEvent {
 
-  protected PromotionEntity promotion;
-
-  public PromotionEntity getPromotion() {
-    return promotion;
-  }
-
-  public PromotionStartEvent() {
-    super();
-    this.type = PromotionStartEvent.class.getSimpleName();
-  }
-
-  public PromotionStartEvent(Format format, String content){
-    this();
-    promotion = format.deserialize(content, PromotionEntity.class);
-    this.promotionId = promotion.getPromotionId();
-  }
+  private final PromotionEntity promotion;
 
   public PromotionStartEvent(PromotionEntity promotion) {
-    this();
-    this.promotionId = promotion.getPromotionId();
+    super(promotion.getPromotionId(), PromotionStartEvent.class.getSimpleName());
     this.promotion = promotion;
   }
 
+  public PromotionEntity getPromotion() {
+    return promotion;
+  }
+
   @Override
   public String getContent(Format format) {
     return format.serialize(promotion);

diff --git a/seckill-event-store/src/main/java/io/servicecomb/poc/demo/seckill/event/SecKillEvent.java b/seckill-event-store/src/main/java/io/servicecomb/poc/demo/seckill/event/SecKillEvent.java
@@ -20,8 +20,13 @@
 
 public abstract class SecKillEvent {
 
-  protected String promotionId;
-  protected String type;
+  private final String promotionId;
+  private final String type;
+
+  public SecKillEvent(String promotionId, String type) {
+    this.promotionId = promotionId;
+    this.type = type;
+  }
 
   public String getPromotionId() {
     return promotionId;

diff --git a/...l-event-store/src/main/java/io/servicecomb/poc/demo/seckill/event/SecKillEventFormat.java b/...l-event-store/src/main/java/io/servicecomb/poc/demo/seckill/event/SecKillEventFormat.java
@@ -18,7 +18,9 @@
 
 import io.servicecomb.poc.demo.seckill.Format;
 import io.servicecomb.poc.demo.seckill.dto.EventMessageDto;
+import io.servicecomb.poc.demo.seckill.entities.CouponEntity;
 import io.servicecomb.poc.demo.seckill.entities.EventEntity;
+import io.servicecomb.poc.demo.seckill.entities.PromotionEntity;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
@@ -63,14 +65,14 @@ private SecKillEvent generateEvent(String type, String content) {
   }
 
   private SecKillEvent couponGrabbedEvent(String content) {
-    return new CouponGrabbedEvent(format, content);
+    return new CouponGrabbedEvent<>(format.deserialize(content, CouponEntity.class));
   }
 
   private SecKillEvent promotionStartEvent(String content) {
-    return new PromotionStartEvent(format, content);
+    return new PromotionStartEvent(format.deserialize(content, PromotionEntity.class));
   }
 
   private SecKillEvent promotionFinishEvent(String content) {
-    return new PromotionFinishEvent(format, content);
+    return new PromotionFinishEvent(format.deserialize(content, PromotionEntity.class));
   }
 }