hibernate will persist every changes made to entities during the sess…

…ion, so in ConfigChangeContentBuilder case, we should clone the entity first to not trigger unnecessary writes to the db
scucode · Jan 23, 2018 · 3fc83f1 · 3fc83f1
1 parent 13eda7c
commit 3fc83f1
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/...lo-biz/src/main/java/com/ctrip/framework/apollo/biz/utils/ConfigChangeContentBuilder.java b/...lo-biz/src/main/java/com/ctrip/framework/apollo/biz/utils/ConfigChangeContentBuilder.java
@@ -9,6 +9,7 @@
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
+import org.springframework.beans.BeanUtils;
 
 
 public class ConfigChangeContentBuilder {
@@ -22,22 +23,22 @@ public class ConfigChangeContentBuilder {
 
   public ConfigChangeContentBuilder createItem(Item item) {
     if (!StringUtils.isEmpty(item.getKey())){
-      createItems.add(item);
+      createItems.add(cloneItem(item));
     }
     return this;
   }
 
   public ConfigChangeContentBuilder updateItem(Item oldItem, Item newItem) {
     if (!oldItem.getValue().equals(newItem.getValue())){
-      ItemPair itemPair = new ItemPair(oldItem, newItem);
+      ItemPair itemPair = new ItemPair(cloneItem(oldItem), cloneItem(newItem));
       updateItems.add(itemPair);
     }
     return this;
   }
 
   public ConfigChangeContentBuilder deleteItem(Item item) {
     if (!StringUtils.isEmpty(item.getKey())) {
-      deleteItems.add(item);
+      deleteItems.add(cloneItem(item));
     }
     return this;
   }
@@ -48,16 +49,18 @@ public boolean hasContent(){
 
   public String build() {
     //因为事务第一段提交并没有更新时间,所以build时统一更新
+    Date now = new Date();
+
     for (Item item : createItems) {
-      item.setDataChangeLastModifiedTime(new Date());
+      item.setDataChangeLastModifiedTime(now);
     }
 
     for (ItemPair item : updateItems) {
-      item.newItem.setDataChangeLastModifiedTime(new Date());
+      item.newItem.setDataChangeLastModifiedTime(now);
     }
 
     for (Item item : deleteItems) {
-      item.setDataChangeLastModifiedTime(new Date());
+      item.setDataChangeLastModifiedTime(now);
     }
     return gson.toJson(this);
   }
@@ -73,4 +76,12 @@ public ItemPair(Item oldItem, Item newItem) {
     }
   }
 
+  Item cloneItem(Item source) {
+    Item target = new Item();
+
+    BeanUtils.copyProperties(source, target);
+
+    return target;
+  }
+
 }