Skip to content

The Unified and Autonomous Development Platform

Refactoring various model managers

Robin Shena811bb52cc19
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java
index 1408eb39d0..ab2dc9e7d8 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java
@@ -81,7 +81,7 @@ public class CloseMilestoneStep extends ServerSideStep {
if (build.canCloseMilestone(getAccessTokenSecret(), milestoneName)) {
milestone.setClosed(true);
- milestoneManager.save(milestone);
+ milestoneManager.createOrUpdate(milestone);
} else {
throw new ExplicitException("This build is not authorized to close milestone '" + milestoneName + "'");
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/AgentAttributeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/AgentAttributeManager.java
index 989c5f0bc2..050f2f1b6d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/AgentAttributeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/AgentAttributeManager.java
@@ -8,6 +8,8 @@ import io.onedev.server.model.AgentAttribute;
import io.onedev.server.persistence.dao.EntityManager;
public interface AgentAttributeManager extends EntityManager<AgentAttribute> {
+
+ void create(AgentAttribute attribute);
List<String> getAttributeNames();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java
index 73759f5932..15417f104d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java
@@ -1,22 +1,22 @@
package io.onedev.server.entitymanager;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-
-import org.eclipse.jetty.websocket.api.Session;
-
import io.onedev.agent.AgentData;
import io.onedev.server.model.Agent;
import io.onedev.server.persistence.dao.EntityManager;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.criteria.Criteria;
+import org.eclipse.jetty.websocket.api.Session;
+
+import javax.annotation.Nullable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
public interface AgentManager extends EntityManager<Agent> {
+ void createOrUpdate(Agent agent);
+
String getAgentVersion();
Collection<String> getAgentLibs();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/AgentTokenManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/AgentTokenManager.java
index ddda3a802e..f6dbcb9008 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/AgentTokenManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/AgentTokenManager.java
@@ -9,6 +9,8 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface AgentTokenManager extends EntityManager<AgentToken> {
+ void create(AgentToken token);
+
@Nullable
AgentToken find(String value);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildDependenceManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildDependenceManager.java
index ac48c138df..c37e9a0abb 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildDependenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildDependenceManager.java
@@ -5,4 +5,6 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface BuildDependenceManager extends EntityManager<BuildDependence> {
+ void create(BuildDependence dependence);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
index cccb679c0d..7cac720733 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
@@ -22,7 +22,7 @@ import io.onedev.server.util.StatusInfo;
import io.onedev.server.util.criteria.Criteria;
public interface BuildManager extends EntityManager<Build> {
-
+
@Nullable
Build find(Project project, long number);
@@ -55,6 +55,8 @@ public interface BuildManager extends EntityManager<Build> {
Map<ObjectId, Map<String, Collection<StatusInfo>>> queryStatus(Project project, Collection<ObjectId> commitIds);
void create(Build build);
+
+ void update(Build build);
Map<Long, Long> queryUnfinished();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.java
index 71e3223c87..258ab47295 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.java
@@ -11,8 +11,10 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface BuildParamManager extends EntityManager<BuildParam> {
+ void create(BuildParam param);
+
void deleteParams(Build build);
Collection<String> getParamNames(@Nullable Project project);
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildQueryPersonalizationManager.java
index 27aa7c7486..efde2ad463 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildQueryPersonalizationManager.java
@@ -8,5 +8,6 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface BuildQueryPersonalizationManager extends EntityManager<BuildQueryPersonalization> {
BuildQueryPersonalization find(Project project, User user);
-
+
+ void createOrUpdate(BuildQueryPersonalization buildQueryPersonalization);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java
index ffd523629d..2e18a24b41 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java
@@ -33,5 +33,6 @@ public interface CodeCommentManager extends EntityManager<CodeComment> {
@Nullable
CodeComment findByUUID(String uuid);
-
+
+ void createOrUpdate(CodeComment comment);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentMentionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentMentionManager.java
index a7f81966da..0c35b6c7dc 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentMentionManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentMentionManager.java
@@ -1,10 +1,12 @@
package io.onedev.server.entitymanager;
-import io.onedev.server.model.*;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentMention;
+import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityManager;
public interface CodeCommentMentionManager extends EntityManager<CodeCommentMention> {
void mention(CodeComment comment, User user);
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentQueryPersonalizationManager.java
index 1ca350f286..439a002142 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentQueryPersonalizationManager.java
@@ -8,5 +8,6 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface CodeCommentQueryPersonalizationManager extends EntityManager<CodeCommentQueryPersonalization> {
CodeCommentQueryPersonalization find(Project project, User user);
-
+
+ void createOrUpdate(CodeCommentQueryPersonalization codeCommentQueryPersonalization);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentReplyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentReplyManager.java
index 2f347069d5..d92b012384 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentReplyManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentReplyManager.java
@@ -5,6 +5,6 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface CodeCommentReplyManager extends EntityManager<CodeCommentReply> {
- void save(CodeCommentReply reply);
+ void createOrUpdate(CodeCommentReply reply);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CommitQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CommitQueryPersonalizationManager.java
index 97564ce2d3..785ad16003 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/CommitQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CommitQueryPersonalizationManager.java
@@ -8,5 +8,6 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface CommitQueryPersonalizationManager extends EntityManager<CommitQueryPersonalization> {
CommitQueryPersonalization find(Project project, User user);
-
+
+ void createOrUpdate(CommitQueryPersonalization commitQueryPersonalization);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/DashboardGroupShareManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardGroupShareManager.java
index b854165b6e..ba0f33141c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/DashboardGroupShareManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardGroupShareManager.java
@@ -1,13 +1,13 @@
package io.onedev.server.entitymanager;
-import java.util.Collection;
-
import io.onedev.server.model.Dashboard;
import io.onedev.server.model.DashboardGroupShare;
import io.onedev.server.persistence.dao.EntityManager;
+import java.util.Collection;
+
public interface DashboardGroupShareManager extends EntityManager<DashboardGroupShare> {
void syncShares(Dashboard dashboard, Collection<String> groupNames);
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/DashboardUserShareManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardUserShareManager.java
index 8436d352f7..a10d2ab37c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/DashboardUserShareManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardUserShareManager.java
@@ -1,13 +1,13 @@
package io.onedev.server.entitymanager;
-import java.util.Collection;
-
import io.onedev.server.model.Dashboard;
import io.onedev.server.model.DashboardUserShare;
import io.onedev.server.persistence.dao.EntityManager;
+import java.util.Collection;
+
public interface DashboardUserShareManager extends EntityManager<DashboardUserShare> {
void syncShares(Dashboard dashboard, Collection<String> userNames);
-
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/EmailAddressManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/EmailAddressManager.java
index 9ff446df0a..fb5db29352 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/EmailAddressManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/EmailAddressManager.java
@@ -37,4 +37,6 @@ public interface EmailAddressManager extends EntityManager<EmailAddress> {
void sendVerificationEmail(EmailAddress emailAddress);
EmailAddressCache cloneCache();
+
+ void createOrUpdate(EmailAddress address);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/GitLfsLockManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/GitLfsLockManager.java
index 77f60b1c4d..5961055487 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/GitLfsLockManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/GitLfsLockManager.java
@@ -6,5 +6,7 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface GitLfsLockManager extends EntityManager<GitLfsLock> {
GitLfsLock find(String path);
+
+ void create(GitLfsLock lock);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/GpgKeyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/GpgKeyManager.java
index 595715a366..c0c47976f2 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/GpgKeyManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/GpgKeyManager.java
@@ -10,5 +10,6 @@ public interface GpgKeyManager extends EntityManager<GpgKey> {
@Nullable
SignatureVerificationKey findSignatureVerificationKey(long keyId);
-
+
+ void create(GpgKey gpgKey);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.java
index 31c50bca07..fc7d8e41c8 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.java
@@ -9,5 +9,6 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface GroupAuthorizationManager extends EntityManager<GroupAuthorization> {
void syncAuthorizations(Group group, Collection<GroupAuthorization> authorizations);
-
+
+ void createOrUpdate(GroupAuthorization authorization);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueAuthorizationManager.java
index 61f0008d60..775d2ce9a9 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueAuthorizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueAuthorizationManager.java
@@ -9,4 +9,5 @@ public interface IssueAuthorizationManager extends EntityManager<IssueAuthorizat
void authorize(Issue issue, User user);
+ void createOrUpdate(IssueAuthorization authorization);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueFieldManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueFieldManager.java
index 6d60536f6c..7f59d3c97e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueFieldManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueFieldManager.java
@@ -11,8 +11,10 @@ public interface IssueFieldManager extends EntityManager<IssueField> {
void saveFields(Issue issue);
void onRenameUser(String oldName, String newName);
-
- void onRenameGroup(String oldName, String newName);
+
+ void create(IssueField entity);
+
+ void onRenameGroup(String oldName, String newName);
void populateFields(Collection<Issue> issues);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueLinkManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueLinkManager.java
index f0696e90b7..18dc585177 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueLinkManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueLinkManager.java
@@ -1,17 +1,19 @@
package io.onedev.server.entitymanager;
-import java.util.Collection;
-
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueLink;
import io.onedev.server.model.LinkSpec;
import io.onedev.server.persistence.dao.EntityManager;
+import java.util.Collection;
+
public interface IssueLinkManager extends EntityManager<IssueLink> {
void syncLinks(LinkSpec spec, Issue issue, Collection<Issue> linkedIssues, boolean opposite);
-
- void populateLinks(Collection<Issue> issues);
+
+ void create(IssueLink link);
+
+ void populateLinks(Collection<Issue> issues);
void loadDeepLinks(Issue issue);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueMentionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueMentionManager.java
index 472fec01f6..471edf0de5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueMentionManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueMentionManager.java
@@ -2,12 +2,11 @@ package io.onedev.server.entitymanager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueMention;
-import io.onedev.server.model.IssueVote;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityManager;
public interface IssueMentionManager extends EntityManager<IssueMention> {
void mention(Issue issue, User user);
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueQueryPersonalizationManager.java
index 4d1f6bd0bd..e046497d4c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueQueryPersonalizationManager.java
@@ -1,12 +1,13 @@
package io.onedev.server.entitymanager;
+import io.onedev.server.model.IssueQueryPersonalization;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.IssueQueryPersonalization;
import io.onedev.server.persistence.dao.EntityManager;
public interface IssueQueryPersonalizationManager extends EntityManager<IssueQueryPersonalization> {
IssueQueryPersonalization find(Project project, User user);
-
+
+ void createOrUpdate(IssueQueryPersonalization personalization);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueScheduleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueScheduleManager.java
index 600b1df100..69c0ae6669 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueScheduleManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueScheduleManager.java
@@ -10,5 +10,6 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface IssueScheduleManager extends EntityManager<IssueSchedule> {
void syncMilestones(Issue issue, Collection<Milestone> milestones);
-
+
+ void create(IssueSchedule schedule);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueVoteManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueVoteManager.java
index c2a0f76b4f..2cc4413d39 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueVoteManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueVoteManager.java
@@ -5,4 +5,6 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface IssueVoteManager extends EntityManager<IssueVote> {
+ void create(IssueVote vote);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueWatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueWatchManager.java
index 398e0d3d01..db8e35e936 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueWatchManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueWatchManager.java
@@ -13,5 +13,6 @@ public interface IssueWatchManager extends EntityManager<IssueWatch> {
IssueWatch find(Issue issue, User user);
void watch(Issue issue, User user, boolean watching);
-
+
+ void createOrUpdate(IssueWatch watch);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/LinkAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/LinkAuthorizationManager.java
index 6c5f85fc40..6a8354cafc 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/LinkAuthorizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/LinkAuthorizationManager.java
@@ -1,14 +1,15 @@
package io.onedev.server.entitymanager;
-import java.util.Collection;
-
import io.onedev.server.model.LinkAuthorization;
import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Role;
import io.onedev.server.persistence.dao.EntityManager;
+import java.util.Collection;
+
public interface LinkAuthorizationManager extends EntityManager<LinkAuthorization> {
void syncAuthorizations(Role role, Collection<LinkSpec> authorizedLinks);
-
+
+ void create(LinkAuthorization authorization);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/LinkSpecManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/LinkSpecManager.java
index ff2bee4df7..b29b17320d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/LinkSpecManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/LinkSpecManager.java
@@ -16,5 +16,7 @@ public interface LinkSpecManager extends EntityManager<LinkSpec> {
void updateOrders(List<LinkSpec> links);
- void save(LinkSpec spec, @Nullable String oldName, @Nullable String oldOppositeName);
+ void update(LinkSpec spec, @Nullable String oldName, @Nullable String oldOppositeName);
+
+ void create(LinkSpec link);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/MembershipManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/MembershipManager.java
index 178307324a..2f834e5f4e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/MembershipManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/MembershipManager.java
@@ -1,18 +1,20 @@
package io.onedev.server.entitymanager;
-import java.util.Collection;
-import java.util.List;
-
import io.onedev.server.model.Membership;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityManager;
+import java.util.Collection;
+import java.util.List;
+
public interface MembershipManager extends EntityManager<Membership> {
void delete(Collection<Membership> memberships);
void syncMemberships(User user, Collection<String> groupNames);
-
- List<User> queryMembers(User user);
+
+ void create(Membership membership);
+
+ List<User> queryMembers(User user);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java
index 9478f0522e..4d44f7f1eb 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java
@@ -17,4 +17,6 @@ public interface MilestoneManager extends EntityManager<Milestone> {
@Nullable
Milestone findNextOpen(Project project);
+
+ void createOrUpdate(Milestone milestone);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PendingSuggestionApplyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PendingSuggestionApplyManager.java
index 0bcff6525e..e7ca37dc30 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PendingSuggestionApplyManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PendingSuggestionApplyManager.java
@@ -18,5 +18,6 @@ public interface PendingSuggestionApplyManager extends EntityManager<PendingSugg
void discard(@Nullable User user, PullRequest request);
List<PendingSuggestionApply> query(User user, PullRequest request);
-
+
+ void create(PendingSuggestionApply pendingApply);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectDynamicsManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectDynamicsManager.java
index 0524806f6a..012d7e51a3 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectDynamicsManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectDynamicsManager.java
@@ -5,4 +5,6 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface ProjectDynamicsManager extends EntityManager<ProjectDynamics> {
+ void create(ProjectDynamics dynamics);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
index f4e7c79558..6e7b6592a3 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
@@ -47,6 +47,8 @@ public interface ProjectManager extends EntityManager<Project> {
void create(Project project);
+ void update(Project project);
+
void onDeleteBranch(Project project, String branchName);
void clone(Project project, String repositoryUrl);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestAssignmentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestAssignmentManager.java
index ac47dd6a1d..165e5cc396 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestAssignmentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestAssignmentManager.java
@@ -4,5 +4,6 @@ import io.onedev.server.model.PullRequestAssignment;
import io.onedev.server.persistence.dao.EntityManager;
public interface PullRequestAssignmentManager extends EntityManager<PullRequestAssignment> {
-
+
+ void create(PullRequestAssignment assignment);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.java
index a8a919ee54..7f62bebd49 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.java
@@ -1,12 +1,14 @@
package io.onedev.server.entitymanager;
-import java.util.Collection;
-
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.persistence.dao.EntityManager;
+import java.util.Collection;
+
public interface PullRequestCommentManager extends EntityManager<PullRequestComment> {
- void save(PullRequestComment comment, Collection<String> notifiedEmailAddresses);
+ void createOrUpdate(PullRequestComment comment);
+
+ void createOrUpdate(PullRequestComment comment, Collection<String> notifiedEmailAddresses);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestMentionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestMentionManager.java
index 6b2bf1464a..47961465ff 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestMentionManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestMentionManager.java
@@ -1,10 +1,12 @@
package io.onedev.server.entitymanager;
-import io.onedev.server.model.*;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestMention;
+import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityManager;
public interface PullRequestMentionManager extends EntityManager<PullRequestMention> {
void mention(PullRequest request, User user);
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQueryPersonalizationManager.java
index 15f430066c..78ba6e32ff 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQueryPersonalizationManager.java
@@ -8,5 +8,7 @@ import io.onedev.server.persistence.dao.EntityManager;
public interface PullRequestQueryPersonalizationManager extends EntityManager<PullRequestQueryPersonalization> {
PullRequestQueryPersonalization find(Project project, User user);
+
+ void createOrUpdate(PullRequestQueryPersonalization personalization);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java
index 713a271fea..9f75fb5b3a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java
@@ -13,5 +13,6 @@ public interface PullRequestReviewManager extends EntityManager<PullRequestRevie
void review(PullRequest request, boolean approved, @Nullable String note);
void populateReviews(Collection<PullRequest> requests);
-
+
+ void createOrUpdate(PullRequestReview review);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestUpdateManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestUpdateManager.java
index cf6c507292..3d9473650b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestUpdateManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestUpdateManager.java
@@ -11,5 +11,7 @@ public interface PullRequestUpdateManager extends EntityManager<PullRequestUpdat
void checkUpdate(PullRequest request);
List<PullRequestUpdate> queryAfter(Long projectId, Long afterUpdateId, int count);
+
+ void create(PullRequestUpdate update);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestWatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestWatchManager.java
index fd5857d567..1c23523cae 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestWatchManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestWatchManager.java
@@ -13,4 +13,6 @@ public interface PullRequestWatchManager extends EntityManager<PullRequestWatch>
PullRequestWatch find(PullRequest request, User user);
void watch(PullRequest request, User user, boolean watching);
+
+ void createOrUpdate(PullRequestWatch watch);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SshKeyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SshKeyManager.java
index 04f2f4fefb..b6b29dd875 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/SshKeyManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SshKeyManager.java
@@ -14,4 +14,7 @@ public interface SshKeyManager extends EntityManager<SshKey> {
SshKey findByDigest(String digest);
void syncSshKeys(User user, Collection<String> sshKeys);
+
+ void create(SshKey sshKey);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.java
index 16693678b9..2f9c2ef9dd 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.java
@@ -12,5 +12,6 @@ public interface UserAuthorizationManager extends EntityManager<UserAuthorizatio
void syncAuthorizations(User user, Collection<UserAuthorization> authorizations);
void syncAuthorizations(Project project, Collection<UserAuthorization> authorizations);
-
+
+ void createOrUpdate(UserAuthorization authorization);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UserInvitationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UserInvitationManager.java
index c609b6522e..aea88bcbf2 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/UserInvitationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UserInvitationManager.java
@@ -20,5 +20,6 @@ public interface UserInvitationManager extends EntityManager<UserInvitation> {
int count(@Nullable String term);
List<UserInvitation> query(@Nullable String term, int firstResult, int maxResults);
-
+
+ void create(UserInvitation invitation);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/BaseEntityLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/BaseEntityLabelManager.java
index 2354d473da..06b9ba8a7d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/BaseEntityLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/BaseEntityLabelManager.java
@@ -1,48 +1,47 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-
-import io.onedev.server.entitymanager.LabelManager;
-import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.LabelSpec;
-import io.onedev.server.model.support.EntityLabel;
-import io.onedev.server.model.support.LabelSupport;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-
-public abstract class BaseEntityLabelManager<T extends EntityLabel> extends BaseEntityManager<T> {
-
- private final LabelManager labelManager;
-
- @Inject
- public BaseEntityLabelManager(Dao dao, LabelManager labelManager) {
- super(dao);
- this.labelManager = labelManager;
- }
-
- @Transactional
- public void sync(LabelSupport<T> entity, Collection<String> labelNames) {
- var labelsToRemove = new HashSet<>();
- entity.getLabels().stream()
- .filter(it->!labelNames.contains(it.getSpec().getName()))
- .forEach(it-> {delete(it); labelsToRemove.add(it);});
- entity.getLabels().removeAll(labelsToRemove);
-
- Collection<String> existingLabelNames = entity.getLabels().stream()
- .map(it->it.getSpec().getName())
- .collect(Collectors.toSet());
- labelNames.stream().filter(it->!existingLabelNames.contains(it)).forEach(it-> {
- var label = newEntityLabel((AbstractEntity) entity, labelManager.find(it));
- save(label);
- entity.getLabels().add(label);
- });
- }
-
- protected abstract T newEntityLabel(AbstractEntity entity, LabelSpec spec);
-
+package io.onedev.server.entitymanager.impl;
+
+import io.onedev.server.entitymanager.LabelManager;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.LabelSpec;
+import io.onedev.server.model.support.EntityLabel;
+import io.onedev.server.model.support.LabelSupport;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+
+import javax.inject.Inject;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.stream.Collectors;
+
+public abstract class BaseEntityLabelManager<T extends EntityLabel> extends BaseEntityManager<T> {
+
+ private final LabelManager labelManager;
+
+ @Inject
+ public BaseEntityLabelManager(Dao dao, LabelManager labelManager) {
+ super(dao);
+ this.labelManager = labelManager;
+ }
+
+ @Transactional
+ public void sync(LabelSupport<T> entity, Collection<String> labelNames) {
+ var labelsToRemove = new HashSet<>();
+ entity.getLabels().stream()
+ .filter(it->!labelNames.contains(it.getSpec().getName()))
+ .forEach(it-> {delete(it); labelsToRemove.add(it);});
+ entity.getLabels().removeAll(labelsToRemove);
+
+ Collection<String> existingLabelNames = entity.getLabels().stream()
+ .map(it->it.getSpec().getName())
+ .collect(Collectors.toSet());
+ labelNames.stream().filter(it->!existingLabelNames.contains(it)).forEach(it-> {
+ var label = newEntityLabel((AbstractEntity) entity, labelManager.find(it));
+ dao.persist(label);
+ entity.getLabels().add(label);
+ });
+ }
+
+ protected abstract T newEntityLabel(AbstractEntity entity, LabelSpec spec);
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentAttributeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentAttributeManager.java
index 94eda4af03..31be6ccc5d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentAttributeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentAttributeManager.java
@@ -59,8 +59,8 @@ public class DefaultAgentAttributeManager extends BaseEntityManager<AgentAttribu
@Transactional
@Override
- public void save(AgentAttribute attribute) {
- super.save(attribute);
+ public void create(AgentAttribute attribute) {
+ dao.persist(attribute);
transactionManager.runAfterCommit(new Runnable() {
@@ -101,7 +101,7 @@ public class DefaultAgentAttributeManager extends BaseEntityManager<AgentAttribu
attribute.setAgent(agent);
attribute.setName(entry.getKey());
attribute.setValue(entry.getValue());
- save(attribute);
+ create(attribute);
agent.getAttributes().add(attribute);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java
index 11cbf46579..ea55dd452e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java
@@ -192,14 +192,14 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
agent.setCpus(data.getCpus());
agent.setTemporal(data.isTemporal());
agent.setIpAddress(data.getIpAddress());
- save(agent);
+ createOrUpdate(agent);
for (Map.Entry<String, String> entry: data.getAttributes().entrySet()) {
AgentAttribute attribute = new AgentAttribute();
attribute.setAgent(agent);
attribute.setName(entry.getKey());
attribute.setValue(entry.getValue());
- attributeManager.save(attribute);
+ attributeManager.create(attribute);
agent.getAttributes().add(attribute);
}
} else if (agentSessions.containsKey(agent.getId())) {
@@ -211,7 +211,7 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
agent.setIpAddress(data.getIpAddress());
agent.setCpus(data.getCpus());
agent.setTemporal(data.isTemporal());
- save(agent);
+ createOrUpdate(agent);
attributeManager.syncAttributes(agent, data.getAttributes());
}
@@ -245,21 +245,6 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
}
}
- @Override
- public void save(Agent agent) {
- super.save(agent);
-
- transactionManager.runAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- osNames.put(agent.getOsName(), agent.getOsName());
- osArchs.put(agent.getOsArch(), agent.getOsArch());
- }
-
- });
- }
-
private void removeReferences(Agent agent) {
Query<?> query = getSession().createQuery("update Build set agent=null where agent=:agent");
query.setParameter("agent", agent);
@@ -401,18 +386,33 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
dao.remove(agent.getToken());
}
+ @Transactional
+ @Override
+ public void createOrUpdate(Agent agent) {
+ dao.persist(agent);
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ osNames.put(agent.getOsName(), agent.getOsName());
+ osArchs.put(agent.getOsArch(), agent.getOsArch());
+ }
+
+ });
+ }
+
@Transactional
@Override
public void pause(Agent agent) {
agent.setPaused(true);
- save(agent);
+ createOrUpdate(agent);
}
@Transactional
@Override
public void resume(Agent agent) {
agent.setPaused(false);
- save(agent);
+ createOrUpdate(agent);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentTokenManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentTokenManager.java
index 280b392898..dfce7a58be 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentTokenManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentTokenManager.java
@@ -23,6 +23,11 @@ public class DefaultAgentTokenManager extends BaseEntityManager<AgentToken> impl
super(dao);
}
+ @Override
+ public void create(AgentToken token) {
+ dao.persist(token);
+ }
+
@Override
public AgentToken find(String value) {
EntityCriteria<AgentToken> criteria = newCriteria();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildDependenceManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildDependenceManager.java
index f8b032f62a..23922131f1 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildDependenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildDependenceManager.java
@@ -5,6 +5,7 @@ import javax.inject.Singleton;
import io.onedev.server.entitymanager.BuildDependenceManager;
import io.onedev.server.model.BuildDependence;
+import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@@ -16,4 +17,10 @@ public class DefaultBuildDependenceManager extends BaseEntityManager<BuildDepend
super(dao);
}
+ @Transactional
+ @Override
+ public void create(BuildDependence dependence) {
+ dao.persist(dependence);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 1fa68250b9..ae3ba7d52b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -184,9 +184,12 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
@Transactional
@Override
- public void save(Build build) {
- super.save(build);
-
+ public void update(Build build) {
+ dao.persist(build);
+ updateCacheAfterCommit(build);
+ }
+
+ private void updateCacheAfterCommit(Build build) {
BuildFacade facade = build.getFacade();
String jobName = build.getJobName();
transactionManager.runAfterCommit(new Runnable() {
@@ -196,7 +199,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
cache.put(facade.getId(), facade);
populateJobNames(facade.getProjectId(), jobName);
}
-
+
});
}
@@ -429,11 +432,14 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
Preconditions.checkArgument(build.isNew());
build.setNumberScope(build.getProject().getForkRoot());
build.setNumber(numberGenerator.getNextSequence(build.getNumberScope()));
- save(build);
+
+ dao.persist(build);
+ updateCacheAfterCommit(build);
+
for (BuildParam param: build.getParams())
- buildParamManager.save(param);
+ buildParamManager.create(param);
for (BuildDependence dependence: build.getDependencies())
- buildDependenceManager.save(dependence);
+ buildDependenceManager.create(dependence);
}
private Collection<Predicate> getPredicates(@Nullable Project project, From<Build, Build> root, CriteriaBuilder builder) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java
index c8e3705dd6..721bb2cfcd 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java
@@ -1,19 +1,5 @@
package io.onedev.server.entitymanager.impl;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.query.Query;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.entitymanager.BuildParamManager;
import io.onedev.server.event.Listen;
@@ -27,6 +13,14 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
+import org.hibernate.query.Query;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.*;
@Singleton
public class DefaultBuildParamManager extends BaseEntityManager<BuildParam> implements BuildParamManager {
@@ -78,8 +72,8 @@ public class DefaultBuildParamManager extends BaseEntityManager<BuildParam> impl
@Transactional
@Override
- public void save(BuildParam param) {
- super.save(param);
+ public void create(BuildParam param) {
+ dao.persist(param);
Long projectId = param.getBuild().getProject().getId();
String paramName = param.getName();
@@ -111,7 +105,7 @@ public class DefaultBuildParamManager extends BaseEntityManager<BuildParam> impl
}
return paramNames;
}
-
+
@Transactional
@Listen
public void on(EntityRemoved event) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQueryPersonalizationManager.java
index 48785b9a17..8a5896fce2 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQueryPersonalizationManager.java
@@ -40,7 +40,7 @@ public class DefaultBuildQueryPersonalizationManager extends BaseEntityManager<B
@Transactional
@Override
- public void save(BuildQueryPersonalization personalization) {
+ public void createOrUpdate(BuildQueryPersonalization personalization) {
Collection<String> retainNames = new HashSet<>();
retainNames.addAll(personalization.getQueries().stream()
.map(it->NamedQuery.PERSONAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
@@ -52,7 +52,7 @@ public class DefaultBuildQueryPersonalizationManager extends BaseEntityManager<B
if (!personalization.isNew())
delete(personalization);
} else {
- super.save(personalization);
+ dao.persist(personalization);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
index b294bf50dd..2f7952452a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
@@ -89,7 +89,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> im
@Transactional
@Override
- public void save(CodeComment comment) {
+ public void createOrUpdate(CodeComment comment) {
if (comment.isNew()) {
LastActivity lastActivity = new LastActivity();
lastActivity.setUser(comment.getUser());
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentMentionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentMentionManager.java
index 26841b256c..5a7ec0d52c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentMentionManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentMentionManager.java
@@ -1,8 +1,9 @@
package io.onedev.server.entitymanager.impl;
import io.onedev.server.entitymanager.CodeCommentMentionManager;
-import io.onedev.server.entitymanager.IssueMentionManager;
-import io.onedev.server.model.*;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentMention;
+import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@@ -24,8 +25,8 @@ public class DefaultCodeCommentMentionManager extends BaseEntityManager<CodeComm
CodeCommentMention mention = new CodeCommentMention();
mention.setComment(comment);
mention.setUser(user);
- save(mention);
+ dao.persist(mention);
}
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQueryPersonalizationManager.java
index ebb7a58db2..7aceaad65f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQueryPersonalizationManager.java
@@ -35,12 +35,12 @@ public class DefaultCodeCommentQueryPersonalizationManager extends BaseEntityMan
@Transactional
@Override
- public void save(CodeCommentQueryPersonalization setting) {
+ public void createOrUpdate(CodeCommentQueryPersonalization setting) {
if (setting.getQueries().isEmpty()) {
if (!setting.isNew())
delete(setting);
} else {
- super.save(setting);
+ dao.persist(setting);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java
index f8942d9de9..b6b6515e1e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java
@@ -28,7 +28,7 @@ public class DefaultCodeCommentReplyManager extends BaseEntityManager<CodeCommen
@Transactional
@Override
- public void save(CodeCommentReply reply) {
+ public void createOrUpdate(CodeCommentReply reply) {
if (reply.isNew()) {
dao.persist(reply);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQueryPersonalizationManager.java
index 80d37e9e03..1635432ec1 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQueryPersonalizationManager.java
@@ -1,14 +1,5 @@
package io.onedev.server.entitymanager.impl;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.criterion.Restrictions;
-
import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;
import io.onedev.server.model.CommitQueryPersonalization;
import io.onedev.server.model.Project;
@@ -19,6 +10,13 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
+import org.hibernate.criterion.Restrictions;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.stream.Collectors;
@Singleton
public class DefaultCommitQueryPersonalizationManager extends BaseEntityManager<CommitQueryPersonalization>
@@ -40,7 +38,7 @@ public class DefaultCommitQueryPersonalizationManager extends BaseEntityManager<
@Transactional
@Override
- public void save(CommitQueryPersonalization personalization) {
+ public void createOrUpdate(CommitQueryPersonalization personalization) {
Collection<String> retainNames = new HashSet<>();
retainNames.addAll(personalization.getQueries().stream()
.map(it->NamedQuery.PERSONAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
@@ -52,7 +50,7 @@ public class DefaultCommitQueryPersonalizationManager extends BaseEntityManager<
if (!personalization.isNew())
delete(personalization);
} else {
- super.save(personalization);
+ dao.persist(personalization);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardGroupShareManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardGroupShareManager.java
index 35aa1db792..4f3e2a6882 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardGroupShareManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardGroupShareManager.java
@@ -60,9 +60,9 @@ public class DefaultDashboardGroupShareManager extends BaseEntityManager<Dashboa
MapDifference<String, DashboardGroupShare> diff = Maps.difference(currentMap, syncMap);
diff.entriesOnlyOnLeft().values().forEach(share -> delete(share));
- diff.entriesOnlyOnRight().values().forEach(share -> save(share));
+ diff.entriesOnlyOnRight().values().forEach(share -> dao.persist(share));
}
-
+
@Override
public List<DashboardGroupShare> query() {
return query(true);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardUserShareManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardUserShareManager.java
index d6b482e5de..5f8a26fd41 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardUserShareManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardUserShareManager.java
@@ -70,7 +70,7 @@ public class DefaultDashboardUserShareManager extends BaseEntityManager<Dashboar
MapDifference<String, DashboardUserShare> diff = Maps.difference(currentMap, syncMap);
diff.entriesOnlyOnLeft().values().forEach(share -> delete(share));
- diff.entriesOnlyOnRight().values().forEach(share -> save(share));
+ diff.entriesOnlyOnRight().values().forEach(share -> dao.persist(share));
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
index 40c97c64e0..575adbdbaf 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
@@ -137,7 +137,7 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
@Transactional
@Override
- public void save(EmailAddress emailAddress) {
+ public void createOrUpdate(EmailAddress emailAddress) {
boolean isNew = emailAddress.isNew();
emailAddress.setValue(emailAddress.getValue().toLowerCase());
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGitLfsLockManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGitLfsLockManager.java
index a81bf02a8e..cc38ec7ffa 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGitLfsLockManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGitLfsLockManager.java
@@ -3,6 +3,7 @@ package io.onedev.server.entitymanager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
+import io.onedev.server.persistence.annotation.Transactional;
import org.hibernate.criterion.Restrictions;
import io.onedev.server.entitymanager.GitLfsLockManager;
@@ -27,4 +28,10 @@ public class DefaultGitLfsLockManager extends BaseEntityManager<GitLfsLock> impl
return find(criteria);
}
+ @Transactional
+ @Override
+ public void create(GitLfsLock lock) {
+ dao.persist(lock);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGpgKeyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGpgKeyManager.java
index 2c286f1c6f..3a9bf08d73 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGpgKeyManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGpgKeyManager.java
@@ -154,5 +154,11 @@ public class DefaultGpgKeyManager extends BaseEntityManager<GpgKey> implements G
return null;
}
}
-
+
+ @Transactional
+ @Override
+ public void create(GpgKey gpgKey) {
+ dao.persist(gpgKey);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java
index 67ca3b3ee1..618b30d9d5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java
@@ -33,7 +33,7 @@ public class DefaultGroupAuthorizationManager extends BaseEntityManager<GroupAut
if (newAuthorization.getProject().equals(authorization.getProject())) {
found = true;
authorization.setRole(newAuthorization.getRole());
- save(authorization);
+ dao.persist(authorization);
}
}
if (!found) {
@@ -52,11 +52,17 @@ public class DefaultGroupAuthorizationManager extends BaseEntityManager<GroupAut
}
if (!found) {
group.getAuthorizations().add(newAuthorization);
- save(newAuthorization);
+ dao.persist(newAuthorization);
}
}
}
-
+
+ @Transactional
+ @Override
+ public void createOrUpdate(GroupAuthorization authorization) {
+ dao.persist(authorization);
+ }
+
@Override
public List<GroupAuthorization> query() {
return query(true);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueAuthorizationManager.java
index bdb9908789..4be2aa4892 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueAuthorizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueAuthorizationManager.java
@@ -47,8 +47,14 @@ public class DefaultIssueAuthorizationManager extends BaseEntityManager<IssueAut
authorization.setIssue(issue);
authorization.setUser(user);
issue.getAuthorizations().add(authorization);
- save(authorization);
+ createOrUpdate(authorization);
}
}
+ @Transactional
+ @Override
+ public void createOrUpdate(IssueAuthorization authorization) {
+ dao.persist(authorization);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index 36e6b1d85b..a29487afd5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -174,7 +174,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
@Transactional
@Override
public void addSchedule(Issue issue, Milestone milestone) {
- issueScheduleManager.save(issue.addSchedule(milestone));
+ issueScheduleManager.create(issue.addSchedule(milestone));
IssueChange change = new IssueChange();
change.setIssue(issue);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java
index 95a1aa7ab9..d0beacf049 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java
@@ -47,12 +47,18 @@ public class DefaultIssueFieldManager extends BaseEntityManager<IssueField> impl
query.executeUpdate();
}
- for (IssueField entity: issue.getFields()) {
- if (entity.isNew())
- save(entity);
+ for (IssueField field: issue.getFields()) {
+ if (field.isNew())
+ create(field);
}
}
+ @Transactional
+ @Override
+ public void create(IssueField field) {
+ dao.persist(field);
+ }
+
@Transactional
@Override
public void onRenameGroup(String oldName, String newName) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java
index 6cfedba6ff..e1b94fd4ec 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java
@@ -1,166 +1,172 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
-
-import org.hibernate.Hibernate;
-import org.hibernate.query.Query;
-
-import io.onedev.server.entitymanager.IssueFieldManager;
-import io.onedev.server.entitymanager.IssueLinkManager;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueLink;
-import io.onedev.server.model.LinkSpec;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-
-@Singleton
-public class DefaultIssueLinkManager extends BaseEntityManager<IssueLink> implements IssueLinkManager {
-
- private final IssueFieldManager fieldManager;
-
- @Inject
- public DefaultIssueLinkManager(Dao dao, IssueFieldManager fieldManager) {
- super(dao);
- this.fieldManager = fieldManager;
- }
-
- @Transactional
- @Override
- public void syncLinks(LinkSpec spec, Issue issue, Collection<Issue> linkedIssues, boolean opposite) {
- if (spec.getOpposite() != null) {
- Collection<IssueLink> links = opposite?issue.getSourceLinks():issue.getTargetLinks();
- for (IssueLink link: links) {
- if (link.getSpec().equals(spec) && !linkedIssues.contains(link.getLinked(issue)))
- delete(link);
- }
- for (Issue linkedIssue: linkedIssues) {
- boolean found = false;
- for (IssueLink link: links) {
- if (link.getSpec().equals(spec) && link.getLinked(issue).equals(linkedIssue)) {
- found = true;
- break;
- }
- }
- if (!found) {
- IssueLink link = new IssueLink();
- link.setSpec(spec);
- if (opposite) {
- link.setSource(linkedIssue);
- link.setTarget(issue);
- } else {
- link.setSource(issue);
- link.setTarget(linkedIssue);
- }
- save(link);
- }
- }
- } else {
- for (IssueLink link: issue.getLinks()) {
- if (link.getSpec().equals(spec) && !linkedIssues.contains(link.getLinked(issue)))
- delete(link);
- }
- for (Issue linkedIssue: linkedIssues) {
- boolean found = false;
- for (IssueLink link: issue.getLinks()) {
- if (link.getSpec().equals(spec) && link.getLinked(issue).equals(linkedIssue)) {
- found = true;
- break;
- }
- }
- if (!found) {
- IssueLink link = new IssueLink();
- link.setSpec(spec);
- link.setSource(issue);
- link.setTarget(linkedIssue);
- save(link);
- }
- }
- }
- }
-
- @Sessional
- @Override
- public void populateLinks(Collection<Issue> issues) {
- CriteriaBuilder builder = getSession().getCriteriaBuilder();
- CriteriaQuery<IssueLink> linkQuery = builder.createQuery(IssueLink.class);
-
- Root<IssueLink> linkRoot = linkQuery.from(IssueLink.class);
- linkQuery.select(linkRoot);
-
- linkQuery.where(builder.or(
- linkRoot.get(IssueLink.PROP_SOURCE).in(issues),
- linkRoot.get(IssueLink.PROP_TARGET).in(issues)));
-
- for (Issue issue: issues) {
- issue.setSourceLinks(new ArrayList<>());
- issue.setTargetLinks(new ArrayList<>());
- }
-
- for (IssueLink link: getSession().createQuery(linkQuery).getResultList()) {
- issues.stream().filter(it->it.equals(link.getSource())).forEach(it->it.getTargetLinks().add(link));
- issues.stream().filter(it->it.equals(link.getTarget())).forEach(it->it.getSourceLinks().add(link));
- }
- }
-
- @Sessional
- @Override
- public void loadDeepLinks(Issue issue) {
- CriteriaBuilder builder = getSession().getCriteriaBuilder();
- CriteriaQuery<Object[]> criteriaQuery = builder.createQuery(Object[].class);
- Root<IssueLink> root = criteriaQuery.from(IssueLink.class);
- criteriaQuery.multiselect(root, root.get(IssueLink.PROP_SOURCE), root.get(IssueLink.PROP_TARGET));
-
- criteriaQuery.where(builder.or(
- builder.equal(root.get(IssueLink.PROP_SOURCE), issue),
- builder.equal(root.get(IssueLink.PROP_TARGET), issue)));
-
- Query<Object[]> query = getSession().createQuery(criteriaQuery);
- query.setFirstResult(0);
- query.setMaxResults(Integer.MAX_VALUE);
-
- List<IssueLink> sourceLinks = new ArrayList<>();
- List<IssueLink> targetLinks = new ArrayList<>();
-
- List<Object[]> results = query.getResultList();
- if (!results.isEmpty()) {
- Map<Long, Issue> issues = new HashMap<>();
- for (Object[] row: results) {
- IssueLink link = (IssueLink) row[0];
- Issue source = (Issue) row[1];
- Issue target = (Issue) row[2];
- if (!source.equals(issue))
- sourceLinks.add(link);
- issues.put(source.getId(), source);
- if (!target.equals(issue))
- targetLinks.add(link);
- issues.put(target.getId(), target);
- }
-
- if (Hibernate.isInitialized(issue.getFields())) {
- issues.remove(issue.getId());
- fieldManager.populateFields(issues.values());
- populateLinks(issues.values());
- } else {
- fieldManager.populateFields(issues.values());
- issues.remove(issue.getId());
- populateLinks(issues.values());
- }
- }
-
- issue.setSourceLinks(sourceLinks);
- issue.setTargetLinks(targetLinks);
- }
-
-}
+package io.onedev.server.entitymanager.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+
+import org.hibernate.Hibernate;
+import org.hibernate.query.Query;
+
+import io.onedev.server.entitymanager.IssueFieldManager;
+import io.onedev.server.entitymanager.IssueLinkManager;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueLink;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultIssueLinkManager extends BaseEntityManager<IssueLink> implements IssueLinkManager {
+
+ private final IssueFieldManager fieldManager;
+
+ @Inject
+ public DefaultIssueLinkManager(Dao dao, IssueFieldManager fieldManager) {
+ super(dao);
+ this.fieldManager = fieldManager;
+ }
+
+ @Transactional
+ @Override
+ public void syncLinks(LinkSpec spec, Issue issue, Collection<Issue> linkedIssues, boolean opposite) {
+ if (spec.getOpposite() != null) {
+ Collection<IssueLink> links = opposite?issue.getSourceLinks():issue.getTargetLinks();
+ for (IssueLink link: links) {
+ if (link.getSpec().equals(spec) && !linkedIssues.contains(link.getLinked(issue)))
+ delete(link);
+ }
+ for (Issue linkedIssue: linkedIssues) {
+ boolean found = false;
+ for (IssueLink link: links) {
+ if (link.getSpec().equals(spec) && link.getLinked(issue).equals(linkedIssue)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ IssueLink link = new IssueLink();
+ link.setSpec(spec);
+ if (opposite) {
+ link.setSource(linkedIssue);
+ link.setTarget(issue);
+ } else {
+ link.setSource(issue);
+ link.setTarget(linkedIssue);
+ }
+ create(link);
+ }
+ }
+ } else {
+ for (IssueLink link: issue.getLinks()) {
+ if (link.getSpec().equals(spec) && !linkedIssues.contains(link.getLinked(issue)))
+ delete(link);
+ }
+ for (Issue linkedIssue: linkedIssues) {
+ boolean found = false;
+ for (IssueLink link: issue.getLinks()) {
+ if (link.getSpec().equals(spec) && link.getLinked(issue).equals(linkedIssue)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ IssueLink link = new IssueLink();
+ link.setSpec(spec);
+ link.setSource(issue);
+ link.setTarget(linkedIssue);
+ create(link);
+ }
+ }
+ }
+ }
+
+ @Transactional
+ @Override
+ public void create(IssueLink link) {
+ dao.persist(link);
+ }
+
+ @Sessional
+ @Override
+ public void populateLinks(Collection<Issue> issues) {
+ CriteriaBuilder builder = getSession().getCriteriaBuilder();
+ CriteriaQuery<IssueLink> linkQuery = builder.createQuery(IssueLink.class);
+
+ Root<IssueLink> linkRoot = linkQuery.from(IssueLink.class);
+ linkQuery.select(linkRoot);
+
+ linkQuery.where(builder.or(
+ linkRoot.get(IssueLink.PROP_SOURCE).in(issues),
+ linkRoot.get(IssueLink.PROP_TARGET).in(issues)));
+
+ for (Issue issue: issues) {
+ issue.setSourceLinks(new ArrayList<>());
+ issue.setTargetLinks(new ArrayList<>());
+ }
+
+ for (IssueLink link: getSession().createQuery(linkQuery).getResultList()) {
+ issues.stream().filter(it->it.equals(link.getSource())).forEach(it->it.getTargetLinks().add(link));
+ issues.stream().filter(it->it.equals(link.getTarget())).forEach(it->it.getSourceLinks().add(link));
+ }
+ }
+
+ @Sessional
+ @Override
+ public void loadDeepLinks(Issue issue) {
+ CriteriaBuilder builder = getSession().getCriteriaBuilder();
+ CriteriaQuery<Object[]> criteriaQuery = builder.createQuery(Object[].class);
+ Root<IssueLink> root = criteriaQuery.from(IssueLink.class);
+ criteriaQuery.multiselect(root, root.get(IssueLink.PROP_SOURCE), root.get(IssueLink.PROP_TARGET));
+
+ criteriaQuery.where(builder.or(
+ builder.equal(root.get(IssueLink.PROP_SOURCE), issue),
+ builder.equal(root.get(IssueLink.PROP_TARGET), issue)));
+
+ Query<Object[]> query = getSession().createQuery(criteriaQuery);
+ query.setFirstResult(0);
+ query.setMaxResults(Integer.MAX_VALUE);
+
+ List<IssueLink> sourceLinks = new ArrayList<>();
+ List<IssueLink> targetLinks = new ArrayList<>();
+
+ List<Object[]> results = query.getResultList();
+ if (!results.isEmpty()) {
+ Map<Long, Issue> issues = new HashMap<>();
+ for (Object[] row: results) {
+ IssueLink link = (IssueLink) row[0];
+ Issue source = (Issue) row[1];
+ Issue target = (Issue) row[2];
+ if (!source.equals(issue))
+ sourceLinks.add(link);
+ issues.put(source.getId(), source);
+ if (!target.equals(issue))
+ targetLinks.add(link);
+ issues.put(target.getId(), target);
+ }
+
+ if (Hibernate.isInitialized(issue.getFields())) {
+ issues.remove(issue.getId());
+ fieldManager.populateFields(issues.values());
+ populateLinks(issues.values());
+ } else {
+ fieldManager.populateFields(issues.values());
+ issues.remove(issue.getId());
+ populateLinks(issues.values());
+ }
+ }
+
+ issue.setSourceLinks(sourceLinks);
+ issue.setTargetLinks(targetLinks);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 1a1c38e2be..53cba6cd7f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -214,7 +214,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
authorization.setIssue(issue);
authorization.setUser(issue.getSubmitter());
issue.getAuthorizations().add(authorization);
- authorizationManager.save(authorization);
+ authorizationManager.createOrUpdate(authorization);
updateCacheAfterCommit(Lists.newArrayList(issue));
listenerRegistry.post(new IssueOpened(issue));
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueMentionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueMentionManager.java
index 5a990e0364..7c5b45a01d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueMentionManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueMentionManager.java
@@ -25,8 +25,8 @@ public class DefaultIssueMentionManager extends BaseEntityManager<IssueMention>
IssueMention mention = new IssueMention();
mention.setIssue(issue);
mention.setUser(user);
- save(mention);
+ dao.persist(mention);
}
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java
index a9a33355ba..5b8a5ed612 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java
@@ -1,14 +1,5 @@
package io.onedev.server.entitymanager.impl;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.criterion.Restrictions;
-
import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
import io.onedev.server.model.IssueQueryPersonalization;
import io.onedev.server.model.Project;
@@ -19,6 +10,13 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
+import org.hibernate.criterion.Restrictions;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.stream.Collectors;
@Singleton
public class DefaultIssueQueryPersonalizationManager extends BaseEntityManager<IssueQueryPersonalization>
@@ -40,7 +38,7 @@ public class DefaultIssueQueryPersonalizationManager extends BaseEntityManager<I
@Transactional
@Override
- public void save(IssueQueryPersonalization personalization) {
+ public void createOrUpdate(IssueQueryPersonalization personalization) {
Collection<String> retainNames = new HashSet<>();
retainNames.addAll(personalization.getQueries().stream()
.map(it->NamedQuery.PERSONAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
@@ -52,7 +50,7 @@ public class DefaultIssueQueryPersonalizationManager extends BaseEntityManager<I
if (!personalization.isNew())
delete(personalization);
} else {
- super.save(personalization);
+ dao.persist(personalization);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueScheduleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueScheduleManager.java
index 843075164a..84683fbfa2 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueScheduleManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueScheduleManager.java
@@ -43,5 +43,11 @@ public class DefaultIssueScheduleManager extends BaseEntityManager<IssueSchedule
}
}
}
-
+
+ @Transactional
+ @Override
+ public void create(IssueSchedule schedule) {
+ dao.persist(schedule);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueVoteManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueVoteManager.java
index 7a8607bb55..211e11cb57 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueVoteManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueVoteManager.java
@@ -19,10 +19,10 @@ public class DefaultIssueVoteManager extends BaseEntityManager<IssueVote>
}
@Transactional
- public void save(IssueVote vote) {
- if (vote.isNew())
- vote.getIssue().setVoteCount(vote.getIssue().getVoteCount()+1);
- super.save(vote);
+ @Override
+ public void create(IssueVote vote) {
+ vote.getIssue().setVoteCount(vote.getIssue().getVoteCount()+1);
+ dao.persist(vote);
}
@Transactional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java
index f3d1a907b4..33976e911a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java
@@ -3,6 +3,7 @@ package io.onedev.server.entitymanager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
+import io.onedev.server.persistence.annotation.Transactional;
import org.hibernate.criterion.Restrictions;
import io.onedev.server.entitymanager.IssueWatchManager;
@@ -35,8 +36,14 @@ public class DefaultIssueWatchManager extends BaseEntityManager<IssueWatch>
IssueWatch watch = (IssueWatch) issue.getWatch(user, true);
if (watch.isNew()) {
watch.setWatching(watching);
- save(watch);
+ createOrUpdate(watch);
}
}
-
+
+ @Transactional
+ @Override
+ public void createOrUpdate(IssueWatch watch) {
+ dao.persist(watch);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLabelManager.java
index 633d231186..77e98f9643 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLabelManager.java
@@ -1,71 +1,70 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-
-import io.onedev.server.entitymanager.LabelManager;
-import io.onedev.server.model.LabelSpec;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityCriteria;
-
-@Singleton
-public class DefaultLabelManager extends BaseEntityManager<LabelSpec> implements LabelManager {
-
- @Inject
- public DefaultLabelManager(Dao dao) {
- super(dao);
- }
-
- @Override
- public LabelSpec find(String name) {
- EntityCriteria<LabelSpec> criteria = EntityCriteria.of(LabelSpec.class);
- criteria.add(Restrictions.eq(LabelSpec.PROP_NAME, name));
- return find(criteria);
- }
-
- private EntityCriteria<LabelSpec> getCriteria(@Nullable String term) {
- EntityCriteria<LabelSpec> criteria = EntityCriteria.of(LabelSpec.class);
- if (term != null)
- criteria.add(Restrictions.ilike(LabelSpec.PROP_NAME, term, MatchMode.ANYWHERE));
- else
- criteria.setCacheable(true);
- return criteria;
- }
-
- @Sessional
- @Override
- public List<LabelSpec> query(String term, int firstResult, int maxResults) {
- EntityCriteria<LabelSpec> criteria = getCriteria(term);
- criteria.addOrder(Order.asc(LabelSpec.PROP_NAME));
- return query(criteria, firstResult, maxResults);
- }
-
- @Sessional
- @Override
- public int count(String term) {
- return count(getCriteria(term));
- }
-
- @Transactional
- @Override
- public void sync(List<LabelSpec> labels) {
- for (var label: labels) {
- save(label);
- }
- for (var existingLabel: query()) {
- if (!labels.contains(existingLabel))
- delete(existingLabel);
- }
- }
-
+package io.onedev.server.entitymanager.impl;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.criterion.MatchMode;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.server.entitymanager.LabelManager;
+import io.onedev.server.model.LabelSpec;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+
+@Singleton
+public class DefaultLabelManager extends BaseEntityManager<LabelSpec> implements LabelManager {
+
+ @Inject
+ public DefaultLabelManager(Dao dao) {
+ super(dao);
+ }
+
+ @Override
+ public LabelSpec find(String name) {
+ EntityCriteria<LabelSpec> criteria = EntityCriteria.of(LabelSpec.class);
+ criteria.add(Restrictions.eq(LabelSpec.PROP_NAME, name));
+ return find(criteria);
+ }
+
+ private EntityCriteria<LabelSpec> getCriteria(@Nullable String term) {
+ EntityCriteria<LabelSpec> criteria = EntityCriteria.of(LabelSpec.class);
+ if (term != null)
+ criteria.add(Restrictions.ilike(LabelSpec.PROP_NAME, term, MatchMode.ANYWHERE));
+ else
+ criteria.setCacheable(true);
+ return criteria;
+ }
+
+ @Sessional
+ @Override
+ public List<LabelSpec> query(String term, int firstResult, int maxResults) {
+ EntityCriteria<LabelSpec> criteria = getCriteria(term);
+ criteria.addOrder(Order.asc(LabelSpec.PROP_NAME));
+ return query(criteria, firstResult, maxResults);
+ }
+
+ @Sessional
+ @Override
+ public int count(String term) {
+ return count(getCriteria(term));
+ }
+
+ @Transactional
+ @Override
+ public void sync(List<LabelSpec> labels) {
+ for (var label: labels)
+ dao.persist(label);
+ for (var existingLabel: query()) {
+ if (!labels.contains(existingLabel))
+ delete(existingLabel);
+ }
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkAuthorizationManager.java
index 5f91898605..f5eaeb8e46 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkAuthorizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkAuthorizationManager.java
@@ -1,49 +1,55 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.onedev.server.entitymanager.LinkAuthorizationManager;
-import io.onedev.server.model.LinkAuthorization;
-import io.onedev.server.model.LinkSpec;
-import io.onedev.server.model.Role;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-
-@Singleton
-public class DefaultLinkAuthorizationManager extends BaseEntityManager<LinkAuthorization> implements LinkAuthorizationManager {
-
- @Inject
- public DefaultLinkAuthorizationManager(Dao dao) {
- super(dao);
- }
-
- @Transactional
- @Override
- public void syncAuthorizations(Role role, Collection<LinkSpec> authorizedLinks) {
- for (LinkAuthorization authorization: role.getLinkAuthorizations()) {
- if (!authorizedLinks.contains(authorization.getLink()))
- delete(authorization);
- }
-
- for (LinkSpec link: authorizedLinks) {
- boolean found = false;
- for (LinkAuthorization authorization: role.getLinkAuthorizations()) {
- if (authorization.getLink().equals(link)) {
- found = true;
- break;
- }
- }
- if (!found) {
- LinkAuthorization authorization = new LinkAuthorization();
- authorization.setLink(link);
- authorization.setRole(role);
- save(authorization);
- }
- }
- }
-
-}
+package io.onedev.server.entitymanager.impl;
+
+import java.util.Collection;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.onedev.server.entitymanager.LinkAuthorizationManager;
+import io.onedev.server.model.LinkAuthorization;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.model.Role;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultLinkAuthorizationManager extends BaseEntityManager<LinkAuthorization> implements LinkAuthorizationManager {
+
+ @Inject
+ public DefaultLinkAuthorizationManager(Dao dao) {
+ super(dao);
+ }
+
+ @Transactional
+ @Override
+ public void syncAuthorizations(Role role, Collection<LinkSpec> authorizedLinks) {
+ for (LinkAuthorization authorization: role.getLinkAuthorizations()) {
+ if (!authorizedLinks.contains(authorization.getLink()))
+ delete(authorization);
+ }
+
+ for (LinkSpec link: authorizedLinks) {
+ boolean found = false;
+ for (LinkAuthorization authorization: role.getLinkAuthorizations()) {
+ if (authorization.getLink().equals(link)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ LinkAuthorization authorization = new LinkAuthorization();
+ authorization.setLink(link);
+ authorization.setRole(role);
+ create(authorization);
+ }
+ }
+ }
+
+ @Transactional
+ @Override
+ public void create(LinkAuthorization authorization) {
+ dao.persist(authorization);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java
index 0d86c802c0..b67ea8cf8c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java
@@ -1,173 +1,179 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.onedev.server.cluster.ClusterManager;
-import io.onedev.server.entitymanager.LinkSpecManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.event.Listen;
-import io.onedev.server.event.system.SystemStarted;
-import io.onedev.server.model.LinkSpec;
-import io.onedev.server.persistence.TransactionManager;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.search.entity.issue.IssueQueryUpdater;
-import io.onedev.server.util.facade.LinkSpecFacade;
-import io.onedev.server.util.usage.Usage;
-
-@Singleton
-public class DefaultLinkSpecManager extends BaseEntityManager<LinkSpec> implements LinkSpecManager {
-
- private final SettingManager settingManager;
-
- private final TransactionManager transactionManager;
-
- private final ClusterManager clusterManager;
-
- private volatile Map<String, Long> ids;
-
- private volatile Map<Long, LinkSpecFacade> cache;
-
- @Inject
- public DefaultLinkSpecManager(Dao dao, SettingManager settingManager, TransactionManager transactionManager,
- ClusterManager clusterManager) {
- super(dao);
- this.settingManager = settingManager;
- this.transactionManager = transactionManager;
- this.clusterManager = clusterManager;
- }
-
- @Sessional
- @Listen
- public void on(SystemStarted event) {
- ids = clusterManager.getHazelcastInstance().getReplicatedMap("linkSpecIds");
- cache = clusterManager.getHazelcastInstance().getReplicatedMap("linkSpecCache");
-
- for (LinkSpec link: query(true)) {
- ids.put(link.getName(), link.getId());
-
- String oppositeName = link.getOpposite()!=null?link.getOpposite().getName():null;
- if (oppositeName != null)
- ids.put(oppositeName, link.getId());
- cache.put(link.getId(), link.getFacade());
- }
- }
-
- @Sessional
- @Override
- public LinkSpec find(String name) {
- Long linkId = ids.get(name);
- if (linkId != null) {
- LinkSpecFacade facade = cache.get(linkId);
- if (facade != null && (name.equals(facade.getName()) || name.equals(facade.getOppositeName())))
- return load(linkId);
- }
- return null;
- }
-
- @Override
- public List<LinkSpec> queryAndSort() {
- List<LinkSpec> links = query(true);
- links.sort(Comparator.comparing(LinkSpec::getOrder));
- return links;
- }
-
- @Transactional
- @Override
- public void updateOrders(List<LinkSpec> links) {
- for (int i=0; i<links.size(); i++) {
- LinkSpec link = links.get(i);
- link.setOrder(i+1);
- save(link);
- }
- }
-
- @Transactional
- @Override
- public void save(LinkSpec spec, String oldName, String oldOppositeName) {
- if (oldName != null) {
- if (oldOppositeName != null) {
- if (spec.getOpposite() == null) {
- Usage usage = new Usage();
- usage.add(settingManager.onDeleteLink(oldOppositeName));
- for (LinkSpec link: query(true)) {
- for (IssueQueryUpdater updater: link.getQueryUpdaters())
- usage.add(updater.onDeleteLink(oldOppositeName));
- }
- usage.checkInUse("Opposite side of issue link '" + oldName + "'");
- } else if (!oldOppositeName.equals(spec.getOpposite().getName())){
- settingManager.onRenameLink(oldOppositeName, spec.getOpposite().getName());
- for (LinkSpec link: query(true)) {
- for (IssueQueryUpdater updater: link.getQueryUpdaters())
- updater.onRenameLink(oldOppositeName, spec.getOpposite().getName());
- }
- }
- }
- if (!oldName.equals(spec.getName())) {
- settingManager.onRenameLink(oldName, spec.getName());
- for (LinkSpec link: query(true)) {
- for (IssueQueryUpdater updater: link.getQueryUpdaters())
- updater.onRenameLink(oldName, spec.getName());
- }
- }
- }
- super.save(spec);
-
- LinkSpecFacade facade = new LinkSpecFacade(spec);
-
- transactionManager.runAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- cache.put(facade.getId(), facade);
- ids.put(facade.getName(), facade.getId());
- if (facade.getOppositeName() != null)
- ids.put(facade.getOppositeName(), facade.getId());
- }
-
- });
- }
-
- @Transactional
- public void delete(LinkSpec spec) {
- if (spec.getOpposite() != null) {
- Usage usage = new Usage();
- usage.add(settingManager.onDeleteLink(spec.getOpposite().getName()));
- for (LinkSpec link: query(true)) {
- for (IssueQueryUpdater updater: link.getQueryUpdaters())
- usage.add(updater.onDeleteLink(spec.getOpposite().getName()));
- }
- usage.checkInUse("Opposite side of issue link '" + spec.getName() + "'");
- }
-
- Usage usage = new Usage();
- usage.add(settingManager.onDeleteLink(spec.getName()));
- for (LinkSpec link: query(true)) {
- for (IssueQueryUpdater updater: link.getQueryUpdaters())
- usage.add(updater.onDeleteLink(spec.getName()));
- }
- usage.checkInUse("Issue link '" + spec.getName() + "'");
-
- super.delete(spec);
-
- transactionManager.runAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- cache.remove(spec.getId());
- ids.remove(spec.getName());
- if (spec.getOpposite() != null)
- ids.remove(spec.getOpposite().getName());
- }
-
- });
- }
-
-}
+package io.onedev.server.entitymanager.impl;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.onedev.server.cluster.ClusterManager;
+import io.onedev.server.entitymanager.LinkSpecManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.event.Listen;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.search.entity.issue.IssueQueryUpdater;
+import io.onedev.server.util.facade.LinkSpecFacade;
+import io.onedev.server.util.usage.Usage;
+
+@Singleton
+public class DefaultLinkSpecManager extends BaseEntityManager<LinkSpec> implements LinkSpecManager {
+
+ private final SettingManager settingManager;
+
+ private final TransactionManager transactionManager;
+
+ private final ClusterManager clusterManager;
+
+ private volatile Map<String, Long> ids;
+
+ private volatile Map<Long, LinkSpecFacade> cache;
+
+ @Inject
+ public DefaultLinkSpecManager(Dao dao, SettingManager settingManager, TransactionManager transactionManager,
+ ClusterManager clusterManager) {
+ super(dao);
+ this.settingManager = settingManager;
+ this.transactionManager = transactionManager;
+ this.clusterManager = clusterManager;
+ }
+
+ @Sessional
+ @Listen
+ public void on(SystemStarted event) {
+ ids = clusterManager.getHazelcastInstance().getReplicatedMap("linkSpecIds");
+ cache = clusterManager.getHazelcastInstance().getReplicatedMap("linkSpecCache");
+
+ for (LinkSpec link: query(true)) {
+ ids.put(link.getName(), link.getId());
+
+ String oppositeName = link.getOpposite()!=null?link.getOpposite().getName():null;
+ if (oppositeName != null)
+ ids.put(oppositeName, link.getId());
+ cache.put(link.getId(), link.getFacade());
+ }
+ }
+
+ @Sessional
+ @Override
+ public LinkSpec find(String name) {
+ Long linkId = ids.get(name);
+ if (linkId != null) {
+ LinkSpecFacade facade = cache.get(linkId);
+ if (facade != null && (name.equals(facade.getName()) || name.equals(facade.getOppositeName())))
+ return load(linkId);
+ }
+ return null;
+ }
+
+ @Override
+ public List<LinkSpec> queryAndSort() {
+ List<LinkSpec> links = query(true);
+ links.sort(Comparator.comparing(LinkSpec::getOrder));
+ return links;
+ }
+
+ @Transactional
+ @Override
+ public void updateOrders(List<LinkSpec> links) {
+ for (int i=0; i<links.size(); i++) {
+ LinkSpec link = links.get(i);
+ link.setOrder(i+1);
+ dao.persist(link);
+ }
+ }
+
+ @Transactional
+ @Override
+ public void update(LinkSpec spec, String oldName, String oldOppositeName) {
+ if (oldName != null) {
+ if (oldOppositeName != null) {
+ if (spec.getOpposite() == null) {
+ Usage usage = new Usage();
+ usage.add(settingManager.onDeleteLink(oldOppositeName));
+ for (LinkSpec link: query(true)) {
+ for (IssueQueryUpdater updater: link.getQueryUpdaters())
+ usage.add(updater.onDeleteLink(oldOppositeName));
+ }
+ usage.checkInUse("Opposite side of issue link '" + oldName + "'");
+ } else if (!oldOppositeName.equals(spec.getOpposite().getName())){
+ settingManager.onRenameLink(oldOppositeName, spec.getOpposite().getName());
+ for (LinkSpec link: query(true)) {
+ for (IssueQueryUpdater updater: link.getQueryUpdaters())
+ updater.onRenameLink(oldOppositeName, spec.getOpposite().getName());
+ }
+ }
+ }
+ if (!oldName.equals(spec.getName())) {
+ settingManager.onRenameLink(oldName, spec.getName());
+ for (LinkSpec link: query(true)) {
+ for (IssueQueryUpdater updater: link.getQueryUpdaters())
+ updater.onRenameLink(oldName, spec.getName());
+ }
+ }
+ }
+ dao.persist(spec);
+
+ LinkSpecFacade facade = new LinkSpecFacade(spec);
+
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ cache.put(facade.getId(), facade);
+ ids.put(facade.getName(), facade.getId());
+ if (facade.getOppositeName() != null)
+ ids.put(facade.getOppositeName(), facade.getId());
+ }
+
+ });
+ }
+
+ @Transactional
+ @Override
+ public void create(LinkSpec link) {
+ dao.persist(link);
+ }
+
+ @Transactional
+ public void delete(LinkSpec spec) {
+ if (spec.getOpposite() != null) {
+ Usage usage = new Usage();
+ usage.add(settingManager.onDeleteLink(spec.getOpposite().getName()));
+ for (LinkSpec link: query(true)) {
+ for (IssueQueryUpdater updater: link.getQueryUpdaters())
+ usage.add(updater.onDeleteLink(spec.getOpposite().getName()));
+ }
+ usage.checkInUse("Opposite side of issue link '" + spec.getName() + "'");
+ }
+
+ Usage usage = new Usage();
+ usage.add(settingManager.onDeleteLink(spec.getName()));
+ for (LinkSpec link: query(true)) {
+ for (IssueQueryUpdater updater: link.getQueryUpdaters())
+ usage.add(updater.onDeleteLink(spec.getName()));
+ }
+ usage.checkInUse("Issue link '" + spec.getName() + "'");
+
+ super.delete(spec);
+
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ cache.remove(spec.getId());
+ ids.remove(spec.getName());
+ if (spec.getOpposite() != null)
+ ids.remove(spec.getOpposite().getName());
+ }
+
+ });
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java
index 11c7df87a9..fce0958c60 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java
@@ -83,7 +83,13 @@ public class DefaultMembershipManager extends BaseEntityManager<Membership> impl
MapDifference<String, Membership> diff = Maps.difference(currentMap, syncMap);
diff.entriesOnlyOnLeft().values().forEach(membership -> delete(membership));
- diff.entriesOnlyOnRight().values().forEach(membership -> save(membership));
+ diff.entriesOnlyOnRight().values().forEach(membership -> dao.persist(membership));
+ }
+
+ @Transactional
+ @Override
+ public void create(Membership membership) {
+ dao.persist(membership);
}
@Sessional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java
index bb46caee7b..28b8d7a311 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java
@@ -5,6 +5,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
+import io.onedev.server.persistence.annotation.Transactional;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
@@ -75,5 +76,11 @@ public class DefaultMilestoneManager extends BaseEntityManager<Milestone> implem
criteria.addOrder(Order.asc(Milestone.PROP_DUE_DATE));
return find(criteria);
}
-
+
+ @Transactional
+ @Override
+ public void createOrUpdate(Milestone milestone) {
+ dao.persist(milestone);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPendingSuggestionApplyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPendingSuggestionApplyManager.java
index 043091eef8..dd6756db3d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPendingSuggestionApplyManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPendingSuggestionApplyManager.java
@@ -123,4 +123,10 @@ public class DefaultPendingSuggestionApplyManager extends BaseEntityManager<Pend
return getSession().createQuery(criteriaQuery).list();
}
+ @Transactional
+ @Override
+ public void create(PendingSuggestionApply pendingSuggestionApply) {
+ dao.persist(pendingSuggestionApply);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectDynamicsManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectDynamicsManager.java
index 57accc464e..c392aa09bc 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectDynamicsManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectDynamicsManager.java
@@ -37,4 +37,10 @@ public class DefaultProjectDynamicsManager extends BaseEntityManager<ProjectDyna
}
}
+ @Transactional
+ @Override
+ public void create(ProjectDynamics dynamics) {
+ dao.persist(dynamics);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 571b5f80d1..4df1a53130 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -208,7 +208,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
@Transactional
@Override
- public void save(Project project) {
+ public void update(Project project) {
String oldPath = project.getPath();
String newPath = project.calcPath();
if (!newPath.equals(oldPath)) {
@@ -278,9 +278,9 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
create(parent);
project.setPath(project.calcPath());
- ProjectDynamics update = new ProjectDynamics();
- project.setDynamics(update);
- dynamicsManager.save(update);
+ ProjectDynamics dynamics = new ProjectDynamics();
+ project.setDynamics(dynamics);
+ dynamicsManager.create(dynamics);
dao.persist(project);
var projectDir = storageManager.getProjectDir(project.getId());
@@ -295,7 +295,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
authorization.setProject(project);
authorization.setUser(SecurityUtils.getUser());
authorization.setRole(roleManager.getOwner());
- userAuthorizationManager.save(authorization);
+ userAuthorizationManager.createOrUpdate(authorization);
updateStorageServer(project);
listenerRegistry.post(new ProjectCreated(project));
@@ -1009,7 +1009,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
public void move(Collection<Project> projects, Project parent) {
for (Project project : projects) {
project.setParent(parent);
- save(project);
+ update(project);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java
index ea1be8717e..e08a6dcce7 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java
@@ -29,8 +29,8 @@ public class DefaultPullRequestAssignmentManager extends BaseEntityManager<PullR
@Transactional
@Override
- public void save(PullRequestAssignment assignment) {
- super.save(assignment);
+ public void create(PullRequestAssignment assignment) {
+ dao.persist(assignment);
listenerRegistry.post(new PullRequestAssigned(
SecurityUtils.getUser(), new Date(),
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
index c25e3bbd3a..da9a495514 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
@@ -30,8 +30,8 @@ public class DefaultPullRequestCommentManager extends BaseEntityManager<PullRequ
@Transactional
@Override
- public void save(PullRequestComment comment) {
- save(comment, Lists.newArrayList());
+ public void createOrUpdate(PullRequestComment comment) {
+ createOrUpdate(comment, Lists.newArrayList());
}
@Transactional
@@ -42,8 +42,9 @@ public class DefaultPullRequestCommentManager extends BaseEntityManager<PullRequ
request.setCommentCount(request.getCommentCount()-1);
}
+ @Transactional
@Override
- public void save(PullRequestComment comment, Collection<String> notifiedEmailAddresses) {
+ public void createOrUpdate(PullRequestComment comment, Collection<String> notifiedEmailAddresses) {
boolean isNew = comment.isNew();
dao.persist(comment);
if (isNew) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 7841f0815d..e91896337a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -320,7 +320,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
ObjectId.fromString(request.getLatestUpdate().getHeadCommitHash()), null);
for (PullRequestUpdate update: request.getUpdates())
- updateManager.save(update);
+ updateManager.create(update);
for (PullRequestReview review: request.getReviews())
dao.persist(review);
@@ -425,7 +425,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
for (PullRequestReview review: request.getReviews()) {
if (review.isNew() || review.isDirty())
- reviewManager.save(review);
+ reviewManager.createOrUpdate(review);
}
Project targetProject = request.getTargetProject();
@@ -957,7 +957,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
throw new ExplicitException("Description too long");
request.setDescription(description);
referenceManager.addReferenceChange(request, description);
- save(request);
+ dao.persist(request);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestMentionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestMentionManager.java
index beefc40b33..12405a98eb 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestMentionManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestMentionManager.java
@@ -1,8 +1,9 @@
package io.onedev.server.entitymanager.impl;
-import io.onedev.server.entitymanager.IssueMentionManager;
import io.onedev.server.entitymanager.PullRequestMentionManager;
-import io.onedev.server.model.*;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestMention;
+import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@@ -24,8 +25,8 @@ public class DefaultPullRequestMentionManager extends BaseEntityManager<PullRequ
PullRequestMention mention = new PullRequestMention();
mention.setRequest(request);
mention.setUser(user);
- save(mention);
+ dao.persist(mention);
}
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQueryPersonalizationManager.java
index 365443b1f1..d07c92f14f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQueryPersonalizationManager.java
@@ -1,14 +1,5 @@
package io.onedev.server.entitymanager.impl;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.criterion.Restrictions;
-
import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequestQueryPersonalization;
@@ -19,6 +10,13 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
+import org.hibernate.criterion.Restrictions;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.stream.Collectors;
@Singleton
public class DefaultPullRequestQueryPersonalizationManager extends BaseEntityManager<PullRequestQueryPersonalization>
@@ -40,7 +38,7 @@ public class DefaultPullRequestQueryPersonalizationManager extends BaseEntityMan
@Transactional
@Override
- public void save(PullRequestQueryPersonalization personalization) {
+ public void createOrUpdate(PullRequestQueryPersonalization personalization) {
Collection<String> retainNames = new HashSet<>();
retainNames.addAll(personalization.getQueries().stream()
.map(it->NamedQuery.PERSONAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
@@ -52,7 +50,7 @@ public class DefaultPullRequestQueryPersonalizationManager extends BaseEntityMan
if (!personalization.isNew())
delete(personalization);
} else {
- super.save(personalization);
+ dao.persist(personalization);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
index 9d906d6dc5..feab2a25d5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
@@ -48,9 +48,9 @@ public class DefaultPullRequestReviewManager extends BaseEntityManager<PullReque
@Transactional
@Override
- public void save(PullRequestReview review) {
+ public void createOrUpdate(PullRequestReview review) {
review.setDirty(false);
- super.save(review);
+ dao.persist(review);
if (review.getStatus() == Status.PENDING) {
listenerRegistry.post(new PullRequestReviewRequested(
@@ -92,7 +92,7 @@ public class DefaultPullRequestReviewManager extends BaseEntityManager<PullReque
else
review.setStatus(PullRequestReview.Status.REQUESTED_FOR_CHANGES);
- save(review);
+ createOrUpdate(review);
PullRequestChange change = new PullRequestChange();
change.setDate(review.getStatusDate());
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
index 1ed0ad426e..98b59220a7 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
@@ -41,8 +41,8 @@ public class DefaultPullRequestUpdateManager extends BaseEntityManager<PullReque
@Transactional
@Override
- public void save(PullRequestUpdate update) {
- super.save(update);
+ public void create(PullRequestUpdate update) {
+ dao.persist(update);
PullRequest request = update.getRequest();
if (!request.getTargetProject().equals(request.getSourceProject())) {
if (request.getTargetProject().findPullRequestWithLFS()) {
@@ -72,7 +72,7 @@ public class DefaultPullRequestUpdateManager extends BaseEntityManager<PullReque
update.setHeadCommitHash(request.getSource().getObjectName());
update.setTargetHeadCommitHash(request.getTarget().getObjectName());
request.getUpdates().add(update);
- save(update);
+ create(update);
gitService.updateRef(request.getTargetProject(), request.getHeadRef(),
ObjectId.fromString(request.getLatestUpdate().getHeadCommitHash()), null);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java
index 5b4a8bdd4e..616fa8af8b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java
@@ -35,8 +35,13 @@ public class DefaultPullRequestWatchManager extends BaseEntityManager<PullReques
PullRequestWatch watch = (PullRequestWatch) request.getWatch(user, true);
if (watch.isNew()) {
watch.setWatching(watching);
- save(watch);
+ dao.persist(watch);
}
}
-
+
+ @Override
+ public void createOrUpdate(PullRequestWatch watch) {
+ dao.persist(watch);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
index dc22228feb..cf8683630f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
@@ -146,7 +146,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
for (Project project: role.getDefaultProjects()) {
project.setDefaultRole(null);
- projectManager.save(project);
+ projectManager.update(project);
}
dao.remove(role);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java
index 2899743545..4c5d35167c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java
@@ -66,11 +66,17 @@ public class DefaultSshKeyManager extends BaseEntityManager<SshKey> implements S
diff.entriesOnlyOnRight().values().forEach(sshKey -> {
if (findByDigest(sshKey.getDigest()) == null)
- save(sshKey);
+ create(sshKey);
else
logger.warn("SSH key is already in use (digest: {})", sshKey.getDigest());
});
}
+ @Transactional
+ @Override
+ public void create(SshKey sshKey) {
+ dao.persist(sshKey);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java
index c98113293a..6dc5d3fc7a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java
@@ -34,7 +34,7 @@ public class DefaultUserAuthorizationManager extends BaseEntityManager<UserAutho
if (newAuthorization.getProject().equals(authorization.getProject())) {
found = true;
authorization.setRole(newAuthorization.getRole());
- save(authorization);
+ dao.persist(authorization);
}
}
if (!found) {
@@ -53,7 +53,7 @@ public class DefaultUserAuthorizationManager extends BaseEntityManager<UserAutho
}
if (!found) {
user.getProjectAuthorizations().add(newAuthorization);
- save(newAuthorization);
+ dao.persist(newAuthorization);
}
}
}
@@ -78,7 +78,7 @@ public class DefaultUserAuthorizationManager extends BaseEntityManager<UserAutho
if (newAuthorization.getUser().equals(authorization.getUser())) {
found = true;
authorization.setRole(newAuthorization.getRole());
- save(authorization);
+ dao.persist(authorization);
}
}
if (!found) {
@@ -97,9 +97,15 @@ public class DefaultUserAuthorizationManager extends BaseEntityManager<UserAutho
}
if (!found) {
project.getUserAuthorizations().add(newAuthorization);
- save(newAuthorization);
+ dao.persist(newAuthorization);
}
}
}
+
+ @Transactional
+ @Override
+ public void createOrUpdate(UserAuthorization authorization) {
+ dao.persist(authorization);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserInvitationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserInvitationManager.java
index 8c164cc291..53cf96b5b7 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserInvitationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserInvitationManager.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
+import io.onedev.server.persistence.annotation.Transactional;
import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
@@ -95,6 +96,12 @@ public class DefaultUserInvitationManager extends BaseEntityManager<UserInvitati
return query(criteria, firstResult, maxResults);
}
+ @Transactional
+ @Override
+ public void create(UserInvitation invitation) {
+ dao.persist(invitation);
+ }
+
@Sessional
@Override
public int count(String term) {
diff --git a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
index 8d487223c1..5beab06e94 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
@@ -340,7 +340,7 @@ public class GitLfsFilter implements Filter {
lock = new GitLfsLock();
lock.setPath(path);
lock.setOwner(SecurityUtils.getUser());
- lockManager.save(lock);
+ lockManager.create(lock);
httpResponse.setStatus(SC_CREATED);
} else {
httpResponse.setStatus(SC_CONFLICT);
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
index bc98d5ea52..dc844133c9 100644
--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
@@ -589,7 +589,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
build.setRetryDate(new Date());
build.setStatus(Status.WAITING);
listenerRegistry.post(new BuildRetrying(build));
- buildManager.save(build);
+ buildManager.update(build);
}
});
@@ -609,7 +609,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
build.setPendingDate(new Date());
build.setStatus(Status.PENDING);
listenerRegistry.post(new BuildPending(build));
- buildManager.save(build);
+ buildManager.update(build);
}
});
@@ -653,7 +653,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
build.setStatus(Build.Status.FAILED);
logManager.newLogger(build).error(errorMessage);
build.setFinishDate(new Date());
- buildManager.save(build);
+ buildManager.update(build);
listenerRegistry.post(new BuildFinished(build));
}
@@ -777,7 +777,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
param.setType(type);
param.setValue(value);
build.getParams().add(param);
- buildParamManager.save(param);
+ buildParamManager.create(param);
}
} else {
BuildParam param = new BuildParam();
@@ -785,10 +785,10 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
param.setName(paramSpec.getName());
param.setType(type);
build.getParams().add(param);
- buildParamManager.save(param);
+ buildParamManager.create(param);
}
}
- buildManager.save(build);
+ buildManager.update(build);
buildSubmitted(build);
} finally {
JobAuthorizationContext.pop();
@@ -969,7 +969,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
build.setStatus(Status.CANCELLED);
build.setFinishDate(new Date());
build.setCanceller(userManager.load(userId));
- buildManager.save(build);
+ buildManager.update(build);
listenerRegistry.post(new BuildFinished(build));
}
}
@@ -1243,7 +1243,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
} catch (InterruptedException ignored) {
} finally {
build.setFinishDate(new Date());
- buildManager.save(build);
+ buildManager.update(build);
listenerRegistry.post(new BuildFinished(build));
}
}
@@ -1457,7 +1457,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
public void run() {
Build build = buildManager.load(jobContext.getBuildId());
build.setJobWorkspace(jobWorkspace);
- buildManager.save(build);
+ buildManager.update(build);
}
});
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
index b13679f966..46a414d2c2 100644
--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
@@ -458,7 +458,7 @@ public class DefaultMailManager implements MailManager, Serializable {
IssueWatch watch = issueWatchManager.find(issue, user);
if (watch != null) {
watch.setWatching(false);
- issueWatchManager.save(watch);
+ issueWatchManager.createOrUpdate(watch);
String subject = "Unsubscribed successfully from issue " + issue.getFQN();
String body = "You will no longer receive notifications of issue " + issue.getFQN() + " unless mentioned. "
+ "However if you subscribed to certain issue queries, you may still get notifications of newly "
@@ -484,7 +484,7 @@ public class DefaultMailManager implements MailManager, Serializable {
PullRequestWatch watch = pullRequestWatchManager.find(pullRequest, user);
if (watch != null) {
watch.setWatching(false);
- pullRequestWatchManager.save(watch);
+ pullRequestWatchManager.createOrUpdate(watch);
String subject = "Unsubscribed successfully from pull request " + pullRequest.getFQN();
String body = "You will no longer receive notifications of pull request " + pullRequest.getFQN()
+ " unless mentioned. However if you subscribed to certain pull request queries, you may still "
@@ -705,7 +705,7 @@ public class DefaultMailManager implements MailManager, Serializable {
String content = stripQuotationAndSignature(sendSetting, getText(pullRequest.getProject(), pullRequest.getUUID(), message, null));
if (content != null) {
comment.setContent(decorateContent(content));
- pullRequestCommentManager.save(comment, receiverEmailAddresses);
+ pullRequestCommentManager.createOrUpdate(comment, receiverEmailAddresses);
}
}
@@ -790,7 +790,7 @@ public class DefaultMailManager implements MailManager, Serializable {
emailAddress.setPrimary(true);
emailAddress.setGit(true);
emailAddress.setOwner(user);
- emailAddressManager.save(emailAddress);
+ emailAddressManager.createOrUpdate(emailAddress);
boolean found = false;
for (UserAuthorization authorization: user.getProjectAuthorizations()) {
@@ -804,7 +804,7 @@ public class DefaultMailManager implements MailManager, Serializable {
authorization.setUser(user);
authorization.setProject(project);
authorization.setRole(role);
- authorizationManager.save(authorization);
+ authorizationManager.createOrUpdate(authorization);
}
return user;
diff --git a/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java
index f43fbb33f5..57b81a34f5 100644
--- a/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java
+++ b/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java
@@ -92,7 +92,7 @@ public class BuildQueryPersonalization extends AbstractEntity implements QueryPe
@Override
public void onUpdated() {
- OneDev.getInstance(BuildQueryPersonalizationManager.class).save(this);
+ OneDev.getInstance(BuildQueryPersonalizationManager.class).createOrUpdate(this);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentQueryPersonalization.java
index 7755b9ab40..b0bd519ff4 100644
--- a/server-core/src/main/java/io/onedev/server/model/CodeCommentQueryPersonalization.java
+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentQueryPersonalization.java
@@ -80,7 +80,7 @@ public class CodeCommentQueryPersonalization extends AbstractEntity implements Q
@Override
public void onUpdated() {
- OneDev.getInstance(CodeCommentQueryPersonalizationManager.class).save(this);
+ OneDev.getInstance(CodeCommentQueryPersonalizationManager.class).createOrUpdate(this);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java
index c954ce14d0..b0df1756b9 100644
--- a/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java
+++ b/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java
@@ -96,7 +96,7 @@ public class CommitQueryPersonalization extends AbstractEntity implements QueryP
@Override
public void onUpdated() {
- OneDev.getInstance(CommitQueryPersonalizationManager.class).save(this);
+ OneDev.getInstance(CommitQueryPersonalizationManager.class).createOrUpdate(this);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java
index 9d1bf796ba..5b9b030bc4 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java
@@ -97,7 +97,7 @@ public class IssueQueryPersonalization extends AbstractEntity implements QueryPe
@Override
public void onUpdated() {
- OneDev.getInstance(IssueQueryPersonalizationManager.class).save(this);
+ OneDev.getInstance(IssueQueryPersonalizationManager.class).createOrUpdate(this);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java
index 078885abfa..5d8e50df44 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java
@@ -96,7 +96,7 @@ public class PullRequestQueryPersonalization extends AbstractEntity implements Q
@Override
public void onUpdated() {
- OneDev.getInstance(PullRequestQueryPersonalizationManager.class).save(this);
+ OneDev.getInstance(PullRequestQueryPersonalizationManager.class).createOrUpdate(this);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
index df0419fdc2..dc3412ef06 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
@@ -191,7 +191,7 @@ public abstract class JobExecutor implements Serializable {
build.setRunningDate(new Date());
if (agentId != null)
build.setAgent(OneDev.getInstance(AgentManager.class).load(agentId));
- buildManager.save(build);
+ buildManager.update(build);
OneDev.getInstance(ListenerRegistry.class).post(new BuildRunning(build));
});
}
diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultDataManager.java
index 769d808503..d053bfbf9b 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultDataManager.java
@@ -720,7 +720,7 @@ public class DefaultDataManager implements DataManager, Serializable {
primaryEmailAddress.setOwner(user);
}
primaryEmailAddress.setValue(bean.getEmailAddress());
- emailAddressManager.save(primaryEmailAddress);
+ emailAddressManager.createOrUpdate(primaryEmailAddress);
}
@SuppressWarnings({"serial"})
@@ -841,7 +841,7 @@ public class DefaultDataManager implements DataManager, Serializable {
link.setOpposite(new LinkSpecOpposite());
link.getOpposite().setName("Parent Issue");
link.setOrder(1);
- linkSpecManager.save(link);
+ linkSpecManager.create(link);
link = new LinkSpec();
link.setName("Blocked By");
@@ -850,7 +850,7 @@ public class DefaultDataManager implements DataManager, Serializable {
link.getOpposite().setName("Blocking");
link.getOpposite().setMultiple(true);
link.setOrder(2);
- linkSpecManager.save(link);
+ linkSpecManager.create(link);
settingManager.saveIssueSetting(new GlobalIssueSetting());
}
diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/BaseEntityManager.java b/server-core/src/main/java/io/onedev/server/persistence/dao/BaseEntityManager.java
index 52c050f522..f28070aea8 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/dao/BaseEntityManager.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/BaseEntityManager.java
@@ -35,11 +35,6 @@ public abstract class BaseEntityManager<T extends AbstractEntity> implements Ent
return dao.load(entityClass, entityId);
}
- @Override
- public void save(T entity) {
- dao.persist(entity);
- }
-
@Override
public void delete(T entity) {
dao.remove(entity);
diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/EntityManager.java b/server-core/src/main/java/io/onedev/server/persistence/dao/EntityManager.java
index 8340befb86..6340cfb629 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/dao/EntityManager.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/EntityManager.java
@@ -31,22 +31,7 @@ public interface EntityManager<T extends AbstractEntity> {
* HibernateException if no matching entity is found
*/
T load(Long entityId);
-
- /**
- * If the id of the entity is null or zero, add it to the datastore and
- * assign it an id; otherwise, update the corresponding entity in the
- * data store with the properties of this entity. In either case the entity
- * passed to this method will be attached to the session.
- * <p>
- * If an entity to update is already attached to the session, this method
- * will have no effect. If an entity to update has the same id as another
- * instance already attached to the session, an error will be thrown.
- *
- * @param entity
- * the entity to be saved
- */
- void save(T entity);
-
+
/**
* Remove the specified entity from the datastore.
*
diff --git a/server-core/src/main/java/io/onedev/server/rest/AgentTokenResource.java b/server-core/src/main/java/io/onedev/server/rest/AgentTokenResource.java
index 3a7df77913..b107aa179c 100644
--- a/server-core/src/main/java/io/onedev/server/rest/AgentTokenResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/AgentTokenResource.java
@@ -81,16 +81,14 @@ public class AgentTokenResource {
return tokenManager.query(criteria, offset, count);
}
- @Api(order=500, description="Update token of specified id in request body, or create new if id property not provided")
+ @Api(order=500, description="Create new token if id property not provided")
@POST
- public Long createOrUpdate(AgentToken token) {
+ public Long createOrUpdate() {
if (!SecurityUtils.isAdministrator())
throw new UnauthorizedException();
- if (token == null)
- token = new AgentToken();
- if (token.isNew())
- token.setValue(UUID.randomUUID().toString());
- tokenManager.save(token);
+ AgentToken token = new AgentToken();
+ token.setValue(UUID.randomUUID().toString());
+ tokenManager.create(token);
return token.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/BuildQueryPersonalizationResource.java b/server-core/src/main/java/io/onedev/server/rest/BuildQueryPersonalizationResource.java
index 4c40991edd..63d85f7cd4 100644
--- a/server-core/src/main/java/io/onedev/server/rest/BuildQueryPersonalizationResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/BuildQueryPersonalizationResource.java
@@ -49,7 +49,7 @@ public class BuildQueryPersonalizationResource {
public Long createOrUpdate(@NotNull BuildQueryPersonalization queryPersonalization) {
if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
throw new UnauthorizedException();
- queryPersonalizationManager.save(queryPersonalization);
+ queryPersonalizationManager.createOrUpdate(queryPersonalization);
return queryPersonalization.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/CodeCommentQueryPersonalizationResource.java b/server-core/src/main/java/io/onedev/server/rest/CodeCommentQueryPersonalizationResource.java
index 166ee597a4..774fb1c0cf 100644
--- a/server-core/src/main/java/io/onedev/server/rest/CodeCommentQueryPersonalizationResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/CodeCommentQueryPersonalizationResource.java
@@ -51,7 +51,7 @@ public class CodeCommentQueryPersonalizationResource {
|| !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- queryPersonalizationManager.save(queryPersonalization);
+ queryPersonalizationManager.createOrUpdate(queryPersonalization);
return queryPersonalization.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/CodeCommentReplyResource.java b/server-core/src/main/java/io/onedev/server/rest/CodeCommentReplyResource.java
index 8406644056..c7e86d2e4c 100644
--- a/server-core/src/main/java/io/onedev/server/rest/CodeCommentReplyResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/CodeCommentReplyResource.java
@@ -52,7 +52,7 @@ public class CodeCommentReplyResource {
throw new UnauthorizedException();
}
- replyManager.save(reply);
+ replyManager.createOrUpdate(reply);
return reply.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/CodeCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/CodeCommentResource.java
index e006434983..2762dd4864 100644
--- a/server-core/src/main/java/io/onedev/server/rest/CodeCommentResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/CodeCommentResource.java
@@ -125,7 +125,7 @@ public class CodeCommentResource {
throw new UnauthorizedException();
}
- commentManager.save(comment);
+ commentManager.createOrUpdate(comment);
return comment.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/CommitQueryPersonalizationResource.java b/server-core/src/main/java/io/onedev/server/rest/CommitQueryPersonalizationResource.java
index 47c86da7d1..78b6fdeb4b 100644
--- a/server-core/src/main/java/io/onedev/server/rest/CommitQueryPersonalizationResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/CommitQueryPersonalizationResource.java
@@ -51,7 +51,7 @@ public class CommitQueryPersonalizationResource {
|| !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- queryPersonalizationManager.save(queryPersonalization);
+ queryPersonalizationManager.createOrUpdate(queryPersonalization);
return queryPersonalization.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/EmailAddressResource.java b/server-core/src/main/java/io/onedev/server/rest/EmailAddressResource.java
index 4ed34676d9..835b064d26 100644
--- a/server-core/src/main/java/io/onedev/server/rest/EmailAddressResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/EmailAddressResource.java
@@ -88,7 +88,7 @@ public class EmailAddressResource {
if (SecurityUtils.isAdministrator())
emailAddress.setVerificationCode(null);
- emailAddressManager.save(emailAddress);
+ emailAddressManager.createOrUpdate(emailAddress);
return emailAddress.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/GroupAuthorizationResource.java b/server-core/src/main/java/io/onedev/server/rest/GroupAuthorizationResource.java
index bbbde82a40..1d0b4b029b 100644
--- a/server-core/src/main/java/io/onedev/server/rest/GroupAuthorizationResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/GroupAuthorizationResource.java
@@ -48,7 +48,7 @@ public class GroupAuthorizationResource {
public Long createOrUpdate(@NotNull GroupAuthorization authorization) {
if (!SecurityUtils.isAdministrator())
throw new UnauthorizedException();
- authorizationManager.save(authorization);
+ authorizationManager.createOrUpdate(authorization);
return authorization.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/IssueQueryPersonalizationResource.java b/server-core/src/main/java/io/onedev/server/rest/IssueQueryPersonalizationResource.java
index f901350af5..e57d4a701b 100644
--- a/server-core/src/main/java/io/onedev/server/rest/IssueQueryPersonalizationResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/IssueQueryPersonalizationResource.java
@@ -51,7 +51,7 @@ public class IssueQueryPersonalizationResource {
|| !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- queryPersonalizationManager.save(queryPersonalization);
+ queryPersonalizationManager.createOrUpdate(queryPersonalization);
return queryPersonalization.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/IssueVoteResource.java b/server-core/src/main/java/io/onedev/server/rest/IssueVoteResource.java
index 73f7585606..b186ada9bb 100644
--- a/server-core/src/main/java/io/onedev/server/rest/IssueVoteResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/IssueVoteResource.java
@@ -44,14 +44,14 @@ public class IssueVoteResource {
return vote;
}
- @Api(order=200, description="Update issue vote of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new issue vote. Id property should not be specified")
@POST
- public Long createOrUpdate(@NotNull IssueVote vote) {
+ public Long create(@NotNull IssueVote vote) {
if (!SecurityUtils.canAccess(vote.getIssue().getProject())
|| !SecurityUtils.isAdministrator() && !vote.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- voteManager.save(vote);
+ voteManager.create(vote);
return vote.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/IssueWatchResource.java b/server-core/src/main/java/io/onedev/server/rest/IssueWatchResource.java
index fa54690e83..17d5252504 100644
--- a/server-core/src/main/java/io/onedev/server/rest/IssueWatchResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/IssueWatchResource.java
@@ -51,7 +51,7 @@ public class IssueWatchResource {
|| !SecurityUtils.isAdministrator() && !watch.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- watchManager.save(watch);
+ watchManager.createOrUpdate(watch);
return watch.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/MembershipResource.java b/server-core/src/main/java/io/onedev/server/rest/MembershipResource.java
index dcca476878..ceb081c649 100644
--- a/server-core/src/main/java/io/onedev/server/rest/MembershipResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/MembershipResource.java
@@ -43,12 +43,12 @@ public class MembershipResource {
return membershipManager.load(membershipId);
}
- @Api(order=200, description="Update membership of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new membership. Id property should not be specified")
@POST
- public Long createOrUpdate(@NotNull Membership membership) {
+ public Long create(@NotNull Membership membership) {
if (!SecurityUtils.isAdministrator())
throw new UnauthorizedException();
- membershipManager.save(membership);
+ membershipManager.create(membership);
return membership.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/MilestoneResource.java b/server-core/src/main/java/io/onedev/server/rest/MilestoneResource.java
index 7425121960..b14a45df7c 100644
--- a/server-core/src/main/java/io/onedev/server/rest/MilestoneResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/MilestoneResource.java
@@ -49,7 +49,7 @@ public class MilestoneResource {
public Long createOrUpdate(@NotNull Milestone milestone) {
if (!SecurityUtils.canManageIssues(milestone.getProject()))
throw new UnauthorizedException();
- milestoneManager.save(milestone);
+ milestoneManager.createOrUpdate(milestone);
return milestone.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
index 3d59396f87..6edfa19104 100644
--- a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
@@ -284,7 +284,7 @@ public class ProjectResource {
} else if (!SecurityUtils.canManage(project)) {
throw new UnauthorizedException();
} else {
- projectManager.save(project);
+ projectManager.update(project);
}
return project.getId();
@@ -306,7 +306,7 @@ public class ProjectResource {
project.setNamedCommitQueries(setting.namedCommitQueries);
project.setPullRequestSetting(setting.pullRequestSetting);
project.setWebHooks(setting.webHooks);
- projectManager.save(project);
+ projectManager.update(project);
return Response.ok().build();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestAssignmentResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestAssignmentResource.java
index b090dcfd5c..4fccd3d747 100644
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestAssignmentResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestAssignmentResource.java
@@ -45,16 +45,16 @@ public class PullRequestAssignmentResource {
return assignment;
}
- @Api(order=200, description="Update pull request assignment of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new pull request assignment. Id property should not be specified")
@POST
- public Long createOrUpdate(PullRequestAssignment assignment) {
+ public Long create(PullRequestAssignment assignment) {
PullRequest pullRequest = assignment.getRequest();
if (!SecurityUtils.canReadCode(pullRequest.getProject()) || !SecurityUtils.canModify(pullRequest))
throw new UnauthorizedException();
if (pullRequest.isMerged())
throw new ExplicitException("Pull request is merged");
- assignmentManager.save(assignment);
+ assignmentManager.create(assignment);
return assignment.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestCommentResource.java
index 58f9103b3c..079dec476f 100644
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestCommentResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestCommentResource.java
@@ -52,7 +52,7 @@ public class PullRequestCommentResource {
throw new UnauthorizedException();
}
- commentManager.save(comment);
+ commentManager.createOrUpdate(comment);
return comment.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestQueryPersonalizationResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestQueryPersonalizationResource.java
index 03c958f1a4..f3df61048a 100644
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestQueryPersonalizationResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestQueryPersonalizationResource.java
@@ -51,7 +51,7 @@ public class PullRequestQueryPersonalizationResource {
|| !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- queryPersonalizationManager.save(queryPersonalization);
+ queryPersonalizationManager.createOrUpdate(queryPersonalization);
return queryPersonalization.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestReviewResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestReviewResource.java
index 27ebb84165..0b36015703 100644
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestReviewResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestReviewResource.java
@@ -57,7 +57,7 @@ public class PullRequestReviewResource {
if (review.getRequest().isMerged())
throw new ExplicitException("Pull request is merged");
- reviewManager.save(review);
+ reviewManager.createOrUpdate(review);
return review.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestWatchResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestWatchResource.java
index bb4045ddc7..d1d06d2a70 100644
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestWatchResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestWatchResource.java
@@ -51,7 +51,7 @@ public class PullRequestWatchResource {
|| !SecurityUtils.isAdministrator() && !watch.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- watchManager.save(watch);
+ watchManager.createOrUpdate(watch);
return watch.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/SshKeyResource.java b/server-core/src/main/java/io/onedev/server/rest/SshKeyResource.java
index 89c943484c..9e304575bf 100644
--- a/server-core/src/main/java/io/onedev/server/rest/SshKeyResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/SshKeyResource.java
@@ -45,17 +45,16 @@ public class SshKeyResource {
return sshKey;
}
- @Api(order=150, description="Update ssh key of specified id in request body, or create new if id property not provided")
+ @Api(order=150, description="Create new ssh key. Id property should not be specified")
@POST
- public Long createOrUpdate(SshKey sshKey) {
+ public Long create(SshKey sshKey) {
if (!SecurityUtils.isAdministrator() && !sshKey.getOwner().equals(SecurityUtils.getUser()))
throw new UnauthorizedException();
- if (sshKey.isNew())
- sshKey.setCreatedAt(new Date());
-
+
+ sshKey.setCreatedAt(new Date());
sshKey.digest();
- sshKeyManager.save(sshKey);
+ sshKeyManager.create(sshKey);
return sshKey.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/UserAuthorizationResource.java b/server-core/src/main/java/io/onedev/server/rest/UserAuthorizationResource.java
index 5e15195f10..d0ecb7495c 100644
--- a/server-core/src/main/java/io/onedev/server/rest/UserAuthorizationResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/UserAuthorizationResource.java
@@ -49,7 +49,7 @@ public class UserAuthorizationResource {
public Long createOrUpdate(@NotNull UserAuthorization authorization) {
if (!SecurityUtils.canManage(authorization.getProject()))
throw new UnauthorizedException();
- authorizationManager.save(authorization);
+ authorizationManager.createOrUpdate(authorization);
return authorization.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/UserResource.java
index e4ea456f6e..d2b98087f3 100644
--- a/server-core/src/main/java/io/onedev/server/rest/UserResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/UserResource.java
@@ -306,7 +306,7 @@ public class UserResource {
emailAddress.setOwner(user);
emailAddress.setValue(data.getEmailAddress());
emailAddress.setVerificationCode(null);
- emailAddressManager.save(emailAddress);
+ emailAddressManager.createOrUpdate(emailAddress);
return user.getId();
} else {
@@ -387,7 +387,7 @@ public class UserResource {
sshKey.setOwner(user);
sshKey.digest();
- sshKeyManager.save(sshKey);
+ sshKeyManager.create(sshKey);
return sshKey.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java
index 3099ddc27f..9ed3fe83e3 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java
@@ -84,7 +84,7 @@ public class PasswordAuthorizingRealm extends AbstractAuthorizingRealm {
emailAddress.setOwner(user);
emailAddress.setPrimary(true);
emailAddress.setGit(true);
- emailAddressManager.save(emailAddress);
+ emailAddressManager.createOrUpdate(emailAddress);
user.getEmailAddresses().add(emailAddress);
@@ -110,7 +110,7 @@ public class PasswordAuthorizingRealm extends AbstractAuthorizingRealm {
emailAddress.setOwner(user);
emailAddress.setPrimary(true);
emailAddress.setGit(true);
- emailAddressManager.save(emailAddress);
+ emailAddressManager.createOrUpdate(emailAddress);
}
user.setSsoConnector(null);
if (authenticated.getFullName() != null)
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java
index ed07af0d81..f95b87fee3 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java
@@ -66,7 +66,7 @@ public class SsoAuthorizingRealm extends AbstractAuthorizingRealm {
emailAddress.setValue(authenticated.getEmail());
emailAddress.setPrimary(true);
emailAddress.setGit(true);
- emailAddressManager.save(emailAddress);
+ emailAddressManager.createOrUpdate(emailAddress);
user.getEmailAddresses().add(emailAddress);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index 6b576da7a6..24e767cd14 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -755,7 +755,7 @@ public abstract class BuildListPanel extends Panel {
super.onSubmit(target, form);
if (getProject() != null) {
getProject().getBuildSetting().setListParams(listParams);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
} else {
getGlobalBuildSetting().setListParams(listParams);
OneDev.getInstance(SettingManager.class).saveBuildSetting(getGlobalBuildSetting());
@@ -771,7 +771,7 @@ public abstract class BuildListPanel extends Panel {
public void onClick(AjaxRequestTarget target) {
modal.close();
getProject().getBuildSetting().setListParams(null);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
target.add(body);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index b149038478..9d0c805ebe 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -10,7 +10,6 @@ import javax.annotation.Nullable;
import io.onedev.server.web.component.markdown.ContentQuoted;
import io.onedev.server.web.component.markdown.MarkdownEditor;
-import io.onedev.server.web.util.WicketUtils;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -69,7 +68,6 @@ import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import org.unbescape.javascript.JavaScriptEscape;
@SuppressWarnings("serial")
public abstract class CodeCommentPanel extends Panel {
@@ -149,7 +147,7 @@ public abstract class CodeCommentPanel extends Panel {
public void setObject(String object) {
CodeComment comment = getComment();
comment.setContent(object);
- OneDev.getInstance(CodeCommentManager.class).save(comment);
+ OneDev.getInstance(CodeCommentManager.class).createOrUpdate(comment);
}
}, null) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 315aca473f..3d46e11e84 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -1720,7 +1720,7 @@ public abstract class RevisionDiffPanel extends Panel {
pendingApply.setRequest(getPullRequest());
pendingApply.setUser(SecurityUtils.getUser());
pendingApply.setSuggestion(new ArrayList<String>(suggestion));
- OneDev.getInstance(PendingSuggestionApplyManager.class).save(pendingApply);
+ OneDev.getInstance(PendingSuggestionApplyManager.class).create(pendingApply);
onBatchChange(target);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java
index cef81379eb..cb07431218 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java
@@ -142,7 +142,7 @@ public abstract class IssueAuthorizationsPanel extends Panel {
IssueAuthorization authorization = new IssueAuthorization();
authorization.setIssue(getIssue());
authorization.setUser(OneDev.getInstance(UserManager.class).load(selection.getId()));
- OneDev.getInstance(IssueAuthorizationManager.class).save(authorization);
+ OneDev.getInstance(IssueAuthorizationManager.class).createOrUpdate(authorization);
target.add(authorizationsTable);
Session.get().success("User authorized");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index fc9abc74eb..f50eeed7bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -498,7 +498,7 @@ public abstract class IssueListPanel extends Panel {
if (getProject() != null) {
getProject().getIssueSetting().setListFields(bean.getFields());
getProject().getIssueSetting().setListLinks(bean.getLinks());
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
} else {
getGlobalIssueSetting().setListFields(bean.getFields());
getGlobalIssueSetting().setListLinks(bean.getLinks());
@@ -516,7 +516,7 @@ public abstract class IssueListPanel extends Panel {
modal.close();
getProject().getIssueSetting().setListFields(null);
getProject().getIssueSetting().setListLinks(null);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
target.add(body);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index daadb0318a..e42753bf2a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -117,7 +117,7 @@ public abstract class IssueSidePanel extends Panel {
@Override
protected void onSaveWatch(EntityWatch watch) {
- OneDev.getInstance(IssueWatchManager.class).save((IssueWatch) watch);
+ OneDev.getInstance(IssueWatchManager.class).createOrUpdate((IssueWatch) watch);
}
@Override
@@ -734,7 +734,7 @@ public abstract class IssueSidePanel extends Panel {
vote.setIssue(getIssue());
vote.setUser(SecurityUtils.getUser());
vote.setDate(new Date());
- OneDev.getInstance(IssueVoteManager.class).save(vote);
+ OneDev.getInstance(IssueVoteManager.class).create(vote);
getIssue().getVotes().add(vote);
} else {
getIssue().getVotes().remove(vote);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/actions/MilestoneActionsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/actions/MilestoneActionsPanel.java
index 1e040e8dd3..b0371d7897 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/actions/MilestoneActionsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/actions/MilestoneActionsPanel.java
@@ -33,7 +33,7 @@ public abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {
@Override
public void onClick(AjaxRequestTarget target) {
getMilestone().setClosed(false);
- getMilestoneManager().save(getMilestone());
+ getMilestoneManager().createOrUpdate(getMilestone());
target.add(MilestoneActionsPanel.this);
onUpdated(target);
getSession().success("Milestone '" + getMilestone().getName() + "' reopened");
@@ -58,7 +58,7 @@ public abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {
@Override
public void onClick(AjaxRequestTarget target) {
getMilestone().setClosed(true);
- getMilestoneManager().save(getMilestone());
+ getMilestoneManager().createOrUpdate(getMilestone());
target.add(MilestoneActionsPanel.this);
onUpdated(target);
getSession().success("Milestone '" + getMilestone().getName() + "' closed");
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java
index a51b7463b2..dfe51880ef 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java
@@ -52,7 +52,7 @@ public abstract class AssigneeChoice extends SelectToAddChoice<User> {
assignment.setUser(user);
if (!getPullRequest().isNew())
- OneDev.getInstance(PullRequestAssignmentManager.class).save(assignment);
+ OneDev.getInstance(PullRequestAssignmentManager.class).create(assignment);
else
getPullRequest().getAssignments().add(assignment);
};
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
index 37f867ebe7..63a9025373 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
@@ -106,7 +106,7 @@ public abstract class ReviewListPanel extends Panel {
public void onClick(AjaxRequestTarget target) {
PullRequestReview review = item.getModelObject();
review.setStatus(Status.PENDING);
- OneDev.getInstance(PullRequestReviewManager.class).save(review);
+ OneDev.getInstance(PullRequestReviewManager.class).createOrUpdate(review);
}
@Override
@@ -148,10 +148,10 @@ public abstract class ReviewListPanel extends Panel {
} else if (request.getReview(reviewer).getStatus() == Status.EXCLUDED) {
PullRequestReviewManager reviewManager =
OneDev.getInstance(PullRequestReviewManager.class);
- reviewManager.save(review);
+ reviewManager.createOrUpdate(review);
for (PullRequestReview eachReview: request.getReviews()) {
if (eachReview.isNew())
- reviewManager.save(eachReview);
+ reviewManager.createOrUpdate(eachReview);
}
} else {
reviewerRequired = true;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java
index b10fb79b0f..658cb0564d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java
@@ -60,7 +60,7 @@ public abstract class ReviewerChoice extends SelectToAddChoice<User> {
}
if (!getPullRequest().isNew())
- OneDev.getInstance(PullRequestReviewManager.class).save(review);
+ OneDev.getInstance(PullRequestReviewManager.class).createOrUpdate(review);
else
getPullRequest().getReviews().add(review);
};
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java
index 8fffa4cc15..3380f2c487 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java
@@ -217,7 +217,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {
address.setOwner(getUser());
if (SecurityUtils.isAdministrator())
address.setVerificationCode(null);
- getEmailAddressManager().save(address);
+ getEmailAddressManager().createOrUpdate(address);
emailAddressValue = null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java
index 913863e04d..d48be7410b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java
@@ -77,7 +77,7 @@ public abstract class InsertGpgKeyPanel extends Panel {
}
if (!hasErrors) {
gpgKey.setCreatedAt(new Date());
- gpgKeyManager.save(gpgKey);
+ gpgKeyManager.create(gpgKey);
onSave(target);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java
index f15461e997..ef3399ac1c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java
@@ -60,7 +60,7 @@ public abstract class InsertSshKeyPanel extends Panel {
} else {
sshKey.setOwner(getUser());
sshKey.setCreatedAt(new Date());
- sshKeyManager.save(sshKey);
+ sshKeyManager.create(sshKey);
onSave(target);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AddAgentPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AddAgentPanel.java
index 9394068d04..79be8adc12 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AddAgentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AddAgentPanel.java
@@ -70,7 +70,7 @@ class AddAgentPanel extends Panel {
public void onClick(AjaxRequestTarget target) {
AgentToken token = new AgentToken();
token.setValue(UUID.randomUUID().toString());
- OneDev.getInstance(AgentTokenManager.class).save(token);
+ OneDev.getInstance(AgentTokenManager.class).create(token);
StringBuilder builder = new StringBuilder("docker run -t -v /var/run/docker.sock:/var/run/docker.sock -v $(pwd)/agent/work:/agent/work -e serverUrl=");
builder.append(OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl());
builder.append(" -e agentToken=").append(token.getValue()).append(" -h myagent").append(" 1dev/agent");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java
index 66a145b250..b502ef4c82 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java
@@ -62,7 +62,7 @@ public class TokenListPanel extends GenericPanel<List<AgentToken>> {
public void onClick(AjaxRequestTarget target) {
AgentToken token = new AgentToken();
token.setValue(UUID.randomUUID().toString());
- getTokenManager().save(token);
+ getTokenManager().create(token);
target.add(TokenListPanel.this);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java
index 7e041d9373..a34f9c895b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java
@@ -149,7 +149,7 @@ public class GroupMembershipsPage extends GroupPage {
Membership membership = new Membership();
membership.setGroup(getGroup());
membership.setUser(OneDev.getInstance(UserManager.class).load(selection.getId()));
- OneDev.getInstance(MembershipManager.class).save(membership);
+ OneDev.getInstance(MembershipManager.class).create(membership);
target.add(membershipsTable);
selectionColumn.getSelections().clear();
Session.get().success("Member added");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java
index 0eea1fc54c..6f720a9448 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java
@@ -113,13 +113,13 @@ abstract class LinkSpecEditPanel extends GenericPanel<LinkSpec> {
} else {
if (getSpec().isNew())
getSpec().setOrder(manager.query().stream().mapToInt(it->it.getOrder()).max().orElse(0)+1);
- manager.save(getSpec(), oldName, oldOppositeName);
+ manager.update(getSpec(), oldName, oldOppositeName);
onSave(target);
}
} else {
if (getSpec().isNew())
getSpec().setOrder(manager.query().stream().mapToInt(it->it.getOrder()).max().orElse(0)+1);
- manager.save(getSpec(), oldName, oldOppositeName);
+ manager.update(getSpec(), oldName, oldOppositeName);
onSave(target);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.java
index cbb9218c81..908d643a77 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.java
@@ -47,7 +47,7 @@ public class NewInvitationPage extends AdministrationPage {
UserInvitation invitation = new UserInvitation();
invitation.setEmailAddress(emailAddress);
UserInvitationManager userInvitationManager = OneDev.getInstance(UserInvitationManager.class);
- userInvitationManager.save(invitation);
+ userInvitationManager.create(invitation);
userInvitationManager.sendInvitationEmail(invitation);
if (Thread.interrupted())
throw new InterruptedException();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java
index 496fe71026..22edbc932d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java
@@ -75,7 +75,7 @@ public class NewUserPage extends AdministrationPage {
@Override
public void run() {
getUserManager().create(user);
- getEmailAddressManager().save(emailAddress);
+ getEmailAddressManager().createOrUpdate(emailAddress);
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/membership/UserMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/membership/UserMembershipsPage.java
index 062d41fdb2..5eedea28da 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/membership/UserMembershipsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/membership/UserMembershipsPage.java
@@ -143,7 +143,7 @@ public class UserMembershipsPage extends UserPage {
Membership membership = new Membership();
membership.setUser(getUser());
membership.setGroup(OneDev.getInstance(GroupManager.class).load(selection.getId()));
- OneDev.getInstance(MembershipManager.class).save(membership);
+ OneDev.getInstance(MembershipManager.class).create(membership);
target.add(membershipsTable);
if (selectionColumn != null)
selectionColumn.getSelections().clear();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
index 3d274227d1..a52496f717 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
@@ -441,7 +441,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
@Override
protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
- OneDev.getInstance(CodeCommentManager.class).save(comment);
+ OneDev.getInstance(CodeCommentManager.class).createOrUpdate(comment);
target.add(commentContainer.get("head"));
}
@@ -584,7 +584,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
comment.setProject(context.getProject());
comment.setCompareContext(getCompareContext());
- OneDev.getInstance(CodeCommentManager.class).save(comment);
+ OneDev.getInstance(CodeCommentManager.class).createOrUpdate(comment);
CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) {
@@ -595,7 +595,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
@Override
protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
- OneDev.getInstance(CodeCommentManager.class).save(comment);
+ OneDev.getInstance(CodeCommentManager.class).createOrUpdate(comment);
target.add(commentContainer.get("head"));
}
@@ -653,7 +653,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
@Override
protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
- OneDev.getInstance(CodeCommentManager.class).save(comment);
+ OneDev.getInstance(CodeCommentManager.class).createOrUpdate(comment);
target.add(commentContainer.get("head"));
}
@@ -1247,7 +1247,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
private void onSaveCommentReply(CodeCommentReply reply) {
reply.setCompareContext(getCompareContext());
- OneDev.getInstance(CodeCommentReplyManager.class).save(reply);
+ OneDev.getInstance(CodeCommentReplyManager.class).createOrUpdate(reply);
}
private void onSaveCommentStatusChange(CodeCommentStatusChange change, String note) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
index fa09e27ea8..7dcf08c0b9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
@@ -94,7 +94,7 @@ public class ProjectBuildsPage extends ProjectPage {
@Override
protected void onSaveCommonQueries(ArrayList<NamedBuildQuery> namedQueries) {
getProject().getBuildSetting().setNamedQueries(namedQueries);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
}
@Override
@@ -169,7 +169,7 @@ public class ProjectBuildsPage extends ProjectPage {
} else {
namedQuery.setQuery(query);
}
- getBuildQueryPersonalizationManager().save(setting);
+ getBuildQueryPersonalizationManager().createOrUpdate(setting);
target.add(savedQueries);
close();
}
@@ -188,7 +188,7 @@ public class ProjectBuildsPage extends ProjectPage {
} else {
namedQuery.setQuery(query);
}
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
target.add(savedQueries);
close();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index 8a2cf57065..29679ea5ca 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -294,7 +294,7 @@ public abstract class BuildDetailPage extends ProjectPage
@Override
protected void onSave(AjaxRequestTarget target, Serializable bean) {
getBuild().setDescription(((DescriptionBean)bean).getValue());
- OneDev.getInstance(BuildManager.class).save(getBuild());
+ OneDev.getInstance(BuildManager.class).update(getBuild());
OneDev.getInstance(ListenerRegistry.class).post(new BuildUpdated(getBuild()));
close();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
index f001aa2ffb..fec850cec0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
@@ -94,7 +94,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {
@Override
protected void onSaveCommonQueries(ArrayList<NamedCodeCommentQuery> projectQueries) {
getProject().setNamedCodeCommentQueries(projectQueries);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
}
});
@@ -166,7 +166,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {
} else {
namedQuery.setQuery(query);
}
- getCodeCommentQueryPersonalizationManager().save(setting);
+ getCodeCommentQueryPersonalizationManager().createOrUpdate(setting);
target.add(savedQueries);
close();
}
@@ -182,7 +182,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {
} else {
namedQuery.setQuery(query);
}
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
target.add(savedQueries);
close();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 818efbdcf9..a15966f915 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -725,12 +725,12 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
@Override
public void onSaveComment(CodeComment comment) {
- OneDev.getInstance(CodeCommentManager.class).save(comment);
+ OneDev.getInstance(CodeCommentManager.class).createOrUpdate(comment);
}
@Override
public void onSaveCommentReply(CodeCommentReply reply) {
- OneDev.getInstance(CodeCommentReplyManager.class).save(reply);
+ OneDev.getInstance(CodeCommentReplyManager.class).createOrUpdate(reply);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index 49ce32d84e..fb397fefd8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -95,7 +95,7 @@ public class ProjectCommitsPage extends ProjectPage {
@Override
protected void onSaveCommonQueries(ArrayList<NamedCommitQuery> projectQueries) {
getProject().setNamedCommitQueries(projectQueries);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
}
});
@@ -144,7 +144,7 @@ public class ProjectCommitsPage extends ProjectPage {
} else {
namedQuery.setQuery(query);
}
- getCommitQueryPersonalizationManager().save(setting);
+ getCommitQueryPersonalizationManager().createOrUpdate(setting);
target.add(savedQueries);
close();
}
@@ -160,7 +160,7 @@ public class ProjectCommitsPage extends ProjectPage {
} else {
namedQuery.setQuery(query);
}
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
target.add(savedQueries);
close();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index 42384ee6ad..3ef701fc35 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -846,12 +846,12 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
@Override
public void onSaveComment(CodeComment comment) {
- OneDev.getInstance(CodeCommentManager.class).save(comment);
+ OneDev.getInstance(CodeCommentManager.class).createOrUpdate(comment);
}
@Override
public void onSaveCommentReply(CodeCommentReply reply) {
- OneDev.getInstance(CodeCommentReplyManager.class).save(reply);
+ OneDev.getInstance(CodeCommentReplyManager.class).createOrUpdate(reply);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
index 4bc4ce70c7..f27192d59d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
@@ -284,7 +284,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
@Override
public void onClick() {
getProject().getIssueSetting().setBoardSpecs(null);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject()));
}
@@ -346,7 +346,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
BoardSpec currentBoard = getBoard();
boards.remove(boardToRemove);
getProject().getIssueSetting().setBoardSpecs(boards);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
BoardSpec nextBoard;
if (boardToRemove.getName().equals(currentBoard.getName()))
@@ -372,7 +372,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
BoardSpec board = boards.get(from.getItemIndex());
boards.set(from.getItemIndex(), boards.set(to.getItemIndex(), board));
getProject().getIssueSetting().setBoardSpecs(boards);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
target.add(menuFragment);
}
@@ -479,11 +479,11 @@ public class IssueBoardsPage extends ProjectIssuesPage {
private void toggleClose(Milestone milestone) {
milestone.setClosed(!milestone.isClosed());
if (milestone.equals(IssueBoardsPage.this.getMilestone())) {
- getMilestoneManager().save(milestone);
+ getMilestoneManager().createOrUpdate(milestone);
setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), getBoard(),
milestone, backlog, queryString, backlogQueryString));
} else {
- getMilestoneManager().save(milestone);
+ getMilestoneManager().createOrUpdate(milestone);
}
dropdown.close();
if (milestone.isClosed())
@@ -844,7 +844,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
@Override
public void onClick() {
getProject().getIssueSetting().setBoardSpecs(null);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject()));
}
@@ -1018,7 +1018,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
@Override
protected void onSave(AjaxRequestTarget target, BoardSpec board) {
getProject().getIssueSetting().setBoardSpecs(boards);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(
getProject(), board, getMilestone(), backlog, queryString,
backlogQueryString));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java
index 41284908c4..0c9ac6da6e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java
@@ -51,7 +51,7 @@ abstract class MilestoneEditPanel extends Panel {
if (editor.isValid()){
Milestone reloaded = getMilestone();
editor.getDescriptor().copyProperties(milestone, reloaded);
- milestoneManager.save(reloaded);
+ milestoneManager.createOrUpdate(reloaded);
Session.get().success("Milestone saved");
onMilestoneSaved(target, reloaded);
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java
index fc0bd704df..0d5c1c6e3c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java
@@ -54,7 +54,7 @@ abstract class NewBoardPanel extends Panel {
boards.add(board);
getProject().getIssueSetting().setBoardSpecs(boards);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
Session.get().success("New issue board created");
onBoardCreated(target, board);
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java
index 782c268ad3..3b920da97f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java
@@ -49,7 +49,7 @@ abstract class NewMilestonePanel extends Panel {
}
if (editor.isValid()){
milestone.setProject(getProject());
- milestoneManager.save(milestone);
+ milestoneManager.createOrUpdate(milestone);
Session.get().success("New milestone created");
onMilestoneCreated(target, milestone);
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
index 1f58bc5e2b..01975244ba 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
@@ -89,7 +89,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
@Override
protected void onSaveCommonQueries(ArrayList<NamedIssueQuery> namedQueries) {
getProject().getIssueSetting().setNamedQueries(namedQueries);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
}
@Override
@@ -164,7 +164,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
} else {
namedQuery.setQuery(query);
}
- getIssueQueryPersonalizationManager().save(setting);
+ getIssueQueryPersonalizationManager().createOrUpdate(setting);
target.add(savedQueries);
close();
}
@@ -183,7 +183,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
} else {
namedQuery.setQuery(query);
}
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
target.add(savedQueries);
close();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java
index 779cf0cf06..05f57e31d6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java
@@ -69,7 +69,7 @@ public class MilestoneEditPage extends ProjectPage {
}
if (editor.isValid()){
editor.getDescriptor().copyProperties(milestone, getMilestone());
- milestoneManager.save(getMilestone());
+ milestoneManager.createOrUpdate(getMilestone());
Session.get().success("Milestone saved");
setResponsePage(MilestoneIssuesPage.class,
MilestoneIssuesPage.paramsOf(getMilestone().getProject(), getMilestone(), null));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java
index d9e7440fa0..9ebef37119 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java
@@ -48,7 +48,7 @@ public class NewMilestonePage extends ProjectPage {
}
if (editor.isValid()){
milestone.setProject(getProject());
- milestoneManager.save(milestone);
+ milestoneManager.createOrUpdate(milestone);
Session.get().success("New milestone created");
setResponsePage(MilestoneIssuesPage.class, MilestoneIssuesPage.paramsOf(getProject(), milestone, null));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
index 37c088faab..0da1c542b6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
@@ -103,7 +103,7 @@ public class ProjectPullRequestsPage extends ProjectPage {
@Override
protected void onSaveCommonQueries(ArrayList<NamedPullRequestQuery> namedQueries) {
getProject().getPullRequestSetting().setNamedQueries(namedQueries);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
}
});
@@ -172,7 +172,7 @@ public class ProjectPullRequestsPage extends ProjectPage {
} else {
namedQuery.setQuery(query);
}
- getPullRequestQueryPersonalizationManager().save(setting);
+ getPullRequestQueryPersonalizationManager().createOrUpdate(setting);
target.add(savedQueries);
close();
}
@@ -191,7 +191,7 @@ public class ProjectPullRequestsPage extends ProjectPage {
} else {
namedQuery.setQuery(query);
}
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
target.add(savedQueries);
close();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 78717dc1eb..3fccc1b79b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -1041,12 +1041,12 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
@Override
public void onSaveComment(CodeComment comment) {
- OneDev.getInstance(CodeCommentManager.class).save(comment);
+ OneDev.getInstance(CodeCommentManager.class).createOrUpdate(comment);
}
@Override
public void onSaveCommentReply(CodeCommentReply reply) {
- OneDev.getInstance(CodeCommentReplyManager.class).save(reply);
+ OneDev.getInstance(CodeCommentReplyManager.class).createOrUpdate(reply);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 97eba68c6c..4c1e377a57 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -104,7 +104,6 @@ import javax.validation.ValidationException;
import java.io.Serializable;
import java.util.*;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
import static io.onedev.server.model.support.pullrequest.MergeStrategy.*;
@@ -990,7 +989,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void onSaveWatch(EntityWatch watch) {
- OneDev.getInstance(PullRequestWatchManager.class).save((PullRequestWatch) watch);
+ OneDev.getInstance(PullRequestWatchManager.class).createOrUpdate((PullRequestWatch) watch);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index 77a289f094..a3c863bd86 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -314,7 +314,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
comment.setRequest(getPullRequest());
comment.setUser(getLoginUser());
comment.setContent(input.getModelObject());
- OneDev.getInstance(PullRequestCommentManager.class).save(comment);
+ OneDev.getInstance(PullRequestCommentManager.class).createOrUpdate(comment);
input.clearMarkdown();
target.add(fragment);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
index e682b1e73a..cea95bc5be 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
@@ -79,7 +79,7 @@ class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
if (comment.length() > PullRequestComment.MAX_CONTENT_LEN)
throw new ExplicitException("Comment too long");
PullRequestCommentedPanel.this.getComment().setContent(comment);
- OneDev.getInstance(PullRequestCommentManager.class).save(PullRequestCommentedPanel.this.getComment());
+ OneDev.getInstance(PullRequestCommentManager.class).createOrUpdate(PullRequestCommentedPanel.this.getComment());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
index f6ec343112..8aed339940 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
@@ -857,7 +857,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
compareContext.setOldCommitHash(state.oldCommitHash);
compareContext.setNewCommitHash(state.newCommitHash);
}
- OneDev.getInstance(CodeCommentManager.class).save(comment);
+ OneDev.getInstance(CodeCommentManager.class).createOrUpdate(comment);
}
@Override
@@ -867,7 +867,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
compareContext.setOldCommitHash(state.oldCommitHash);
compareContext.setNewCommitHash(state.newCommitHash);
}
- OneDev.getInstance(CodeCommentReplyManager.class).save(reply);
+ OneDev.getInstance(CodeCommentReplyManager.class).createOrUpdate(reply);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java
index 6d0b805a88..d1d884361b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java
@@ -36,7 +36,7 @@ public class BuildPreservationsPage extends ProjectBuildSettingPage {
super.onSubmit();
getSession().success("Build preserve rules saved");
getProject().getBuildSetting().setBuildPreservations(bean.getBuildPreservations());
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
setResponsePage(BuildPreservationsPage.class,
BuildPreservationsPage.paramsOf(getProject()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.java
index d856980d0e..215b506073 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.java
@@ -36,7 +36,7 @@ public class DefaultFixedIssueFiltersPage extends ProjectBuildSettingPage {
super.onSubmit();
getSession().success("Default fixed issue filters saved");
getProject().getBuildSetting().setDefaultFixedIssueFilters(bean.getDefaultFixedIssueFilters());
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
setResponsePage(DefaultFixedIssueFiltersPage.class,
DefaultFixedIssueFiltersPage.paramsOf(getProject()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobPropertiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobPropertiesPage.java
index 435fd120ae..d2b633900d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobPropertiesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobPropertiesPage.java
@@ -35,7 +35,7 @@ public class JobPropertiesPage extends ProjectBuildSettingPage {
super.onSubmit();
getSession().success("Job properties saved");
getProject().getBuildSetting().setJobProperties(bean.getProperties());
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
setResponsePage(JobPropertiesPage.class,
JobPropertiesPage.paramsOf(getProject()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.java
index 81451b2eb4..691acc6f71 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.java
@@ -82,7 +82,7 @@ public abstract class JobSecretEditPanel extends Panel {
secrets.add(editingSecret);
else
secrets.set(index, editingSecret);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
onSaved(target);
} else {
target.add(form);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
index 4c7262bf96..6a57a6f65e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
@@ -165,7 +165,7 @@ public class JobSecretsPage extends ProjectBuildSettingPage {
@Override
public void onClick(AjaxRequestTarget target) {
getProject().getBuildSetting().getJobSecrets().remove(index);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
Session.get().success("Secret '" + rowModel.getObject().getName() + "' deleted");
target.add(secretsTable);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeAnalysisSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeAnalysisSettingPage.java
index 729cd8758f..c8f4011877 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeAnalysisSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeAnalysisSettingPage.java
@@ -37,7 +37,7 @@ public class CodeAnalysisSettingPage extends ProjectSettingPage {
super.onSubmit();
getProject().setCodeAnalysisSetting(bean);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
setResponsePage(CodeAnalysisSettingPage.class, CodeAnalysisSettingPage.paramsOf(getProject()));
Session.get().success("Code analysis settings updated");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/branchprotection/BranchProtectionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/branchprotection/BranchProtectionsPage.java
index 3e316bc296..db9d52f9f5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/branchprotection/BranchProtectionsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/branchprotection/BranchProtectionsPage.java
@@ -51,14 +51,14 @@ public class BranchProtectionsPage extends ProjectSettingPage {
@Override
protected void onDelete(AjaxRequestTarget target) {
getProject().getBranchProtections().remove(item.getIndex());
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
target.add(container);
}
@Override
protected void onSave(AjaxRequestTarget target, BranchProtection protection) {
getProject().getBranchProtections().set(item.getIndex(), protection);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
}
});
@@ -73,7 +73,7 @@ public class BranchProtectionsPage extends ProjectSettingPage {
List<BranchProtection> protections = getProject().getBranchProtections();
BranchProtection protection = protections.get(from.getItemIndex());
protections.set(from.getItemIndex(), protections.set(to.getItemIndex(), protection));
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
target.add(container);
}
@@ -96,7 +96,7 @@ public class BranchProtectionsPage extends ProjectSettingPage {
@Override
protected void onSave(AjaxRequestTarget target, BranchProtection protection) {
getProject().getBranchProtections().add(protection);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
container.replace(newAddNewFrag());
target.add(container);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/git/GitPackConfigPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/git/GitPackConfigPage.java
index dd42a16e5d..6b922044f5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/git/GitPackConfigPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/git/GitPackConfigPage.java
@@ -43,7 +43,7 @@ public class GitPackConfigPage extends ProjectSettingPage {
getProject().setGitPackConfig(bean);
var projectManager = OneDev.getInstance(ProjectManager.class);
var clusterManager = OneDev.getInstance(ClusterManager.class);
- projectManager.save(getProject());
+ projectManager.update(getProject());
Long projectId = getProject().getId();
GitPackConfig gitPackConfig = getProject().getGitPackConfig();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java
index f4288f580b..c62db0b7ad 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java
@@ -35,7 +35,7 @@ public class PullRequestSettingPage extends ProjectSettingPage {
protected void onSubmit() {
super.onSubmit();
getProject().setPullRequestSetting(bean);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
setResponsePage(PullRequestSettingPage.class, PullRequestSettingPage.paramsOf(getProject()));
Session.get().success("Pull request settings updated");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/tagprotection/TagProtectionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/tagprotection/TagProtectionsPage.java
index fa700101c9..93ee0c42a7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/tagprotection/TagProtectionsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/tagprotection/TagProtectionsPage.java
@@ -51,14 +51,14 @@ public class TagProtectionsPage extends ProjectSettingPage {
@Override
protected void onDelete(AjaxRequestTarget target) {
getProject().getTagProtections().remove(item.getIndex());
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
target.add(container);
}
@Override
protected void onSave(AjaxRequestTarget target, TagProtection protection) {
getProject().getTagProtections().set(item.getIndex(), protection);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
}
});
@@ -73,7 +73,7 @@ public class TagProtectionsPage extends ProjectSettingPage {
List<TagProtection> protections = getProject().getTagProtections();
TagProtection protection = protections.get(from.getItemIndex());
protections.set(from.getItemIndex(), protections.set(to.getItemIndex(), protection));
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
target.add(container);
}
@@ -96,7 +96,7 @@ public class TagProtectionsPage extends ProjectSettingPage {
@Override
protected void onSave(AjaxRequestTarget target, TagProtection protection) {
getProject().getTagProtections().add(protection);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
container.replace(newAddNewFrag());
target.add(container);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
index 59178c09c8..c6cd254059 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
@@ -134,7 +134,7 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {
@Override
public void run() {
- getProjectManager().save(project);
+ getProjectManager().update(project);
OneDev.getInstance(ProjectLabelManager.class).sync(getProject(), labelsBean.getLabels());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java
index 8cc1e2b380..6987466bb9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java
@@ -82,7 +82,7 @@ public class ContributedProjectSettingPage extends ProjectSettingPage {
else
getProject().setContributedSetting(settingClass, null);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
getSession().success("Setting has been saved");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.java
index 9406178392..4c92aca9e7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.java
@@ -52,7 +52,7 @@ public class ProjectServiceDeskSettingPage extends ProjectSettingPage {
}
if (editor.isValid()) {
getProject().setServiceDeskName(bean.getServiceDeskName());
- projectManager.save(getProject());
+ projectManager.update(getProject());
setResponsePage(ProjectServiceDeskSettingPage.class, ProjectServiceDeskSettingPage.paramsOf(getProject()));
Session.get().success("Service desk settings updated");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java
index 18d58a1796..e3e74a9f9c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java
@@ -37,7 +37,7 @@ public class WebHooksPage extends ProjectSettingPage {
super.onSubmit();
getSession().success("Web hooks saved");
getProject().setWebHooks(bean.getWebHooks());
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(ProjectManager.class).update(getProject());
setResponsePage(WebHooksPage.class, WebHooksPage.paramsOf(getProject()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/CreateUserFromInvitationPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/CreateUserFromInvitationPage.java
index 7bd8a4e838..df0b609ff8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/CreateUserFromInvitationPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/CreateUserFromInvitationPage.java
@@ -87,7 +87,7 @@ public class CreateUserFromInvitationPage extends SimplePage {
@Override
public void run() {
getUserManager().create(user);
- getEmailAddressManager().save(emailAddress);
+ getEmailAddressManager().createOrUpdate(emailAddress);
getInvitationManager().delete(invitationModel.getObject());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/EmailAddressVerificationPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/EmailAddressVerificationPage.java
index cbd2576ed7..1ccca0b06e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/EmailAddressVerificationPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/EmailAddressVerificationPage.java
@@ -38,7 +38,7 @@ public class EmailAddressVerificationPage extends SimplePage {
if (verificationCode.equals(emailAddress.getVerificationCode())) {
emailAddress.setVerificationCode(null);
- getEmailAddressManager().save(emailAddress);
+ getEmailAddressManager().createOrUpdate(emailAddress);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java
index c45a2e6152..dd550e8520 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java
@@ -75,7 +75,7 @@ public class SignUpPage extends SimplePage {
@Override
public void run() {
getUserManager().create(user);
- getEmailAddressManager().save(emailAddress);
+ getEmailAddressManager().createOrUpdate(emailAddress);
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java
index 1261b85926..c23fbb9c3d 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java
@@ -70,7 +70,7 @@ public class AgentResource extends AbstractResource {
AgentToken token = new AgentToken();
token.setValue(UUID.randomUUID().toString());
- OneDev.getInstance(AgentTokenManager.class).save(token);
+ OneDev.getInstance(AgentTokenManager.class).create(token);
props.setProperty("agentToken", token.getValue());
try (OutputStream os = new FileOutputStream(new File(agentDir, "agent/conf/agent.properties"))) {
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
index 983fa4aa3a..a74cfbe74f 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
@@ -535,7 +535,7 @@ public class ImportServer implements Serializable, Validatable {
project.getMilestones().add(milestone);
if (!dryRun)
- OneDev.getInstance(MilestoneManager.class).save(milestone);
+ OneDev.getInstance(MilestoneManager.class).createOrUpdate(milestone);
}
}
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
index 1ed4418fd7..6a7eba346f 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
@@ -585,7 +585,7 @@ public class ImportServer implements Serializable, Validatable {
project.getMilestones().add(milestone);
if (!dryRun)
- OneDev.getInstance(MilestoneManager.class).save(milestone);
+ OneDev.getInstance(MilestoneManager.class).createOrUpdate(milestone);
}
}
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
index 3e21337ba9..d29a3760d8 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
@@ -304,7 +304,7 @@ public class ImportServer implements Serializable, Validatable {
milestone.setProject(project);
project.getMilestones().add(milestone);
if (!dryRun)
- OneDev.getInstance(MilestoneManager.class).save(milestone);
+ OneDev.getInstance(MilestoneManager.class).createOrUpdate(milestone);
}
}
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
index f4e6eb04f9..c0db651b6a 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
@@ -1005,7 +1005,7 @@ public class ImportServer implements Serializable, Validatable {
link.setSource(source);
link.setTarget(target);
link.setSpec(entry.getValue().getFirst());
- OneDev.getInstance(IssueLinkManager.class).save(link);
+ OneDev.getInstance(IssueLinkManager.class).create(link);
}
}
}