hibernate tweaks

src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java

@@ -60,7 +60,7 @@ public class NextUnreadRedirectPage extends WebPage {
 			FeedEntryStatus status = Iterables.getFirst(statuses, null);
 			String url = status.getEntry().getUrl();
 			status.setRead(true);
-			feedEntryStatusDAO.update(status);
+			feedEntryStatusDAO.saveOrUpdate(status);
 			throw new RedirectToUrlException(url);
 		}
 	}

src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.java

@@ -63,7 +63,7 @@ public class PasswordRecoveryCallbackPage extends BasePage {
 					user.setApiKey(userService.generateApiKey(user));
 					user.setRecoverPasswordToken(null);
 					user.setRecoverPasswordTokenDate(null);
-					userDAO.update(user);
+					userDAO.saveOrUpdate(user);
 					info("Password saved.");
 				} else {
 					error("Passwords do not match.");

src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java

@@ -41,7 +41,7 @@ public class PasswordRecoveryPage extends BasePage {
 								.randomUUID().toString()));
 						user.setRecoverPasswordTokenDate(Calendar.getInstance()
 								.getTime());
-						userDAO.update(user);
+						userDAO.saveOrUpdate(user);
 						mailService.sendMail(user, "Password recovery",
 								buildEmailContent(user));
 						info("Email sent.");

src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java

@@ -68,11 +68,11 @@ public class AdminREST extends AbstractResourceREST {
 			}
 			user.setEmail(userModel.getEmail());
 			user.setDisabled(!userModel.isEnabled());
-			userDAO.update(user);
+			userDAO.saveOrUpdate(user);
 
 			Set<Role> roles = userRoleDAO.findRoles(user);
 			if (userModel.isAdmin() && !roles.contains(Role.ADMIN)) {
-				userRoleDAO.save(new UserRole(user, Role.ADMIN));
+				userRoleDAO.saveOrUpdate(new UserRole(user, Role.ADMIN));
 			} else if (!userModel.isAdmin() && roles.contains(Role.ADMIN)) {
 				if (StartupBean.USERNAME_ADMIN.equals(user.getName())) {
 					return Response

src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java

@@ -208,7 +208,7 @@ public class CategoryREST extends AbstractResourceREST {
 			parent.setId(Long.valueOf(parentId));
 			cat.setParent(parent);
 		}
-		feedCategoryDAO.save(cat);
+		feedCategoryDAO.saveOrUpdate(cat);
 		return Response.ok().build();
 	}
 
@@ -227,7 +227,7 @@ public class CategoryREST extends AbstractResourceREST {
 			for (FeedSubscription sub : subs) {
 				sub.setCategory(null);
 			}
-			feedSubscriptionDAO.update(subs);
+			feedSubscriptionDAO.saveOrUpdate(subs);
 			List<FeedCategory> categories = feedCategoryDAO
 					.findAllChildrenCategories(getUser(), cat);
 			for (FeedCategory child : categories) {
@@ -236,7 +236,7 @@ public class CategoryREST extends AbstractResourceREST {
 					child.setParent(null);
 				}
 			}
-			feedCategoryDAO.update(categories);
+			feedCategoryDAO.saveOrUpdate(categories);
 
 			feedCategoryDAO.delete(cat);
 			return Response.ok().build();
@@ -297,12 +297,12 @@ public class CategoryREST extends AbstractResourceREST {
 			for (int i = 0; i < categories.size(); i++) {
 				categories.get(i).setPosition(i);
 			}
-			feedCategoryDAO.update(categories);
+			feedCategoryDAO.saveOrUpdate(categories);
 		} else {
-			feedCategoryDAO.update(category);
+			feedCategoryDAO.saveOrUpdate(category);
 		}
 
-		feedCategoryDAO.update(category);
+		feedCategoryDAO.saveOrUpdate(category);
 
 		return Response.ok(Status.OK).build();
 	}
@@ -320,7 +320,7 @@ public class CategoryREST extends AbstractResourceREST {
 			return Response.status(Status.NOT_FOUND).build();
 		}
 		category.setCollapsed(req.isCollapse());
-		feedCategoryDAO.update(category);
+		feedCategoryDAO.saveOrUpdate(category);
 
 		return Response.ok(Status.OK).build();
 	}

src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java

@@ -359,9 +359,9 @@ public class FeedREST extends AbstractResourceREST {
 			for (int i = 0; i < subs.size(); i++) {
 				subs.get(i).setPosition(i);
 			}
-			feedSubscriptionDAO.update(subs);
+			feedSubscriptionDAO.saveOrUpdate(subs);
 		} else {
-			feedSubscriptionDAO.update(subscription);
+			feedSubscriptionDAO.saveOrUpdate(subscription);
 		}
 
 		return Response.ok(Status.OK).build();

src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java

@@ -67,7 +67,7 @@ public class PubSubHubbubCallbackREST {
 						feed.getPushTopic());
 				feed.setPushLastPing(Calendar.getInstance().getTime());
 			}
-			feedDAO.update(feeds);
+			feedDAO.saveOrUpdate(feeds);
 			return Response.ok(challenge).build();
 		} else {
 			log.debug("rejecting callback: no push info for {}", topic);

src/main/java/com/commafeed/frontend/rest/resources/UserREST.java

@@ -134,7 +134,7 @@ public class UserREST extends AbstractResourceREST {
 		if (request.isNewApiKey()) {
 			user.setApiKey(userService.generateApiKey(user));
 		}
-		userDAO.update(user);
+		userDAO.saveOrUpdate(user);
 		return Response.ok().build();
 	}