hibernate tweaks

src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java

@@ -269,26 +269,26 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 	public void markFeedEntries(User user, Feed feed, Date olderThan) {
 		List<FeedEntryStatus> statuses = findByFeed(feed, user, true,
 				ReadingOrder.desc, false);
-		update(markList(statuses, olderThan));
+		saveOrUpdate(markList(statuses, olderThan));
 	}
 
 	public void markCategoryEntries(User user, List<FeedCategory> categories,
 			Date olderThan) {
 		List<FeedEntryStatus> statuses = findByCategories(categories, user,
 				true, ReadingOrder.desc, false);
-		update(markList(statuses, olderThan));
+		saveOrUpdate(markList(statuses, olderThan));
 	}
 
 	public void markStarredEntries(User user, Date olderThan) {
 		List<FeedEntryStatus> statuses = findStarred(user, ReadingOrder.desc,
 				false);
-		update(markList(statuses, olderThan));
+		saveOrUpdate(markList(statuses, olderThan));
 	}
 
 	public void markAllEntries(User user, Date olderThan) {
 		List<FeedEntryStatus> statuses = findAll(user, true, ReadingOrder.desc,
 				false);
-		update(markList(statuses, olderThan));
+		saveOrUpdate(markList(statuses, olderThan));
 	}
 
 	private List<FeedEntryStatus> markList(List<FeedEntryStatus> statuses,

src/main/java/com/commafeed/backend/dao/GenericDAO.java

@@ -34,44 +34,24 @@ public abstract class GenericDAO<T extends AbstractModel> {
 		builder = em.getCriteriaBuilder();
 	}
 
-	public void save(T object) {
-		em.persist(object);
-	}
-
-	public void save(Collection<T> objects) {
-		for (Object object : objects) {
-			em.persist(object);
-		}
-	}
-
-	public void update(Collection<T> objects) {
-		for (Object object : objects) {
-			em.merge(object);
-		}
-	}
-
-	public void update(T... objects) {
-		update(Arrays.asList(objects));
-	}
-
 	public void saveOrUpdate(Collection<? extends AbstractModel> models) {
+		int i = 0;
 		for (AbstractModel model : models) {
 			if (model.getId() == null) {
 				em.persist(model);
 			} else {
 				em.merge(model);
 			}
+
+			if (i % 20 == 0) {
+				em.flush();
+			}
+			i++;
 		}
 	}
 
 	public void saveOrUpdate(AbstractModel... models) {
-		for (AbstractModel model : models) {
-			if (model.getId() == null) {
-				em.persist(model);
-			} else {
-				em.merge(model);
-			}
-		}
+		saveOrUpdate(Arrays.asList(models));
 	}
 
 	public void delete(T object) {

src/main/java/com/commafeed/backend/feeds/FeedRefreshTaskGiver.java

@@ -94,7 +94,7 @@ public class FeedRefreshTaskGiver {
 			map.put(f.getId(), f);
 		}
 
-		feedDAO.update(map.values());
+		feedDAO.saveOrUpdate(map.values());
 	}
 
 	public void giveBack(Feed feed) {

src/main/java/com/commafeed/backend/feeds/OPMLImporter.java

@@ -64,7 +64,7 @@ public class OPMLImporter {
 				}
 				category.setParent(parent);
 				category.setUser(user);
-				feedCategoryDAO.save(category);
+				feedCategoryDAO.saveOrUpdate(category);
 			}
 
 			List<Outline> children = outline.getChildren();

src/main/java/com/commafeed/backend/pubsubhubbub/SubscriptionHandler.java

@@ -72,7 +72,7 @@ public class SubscriptionHandler {
 						&& StringUtils.contains(message, pushpressError)) {
 					String[] tokens = message.split(" ");
 					feed.setPushTopic(tokens[tokens.length - 1]);
-					feedDAO.update(feed);
+					feedDAO.saveOrUpdate(feed);
 					log.debug("handled pushpress subfeed {} : {}", topic,
 							feed.getPushTopic());
 				} else {

src/main/java/com/commafeed/backend/services/FeedEntryService.java

@@ -17,7 +17,7 @@ public class FeedEntryService {
 		FeedEntryStatus status = feedEntryStatusDAO.findById(user, entryId);
 		if (status != null) {
 			status.setRead(read);
-			feedEntryStatusDAO.update(status);
+			feedEntryStatusDAO.saveOrUpdate(status);
 		}
 	}
 
@@ -25,7 +25,7 @@ public class FeedEntryService {
 		FeedEntryStatus status = feedEntryStatusDAO.findById(user, entryId);
 		if (status != null) {
 			status.setStarred(starred);
-			feedEntryStatusDAO.update(status);
+			feedEntryStatusDAO.saveOrUpdate(status);
 		}
 	}
 }

src/main/java/com/commafeed/backend/services/FeedService.java

@@ -23,7 +23,7 @@ public class FeedService {
 			feed = new Feed();
 			feed.setUrl(url);
 			feed.setUrlHash(DigestUtils.sha1Hex(url));
-			feedDAO.save(feed);
+			feedDAO.saveOrUpdate(feed);
 		}
 		return feed;
 	}

src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java

@@ -86,7 +86,7 @@ public class FeedSubscriptionService {
 				status.setSubscription(sub);
 				statuses.add(status);
 			}
-			feedEntryStatusDAO.save(statuses);
+			feedEntryStatusDAO.saveOrUpdate(statuses);
 		}
 		taskGiver.add(feed);
 		return feed;

src/main/java/com/commafeed/backend/services/UserService.java

@@ -56,7 +56,7 @@ public class UserService {
 					user.getPassword(), user.getSalt());
 			if (authenticated) {
 				user.setLastLogin(Calendar.getInstance().getTime());
-				userDAO.update(user);
+				userDAO.saveOrUpdate(user);
 				return user;
 			}
 		}
@@ -85,7 +85,7 @@ public class UserService {
 		for (Role role : roles) {
 			user.getRoles().add(new UserRole(user, role));
 		}
-		userDAO.save(user);
+		userDAO.saveOrUpdate(user);
 		return user;
 	}