From c7ab179a9ec17e82a0e2103280e8407e11739b40 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Thu, 19 Mar 2015 13:01:03 +0100
Subject: [PATCH] cleanup

---
 .../com/commafeed/backend/dao/GenericDAO.java    | 16 ----------------
 .../com/commafeed/backend/feed/FeedQueues.java   |  2 +-
 .../service/internal/PostLoginActivities.java    |  2 +-
 .../commafeed/frontend/resource/UserREST.java    |  2 +-
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/dao/GenericDAO.java b/src/main/java/com/commafeed/backend/dao/GenericDAO.java
index 3a449a27..db2a61ae 100644
--- a/src/main/java/com/commafeed/backend/dao/GenericDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/GenericDAO.java
@@ -27,22 +27,6 @@ public abstract class GenericDAO<T extends AbstractModel> extends AbstractDAO<T>
 		models.forEach(m -> persist(m));
 	}
 
-	public void update(T model) {
-		currentSession().update(model);
-	}
-
-	public void update(Collection<T> models) {
-		models.forEach(m -> update(m));
-	}
-
-	public void merge(T model) {
-		currentSession().merge(model);
-	}
-
-	public void merge(Collection<T> models) {
-		models.forEach(m -> merge(m));
-	}
-
 	public T findById(Long id) {
 		return get(id);
 	}
diff --git a/src/main/java/com/commafeed/backend/feed/FeedQueues.java b/src/main/java/com/commafeed/backend/feed/FeedQueues.java
index 8be30e2f..8d81af3c 100644
--- a/src/main/java/com/commafeed/backend/feed/FeedQueues.java
+++ b/src/main/java/com/commafeed/backend/feed/FeedQueues.java
@@ -136,7 +136,7 @@ public class FeedQueues {
 		// update all feeds in the database
 		List<Feed> feeds = map.values().stream().filter(c -> config.getApplicationSettings().getHeavyLoad() ? !c.isUrgent() : true)
 				.map(c -> c.getFeed()).collect(Collectors.toList());
-		UnitOfWork.run(sessionFactory, () -> feedDAO.update(feeds));
+		UnitOfWork.run(sessionFactory, () -> feedDAO.saveOrUpdate(feeds));
 	}
 
 	/**
diff --git a/src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java b/src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java
index d27ab4b8..6bf7e071 100644
--- a/src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java
+++ b/src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java
@@ -39,7 +39,7 @@ public class PostLoginActivities {
 			saveUser = true;
 		}
 		if (saveUser) {
-			userDAO.merge(user);
+			userDAO.saveOrUpdate(user);
 		}
 	}
 
diff --git a/src/main/java/com/commafeed/frontend/resource/UserREST.java b/src/main/java/com/commafeed/frontend/resource/UserREST.java
index ad4c54dc..58c85e52 100644
--- a/src/main/java/com/commafeed/frontend/resource/UserREST.java
+++ b/src/main/java/com/commafeed/frontend/resource/UserREST.java
@@ -215,7 +215,7 @@ public class UserREST {
 		if (request.isNewApiKey()) {
 			user.setApiKey(userService.generateApiKey(user));
 		}
-		userDAO.merge(user);
+		userDAO.saveOrUpdate(user);
 		return Response.ok().build();
 	}