From e8719569ba0e82c11c920c4bcad87893edd32224 Mon Sep 17 00:00:00 2001
From: Cherian Mathew <c.mathew@bgbm.org>
Date: Wed, 14 Oct 2015 18:28:35 +0200
Subject: [PATCH] #5066 Remove unnecessary merge listener

---
 .../hibernate/CdmListenerIntegrator.java      |  8 +-------
 ...r.java => SaveOrUpdateEntityListener.java} | 19 +++----------------
 2 files changed, 4 insertions(+), 23 deletions(-)
 rename cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/{SaveOrUpdateorMergeEntityListener.java => SaveOrUpdateEntityListener.java} (82%)

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmListenerIntegrator.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmListenerIntegrator.java
index 53f27a3ca7..9d69c20d24 100644
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmListenerIntegrator.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmListenerIntegrator.java
@@ -49,14 +49,8 @@ public class CdmListenerIntegrator implements Integrator {
 		// this example will register a persist event listener
 		eventRegistry.prependListeners(EventType.SAVE, new CacheStrategyGenerator(), new SaveEntityListener());
 		eventRegistry.prependListeners(EventType.UPDATE, new CacheStrategyGenerator(), new UpdateEntityListener());
-
-		eventRegistry.prependListeners(EventType.SAVE_UPDATE, new CacheStrategyGenerator(), new SaveOrUpdateorMergeEntityListener());
-		eventRegistry.prependListeners(EventType.MERGE, new CacheStrategyGenerator(), new SaveOrUpdateorMergeEntityListener());
-
-//		eventRegistry.prependListeners(EventType.SAVE_UPDATE, new CacheStrategyGenerator(), new SaveOrUpdateEntityListener());
-		//TODO Cherian move to SaveOrUpdateorMergeEntityListener
+		eventRegistry.prependListeners(EventType.SAVE_UPDATE, new CacheStrategyGenerator(), new SaveOrUpdateEntityListener());
 		eventRegistry.appendListeners(EventType.MERGE, new PostMergeEntityListener());
-
 		eventRegistry.appendListeners(EventType.DELETE, new CdmDeleteListener());
 		eventRegistry.appendListeners(EventType.POST_LOAD, new CdmPostDataChangeObservableListener());
 //with validation
diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/SaveOrUpdateorMergeEntityListener.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/SaveOrUpdateEntityListener.java
similarity index 82%
rename from cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/SaveOrUpdateorMergeEntityListener.java
rename to cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/SaveOrUpdateEntityListener.java
index e4e69c93fe..3992d2c1a5 100644
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/SaveOrUpdateorMergeEntityListener.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/SaveOrUpdateEntityListener.java
@@ -10,12 +10,9 @@
 package eu.etaxonomy.cdm.persistence.hibernate;
 
 import java.util.List;
-import java.util.Map;
 
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
-import org.hibernate.event.spi.MergeEvent;
-import org.hibernate.event.spi.MergeEventListener;
 import org.hibernate.event.spi.SaveOrUpdateEvent;
 import org.hibernate.event.spi.SaveOrUpdateEventListener;
 
@@ -24,27 +21,17 @@ import eu.etaxonomy.cdm.model.common.ITreeNode;
 
 
 @SuppressWarnings("serial")
-public class SaveOrUpdateorMergeEntityListener implements SaveOrUpdateEventListener, MergeEventListener {
+public class SaveOrUpdateEntityListener implements SaveOrUpdateEventListener{
 
     @Override
     public void onSaveOrUpdate(SaveOrUpdateEvent event) throws HibernateException {
         //System.err.println("SaveOrUpdateListener" + event.getEntity().getClass());
         Object entity = event.getObject();
-        saveOrUpdateOrMerge(entity, event.getSession());
+        saveOrUpdate(entity, event.getSession());
     }
 
-    @Override
-    public void onMerge(MergeEvent event) throws HibernateException {
-        Object entity = event.getOriginal();
-        saveOrUpdateOrMerge(entity,event.getSession());
-    }
-
-    @Override
-    public void onMerge(MergeEvent event, Map copiedAlready) throws HibernateException {
-
-    }
 
-    private void saveOrUpdateOrMerge(Object entity, Session session) {
+    private void saveOrUpdate(Object entity, Session session) {
 
         //moved to CdmPreDataChangeListener
         if(entity != null && CdmBase.class.isAssignableFrom(entity.getClass())){
-- 
2.34.1