Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-10-26 15:08:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove deprecated usage of saveOrUpdate in preparation of hibernate 7

Browse Source
This commit is contained in:
Athou
2025-06-13 07:33:51 +02:00
parent f2c0d99bd9
commit d46ee7f673
12 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
commafeed-server/src/main/java/com/commafeed/frontend/resource/AdminREST.java
View File

@@ -97,11 +97,10 @@ public class AdminREST {
}
u.setEmail(req.getEmail());
u.setDisabled(!req.isEnabled());
userDAO.saveOrUpdate(u);
Set<Role> roles = userRoleDAO.findRoles(u);
if (req.isAdmin() && !roles.contains(Role.ADMIN)) {
userRoleDAO.saveOrUpdate(new UserRole(u, Role.ADMIN));
userRoleDAO.persist(new UserRole(u, Role.ADMIN));
} else if (!req.isAdmin() && roles.contains(Role.ADMIN)) {
if (CommaFeedApplication.USERNAME_ADMIN.equals(u.getName())) {
return Response.status(Status.FORBIDDEN).entity("You cannot remove the admin role from the admin user.").build();

13
commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java
View File

@@ -291,7 +291,7 @@ public class CategoryREST {
parent.setId(Long.valueOf(parentId));
cat.setParent(parent);
}
feedCategoryDAO.saveOrUpdate(cat);
feedCategoryDAO.persist(cat);
return Response.ok(cat.getId()).build();
}
@@ -311,14 +311,13 @@ public class CategoryREST {
for (FeedSubscription sub : subs) {
sub.setCategory(null);
}
feedSubscriptionDAO.saveOrUpdate(subs);
List<FeedCategory> categories = feedCategoryDAO.findAllChildrenCategories(user, cat);
for (FeedCategory child : categories) {
if (!child.getId().equals(cat.getId()) && child.getParent().getId().equals(cat.getId())) {
child.setParent(null);
}
}
feedCategoryDAO.saveOrUpdate(categories);
feedCategoryDAO.delete(cat);
return Response.ok().build();
@@ -330,7 +329,7 @@ public class CategoryREST {
@POST
@Path("/modify")
@Transactional
@Operation(summary = "Rename a category", description = "Rename an existing feed category")
@Operation(summary = "Modify a category", description = "Modify an existing feed category")
public Response modifyCategory(@Valid @Parameter(required = true) CategoryModificationRequest req) {
Preconditions.checkNotNull(req);
Preconditions.checkNotNull(req.getId());
@@ -367,12 +366,8 @@ public class CategoryREST {
for (int i = 0; i < categories.size(); i++) {
categories.get(i).setPosition(i);
}
feedCategoryDAO.saveOrUpdate(categories);
} else {
feedCategoryDAO.saveOrUpdate(category);
}
feedCategoryDAO.saveOrUpdate(category);
return Response.ok().build();
}
@@ -390,7 +385,7 @@ public class CategoryREST {
return Response.status(Status.NOT_FOUND).build();
}
category.setCollapsed(req.isCollapse());
feedCategoryDAO.saveOrUpdate(category);
return Response.ok().build();
}

4
commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java
View File

@@ -460,10 +460,8 @@ public class FeedREST {
for (int i = 0; i < subs.size(); i++) {
subs.get(i).setPosition(i);
}
feedSubscriptionDAO.saveOrUpdate(subs);
} else {
feedSubscriptionDAO.saveOrUpdate(subscription);
}
return Response.ok().build();
}

7
commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java
View File

@@ -198,7 +198,7 @@ public class UserREST {
s.setInstapaper(settings.getSharingSettings().isInstapaper());
s.setBuffer(settings.getSharingSettings().isBuffer());
userSettingsDAO.saveOrUpdate(s);
userSettingsDAO.merge(s);
return Response.ok().build();
}
@@ -261,7 +261,7 @@ public class UserREST {
user.setApiKey(userService.generateApiKey(user));
}
userDAO.saveOrUpdate(user);
userDAO.merge(user);
return Response.ok().build();
}
@@ -297,7 +297,7 @@ public class UserREST {
try {
user.setRecoverPasswordToken(Digests.sha1Hex(UUID.randomUUID().toString()));
user.setRecoverPasswordTokenDate(Instant.now());
userDAO.saveOrUpdate(user);
mailService.sendMail(user, "Password recovery", buildEmailContent(user));
return Response.ok().build();
} catch (Exception e) {
@@ -351,7 +351,6 @@ public class UserREST {
}
user.setRecoverPasswordToken(null);
user.setRecoverPasswordTokenDate(null);
userDAO.saveOrUpdate(user);
String message = "Your new password is: " + passwd;
message += "<br />";