The Unified and Autonomous Development Platform
Simplify project custom data
Robin Shen394c01780dc1
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.javaindex 2f4a4d67c7..8fd90c86b8 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@@ -28,7 +28,6 @@ import org.hibernate.criterion.Restrictions;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.utils.ExplicitException;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.UrlManager;@@ -242,14 +241,8 @@ public class ProjectResource {@POSTpublic Long createOrUpdate(@NotNull Project project) {Project parent = project.getParent();- String customData = (String) project.getCustomData();+ Long prevParentId = (Long) project.getCustomData();- Long prevParentId;- if (customData != null && customData.contains(":"))- prevParentId = Long.valueOf(StringUtils.substringBefore(customData, ":"));- else- prevParentId = null;-if (project.isNew() || !Objects.equals(prevParentId, Project.idOf(parent))) {if (parent != null && !SecurityUtils.canCreateChildren(parent))throw new UnauthorizedException("Not authorized to create project under '" + parent.getPath() + "'");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.javaindex 95b9d7bea1..a64800094c 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@@ -60,9 +60,7 @@ public class EntityDeserializer extends BeanDeserializer {if (entity instanceof Project) {Project project = (Project) entity;if (project.getParent() != null)- entity.setCustomData(project.getParent().getId() + ":" + project.getPath());- else- entity.setCustomData(project.getPath());+ entity.setCustomData(project.getParent().getId());} else if (entity instanceof User) {entity.setCustomData(((User) entity).getName());} else if (entity instanceof Group) {