Skip to content

The Unified and Autonomous Development Platform

Fix issue #1255 - Update restful api to make update operation accepting id via url instead of request body

Robin Shen7a46ff9b10a5
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 ab2dc9e7d8..b59589b5f3 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.createOrUpdate(milestone);
+ milestoneManager.update(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/AgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java
index 15417f104d..7826c61a97 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
@@ -15,8 +15,6 @@ 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/BuildQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildQueryPersonalizationManager.java
index efde2ad463..aa4e0580b7 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
@@ -9,5 +9,8 @@ public interface BuildQueryPersonalizationManager extends EntityManager<BuildQue
BuildQueryPersonalization find(Project project, User user);
- void createOrUpdate(BuildQueryPersonalization buildQueryPersonalization);
+ void create(BuildQueryPersonalization buildQueryPersonalization);
+
+ void update(BuildQueryPersonalization buildQueryPersonalization);
+
}
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 439a002142..ea94e64b23 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
@@ -9,5 +9,8 @@ public interface CodeCommentQueryPersonalizationManager extends EntityManager<Co
CodeCommentQueryPersonalization find(Project project, User user);
- void createOrUpdate(CodeCommentQueryPersonalization codeCommentQueryPersonalization);
+ void create(CodeCommentQueryPersonalization personalization);
+
+ void update(CodeCommentQueryPersonalization personalization);
+
}
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 785ad16003..660223c808 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
@@ -9,5 +9,8 @@ public interface CommitQueryPersonalizationManager extends EntityManager<CommitQ
CommitQueryPersonalization find(Project project, User user);
- void createOrUpdate(CommitQueryPersonalization commitQueryPersonalization);
+ void create(CommitQueryPersonalization commitQueryPersonalization);
+
+ void update(CommitQueryPersonalization commitQueryPersonalization);
+
}
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 fb5db29352..5ba5ec840a 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
@@ -38,5 +38,8 @@ public interface EmailAddressManager extends EntityManager<EmailAddress> {
EmailAddressCache cloneCache();
- void createOrUpdate(EmailAddress address);
+ void create(EmailAddress address);
+
+ void update(EmailAddress address);
+
}
\ No newline at end of file
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 fc7d8e41c8..7c1303abb2 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
@@ -10,5 +10,8 @@ public interface GroupAuthorizationManager extends EntityManager<GroupAuthorizat
void syncAuthorizations(Group group, Collection<GroupAuthorization> authorizations);
- void createOrUpdate(GroupAuthorization authorization);
+ void create(GroupAuthorization authorization);
+
+ void update(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 775d2ce9a9..281c0ae857 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,5 +9,8 @@ public interface IssueAuthorizationManager extends EntityManager<IssueAuthorizat
void authorize(Issue issue, User user);
- void createOrUpdate(IssueAuthorization authorization);
+ void create(IssueAuthorization authorization);
+
+ void update(IssueAuthorization authorization);
+
}
\ No newline at end of file
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 e046497d4c..f0fef5d0b1 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
@@ -9,5 +9,8 @@ public interface IssueQueryPersonalizationManager extends EntityManager<IssueQue
IssueQueryPersonalization find(Project project, User user);
- void createOrUpdate(IssueQueryPersonalization personalization);
+ void create(IssueQueryPersonalization personalization);
+
+ void update(IssueQueryPersonalization personalization);
+
}
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 db8e35e936..b7ac684b55 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
@@ -14,5 +14,8 @@ public interface IssueWatchManager extends EntityManager<IssueWatch> {
void watch(Issue issue, User user, boolean watching);
- void createOrUpdate(IssueWatch watch);
+ void create(IssueWatch watch);
+
+ void update(IssueWatch watch);
+
}
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 4d44f7f1eb..93c97705c1 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
@@ -18,5 +18,8 @@ public interface MilestoneManager extends EntityManager<Milestone> {
@Nullable
Milestone findNextOpen(Project project);
- void createOrUpdate(Milestone milestone);
+ void create(Milestone milestone);
+
+ void update(Milestone milestone);
+
}
\ No newline at end of file
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 78ba6e32ff..132c3c7466 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
@@ -9,6 +9,8 @@ public interface PullRequestQueryPersonalizationManager extends EntityManager<Pu
PullRequestQueryPersonalization find(Project project, User user);
- void createOrUpdate(PullRequestQueryPersonalization personalization);
+ void create(PullRequestQueryPersonalization personalization);
+
+ void update(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 9f75fb5b3a..909dde4aeb 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
@@ -14,5 +14,8 @@ public interface PullRequestReviewManager extends EntityManager<PullRequestRevie
void populateReviews(Collection<PullRequest> requests);
- void createOrUpdate(PullRequestReview review);
+ void create(PullRequestReview review);
+
+ void update(PullRequestReview review);
+
}
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 1c23523cae..88f635c581 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
@@ -14,5 +14,8 @@ public interface PullRequestWatchManager extends EntityManager<PullRequestWatch>
void watch(PullRequest request, User user, boolean watching);
- void createOrUpdate(PullRequestWatch watch);
+ void create(PullRequestWatch watch);
+
+ void update(PullRequestWatch watch);
+
}
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 2f9c2ef9dd..992664a6a4 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
@@ -13,5 +13,8 @@ public interface UserAuthorizationManager extends EntityManager<UserAuthorizatio
void syncAuthorizations(Project project, Collection<UserAuthorization> authorizations);
- void createOrUpdate(UserAuthorization authorization);
+ void create(UserAuthorization authorization);
+
+ void update(UserAuthorization authorization);
+
}
\ 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 31be6ccc5d..dd58ea963b 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
@@ -8,6 +8,7 @@ import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import org.hibernate.query.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,6 +61,7 @@ public class DefaultAgentAttributeManager extends BaseEntityManager<AgentAttribu
@Transactional
@Override
public void create(AgentAttribute attribute) {
+ Preconditions.checkState(attribute.isNew());
dao.persist(attribute);
transactionManager.runAfterCommit(new Runnable() {
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 ea55dd452e..b04f82fcb3 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
@@ -95,10 +95,9 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
this.transactionManager = transactionManager;
this.clusterManager = clusterManager;
- Properties props = new Properties();
agentLibs = new HashSet<>();
try (InputStream is = Agent.class.getClassLoader().getResourceAsStream("META-INF/onedev-agent.properties")) {
- props = new Properties();
+ Properties props = new Properties();
props.load(is);
for (String dependency: Splitter.on(';').omitEmptyStrings().split(props.getProperty("dependencies")))
agentLibs.add(StringUtils.replace(dependency, ":", "-") + ".jar");
@@ -192,7 +191,8 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
agent.setCpus(data.getCpus());
agent.setTemporal(data.isTemporal());
agent.setIpAddress(data.getIpAddress());
- createOrUpdate(agent);
+ dao.persist(agent);
+ cacheAfterCommit(agent);
for (Map.Entry<String, String> entry: data.getAttributes().entrySet()) {
AgentAttribute attribute = new AgentAttribute();
@@ -211,7 +211,8 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
agent.setIpAddress(data.getIpAddress());
agent.setCpus(data.getCpus());
agent.setTemporal(data.isTemporal());
- createOrUpdate(agent);
+ dao.persist(agent);
+ cacheAfterCommit(agent);
attributeManager.syncAttributes(agent, data.getAttributes());
}
@@ -385,17 +386,16 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
}
dao.remove(agent.getToken());
}
-
- @Transactional
- @Override
- public void createOrUpdate(Agent agent) {
- dao.persist(agent);
+
+ private void cacheAfterCommit(Agent agent) {
+ String osName = agent.getOsName();
+ String osArch = agent.getOsArch();
transactionManager.runAfterCommit(new Runnable() {
@Override
public void run() {
- osNames.put(agent.getOsName(), agent.getOsName());
- osArchs.put(agent.getOsArch(), agent.getOsArch());
+ osNames.put(osName, osName);
+ osArchs.put(osArch, osArch);
}
});
@@ -405,14 +405,14 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
@Override
public void pause(Agent agent) {
agent.setPaused(true);
- createOrUpdate(agent);
+ dao.persist(agent);
}
@Transactional
@Override
public void resume(Agent agent) {
agent.setPaused(false);
- createOrUpdate(agent);
+ dao.persist(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 dfce7a58be..694781230e 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
@@ -5,6 +5,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import org.hibernate.criterion.Restrictions;
import io.onedev.server.entitymanager.AgentTokenManager;
@@ -25,6 +26,7 @@ public class DefaultAgentTokenManager extends BaseEntityManager<AgentToken> impl
@Override
public void create(AgentToken token) {
+ Preconditions.checkState(token.isNew());
dao.persist(token);
}
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 23922131f1..0a06fd501a 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
@@ -3,6 +3,7 @@ package io.onedev.server.entitymanager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.BuildDependenceManager;
import io.onedev.server.model.BuildDependence;
import io.onedev.server.persistence.annotation.Transactional;
@@ -20,6 +21,7 @@ public class DefaultBuildDependenceManager extends BaseEntityManager<BuildDepend
@Transactional
@Override
public void create(BuildDependence dependence) {
+ Preconditions.checkState(dependence.isNew());
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 ae3ba7d52b..18004ff42a 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
@@ -185,6 +185,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
@Transactional
@Override
public void update(Build build) {
+ Preconditions.checkState(!build.isNew());
dao.persist(build);
updateCacheAfterCommit(build);
}
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 721bb2cfcd..90709b63bf 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,5 +1,6 @@
package io.onedev.server.entitymanager.impl;
+import com.google.common.base.Preconditions;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.entitymanager.BuildParamManager;
import io.onedev.server.event.Listen;
@@ -73,6 +74,7 @@ public class DefaultBuildParamManager extends BaseEntityManager<BuildParam> impl
@Transactional
@Override
public void create(BuildParam param) {
+ Preconditions.checkState(param.isNew());
dao.persist(param);
Long projectId = param.getBuild().getProject().getId();
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 8a5896fce2..f351f2e4da 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
@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import org.hibernate.criterion.Restrictions;
import io.onedev.server.entitymanager.BuildQueryPersonalizationManager;
@@ -38,9 +39,7 @@ public class DefaultBuildQueryPersonalizationManager extends BaseEntityManager<B
return find(criteria);
}
- @Transactional
- @Override
- public void createOrUpdate(BuildQueryPersonalization personalization) {
+ private 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()));
@@ -56,4 +55,17 @@ public class DefaultBuildQueryPersonalizationManager extends BaseEntityManager<B
}
}
+ @Transactional
+ @Override
+ public void create(BuildQueryPersonalization personalization) {
+ Preconditions.checkState(personalization.isNew());
+ createOrUpdate(personalization);
+ }
+
+ @Transactional
+ @Override
+ public void update(BuildQueryPersonalization personalization) {
+ Preconditions.checkState(!personalization.isNew());
+ createOrUpdate(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 61e2265835..3d3260e844 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
@@ -73,6 +73,8 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> im
@Transactional
@Override
public void create(CodeComment comment) {
+ Preconditions.checkState(comment.isNew());
+
LastActivity lastActivity = new LastActivity();
lastActivity.setUser(comment.getUser());
lastActivity.setDescription("added");
@@ -90,6 +92,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> im
@Transactional
@Override
public void update(CodeComment comment) {
+ Preconditions.checkState(!comment.isNew());
dao.persist(comment);
listenerRegistry.post(new CodeCommentEdited(SecurityUtils.getUser(), comment));
}
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 7aceaad65f..c32a56771b 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
@@ -3,6 +3,7 @@ package io.onedev.server.entitymanager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import org.hibernate.criterion.Restrictions;
import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;
@@ -33,15 +34,26 @@ public class DefaultCodeCommentQueryPersonalizationManager extends BaseEntityMan
return find(criteria);
}
- @Transactional
- @Override
- public void createOrUpdate(CodeCommentQueryPersonalization setting) {
- if (setting.getQueries().isEmpty()) {
- if (!setting.isNew())
- delete(setting);
+ private void createOrUpdate(CodeCommentQueryPersonalization personalization) {
+ if (personalization.getQueries().isEmpty()) {
+ if (!personalization.isNew())
+ delete(personalization);
} else {
- dao.persist(setting);
+ dao.persist(personalization);
}
}
+ @Transactional
+ @Override
+ public void create(CodeCommentQueryPersonalization personalization) {
+ Preconditions.checkState(personalization.isNew());
+ createOrUpdate(personalization);
+ }
+
+ @Override
+ public void update(CodeCommentQueryPersonalization personalization) {
+ Preconditions.checkState(!personalization.isNew());
+ createOrUpdate(personalization);
+ }
+
}
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 5bcfa68787..9b0a2fa97f 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
@@ -3,6 +3,7 @@ package io.onedev.server.entitymanager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.CodeCommentReplyManager;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.codecomment.CodeCommentReplyCreated;
@@ -31,6 +32,7 @@ public class DefaultCodeCommentReplyManager extends BaseEntityManager<CodeCommen
@Transactional
@Override
public void create(CodeCommentReply reply) {
+ Preconditions.checkState(reply.isNew());
dao.persist(reply);
CodeComment comment = reply.getComment();
@@ -46,6 +48,7 @@ public class DefaultCodeCommentReplyManager extends BaseEntityManager<CodeCommen
@Transactional
@Override
public void update(CodeCommentReply reply) {
+ Preconditions.checkState(!reply.isNew());
dao.persist(reply);
listenerRegistry.post(new CodeCommentReplyEdited(reply));
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.java
index e3b1fc7add..be73fd03c1 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.java
@@ -5,6 +5,7 @@ import java.util.Collection;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.codecomment.CodeCommentStatusChanged;
@@ -32,6 +33,8 @@ public class DefaultCodeCommentStatusChangeManager extends BaseEntityManager<Cod
@Transactional
@Override
public void create(CodeCommentStatusChange change, String note) {
+ Preconditions.checkState(change.isNew());
+
CodeComment comment = change.getComment();
comment.setResolved(change.isResolved());
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 1635432ec1..dc77cb9c4d 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,5 +1,6 @@
package io.onedev.server.entitymanager.impl;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;
import io.onedev.server.model.CommitQueryPersonalization;
import io.onedev.server.model.Project;
@@ -36,9 +37,7 @@ public class DefaultCommitQueryPersonalizationManager extends BaseEntityManager<
return find(criteria);
}
- @Transactional
- @Override
- public void createOrUpdate(CommitQueryPersonalization personalization) {
+ private 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()));
@@ -54,4 +53,18 @@ public class DefaultCommitQueryPersonalizationManager extends BaseEntityManager<
}
}
+ @Transactional
+ @Override
+ public void create(CommitQueryPersonalization personalization) {
+ Preconditions.checkState(personalization.isNew());
+ createOrUpdate(personalization);
+ }
+
+ @Transactional
+ @Override
+ public void update(CommitQueryPersonalization personalization) {
+ Preconditions.checkState(!personalization.isNew());
+ createOrUpdate(personalization);
+ }
+
}
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 575adbdbaf..147a64e847 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
@@ -1,17 +1,8 @@
package io.onedev.server.entitymanager.impl;
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.eclipse.jgit.lib.PersonIdent;
-
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.hazelcast.core.HazelcastInstance;
-
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.entitymanager.EmailAddressManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -30,6 +21,12 @@ import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.facade.EmailAddressCache;
import io.onedev.server.util.facade.EmailAddressFacade;
+import org.eclipse.jgit.lib.PersonIdent;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Arrays;
+import java.util.stream.Collectors;
@Singleton
public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress> implements EmailAddressManager {
@@ -137,8 +134,8 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
@Transactional
@Override
- public void createOrUpdate(EmailAddress emailAddress) {
- boolean isNew = emailAddress.isNew();
+ public void create(EmailAddress emailAddress) {
+ Preconditions.checkState(emailAddress.isNew());
emailAddress.setValue(emailAddress.getValue().toLowerCase());
User user = emailAddress.getOwner();
@@ -150,7 +147,7 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
user.getEmailAddresses().add(emailAddress);
- if (isNew && !emailAddress.isVerified() && settingManager.getMailSetting() != null) {
+ if (!emailAddress.isVerified() && settingManager.getMailSetting() != null) {
Long addressId = emailAddress.getId();
sessionManager.runAsyncAfterCommit(new Runnable() {
@@ -163,6 +160,14 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
}
}
+ @Transactional
+ @Override
+ public void update(EmailAddress emailAddress) {
+ Preconditions.checkState(!emailAddress.isNew());
+ emailAddress.setValue(emailAddress.getValue().toLowerCase());
+ dao.persist(emailAddress);
+ }
+
@Transactional
@Listen
public void on(EntityRemoved event) {
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 cc38ec7ffa..71be4ff8c7 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 com.google.common.base.Preconditions;
import io.onedev.server.persistence.annotation.Transactional;
import org.hibernate.criterion.Restrictions;
@@ -31,6 +32,7 @@ public class DefaultGitLfsLockManager extends BaseEntityManager<GitLfsLock> impl
@Transactional
@Override
public void create(GitLfsLock lock) {
+ Preconditions.checkState(lock.isNew());
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 3a9bf08d73..8e531b41d4 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
@@ -8,6 +8,7 @@ import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import org.bouncycastle.openpgp.PGPPublicKey;
import io.onedev.server.cluster.ClusterManager;
@@ -158,6 +159,7 @@ public class DefaultGpgKeyManager extends BaseEntityManager<GpgKey> implements G
@Transactional
@Override
public void create(GpgKey gpgKey) {
+ Preconditions.checkState(gpgKey.isNew());
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 618b30d9d5..430be2d2d9 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
@@ -7,6 +7,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.GroupAuthorizationManager;
import io.onedev.server.model.Group;
import io.onedev.server.model.GroupAuthorization;
@@ -59,10 +60,18 @@ public class DefaultGroupAuthorizationManager extends BaseEntityManager<GroupAut
@Transactional
@Override
- public void createOrUpdate(GroupAuthorization authorization) {
+ public void create(GroupAuthorization authorization) {
+ Preconditions.checkState(authorization.isNew());
dao.persist(authorization);
}
+ @Transactional
+ @Override
+ public void update(GroupAuthorization authorization) {
+ Preconditions.checkState(!authorization.isNew());
+ dao.persist(authorization);
+ }
+
@Override
public List<GroupAuthorization> query() {
return query(true);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
index ba42b1ca21..3102a50d59 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
@@ -1,5 +1,6 @@
package io.onedev.server.entitymanager.impl;
+import com.google.common.base.Preconditions;
import com.hazelcast.core.HazelcastInstance;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.entitymanager.GroupManager;
@@ -105,12 +106,14 @@ public class DefaultGroupManager extends BaseEntityManager<Group> implements Gro
@Transactional
@Override
public void create(Group group) {
+ Preconditions.checkState(group.isNew());
dao.persist(group);
}
@Transactional
@Override
public void update(Group group, String oldName) {
+ Preconditions.checkState(!group.isNew());
if (oldName != null && !oldName.equals(group.getName())) {
for (Project project: projectManager.query()) {
try {
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 4be2aa4892..5fceecddd6 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
@@ -5,6 +5,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.IssueAuthorizationManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueAuthorization;
@@ -47,14 +48,22 @@ public class DefaultIssueAuthorizationManager extends BaseEntityManager<IssueAut
authorization.setIssue(issue);
authorization.setUser(user);
issue.getAuthorizations().add(authorization);
- createOrUpdate(authorization);
+ create(authorization);
}
}
@Transactional
@Override
- public void createOrUpdate(IssueAuthorization authorization) {
+ public void create(IssueAuthorization authorization) {
+ Preconditions.checkState(authorization.isNew());
dao.persist(authorization);
}
+ @Transactional
+ @Override
+ public void update(IssueAuthorization authorization) {
+ Preconditions.checkState(!authorization.isNew());
+ 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 c1403763c1..1e5edf2229 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
@@ -1,5 +1,6 @@
package io.onedev.server.entitymanager.impl;
+import com.google.common.base.Preconditions;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterManager;
@@ -107,6 +108,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
@Transactional
@Override
public void create(IssueChange change, @Nullable String note) {
+ Preconditions.checkState(change.isNew());
dao.persist(change);
if (note != null && change.getUser() != null) {
IssueComment comment = new IssueComment();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
index dd4c277510..56e55043fd 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
@@ -1,12 +1,12 @@
package io.onedev.server.entitymanager.impl;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.IssueCommentManager;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.issue.IssueCommentCreated;
import io.onedev.server.event.project.issue.IssueCommentDeleted;
import io.onedev.server.event.project.issue.IssueCommentEdited;
import io.onedev.server.model.IssueComment;
-import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@@ -20,18 +20,16 @@ public class DefaultIssueCommentManager extends BaseEntityManager<IssueComment>
private final ListenerRegistry listenerRegistry;
- private final SessionManager sessionManager;
-
@Inject
- public DefaultIssueCommentManager(Dao dao, ListenerRegistry listenerRegistry, SessionManager sessionManager) {
+ public DefaultIssueCommentManager(Dao dao, ListenerRegistry listenerRegistry) {
super(dao);
this.listenerRegistry = listenerRegistry;
- this.sessionManager = sessionManager;
}
@Transactional
@Override
public void update(IssueComment comment) {
+ Preconditions.checkState(!comment.isNew());
dao.persist(comment);
listenerRegistry.post(new IssueCommentEdited(comment));
}
@@ -48,6 +46,7 @@ public class DefaultIssueCommentManager extends BaseEntityManager<IssueComment>
@Transactional
@Override
public void create(IssueComment comment, Collection<String> notifiedEmailAddresses) {
+ Preconditions.checkState(comment.isNew());
dao.persist(comment);
comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()+1);
listenerRegistry.post(new IssueCommentCreated(comment, notifiedEmailAddresses));
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 d0beacf049..b622e8ceb2 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
@@ -11,6 +11,7 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
@@ -56,6 +57,7 @@ public class DefaultIssueFieldManager extends BaseEntityManager<IssueField> impl
@Transactional
@Override
public void create(IssueField field) {
+ Preconditions.checkState(field.isNew());
dao.persist(field);
}
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 e1b94fd4ec..d12ed6cbf4 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
@@ -12,6 +12,7 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
+import com.google.common.base.Preconditions;
import org.hibernate.Hibernate;
import org.hibernate.query.Query;
@@ -93,6 +94,7 @@ public class DefaultIssueLinkManager extends BaseEntityManager<IssueLink> implem
@Transactional
@Override
public void create(IssueLink link) {
+ Preconditions.checkState(link.isNew());
dao.persist(link);
}
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 301554f6f5..ebdcb02ae4 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.createOrUpdate(authorization);
+ authorizationManager.create(authorization);
updateCacheAfterCommit(Lists.newArrayList(issue));
listenerRegistry.post(new IssueOpened(issue));
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 5b8a5ed612..4db60c9e55 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,5 +1,6 @@
package io.onedev.server.entitymanager.impl;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
import io.onedev.server.model.IssueQueryPersonalization;
import io.onedev.server.model.Project;
@@ -38,14 +39,26 @@ public class DefaultIssueQueryPersonalizationManager extends BaseEntityManager<I
@Transactional
@Override
- public void createOrUpdate(IssueQueryPersonalization personalization) {
+ public void create(IssueQueryPersonalization personalization) {
+ Preconditions.checkState(personalization.isNew());
+ createrOrUpdate(personalization);
+ }
+
+ @Transactional
+ @Override
+ public void update(IssueQueryPersonalization personalization) {
+ Preconditions.checkState(!personalization.isNew());
+ createrOrUpdate(personalization);
+ }
+
+ private void createrOrUpdate(IssueQueryPersonalization personalization) {
Collection<String> retainNames = new HashSet<>();
retainNames.addAll(personalization.getQueries().stream()
.map(it->NamedQuery.PERSONAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
retainNames.addAll(personalization.getProject().getNamedIssueQueries().stream()
.map(it->NamedQuery.COMMON_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
personalization.getQueryWatchSupport().getQueryWatches().keySet().retainAll(retainNames);
-
+
if (personalization.getQueryWatchSupport().getQueryWatches().isEmpty() && personalization.getQueries().isEmpty()) {
if (!personalization.isNew())
delete(personalization);
@@ -53,5 +66,5 @@ public class DefaultIssueQueryPersonalizationManager extends BaseEntityManager<I
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 84683fbfa2..301e4a9699 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
@@ -6,6 +6,7 @@ import java.util.Iterator;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.IssueScheduleManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueSchedule;
@@ -47,6 +48,7 @@ public class DefaultIssueScheduleManager extends BaseEntityManager<IssueSchedule
@Transactional
@Override
public void create(IssueSchedule schedule) {
+ Preconditions.checkState(schedule.isNew());
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 211e11cb57..547ee47c8b 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
@@ -3,6 +3,7 @@ package io.onedev.server.entitymanager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.IssueVoteManager;
import io.onedev.server.model.IssueVote;
import io.onedev.server.persistence.annotation.Transactional;
@@ -21,6 +22,7 @@ public class DefaultIssueVoteManager extends BaseEntityManager<IssueVote>
@Transactional
@Override
public void create(IssueVote vote) {
+ Preconditions.checkState(vote.isNew());
vote.getIssue().setVoteCount(vote.getIssue().getVoteCount()+1);
dao.persist(vote);
}
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 33976e911a..12790d1349 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 com.google.common.base.Preconditions;
import io.onedev.server.persistence.annotation.Transactional;
import org.hibernate.criterion.Restrictions;
@@ -36,14 +37,22 @@ public class DefaultIssueWatchManager extends BaseEntityManager<IssueWatch>
IssueWatch watch = (IssueWatch) issue.getWatch(user, true);
if (watch.isNew()) {
watch.setWatching(watching);
- createOrUpdate(watch);
+ create(watch);
}
}
@Transactional
@Override
- public void createOrUpdate(IssueWatch watch) {
+ public void create(IssueWatch watch) {
+ Preconditions.checkState(watch.isNew());
dao.persist(watch);
}
+ @Transactional
+ @Override
+ public void update(IssueWatch watch) {
+ Preconditions.checkState(!watch.isNew());
+ dao.persist(watch);
+ }
+
}
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 f5eaeb8e46..4f16017c4d 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
@@ -5,6 +5,7 @@ import java.util.Collection;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.LinkAuthorizationManager;
import io.onedev.server.model.LinkAuthorization;
import io.onedev.server.model.LinkSpec;
@@ -49,6 +50,7 @@ public class DefaultLinkAuthorizationManager extends BaseEntityManager<LinkAutho
@Transactional
@Override
public void create(LinkAuthorization authorization) {
+ Preconditions.checkState(authorization.isNew());
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 b67ea8cf8c..8b1b6e76ae 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
@@ -7,6 +7,7 @@ import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -92,6 +93,7 @@ public class DefaultLinkSpecManager extends BaseEntityManager<LinkSpec> implemen
@Transactional
@Override
public void update(LinkSpec spec, String oldName, String oldOppositeName) {
+ Preconditions.checkState(!spec.isNew());
if (oldName != null) {
if (oldOppositeName != null) {
if (spec.getOpposite() == null) {
@@ -138,6 +140,7 @@ public class DefaultLinkSpecManager extends BaseEntityManager<LinkSpec> implemen
@Transactional
@Override
public void create(LinkSpec link) {
+ Preconditions.checkState(link.isNew());
dao.persist(link);
}
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 fce0958c60..945a69e6a8 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
@@ -14,6 +14,7 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
+import com.google.common.base.Preconditions;
import org.hibernate.query.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -89,6 +90,7 @@ public class DefaultMembershipManager extends BaseEntityManager<Membership> impl
@Transactional
@Override
public void create(Membership membership) {
+ Preconditions.checkState(membership.isNew());
dao.persist(membership);
}
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 28b8d7a311..23aa600202 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 com.google.common.base.Preconditions;
import io.onedev.server.persistence.annotation.Transactional;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
@@ -79,8 +80,16 @@ public class DefaultMilestoneManager extends BaseEntityManager<Milestone> implem
@Transactional
@Override
- public void createOrUpdate(Milestone milestone) {
+ public void create(Milestone milestone) {
+ Preconditions.checkState(milestone.isNew());
dao.persist(milestone);
}
+ @Transactional
+ @Override
+ public void update(Milestone milestone) {
+ Preconditions.checkState(!milestone.isNew());
+ 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 dd6756db3d..f110dfff6a 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
@@ -10,6 +10,7 @@ import javax.persistence.criteria.CriteriaDelete;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
+import com.google.common.base.Preconditions;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
@@ -126,6 +127,7 @@ public class DefaultPendingSuggestionApplyManager extends BaseEntityManager<Pend
@Transactional
@Override
public void create(PendingSuggestionApply pendingSuggestionApply) {
+ Preconditions.checkState(pendingSuggestionApply.isNew());
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 c392aa09bc..35d47360fe 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
@@ -1,5 +1,6 @@
package io.onedev.server.entitymanager.impl;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.ProjectDynamicsManager;
import io.onedev.server.event.Listen;
import io.onedev.server.event.project.ProjectCreated;
@@ -40,6 +41,7 @@ public class DefaultProjectDynamicsManager extends BaseEntityManager<ProjectDyna
@Transactional
@Override
public void create(ProjectDynamics dynamics) {
+ Preconditions.checkState(dynamics.isNew());
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 4df1a53130..7fdfe83177 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
@@ -1,6 +1,7 @@
package io.onedev.server.entitymanager.impl;
import com.beust.jcommander.internal.Lists;
+import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Sets;
import com.hazelcast.cluster.MembershipEvent;
@@ -209,6 +210,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
@Transactional
@Override
public void update(Project project) {
+ Preconditions.checkState(!project.isNew());
String oldPath = project.getPath();
String newPath = project.calcPath();
if (!newPath.equals(oldPath)) {
@@ -273,6 +275,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
@Transactional
@Override
public void create(Project project) {
+ Preconditions.checkState(project.isNew());
Project parent = project.getParent();
if (parent != null && parent.isNew())
create(parent);
@@ -295,7 +298,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
authorization.setProject(project);
authorization.setUser(SecurityUtils.getUser());
authorization.setRole(roleManager.getOwner());
- userAuthorizationManager.createOrUpdate(authorization);
+ userAuthorizationManager.create(authorization);
updateStorageServer(project);
listenerRegistry.post(new ProjectCreated(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 e08a6dcce7..fd3aae2bb1 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
@@ -5,6 +5,7 @@ import java.util.Date;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.PullRequestAssignmentManager;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.pullrequest.PullRequestAssigned;
@@ -30,6 +31,7 @@ public class DefaultPullRequestAssignmentManager extends BaseEntityManager<PullR
@Transactional
@Override
public void create(PullRequestAssignment assignment) {
+ Preconditions.checkState(assignment.isNew());
dao.persist(assignment);
listenerRegistry.post(new PullRequestAssigned(
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
index de5eb41c6f..bc8fab985c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
@@ -1,5 +1,6 @@
package io.onedev.server.entitymanager.impl;
+import com.google.common.base.Preconditions;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entityreference.EntityReferenceManager;
@@ -43,6 +44,7 @@ public class DefaultPullRequestChangeManager extends BaseEntityManager<PullReque
@Transactional
@Override
public void create(PullRequestChange change, @Nullable String note) {
+ Preconditions.checkState(change.isNew());
dao.persist(change);
if (note != null && change.getUser() != null) {
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 d6ac732506..65416c2e89 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
@@ -1,5 +1,6 @@
package io.onedev.server.entitymanager.impl;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.PullRequestCommentManager;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.pullrequest.PullRequestCommentCreated;
@@ -37,6 +38,7 @@ public class DefaultPullRequestCommentManager extends BaseEntityManager<PullRequ
@Transactional
@Override
public void create(PullRequestComment comment, Collection<String> notifiedEmailAddresses) {
+ Preconditions.checkState(comment.isNew());
dao.persist(comment);
comment.getRequest().setCommentCount(comment.getRequest().getCommentCount()+1);
listenerRegistry.post(new PullRequestCommentCreated(comment, notifiedEmailAddresses));
@@ -45,6 +47,7 @@ public class DefaultPullRequestCommentManager extends BaseEntityManager<PullRequ
@Transactional
@Override
public void update(PullRequestComment comment) {
+ Preconditions.checkState(!comment.isNew());
dao.persist(comment);
listenerRegistry.post(new PullRequestCommentEdited(comment));
}
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 7c6dede7c8..7eec69e464 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
@@ -423,8 +423,10 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
checkReviews(request, sourceUpdated);
for (PullRequestReview review: request.getReviews()) {
- if (review.isNew() || review.isDirty())
- reviewManager.createOrUpdate(review);
+ if (review.isNew())
+ reviewManager.create(review);
+ else if (review.isDirty())
+ reviewManager.update(review);
}
Project targetProject = request.getTargetProject();
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 d07c92f14f..a104361475 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,5 +1,6 @@
package io.onedev.server.entitymanager.impl;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequestQueryPersonalization;
@@ -36,9 +37,7 @@ public class DefaultPullRequestQueryPersonalizationManager extends BaseEntityMan
return find(criteria);
}
- @Transactional
- @Override
- public void createOrUpdate(PullRequestQueryPersonalization personalization) {
+ private 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()));
@@ -54,4 +53,17 @@ public class DefaultPullRequestQueryPersonalizationManager extends BaseEntityMan
}
}
+ @Transactional
+ @Override
+ public void create(PullRequestQueryPersonalization personalization) {
+ Preconditions.checkState(personalization.isNew());
+ createOrUpdate(personalization);
+ }
+
+ @Transactional
+ @Override
+ public void update(PullRequestQueryPersonalization personalization) {
+ Preconditions.checkState(!personalization.isNew());
+ createOrUpdate(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 feab2a25d5..cea5e0ffe7 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
@@ -46,9 +46,7 @@ public class DefaultPullRequestReviewManager extends BaseEntityManager<PullReque
this.listenerRegistry = listenerRegistry;
}
- @Transactional
- @Override
- public void createOrUpdate(PullRequestReview review) {
+ private void createOrUpdate(PullRequestReview review) {
review.setDirty(false);
dao.persist(review);
@@ -63,7 +61,21 @@ public class DefaultPullRequestReviewManager extends BaseEntityManager<PullReque
}
}
- @Sessional
+ @Transactional
+ @Override
+ public void create(PullRequestReview review) {
+ Preconditions.checkState(review.isNew());
+ createOrUpdate(review);
+ }
+
+ @Transactional
+ @Override
+ public void update(PullRequestReview review) {
+ Preconditions.checkState(!review.isNew());
+ createOrUpdate(review);
+ }
+
+ @Sessional
@Override
public void populateReviews(Collection<PullRequest> requests) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
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 98b59220a7..fc8392ec2d 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
@@ -5,6 +5,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import org.eclipse.jgit.lib.ObjectId;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
@@ -42,6 +43,7 @@ public class DefaultPullRequestUpdateManager extends BaseEntityManager<PullReque
@Transactional
@Override
public void create(PullRequestUpdate update) {
+ Preconditions.checkState(update.isNew());
dao.persist(update);
PullRequest request = update.getRequest();
if (!request.getTargetProject().equals(request.getSourceProject())) {
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 616fa8af8b..6cd0290c57 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
@@ -3,6 +3,7 @@ package io.onedev.server.entitymanager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import org.hibernate.criterion.Restrictions;
import io.onedev.server.entitymanager.PullRequestWatchManager;
@@ -40,8 +41,15 @@ public class DefaultPullRequestWatchManager extends BaseEntityManager<PullReques
}
@Override
- public void createOrUpdate(PullRequestWatch watch) {
+ public void create(PullRequestWatch watch) {
+ Preconditions.checkState(watch.isNew());
dao.persist(watch);
}
+ @Override
+ public void update(PullRequestWatch watch) {
+ Preconditions.checkState(!watch.isNew());
+ 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 cf8683630f..d9ed1d2ed6 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
@@ -1,5 +1,6 @@
package io.onedev.server.entitymanager.impl;
+import com.google.common.base.Preconditions;
import com.hazelcast.core.HazelcastInstance;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.entitymanager.LinkAuthorizationManager;
@@ -121,6 +122,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
@Transactional
@Override
public void create(Role role, Collection<LinkSpec> authorizedLinks) {
+ Preconditions.checkState(role.isNew());
dao.persist(role);
linkAuthorizationManager.syncAuthorizations(role, authorizedLinks);
}
@@ -128,6 +130,8 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
@Transactional
@Override
public void update(Role role, Collection<LinkSpec> authorizedLinks, String oldName) {
+ Preconditions.checkState(!role.isNew());
+
if (oldName != null && !oldName.equals(role.getName()))
settingManager.onRenameRole(oldName, role.getName());
dao.persist(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 4c5d35167c..2c5f32dc1b 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
@@ -8,6 +8,7 @@ import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import org.hibernate.criterion.Restrictions;
import org.hibernate.criterion.SimpleExpression;
import org.slf4j.Logger;
@@ -76,6 +77,7 @@ public class DefaultSshKeyManager extends BaseEntityManager<SshKey> implements S
@Transactional
@Override
public void create(SshKey sshKey) {
+ Preconditions.checkState(sshKey.isNew());
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 6dc5d3fc7a..616103fd3c 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
@@ -7,6 +7,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.UserAuthorizationManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
@@ -104,7 +105,15 @@ public class DefaultUserAuthorizationManager extends BaseEntityManager<UserAutho
@Transactional
@Override
- public void createOrUpdate(UserAuthorization authorization) {
+ public void create(UserAuthorization authorization) {
+ Preconditions.checkState(authorization.isNew());
+ dao.persist(authorization);
+ }
+
+ @Transactional
+ @Override
+ public void update(UserAuthorization authorization) {
+ Preconditions.checkState(!authorization.isNew());
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 53cf96b5b7..ff1e28ac04 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
@@ -99,6 +99,7 @@ public class DefaultUserInvitationManager extends BaseEntityManager<UserInvitati
@Transactional
@Override
public void create(UserInvitation invitation) {
+ Preconditions.checkState(invitation.isNew());
dao.persist(invitation);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index 9959ba096b..380fa86229 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -1,5 +1,6 @@
package io.onedev.server.entitymanager.impl;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
import com.hazelcast.core.HazelcastInstance;
import io.onedev.server.cluster.ClusterManager;
@@ -95,6 +96,8 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
@Transactional
@Override
public void update(User user, String oldName) {
+ Preconditions.checkState(!user.isNew());
+
user.setName(user.getName().toLowerCase());
dao.persist(user);
@@ -122,6 +125,7 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
@Transactional
@Override
public void create(User user) {
+ Preconditions.checkState(user.isNew());
user.setName(user.getName().toLowerCase());
dao.persist(user);
}
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 cb47104d96..9c6f027e4f 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.createOrUpdate(watch);
+ issueWatchManager.update(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.createOrUpdate(watch);
+ pullRequestWatchManager.update(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 "
@@ -790,7 +790,7 @@ public class DefaultMailManager implements MailManager, Serializable {
emailAddress.setPrimary(true);
emailAddress.setGit(true);
emailAddress.setOwner(user);
- emailAddressManager.createOrUpdate(emailAddress);
+ emailAddressManager.create(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.createOrUpdate(authorization);
+ authorizationManager.create(authorization);
}
return user;
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index a8249348ae..be5fb11696 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -176,14 +176,7 @@ public class Build extends ProjectBelonging
NAME_PROJECT, PROP_PROJECT,
NAME_COMMIT, PROP_COMMIT);
- private static ThreadLocal<Stack<Build>> stack = new ThreadLocal<Stack<Build>>() {
-
- @Override
- protected Stack<Build> initialValue() {
- return new Stack<Build>();
- }
-
- };
+ private static ThreadLocal<Stack<Build>> stack = ThreadLocal.withInitial(() -> new Stack<Build>());
public static final String ARTIFACTS_DIR = "artifacts";
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 57b81a34f5..ead7410ec5 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,10 @@ public class BuildQueryPersonalization extends AbstractEntity implements QueryPe
@Override
public void onUpdated() {
- OneDev.getInstance(BuildQueryPersonalizationManager.class).createOrUpdate(this);
+ if (isNew())
+ OneDev.getInstance(BuildQueryPersonalizationManager.class).create(this);
+ else
+ OneDev.getInstance(BuildQueryPersonalizationManager.class).update(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 b0bd519ff4..753d841022 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,10 @@ public class CodeCommentQueryPersonalization extends AbstractEntity implements Q
@Override
public void onUpdated() {
- OneDev.getInstance(CodeCommentQueryPersonalizationManager.class).createOrUpdate(this);
+ if (isNew())
+ OneDev.getInstance(CodeCommentQueryPersonalizationManager.class).create(this);
+ else
+ OneDev.getInstance(CodeCommentQueryPersonalizationManager.class).update(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 b0df1756b9..350edeeb56 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,10 @@ public class CommitQueryPersonalization extends AbstractEntity implements QueryP
@Override
public void onUpdated() {
- OneDev.getInstance(CommitQueryPersonalizationManager.class).createOrUpdate(this);
+ if (isNew())
+ OneDev.getInstance(CommitQueryPersonalizationManager.class).create(this);
+ else
+ OneDev.getInstance(CommitQueryPersonalizationManager.class).update(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 5b9b030bc4..533a678d3b 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,10 @@ public class IssueQueryPersonalization extends AbstractEntity implements QueryPe
@Override
public void onUpdated() {
- OneDev.getInstance(IssueQueryPersonalizationManager.class).createOrUpdate(this);
+ if (isNew())
+ OneDev.getInstance(IssueQueryPersonalizationManager.class).create(this);
+ else
+ OneDev.getInstance(IssueQueryPersonalizationManager.class).update(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 5d8e50df44..8b2237e6f0 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,10 @@ public class PullRequestQueryPersonalization extends AbstractEntity implements Q
@Override
public void onUpdated() {
- OneDev.getInstance(PullRequestQueryPersonalizationManager.class).createOrUpdate(this);
+ if (isNew())
+ OneDev.getInstance(PullRequestQueryPersonalizationManager.class).create(this);
+ else
+ OneDev.getInstance(PullRequestQueryPersonalizationManager.class).update(this);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java
index ba57ea9451..5610ad9464 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java
@@ -2,6 +2,7 @@ package io.onedev.server.model.support.issue.field.spec;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.OneDev;
+import io.onedev.server.annotation.Multiline;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
@@ -55,7 +56,9 @@ public abstract class FieldSpec extends InputSpec {
super.setName(name);
}
- @Editable(order=30, placeholder="No description", description="Optionally describes the custom field")
+ @Editable(order=30, placeholder="No description", description="Optionally describes the custom field. " +
+ "Html tags are accepted")
+ @Multiline
@Override
public String getDescription() {
return super.getDescription();
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 d053bfbf9b..ecb49e055f 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,10 @@ public class DefaultDataManager implements DataManager, Serializable {
primaryEmailAddress.setOwner(user);
}
primaryEmailAddress.setValue(bean.getEmailAddress());
- emailAddressManager.createOrUpdate(primaryEmailAddress);
+ if (primaryEmailAddress.isNew())
+ emailAddressManager.create(primaryEmailAddress);
+ else
+ emailAddressManager.update(primaryEmailAddress);
}
@SuppressWarnings({"serial"})
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 9b79931d3d..8168a54d44 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
@@ -71,7 +71,7 @@ public class AgentTokenResource {
return tokenManager.query(criteria, offset, count);
}
- @Api(order=500, createOnly = true, description="Create new token")
+ @Api(order=500, description="Create new token")
@POST
public Long create(AgentToken token) {
if (!SecurityUtils.isAdministrator())
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 63d85f7cd4..4651f80462 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
@@ -44,14 +44,24 @@ public class BuildQueryPersonalizationResource {
return queryPersonalization;
}
- @Api(order=200, description="Update build query personalization of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new build query personalization ")
@POST
- public Long createOrUpdate(@NotNull BuildQueryPersonalization queryPersonalization) {
+ public Long create(@NotNull BuildQueryPersonalization queryPersonalization) {
if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
throw new UnauthorizedException();
- queryPersonalizationManager.createOrUpdate(queryPersonalization);
+ queryPersonalizationManager.create(queryPersonalization);
return queryPersonalization.getId();
}
+
+ @Api(order=250, description="Update build query personalization of specified id")
+ @Path("/{queryPersonalizationId}")
+ @POST
+ public Response update(@PathParam("queryPersonalizationId") Long queryPersonalizationId, @NotNull BuildQueryPersonalization queryPersonalization) {
+ if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ queryPersonalizationManager.update(queryPersonalization);
+ return Response.ok().build();
+ }
@Api(order=300)
@Path("/{queryPersonalizationId}")
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 774fb1c0cf..8ffb93b8ec 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
@@ -44,16 +44,28 @@ public class CodeCommentQueryPersonalizationResource {
return queryPersonalization;
}
- @Api(order=200, description="Update code comment query personalization of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new code comment query personalization")
@POST
- public Long createOrUpdate(@NotNull CodeCommentQueryPersonalization queryPersonalization) {
+ public Long create(@NotNull CodeCommentQueryPersonalization queryPersonalization) {
if (!SecurityUtils.canAccess(queryPersonalization.getProject())
|| !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- queryPersonalizationManager.createOrUpdate(queryPersonalization);
+ queryPersonalizationManager.create(queryPersonalization);
return queryPersonalization.getId();
}
+
+ @Api(order=250, description="Update code comment query personalization of specified id")
+ @Path("/{queryPersonalizationId}")
+ @POST
+ public Response update(@PathParam("queryPersonalizationId") Long queryPersonalizationId, @NotNull CodeCommentQueryPersonalization queryPersonalization) {
+ if (!SecurityUtils.canAccess(queryPersonalization.getProject())
+ || !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+ queryPersonalizationManager.update(queryPersonalization);
+ return Response.ok().build();
+ }
@Api(order=300)
@Path("/{queryPersonalizationId}")
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 5fbfc84b1a..2c8aa49141 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
@@ -44,21 +44,32 @@ public class CodeCommentReplyResource {
return reply;
}
- @Api(order=200, description="Update code comment reply of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new code comment reply")
@POST
- public Long createOrUpdate(@NotNull CodeCommentReply reply) {
+ public Long create(@NotNull CodeCommentReply reply) {
if (!SecurityUtils.canReadCode(reply.getComment().getProject()) ||
!SecurityUtils.isAdministrator() && !reply.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- if (reply.isNew())
- replyManager.create(reply);
- else
- replyManager.update(reply);
+ replyManager.create(reply);
return reply.getId();
}
+
+ @Api(order=250, description="Update code comment reply of specified id")
+ @Path("/{replyId}")
+ @POST
+ public Response update(@PathParam("replyId") Long replyId, @NotNull CodeCommentReply reply) {
+ if (!SecurityUtils.canReadCode(reply.getComment().getProject()) ||
+ !SecurityUtils.isAdministrator() && !reply.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+
+ replyManager.update(reply);
+
+ return Response.ok().build();
+ }
@Api(order=300)
@Path("/{replyId}")
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 34a04fcaff..19bfebbf67 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
@@ -117,21 +117,32 @@ public class CodeCommentResource {
return commentManager.query(project, pullRequest, parsedQuery, offset, count);
}
- @Api(order=400, description="Update code comment of specified id in request body, or create new if id property not provided")
+ @Api(order=400, description="Create new code comment")
@POST
- public Long createOrUpdate(@NotNull CodeComment comment) {
+ public Long create(@NotNull CodeComment comment) {
if (!SecurityUtils.canReadCode(comment.getProject()) ||
!SecurityUtils.isAdministrator() && !comment.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- if (comment.isNew())
- commentManager.create(comment);
- else
- commentManager.update(comment);
+ commentManager.create(comment);
return comment.getId();
}
+
+ @Api(order=450, description="Update code comment of specified id")
+ @Path("/{commentId}")
+ @POST
+ public Response update(@PathParam("commentId") Long commentId, @NotNull CodeComment comment) {
+ if (!SecurityUtils.canReadCode(comment.getProject()) ||
+ !SecurityUtils.isAdministrator() && !comment.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+
+ commentManager.update(comment);
+
+ return Response.ok().build();
+ }
@Api(order=500)
@Path("/{commentId}")
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 78b6fdeb4b..a22a483ee1 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
@@ -44,16 +44,28 @@ public class CommitQueryPersonalizationResource {
return queryPersonalization;
}
- @Api(order=200, description="Update commit query personalization of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new commit query personalization")
@POST
- public Long createOrUpdate(@NotNull CommitQueryPersonalization queryPersonalization) {
+ public Long create(@NotNull CommitQueryPersonalization queryPersonalization) {
if (!SecurityUtils.canAccess(queryPersonalization.getProject())
|| !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- queryPersonalizationManager.createOrUpdate(queryPersonalization);
+ queryPersonalizationManager.create(queryPersonalization);
return queryPersonalization.getId();
}
+
+ @Api(order=250, description="Update commit query personalization of specified id")
+ @Path("/{queryPersonalizationId}")
+ @POST
+ public Response update(@PathParam("queryPersonalizationId") Long queryPersonalizationId, @NotNull CommitQueryPersonalization queryPersonalization) {
+ if (!SecurityUtils.canAccess(queryPersonalization.getProject())
+ || !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+ queryPersonalizationManager.update(queryPersonalization);
+ return Response.ok().build();
+ }
@Api(order=300)
@Path("/{queryPersonalizationId}")
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 835b064d26..5076c3e3e7 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.createOrUpdate(emailAddress);
+ emailAddressManager.create(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 1d0b4b029b..a37b964da4 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
@@ -43,14 +43,24 @@ public class GroupAuthorizationResource {
return authorizationManager.load(authorizationId);
}
- @Api(order=200, description="Update group authorization of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new group authorization")
@POST
- public Long createOrUpdate(@NotNull GroupAuthorization authorization) {
+ public Long create(@NotNull GroupAuthorization authorization) {
if (!SecurityUtils.isAdministrator())
throw new UnauthorizedException();
- authorizationManager.createOrUpdate(authorization);
+ authorizationManager.create(authorization);
return authorization.getId();
}
+
+ @Api(order=250, description="Update group authorization of specified id")
+ @Path("/{authorizationId}")
+ @POST
+ public Response update(@PathParam("authorizationId") Long authorizationId, @NotNull GroupAuthorization authorization) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+ authorizationManager.update(authorization);
+ return Response.ok().build();
+ }
@Api(order=300)
@Path("/{authorizationId}")
diff --git a/server-core/src/main/java/io/onedev/server/rest/GroupResource.java b/server-core/src/main/java/io/onedev/server/rest/GroupResource.java
index 87f369f340..8d88ad83ce 100644
--- a/server-core/src/main/java/io/onedev/server/rest/GroupResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/GroupResource.java
@@ -91,20 +91,29 @@ public class GroupResource {
return groupManager.query(criteria, offset, count);
}
- @Api(order=500, description="Update group of specified id in request body, or create new if id property not provided")
+ @Api(order=500, description="Create new group")
@POST
- public Long createOrUpdate(@NotNull Group group) {
+ public Long create(@NotNull Group group) {
if (!SecurityUtils.isAdministrator())
throw new UnauthorizedException();
- if (group.getOldVersion() != null)
- groupManager.update(group, ((GroupFacade) group.getOldVersion()).getName());
- else if (group.isNew())
- groupManager.create(group);
- else
- groupManager.update(group, null);
+
+ groupManager.create(group);
return group.getId();
}
+
+ @Api(order=550, description="Update group of specified id")
+ @Path("/{groupId}")
+ @POST
+ public Response update(@PathParam("groupId") Long groupId, @NotNull Group group) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+ if (group.getOldVersion() != null)
+ groupManager.update(group, ((GroupFacade) group.getOldVersion()).getName());
+ else
+ groupManager.update(group, null);
+ return Response.ok().build();
+ }
@Api(order=600)
@Path("/{groupId}")
diff --git a/server-core/src/main/java/io/onedev/server/rest/IssueCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/IssueCommentResource.java
index af50fbff9d..ff2bd13d0f 100644
--- a/server-core/src/main/java/io/onedev/server/rest/IssueCommentResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/IssueCommentResource.java
@@ -38,20 +38,32 @@ public class IssueCommentResource {
return comment;
}
- @Api(order=200, description="Update issue comment of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new issue comment")
@POST
- public Long createOrUpdate(@NotNull IssueComment comment) {
+ public Long create(@NotNull IssueComment comment) {
if (!SecurityUtils.canAccess(comment.getIssue().getProject()) ||
!SecurityUtils.isAdministrator() && !comment.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- if (comment.isNew())
- commentManager.create(comment, new ArrayList<>());
- else
- commentManager.update(comment);
+ commentManager.create(comment, new ArrayList<>());
+
return comment.getId();
}
+
+ @Api(order=250, description="Update issue comment of specified id")
+ @Path("/{commentId}")
+ @POST
+ public Response update(@PathParam("commentId") Long commentId, @NotNull IssueComment comment) {
+ if (!SecurityUtils.canAccess(comment.getIssue().getProject()) ||
+ !SecurityUtils.isAdministrator() && !comment.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+
+ commentManager.update(comment);
+
+ return Response.ok().build();
+ }
@Api(order=300)
@Path("/{commentId}")
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 e57d4a701b..eb11732e5a 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
@@ -44,16 +44,28 @@ public class IssueQueryPersonalizationResource {
return queryPersonalization;
}
- @Api(order=200, description="Update issue query setting of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new issue query setting")
@POST
- public Long createOrUpdate(@NotNull IssueQueryPersonalization queryPersonalization) {
+ public Long create(@NotNull IssueQueryPersonalization queryPersonalization) {
if (!SecurityUtils.canAccess(queryPersonalization.getProject())
|| !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- queryPersonalizationManager.createOrUpdate(queryPersonalization);
+ queryPersonalizationManager.create(queryPersonalization);
return queryPersonalization.getId();
}
+
+ @Api(order=250, description="Updae query setting of specified id")
+ @Path("/{queryPersonalizationId}")
+ @POST
+ public Response update(@PathParam("queryPersonalizationId") Long queryPersonalizationId, @NotNull IssueQueryPersonalization queryPersonalization) {
+ if (!SecurityUtils.canAccess(queryPersonalization.getProject())
+ || !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+ queryPersonalizationManager.update(queryPersonalization);
+ return Response.ok().build();
+ }
@Api(order=300)
@Path("/{queryPersonalizationId}")
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 6aaba72b32..92766dc00b 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,7 +44,7 @@ public class IssueVoteResource {
return vote;
}
- @Api(order=200, createOnly = true, description="Create new issue vote")
+ @Api(order=200, description="Create new issue vote")
@POST
public Long create(@NotNull IssueVote vote) {
if (!SecurityUtils.canAccess(vote.getIssue().getProject())
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 17d5252504..7ea88d6178 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
@@ -44,16 +44,28 @@ public class IssueWatchResource {
return watch;
}
- @Api(order=200, description="Update issue watch of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new issue watch")
@POST
- public Long createOrUpdate(@NotNull IssueWatch watch) {
+ public Long create(@NotNull IssueWatch watch) {
if (!SecurityUtils.canAccess(watch.getIssue().getProject())
|| !SecurityUtils.isAdministrator() && !watch.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- watchManager.createOrUpdate(watch);
+ watchManager.create(watch);
return watch.getId();
}
+
+ @Api(order=250, description="Update issue watch of specified id")
+ @Path("/{watchId}")
+ @POST
+ public Response update(@PathParam("watchId") Long watchId, @NotNull IssueWatch watch) {
+ if (!SecurityUtils.canAccess(watch.getIssue().getProject())
+ || !SecurityUtils.isAdministrator() && !watch.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+ watchManager.update(watch);
+ return Response.ok().build();
+ }
@Api(order=300)
@Path("/{watchId}")
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 4e484a60a0..e67786e6d5 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
@@ -47,7 +47,7 @@ public class MembershipResource {
return membershipManager.load(membershipId);
}
- @Api(order=200, createOnly = true, description="Create new membership")
+ @Api(order=200, description="Create new membership")
@POST
public Long create(@NotNull Membership membership) {
if (!SecurityUtils.isAdministrator())
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 b14a45df7c..c7c28ffacf 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
@@ -44,12 +44,22 @@ public class MilestoneResource {
return milestone;
}
- @Api(order=200, description="Update milestone of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new milestone")
@POST
- public Long createOrUpdate(@NotNull Milestone milestone) {
+ public Long create(@NotNull Milestone milestone) {
if (!SecurityUtils.canManageIssues(milestone.getProject()))
throw new UnauthorizedException();
- milestoneManager.createOrUpdate(milestone);
+ milestoneManager.create(milestone);
+ return milestone.getId();
+ }
+
+ @Api(order=250, description="Update milestone of specified id")
+ @Path("/{milestoneId}")
+ @POST
+ public Long update(@PathParam("milestoneId") Long milestoneId, @NotNull Milestone milestone) {
+ if (!SecurityUtils.canManageIssues(milestone.getProject()))
+ throw new UnauthorizedException();
+ milestoneManager.update(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 6edfa19104..894e763452 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
@@ -9,6 +9,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Objects;
+import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.validation.constraints.NotEmpty;
@@ -249,46 +250,70 @@ public class ProjectResource {
return DateUtils.formatISO8601Date(new Date());
}
- @Api(order=800, description="Update project of specified id in request body, or create new if id property not provided")
+ @Api(order=800, description="Create new project")
@POST
- public Long createOrUpdate(@NotNull Project project) {
+ public Long create(@NotNull Project project) {
+ Project parent = project.getParent();
+
+ checkProjectCreationPermission(parent);
+
+ if (parent != null && project.isSelfOrAncestorOf(parent))
+ throw new ExplicitException("Can not use current or descendant project as parent");
+
+ checkProjectNameDuplication(project);
+
+ projectManager.create(project);
+
+ return project.getId();
+ }
+
+ @Api(order=850, description="Update projecty basic info of specified id")
+ @Path("/{projectId}")
+ @POST
+ public Response updateBasicInfo(@PathParam("projectId") Long projectId, @NotNull Project project) {
Project parent = project.getParent();
Long oldParentId;
if (project.getOldVersion() != null)
oldParentId = ((ProjectFacade) project.getOldVersion()).getParentId();
else
oldParentId = null;
-
- if (project.isNew() || !Objects.equals(oldParentId, Project.idOf(parent))) {
- if (parent != null && !SecurityUtils.canCreateChildren(parent))
- throw new UnauthorizedException("Not authorized to create project under '" + parent.getPath() + "'");
- if (parent == null && !SecurityUtils.canCreateRootProjects())
- throw new UnauthorizedException("Not authorized to create root project");
+
+ if (!Objects.equals(oldParentId, Project.idOf(parent)))
+ checkProjectCreationPermission(parent);
+
+ if (parent != null && project.isSelfOrAncestorOf(parent))
+ throw new ExplicitException("Can not use current or descendant project as parent");
+
+ checkProjectNameDuplication(project);
+
+ if (!SecurityUtils.canManage(project)) {
+ throw new UnauthorizedException();
+ } else {
+ projectManager.update(project);
}
+
+ return Response.ok().build();
+ }
- if (parent != null && project.isSelfOrAncestorOf(parent))
- throw new ExplicitException("Can not use current or descendant project as parent");
-
+ private void checkProjectCreationPermission(@Nullable Project parent) {
+ if (parent != null && !SecurityUtils.canCreateChildren(parent))
+ throw new UnauthorizedException("Not authorized to create project under '" + parent.getPath() + "'");
+ if (parent == null && !SecurityUtils.canCreateRootProjects())
+ throw new UnauthorizedException("Not authorized to create root project");
+ }
+
+ private void checkProjectNameDuplication(Project project) {
+ Project parent = project.getParent();
Project projectWithSameName = projectManager.find(parent, project.getName());
if (projectWithSameName != null && !projectWithSameName.equals(project)) {
if (parent != null) {
- throw new ExplicitException("Name '" + project.getName() + "' is already used by another project under '"
+ throw new ExplicitException("Name '" + project.getName() + "' is already used by another project under '"
+ parent.getPath() + "'");
} else {
throw new ExplicitException("Name '" + project.getName() + "' is already used by another root project");
}
}
-
- if (project.isNew()) {
- projectManager.create(project);
- } else if (!SecurityUtils.canManage(project)) {
- throw new UnauthorizedException();
- } else {
- projectManager.update(project);
- }
-
- return project.getId();
- }
+ }
@Api(order=900, description="Update project setting")
@Path("/{projectId}/setting")
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 46d3ff8c25..8095088861 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,7 +45,7 @@ public class PullRequestAssignmentResource {
return assignment;
}
- @Api(order=200, createOnly = true, description="Create new pull request assignment")
+ @Api(order=200, description="Create new pull request assignment")
@POST
public Long create(PullRequestAssignment assignment) {
PullRequest pullRequest = assignment.getRequest();
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 2b30b07c82..43661bc085 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
@@ -38,21 +38,32 @@ public class PullRequestCommentResource {
return comment;
}
- @Api(order=200, description="Update pull request comment of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new pull request comment")
@POST
- public Long createOrUpdate(@NotNull PullRequestComment comment) {
+ public Long create(@NotNull PullRequestComment comment) {
if (!SecurityUtils.canReadCode(comment.getProject()) ||
!SecurityUtils.isAdministrator() && !comment.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- if (comment.isNew())
- commentManager.create(comment, new ArrayList<>());
- else
- commentManager.update(comment);
+ commentManager.create(comment, new ArrayList<>());
return comment.getId();
}
+
+ @Api(order=250, description="Update pull request comment of specified id")
+ @Path("/{commentId}")
+ @POST
+ public Response update(@PathParam("commentId") Long commentId, @NotNull PullRequestComment comment) {
+ if (!SecurityUtils.canReadCode(comment.getProject()) ||
+ !SecurityUtils.isAdministrator() && !comment.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+
+ commentManager.update(comment);
+
+ return Response.ok().build();
+ }
@Api(order=300)
@Path("/{commentId}")
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 f3df61048a..566180373e 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
@@ -44,16 +44,28 @@ public class PullRequestQueryPersonalizationResource {
return queryPersonalization;
}
- @Api(order=200, description="Update pull request query personalization of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new pull request query personalization")
@POST
- public Long createOrUpdate(@NotNull PullRequestQueryPersonalization queryPersonalization) {
+ public Long create(@NotNull PullRequestQueryPersonalization queryPersonalization) {
if (!SecurityUtils.canAccess(queryPersonalization.getProject())
|| !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- queryPersonalizationManager.createOrUpdate(queryPersonalization);
+ queryPersonalizationManager.create(queryPersonalization);
return queryPersonalization.getId();
}
+
+ @Api(order=250, description="Update pull request query personalization of specified id")
+ @Path("/{queryPersonalizationId}")
+ @POST
+ public Response update(@NotNull PullRequestQueryPersonalization queryPersonalization) {
+ if (!SecurityUtils.canAccess(queryPersonalization.getProject())
+ || !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+ queryPersonalizationManager.update(queryPersonalization);
+ return Response.ok().build();
+ }
@Api(order=300)
@Path("/{queryPersonalizationId}")
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 0b36015703..f83da9f8ef 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
@@ -10,6 +10,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
import org.apache.shiro.authz.UnauthorizedException;
@@ -43,9 +44,9 @@ public class PullRequestReviewResource {
return review;
}
- @Api(order=200, description="Update pull request review of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Creater new pull request review")
@POST
- public Long createOrUpdate(@NotNull PullRequestReview review) {
+ public Long create(@NotNull PullRequestReview review) {
if (!SecurityUtils.canReadCode(review.getRequest().getProject())
|| !SecurityUtils.isAdministrator() && !review.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
@@ -57,8 +58,27 @@ public class PullRequestReviewResource {
if (review.getRequest().isMerged())
throw new ExplicitException("Pull request is merged");
- reviewManager.createOrUpdate(review);
+ reviewManager.create(review);
return review.getId();
}
+
+ @Api(order=250, description="Update pull request review of specified id")
+ @Path("/{reviewId}")
+ @POST
+ public Response update(@PathParam("reviewId") Long reviewId, @NotNull PullRequestReview review) {
+ if (!SecurityUtils.canReadCode(review.getRequest().getProject())
+ || !SecurityUtils.isAdministrator() && !review.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+
+ if (review.getUser().equals(review.getRequest().getSubmitter()))
+ throw new ExplicitException("Pull request submitter can not be reviewer");
+
+ if (review.getRequest().isMerged())
+ throw new ExplicitException("Pull request is merged");
+
+ reviewManager.update(review);
+ return Response.ok().build();
+ }
}
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 d1d06d2a70..048257b3d4 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
@@ -44,16 +44,28 @@ public class PullRequestWatchResource {
return watch;
}
- @Api(order=200, description="Update pull request watch of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create new pull request watch")
@POST
- public Long createOrUpdate(@NotNull PullRequestWatch watch) {
+ public Long create(@NotNull PullRequestWatch watch) {
if (!SecurityUtils.canReadCode(watch.getRequest().getProject())
|| !SecurityUtils.isAdministrator() && !watch.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
- watchManager.createOrUpdate(watch);
+ watchManager.create(watch);
return watch.getId();
}
+
+ @Api(order=250, description="Update pull request watch of specified id")
+ @Path("/{watchId}")
+ @POST
+ public Response update(@PathParam("watchId") Long watchId, @NotNull PullRequestWatch watch) {
+ if (!SecurityUtils.canReadCode(watch.getRequest().getProject())
+ || !SecurityUtils.isAdministrator() && !watch.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+ watchManager.update(watch);
+ return Response.ok().build();
+ }
@Api(order=300)
@Path("/{watchId}")
diff --git a/server-core/src/main/java/io/onedev/server/rest/RoleResource.java b/server-core/src/main/java/io/onedev/server/rest/RoleResource.java
index c98620c516..f14e73d0f9 100644
--- a/server-core/src/main/java/io/onedev/server/rest/RoleResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/RoleResource.java
@@ -77,9 +77,9 @@ public class RoleResource {
return roleManager.query(criteria, offset, count);
}
- @Api(order=300, description="Update role of specified id in request body, or create new if id property not provided")
+ @Api(order=300, description="Create new role")
@POST
- public Long createOrUpdate(@NotNull Role role) {
+ public Long create(@NotNull Role role) {
if (!SecurityUtils.isAdministrator())
throw new UnauthorizedException();
@@ -87,15 +87,29 @@ public class RoleResource {
for (String linkName: role.getEditableIssueLinks())
authorizedLinks.add(linkSpecManager.find(linkName));
- if (role.getOldVersion() != null)
- roleManager.update(role, authorizedLinks, ((RoleFacade) role.getOldVersion()).getName());
- else if (role.isNew())
- roleManager.create(role, authorizedLinks);
- else
- roleManager.update(role, authorizedLinks, null);
+ roleManager.create(role, authorizedLinks);
return role.getId();
}
+
+ @Api(order=350, description="Update role of specified id")
+ @Path("/{roleId}")
+ @POST
+ public Response update(@PathParam("roleId") Long roleId, @NotNull Role role) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+
+ Collection<LinkSpec> authorizedLinks = new ArrayList<>();
+ for (String linkName: role.getEditableIssueLinks())
+ authorizedLinks.add(linkSpecManager.find(linkName));
+
+ if (role.getOldVersion() != null)
+ roleManager.update(role, authorizedLinks, ((RoleFacade) role.getOldVersion()).getName());
+ else
+ roleManager.update(role, authorizedLinks, null);
+
+ return Response.ok().build();
+ }
@Api(order=400)
@Path("/{roleId}")
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 ac6b2f1325..331467de3f 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,7 +45,7 @@ public class SshKeyResource {
return sshKey;
}
- @Api(order=150, createOnly = true, description="Create new ssh key")
+ @Api(order=150, description="Create new ssh key")
@POST
public Long create(SshKey sshKey) {
if (!SecurityUtils.isAdministrator() && !sshKey.getOwner().equals(SecurityUtils.getUser()))
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 d0ecb7495c..36ec9df60b 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
@@ -44,14 +44,24 @@ public class UserAuthorizationResource {
return authorization;
}
- @Api(order=200, description="Update user authorization of specified id in request body, or create new if id property not provided")
+ @Api(order=200, description="Create user authorization")
@POST
- public Long createOrUpdate(@NotNull UserAuthorization authorization) {
+ public Long create(@NotNull UserAuthorization authorization) {
if (!SecurityUtils.canManage(authorization.getProject()))
throw new UnauthorizedException();
- authorizationManager.createOrUpdate(authorization);
+ authorizationManager.create(authorization);
return authorization.getId();
}
+
+ @Api(order=250, description="Update user authorization of specified id")
+ @Path("/{authorizationId}")
+ @POST
+ public Response update(@PathParam("authorizationId") Long authorizationId, @NotNull UserAuthorization authorization) {
+ if (!SecurityUtils.canManage(authorization.getProject()))
+ throw new UnauthorizedException();
+ authorizationManager.update(authorization);
+ return Response.ok().build();
+ }
@Api(order=300)
@Path("/{authorizationId}")
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 d2b98087f3..28a3443baf 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.createOrUpdate(emailAddress);
+ emailAddressManager.create(emailAddress);
return user.getId();
} else {
@@ -317,7 +317,7 @@ public class UserResource {
@Api(order=1950, description="Update user profile")
@Path("/{userId}")
@POST
- public Long updateProfile(@PathParam("userId") Long userId, @NotNull @Valid ProfileUpdateData data) {
+ public Response updateProfile(@PathParam("userId") Long userId, @NotNull @Valid ProfileUpdateData data) {
User user = userManager.load(userId);
if (SecurityUtils.isAdministrator() || user.equals(SecurityUtils.getUser())) {
User existingUser = userManager.findByName(data.getName());
@@ -328,7 +328,7 @@ public class UserResource {
user.setName(data.getName());
user.setFullName(data.getFullName());
userManager.update(user, oldName);
- return user.getId();
+ return Response.ok().build();
} else {
throw new UnauthenticatedException();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/annotation/Api.java b/server-core/src/main/java/io/onedev/server/rest/annotation/Api.java
index 1f0af24a5c..fd8a3f588c 100644
--- a/server-core/src/main/java/io/onedev/server/rest/annotation/Api.java
+++ b/server-core/src/main/java/io/onedev/server/rest/annotation/Api.java
@@ -19,8 +19,6 @@ public @interface Api {
boolean readOnly() default false;
- boolean createOnly() default false;
-
int order() default 100;
}
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 9ed3fe83e3..561c3e7b06 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.createOrUpdate(emailAddress);
+ emailAddressManager.create(emailAddress);
user.getEmailAddresses().add(emailAddress);
@@ -110,7 +110,7 @@ public class PasswordAuthorizingRealm extends AbstractAuthorizingRealm {
emailAddress.setOwner(user);
emailAddress.setPrimary(true);
emailAddress.setGit(true);
- emailAddressManager.createOrUpdate(emailAddress);
+ emailAddressManager.create(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 f95b87fee3..66024d3440 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.createOrUpdate(emailAddress);
+ emailAddressManager.create(emailAddress);
user.getEmailAddresses().add(emailAddress);
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java
index c310fe8bf9..93bc7a5694 100644
--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java
+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java
@@ -1,10 +1,5 @@
package io.onedev.server.util.jackson.hibernate;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-import org.hibernate.proxy.HibernateProxy;
-
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
@@ -14,13 +9,19 @@ import com.fasterxml.jackson.databind.deser.SettableAnyProperty;
import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
import com.fasterxml.jackson.databind.deser.impl.PropertyValue;
import com.google.common.base.Preconditions;
-
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.persistence.dao.Dao;
+import org.hibernate.proxy.HibernateProxy;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Stack;
@SuppressWarnings("serial")
public class EntityDeserializer extends BeanDeserializer {
+ private static ThreadLocal<Stack<Object[]>> paramsStack = ThreadLocal.withInitial(() -> new Stack<Object[]>());
+
private final Class<? extends AbstractEntity> entityClass;
private final BeanDeserializer defaultDeserializer;
@@ -37,13 +38,37 @@ public class EntityDeserializer extends BeanDeserializer {
this.defaultDeserializer = defaultDeserializer;
this.dao = dao;
}
+
+ public static void pushParams(Object[] params) {
+ paramsStack.get().push(params);
+ }
+
+ public static void popParams() {
+ paramsStack.get().pop();
+ }
@Override
public AbstractEntity deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException {
Preconditions.checkState(jp.getCurrentToken() == JsonToken.START_OBJECT);
jp.nextToken();
+
+ if (!paramsStack.get().isEmpty()
+ && paramsStack.get().peek().length != 0
+ && paramsStack.get().peek()[0] instanceof Long) {
+ Long entityId = (Long) paramsStack.get().peek()[0];
+ AbstractEntity entity = dao.load(entityClass, entityId);
+ entity.setOldVersion(entity.getFacade());
+ Object bean;
+ if (entity instanceof HibernateProxy)
+ bean = ((HibernateProxy) entity).getHibernateLazyInitializer().getImplementation();
+ else
+ bean = entity;
+ defaultDeserializer.deserialize(jp, ctxt, bean);
+ return entity;
+ }
+
PropertyValue buffer = null;
for (JsonToken t = jp.getCurrentToken(); t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
String propName = jp.getCurrentName();
@@ -51,7 +76,7 @@ public class EntityDeserializer extends BeanDeserializer {
SettableBeanProperty property = _beanProperties.find(propName);
if (property != null) {
Object value = property.deserialize(jp, ctxt);
- if (property.getName().equals("id") && value != null) {
+ if (property.getName().equals(AbstractEntity.PROP_ID) && value != null) {
jp.nextToken();
AbstractEntity entity = dao.load(entityClass, (Long)value);
entity.setOldVersion(entity.getFacade());
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 cb07431218..2e7f2d8f8b 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).createOrUpdate(authorization);
+ OneDev.getInstance(IssueAuthorizationManager.class).create(authorization);
target.add(authorizationsTable);
Session.get().success("User authorized");
}
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 e42753bf2a..924856ca28 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,10 @@ public abstract class IssueSidePanel extends Panel {
@Override
protected void onSaveWatch(EntityWatch watch) {
- OneDev.getInstance(IssueWatchManager.class).createOrUpdate((IssueWatch) watch);
+ if (watch.isNew())
+ OneDev.getInstance(IssueWatchManager.class).create((IssueWatch) watch);
+ else
+ OneDev.getInstance(IssueWatchManager.class).update((IssueWatch) watch);
}
@Override
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 b0371d7897..0ddd959a0a 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().createOrUpdate(getMilestone());
+ getMilestoneManager().update(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().createOrUpdate(getMilestone());
+ getMilestoneManager().update(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/review/ReviewListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
index 63a9025373..a201013002 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).createOrUpdate(review);
+ OneDev.getInstance(PullRequestReviewManager.class).update(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.createOrUpdate(review);
+ reviewManager.update(review);
for (PullRequestReview eachReview: request.getReviews()) {
if (eachReview.isNew())
- reviewManager.createOrUpdate(eachReview);
+ reviewManager.create(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 658cb0564d..a08191ac6d 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
@@ -59,10 +59,14 @@ public abstract class ReviewerChoice extends SelectToAddChoice<User> {
review.setStatus(Status.PENDING);
}
- if (!getPullRequest().isNew())
- OneDev.getInstance(PullRequestReviewManager.class).createOrUpdate(review);
- else
+ if (!getPullRequest().isNew()) {
+ if (review.isNew())
+ OneDev.getInstance(PullRequestReviewManager.class).create(review);
+ else
+ OneDev.getInstance(PullRequestReviewManager.class).update(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 3380f2c487..408ab6415c 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().createOrUpdate(address);
+ getEmailAddressManager().create(address);
emailAddressValue = null;
}
}
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 22edbc932d..1fa3b5a2cf 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().createOrUpdate(emailAddress);
+ getEmailAddressManager().create(emailAddress);
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.html b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.html
index 0bb5c28bac..4d7d1c94ac 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.html
@@ -36,10 +36,6 @@
</div>
</wicket:fragment>
- <wicket:fragment wicket:id="idAsResultOfEntityCreateOrUpdateHintFrag">
- Id of created/updated <a wicket:id="entity"><span wicket:id="label"></span></a>
- </wicket:fragment>
-
<wicket:fragment wicket:id="idAsResultOfEntityCreateHintFrag">
Id of created <a wicket:id="entity"><span wicket:id="label"></span></a>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
index b336ab5254..88d91d87d9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
@@ -245,7 +245,7 @@ public class ExampleValuePanel extends Panel {
if (AbstractEntity.class.isAssignableFrom(requestBodyClass)) {
Class<?> resourceClass = resourceMap.get(requestBodyClass);
if (resourceClass != null) {
- Fragment typeHintFrag = new Fragment("typeHint", "idAsResultOfEntityCreateOrUpdateHintFrag", this);
+ Fragment typeHintFrag = new Fragment("typeHint", "idAsResultOfEntityCreateHintFrag", this);
Link<Void> link = new ViewStateAwarePageLink<Void>("entity", ResourceDetailPage.class,
ResourceDetailPage.paramsOf(resourceClass));
@@ -438,8 +438,9 @@ public class ExampleValuePanel extends Panel {
@Override
protected List<Field> load() {
List<Field> fields = ApiHelpUtils.getJsonFields(getValue().getClass(), getValueOrigin());
- for (Iterator<Field> it = fields.iterator(); it.hasNext();) {
- if (getValueInfo().isCreateOnly() && it.next().getAnnotation(Id.class) != null)
+ for (var it = fields.iterator(); it.hasNext();) {
+ var field = it.next();
+ if (getValueInfo().getOrigin() == ValueInfo.Origin.REQUEST_BODY && field.getAnnotation(Id.class) != null)
it.remove();
}
return fields;
@@ -542,7 +543,7 @@ public class ExampleValuePanel extends Panel {
@Override
protected ValueInfo load() {
Field field = item.getModelObject();
- return new ValueInfo(getValueOrigin(), field.getGenericType(), field, false);
+ return new ValueInfo(getValueOrigin(), field.getGenericType(), field);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
index 891c65027d..c677edfe56 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
@@ -138,8 +138,7 @@ public class MethodDetailPage extends ApiHelpPage {
protected ValueInfo load() {
Api api = getResourceMethod().getAnnotation(Api.class);
return new ValueInfo(ValueInfo.Origin.REQUEST_BODY,
- getRequestBodyParam().getParameterizedType(), null,
- api != null && api.createOnly());
+ getRequestBodyParam().getParameterizedType(), null);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ValueInfo.java b/server-core/src/main/java/io/onedev/server/web/page/help/ValueInfo.java
index 860dd181fb..4b94f4ae94 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ValueInfo.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ValueInfo.java
@@ -1,10 +1,9 @@
package io.onedev.server.web.page.help;
+import javax.annotation.Nullable;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
-import javax.annotation.Nullable;
-
class ValueInfo {
public enum Origin {REQUEST_BODY, RESPONSE_BODY, PATH_PLACEHOLDER, QUERY_PARAM};
@@ -15,17 +14,14 @@ class ValueInfo {
private final Field field;
- private final boolean createOnly;
-
- public ValueInfo(Origin origin, Type declaredType, @Nullable Field field, boolean createOnly) {
+ public ValueInfo(Origin origin, Type declaredType, @Nullable Field field) {
this.origin = origin;
this.declaredType = declaredType;
this.field = field;
- this.createOnly = createOnly;
}
public ValueInfo(Origin origin, Type declaredType) {
- this(origin, declaredType, null, false);
+ this(origin, declaredType, null);
}
public Type getDeclaredType() {
@@ -41,7 +37,4 @@ class ValueInfo {
return field;
}
- public boolean isCreateOnly() {
- return createOnly;
- }
}
\ No newline at end of file
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 7dcf08c0b9..6ec8d9743c 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
@@ -169,7 +169,11 @@ public class ProjectBuildsPage extends ProjectPage {
} else {
namedQuery.setQuery(query);
}
- getBuildQueryPersonalizationManager().createOrUpdate(setting);
+ if (setting.isNew())
+ getBuildQueryPersonalizationManager().create(setting);
+ else
+ getBuildQueryPersonalizationManager().update(setting);
+
target.add(savedQueries);
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 fec850cec0..42b6e3ddef 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
@@ -166,7 +166,11 @@ public class ProjectCodeCommentsPage extends ProjectPage {
} else {
namedQuery.setQuery(query);
}
- getCodeCommentQueryPersonalizationManager().createOrUpdate(setting);
+ if (setting.isNew())
+ getCodeCommentQueryPersonalizationManager().create(setting);
+ else
+ getCodeCommentQueryPersonalizationManager().update(setting);
+
target.add(savedQueries);
close();
}
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 fb397fefd8..531845b86a 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
@@ -144,7 +144,11 @@ public class ProjectCommitsPage extends ProjectPage {
} else {
namedQuery.setQuery(query);
}
- getCommitQueryPersonalizationManager().createOrUpdate(setting);
+ if (setting.isNew())
+ getCommitQueryPersonalizationManager().create(setting);
+ else
+ getCommitQueryPersonalizationManager().update(setting);
+
target.add(savedQueries);
close();
}
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 f27192d59d..60d92c324e 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
@@ -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().createOrUpdate(milestone);
+ getMilestoneManager().update(milestone);
setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), getBoard(),
milestone, backlog, queryString, backlogQueryString));
} else {
- getMilestoneManager().createOrUpdate(milestone);
+ getMilestoneManager().update(milestone);
}
dropdown.close();
if (milestone.isClosed())
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 0c9ac6da6e..8636c5f658 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.createOrUpdate(reloaded);
+ milestoneManager.update(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/NewMilestonePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java
index 3b920da97f..06ae25337c 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.createOrUpdate(milestone);
+ milestoneManager.create(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 01975244ba..6652c9f32a 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
@@ -164,7 +164,10 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
} else {
namedQuery.setQuery(query);
}
- getIssueQueryPersonalizationManager().createOrUpdate(setting);
+ if (setting.isNew())
+ getIssueQueryPersonalizationManager().create(setting);
+ else
+ getIssueQueryPersonalizationManager().update(setting);
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 05f57e31d6..2a1f16d091 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.createOrUpdate(getMilestone());
+ milestoneManager.update(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 9ebef37119..ba7f079b78 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.createOrUpdate(milestone);
+ milestoneManager.create(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 0da1c542b6..be54792813 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
@@ -172,7 +172,11 @@ public class ProjectPullRequestsPage extends ProjectPage {
} else {
namedQuery.setQuery(query);
}
- getPullRequestQueryPersonalizationManager().createOrUpdate(setting);
+ if (setting.isNew())
+ getPullRequestQueryPersonalizationManager().create(setting);
+ else
+ getPullRequestQueryPersonalizationManager().update(setting);
+
target.add(savedQueries);
close();
}
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 4c1e377a57..75e0777665 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
@@ -989,7 +989,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void onSaveWatch(EntityWatch watch) {
- OneDev.getInstance(PullRequestWatchManager.class).createOrUpdate((PullRequestWatch) watch);
+ if (watch.isNew())
+ OneDev.getInstance(PullRequestWatchManager.class).create((PullRequestWatch) watch);
+ else
+ OneDev.getInstance(PullRequestWatchManager.class).update((PullRequestWatch) watch);
}
@Override
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 df0b609ff8..fa90706d29 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().createOrUpdate(emailAddress);
+ getEmailAddressManager().create(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 1ccca0b06e..670dbab455 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().createOrUpdate(emailAddress);
+ getEmailAddressManager().update(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 dd550e8520..9ab798ba80 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().createOrUpdate(emailAddress);
+ getEmailAddressManager().create(emailAddress);
}
});
diff --git a/server-core/src/main/java/org/glassfish/jersey/server/spi/internal/ParameterValueHelper.java b/server-core/src/main/java/org/glassfish/jersey/server/spi/internal/ParameterValueHelper.java
new file mode 100644
index 0000000000..a1fdcefced
--- /dev/null
+++ b/server-core/src/main/java/org/glassfish/jersey/server/spi/internal/ParameterValueHelper.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.server.spi.internal;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import javax.ws.rs.NotSupportedException;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+
+import io.onedev.server.util.jackson.hibernate.EntityDeserializer;
+import org.glassfish.jersey.message.internal.MessageBodyProviderNotFoundException;
+import org.glassfish.jersey.server.ContainerRequest;
+import org.glassfish.jersey.server.internal.process.MappableException;
+import org.glassfish.jersey.server.model.Parameter;
+import org.glassfish.jersey.server.model.Parameterized;
+
+/**
+ * Utility methods for retrieving values or value providers for the
+ * {@link Parameterized parameterized} resource model components.
+ *
+ * @author Marek Potociar
+ */
+public final class ParameterValueHelper {
+
+ /**
+ * Get the array of parameter values.
+ *
+ * @param valueProviders a list of value providers.
+ * @return array of parameter values provided by the value providers.
+ */
+ public static Object[] getParameterValues(List<ParamValueFactoryWithSource<?>> valueProviders, ContainerRequest request) {
+ final Object[] params = new Object[valueProviders.size()];
+ EntityDeserializer.pushParams(params);
+ try {
+ int entityProviderIndex = -1;
+ int index = 0;
+
+ for (ParamValueFactoryWithSource<?> paramValProvider : valueProviders) {
+ // entity provider has to be called last; see JERSEY-2642
+ if (paramValProvider.getSource().equals(Parameter.Source.ENTITY)) {
+ entityProviderIndex = index++;
+ continue;
+ }
+
+ params[index++] = paramValProvider.apply(request);
+ }
+
+ if (entityProviderIndex != -1) {
+ params[entityProviderIndex] = valueProviders.get(entityProviderIndex).apply(request);
+ }
+
+ return params;
+ } catch (WebApplicationException e) {
+ throw e;
+ } catch (MessageBodyProviderNotFoundException e) {
+ throw new NotSupportedException(e);
+ } catch (ProcessingException e) {
+ throw e;
+ } catch (RuntimeException e) {
+ if (e.getCause() instanceof WebApplicationException) {
+ throw (WebApplicationException) e.getCause();
+ }
+
+ throw new MappableException("Exception obtaining parameters", e);
+ } finally {
+ EntityDeserializer.popParams();
+ }
+ }
+
+ /**
+ * Create list of parameter value providers for the given {@link Parameterized
+ * parameterized} resource model component.
+ *
+ * @param valueSuppliers all registered value suppliers.
+ * @param parameterized parameterized resource model component.
+ * @return list of parameter value providers for the parameterized component.
+ */
+ public static List<ParamValueFactoryWithSource<?>> createValueProviders(Collection<ValueParamProvider> valueSuppliers,
+ Parameterized parameterized) {
+ if ((null == parameterized.getParameters()) || (0 == parameterized.getParameters().size())) {
+ return Collections.emptyList();
+ }
+
+ List<ValueParamProvider> valueParamProviders = valueSuppliers.stream()
+ .sorted((o1, o2) -> o2.getPriority().getWeight() - o1.getPriority().getWeight())
+ .collect(Collectors.toList());
+
+ boolean entityParamFound = false;
+ final List<ParamValueFactoryWithSource<?>> providers = new ArrayList<>(parameterized.getParameters().size());
+ for (final Parameter parameter : parameterized.getParameters()) {
+ final Parameter.Source parameterSource = parameter.getSource();
+ entityParamFound = entityParamFound || Parameter.Source.ENTITY == parameterSource;
+ final Function<ContainerRequest, ?> valueFunction = getParamValueProvider(valueParamProviders, parameter);
+ if (valueFunction != null) {
+ providers.add(wrapParamValueProvider(valueFunction, parameterSource));
+ } else {
+ providers.add(null);
+ }
+ }
+
+ if (!entityParamFound && Collections.frequency(providers, null) == 1) {
+ // Try to find entity if there is one unresolved parameter and the annotations are unknown
+ final int entityParamIndex = providers.lastIndexOf(null);
+ final Parameter parameter = parameterized.getParameters().get(entityParamIndex);
+ if (Parameter.Source.UNKNOWN == parameter.getSource() && !parameter.isQualified()) {
+ final Parameter overriddenParameter = Parameter.overrideSource(parameter, Parameter.Source.ENTITY);
+ final Function<ContainerRequest, ?> valueFunction = getParamValueProvider(
+ valueParamProviders,
+ overriddenParameter);
+ if (valueFunction != null) {
+ providers.set(entityParamIndex, wrapParamValueProvider(valueFunction, overriddenParameter.getSource()));
+ } else {
+ providers.set(entityParamIndex, null);
+ }
+ }
+ }
+
+ return providers;
+ }
+
+ private static <T> ParamValueFactoryWithSource<T> wrapParamValueProvider(
+ Function<ContainerRequest, T> factory, Parameter.Source paramSource) {
+ return new ParamValueFactoryWithSource<>(factory, paramSource);
+ }
+
+ private static Function<ContainerRequest, ?> getParamValueProvider(
+ Collection<ValueParamProvider> valueProviders, final Parameter parameter) {
+ Function<ContainerRequest, ?> valueProvider = null;
+ Iterator<ValueParamProvider> vfpIterator = valueProviders.iterator();
+ while (valueProvider == null && vfpIterator.hasNext()) {
+ valueProvider = vfpIterator.next().getValueProvider(parameter);
+ }
+ return valueProvider;
+ }
+
+ /**
+ * Prevents instantiation.
+ */
+ private ParameterValueHelper() {
+ }
+}
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 a74cfbe74f..f43755cc3d 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).createOrUpdate(milestone);
+ OneDev.getInstance(MilestoneManager.class).create(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 6a7eba346f..6d56c4441b 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).createOrUpdate(milestone);
+ OneDev.getInstance(MilestoneManager.class).create(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 d29a3760d8..06038a6e15 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).createOrUpdate(milestone);
+ OneDev.getInstance(MilestoneManager.class).create(milestone);
}
}
diff --git a/server-product/system/incompatibilities/incompatibilities.md b/server-product/system/incompatibilities/incompatibilities.md
index f40c781fa2..ba157895b7 100644
--- a/server-product/system/incompatibilities/incompatibilities.md
+++ b/server-product/system/incompatibilities/incompatibilities.md
@@ -1,3 +1,7 @@
+# 8.0.7
+
+Various resource update operations now require resource id to be specified in url path instead of request body. Refer to RESTful api help for details
+
# 8.0.5
Create tag step and close milestone step in build spec now uses access token to authenticate to server for flexibility and consistence reason. Please edit relevant build specs to specify appropriate access tokens for these two steps, otherwise they will fail