The Unified and Autonomous Development Platform
idwork
Robin Shen73da75997dda
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javaindex 676ba61e11..208bc6b81e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java@@ -37,7 +37,7 @@ public interface ProjectManager extends EntityManager<Project> {@NullableProject findByServiceDeskName(String serviceDeskName);- Project prepareToCreate(String path);+ Project setup(String path);@NullableProject find(@Nullable Project parent, String name);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.javaindex 50d50f80b0..1661a6c166 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@@ -448,7 +448,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>@Sessional@Override- public Project prepareToCreate(String path) {+ public Project setup(String path) {List<String> names = Splitter.on("/").omitEmptyStrings().trimResults().splitToList(path);Project project = null;for (String name: names) {diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.javaindex cbe80dec11..b26c4f634c 100644--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java@@ -118,7 +118,7 @@ public class GitFilter implements Filter {if (clusterAccess || upload) {throw new GitException(String.format("Unable to find project '%s'", projectPath));} else {- Project project = projectManager.prepareToCreate(projectPath);+ Project project = projectManager.setup(projectPath);Preconditions.checkState(project.isNew());projectManager.create(project);facade = project.getFacade();diff --git a/server-core/src/main/java/io/onedev/server/git/SshCommand.java b/server-core/src/main/java/io/onedev/server/git/SshCommand.javaindex 4b7289d222..ad4e9fd381 100644--- a/server-core/src/main/java/io/onedev/server/git/SshCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/SshCommand.java@@ -102,7 +102,7 @@ class SshCommand implements Command, ServerSessionAware {return;} else {try {- Project project = projectManager.prepareToCreate(projectPath);+ Project project = projectManager.setup(projectPath);Preconditions.checkState(project.isNew());projectManager.create(project);projectFacade = project.getFacade();diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 8d33348a96..f943548bc5 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -1308,6 +1308,15 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelreturn null;}+ @Nullable+ public Milestone getMilestone(String milestoneName) {+ for (Milestone milestone: getMilestones()) {+ if (milestone.getName().equals(milestoneName))+ return milestone;+ }+ return null;+ }+public boolean isCommitOnBranches(@Nullable ObjectId commitId, String branches) {Matcher matcher = new PathMatcher();if (commitId != null) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.javaindex d1da6c2fff..aeb67648ba 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java@@ -95,7 +95,7 @@ public abstract class ForkOptionPanel extends Panel {String projectPath = editProject.getName();if (parentBean.getParentPath() != null)projectPath = parentBean.getParentPath() + "/" + projectPath;- Project newProject = getProjectManager().prepareToCreate(projectPath);+ Project newProject = getProjectManager().setup(projectPath);if (!newProject.isNew()) {editor.error(new Path(new PathNode.Named("name")),"This name has already been used by another project");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.javaindex c995f5ae3c..2fe2d2429a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java@@ -77,7 +77,7 @@ public class NewProjectPage extends LayoutPage {String projectPath = editProject.getName();if (parentBean.getParentPath() != null)projectPath = parentBean.getParentPath() + "/" + projectPath;- Project newProject = getProjectManager().prepareToCreate(projectPath);+ Project newProject = getProjectManager().setup(projectPath);if (!newProject.isNew()) {editor.error(new Path(new PathNode.Named("name")),"This name has already been used by another project");diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportRepositories.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportRepositories.javaindex 1c0b0c6e5c..efb67f89e0 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportRepositories.java+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportRepositories.java@@ -43,7 +43,7 @@ public class ImportRepositories implements Serializable, Validatable {for (int i=0; i<projectMappings.size(); i++) {String errorMessage = null;try {- Project project = projectManager.prepareToCreate(projectMappings.get(i).getOneDevProject());+ Project project = projectManager.setup(projectMappings.get(i).getOneDevProject());if (!project.isNew())errorMessage = "Project already exists";} catch (UnauthorizedException e) {diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.javaindex a0b357e7d0..94c590e2fe 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java@@ -186,7 +186,7 @@ public class ImportServer implements Serializable, Validatable {String apiEndpoint = getApiEndpoint("/repositories/" + projectMapping.getBitbucketRepo());JsonNode repoNode = JerseyUtils.get(client, apiEndpoint, logger);ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- Project project = projectManager.prepareToCreate(projectMapping.getOneDevProject());+ Project project = projectManager.setup(projectMapping.getOneDevProject());Preconditions.checkState(project.isNew());project.setDescription(repoNode.get("description").asText(null));diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepositories.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepositories.javaindex e700fc2849..058e3397a3 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepositories.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepositories.java@@ -43,7 +43,7 @@ public class ImportRepositories implements Serializable, Validatable {for (int i=0; i<projectMappings.size(); i++) {String errorMessage = null;try {- Project project = projectManager.prepareToCreate(projectMappings.get(i).getOneDevProject());+ Project project = projectManager.setup(projectMappings.get(i).getOneDevProject());if (!project.isNew())errorMessage = "Project already exists";} catch (UnauthorizedException e) {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.javaindex 8e04cfb9c2..4bf44a848d 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@@ -496,7 +496,7 @@ public class ImportServer implements Serializable, Validatable {String apiEndpoint = getApiEndpoint("/repos/" + projectMapping.getGiteaRepo());JsonNode repoNode = JerseyUtils.get(client, apiEndpoint, logger);ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- Project project = projectManager.prepareToCreate(projectMapping.getOneDevProject());+ Project project = projectManager.setup(projectMapping.getOneDevProject());Preconditions.checkState(project.isNew());project.setDescription(repoNode.get("description").asText(null));project.setIssueManagement(repoNode.get("has_issues").asBoolean());diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImporter.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImporter.javaindex 4432124fe2..056036fe03 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImporter.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImporter.java@@ -80,7 +80,7 @@ public class GitHubIssueImporter implements IssueImporter {Map<String, Optional<User>> users = new HashMap<>();ImportResult result = serverStep.getSetting().importIssues(repositoryStep.getSetting().getRepository(),- project,retainIssueNumbers, optionStep.getSetting(), users, dryRun, logger);+ project, retainIssueNumbers, optionStep.getSetting(), users, dryRun, logger);return result.toHtml("Issues imported successfully");}diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepositories.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepositories.javaindex 1659ae2160..f4be5f810a 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepositories.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepositories.java@@ -12,6 +12,7 @@ import org.apache.shiro.authz.UnauthorizedException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Editable;@@ -43,9 +44,9 @@ public class ImportRepositories implements Serializable, Validatable {for (int i=0; i<projectMappings.size(); i++) {String errorMessage = null;try {- Project project = projectManager.prepareToCreate(projectMappings.get(i).getOneDevProject());- if (!project.isNew())- errorMessage = "Project already exists";+ Project project = projectManager.setup(projectMappings.get(i).getOneDevProject());+ if (!project.isNew() && !SecurityUtils.canManage(project))+ throw new UnauthorizedException("Project management permission is required");} catch (UnauthorizedException e) {errorMessage = e.getMessage();}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.javaindex e04e08e29e..1afc6f51df 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@@ -17,6 +17,7 @@ import java.util.concurrent.atomic.AtomicInteger;import javax.annotation.Nullable;import javax.validation.ConstraintValidatorContext;+import javax.validation.constraints.NotEmpty;import javax.ws.rs.client.Client;import javax.ws.rs.client.ClientBuilder;import javax.ws.rs.client.Invocation;@@ -26,14 +27,12 @@ import javax.ws.rs.core.Response;import org.apache.http.client.utils.URIBuilder;import org.glassfish.jersey.client.ClientProperties;import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;-import javax.validation.constraints.NotEmpty;import org.joda.time.format.ISODateTimeFormat;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.unbescape.html.HtmlEscape;import com.fasterxml.jackson.databind.JsonNode;-import com.google.common.base.Preconditions;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.bootstrap.SensitiveMasker;@@ -540,40 +539,45 @@ public class ImportServer implements Serializable, Validatable {Map<String, Optional<User>> users = new HashMap<>();ImportResult result = new ImportResult();for (ProjectMapping projectMapping: repositories.getProjectMappings()) {- logger.log("Cloning code from repository " + projectMapping.getGitHubRepo() + "...");+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);+ Project project = projectManager.setup(projectMapping.getOneDevProject());String apiEndpoint = getApiEndpoint("/repos/" + projectMapping.getGitHubRepo());JsonNode repoNode = get(client, apiEndpoint, logger);- ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- Project project = projectManager.prepareToCreate(projectMapping.getOneDevProject());- Preconditions.checkState(project.isNew());- project.setDescription(repoNode.get("description").asText(null));- project.setIssueManagement(repoNode.get("has_issues").asBoolean());-- boolean isPrivate = repoNode.get("private").asBoolean();- if (!isPrivate && option.getPublicRole() != null)- project.setDefaultRole(option.getPublicRole());- URIBuilder builder = new URIBuilder(repoNode.get("clone_url").asText());- builder.setUserInfo("git", getAccessToken());-- SensitiveMasker.push(new SensitiveMasker() {+ if (project.isNew()) {+ project.setDescription(repoNode.get("description").asText(null));+ project.setIssueManagement(repoNode.get("has_issues").asBoolean());+ boolean isPrivate = repoNode.get("private").asBoolean();+ if (!isPrivate && option.getPublicRole() != null)+ project.setDefaultRole(option.getPublicRole());+ }- @Override- public String mask(String text) {- return StringUtils.replace(text, getAccessToken(), "******");- }+ if (project.isNew() || project.getDefaultBranch() == null) {+ logger.log("Cloning code from repository " + projectMapping.getGitHubRepo() + "...");+ URIBuilder builder = new URIBuilder(repoNode.get("clone_url").asText());+ builder.setUserInfo("git", getAccessToken());- });- try {- if (dryRun) {- new LsRemoteCommand(builder.build().toString()).refs("HEAD").quiet(true).run();- } else {- projectManager.clone(project, builder.build().toString());- projectIds.add(project.getId());+ SensitiveMasker.push(new SensitiveMasker() {++ @Override+ public String mask(String text) {+ return StringUtils.replace(text, getAccessToken(), "******");+ }++ });+ try {+ if (dryRun) {+ new LsRemoteCommand(builder.build().toString()).refs("HEAD").quiet(true).run();+ } else {+ projectManager.clone(project, builder.build().toString());+ projectIds.add(project.getId());+ }+ } finally {+ SensitiveMasker.pop();}- } finally {- SensitiveMasker.pop();+ } else {+ logger.warning("Skipping code clone as the project already has code");}if (option.getIssueImportOption() != null) {@@ -581,21 +585,25 @@ public class ImportServer implements Serializable, Validatable {logger.log("Importing milestones from repository " + projectMapping.getGitHubRepo() + "...");apiEndpoint = getApiEndpoint("/repos/" + projectMapping.getGitHubRepo() + "/milestones?state=all");for (JsonNode milestoneNode: list(client, apiEndpoint, logger)) {- Milestone milestone = new Milestone();- milestone.setName(milestoneNode.get("title").asText());- milestone.setDescription(milestoneNode.get("description").asText(null));- milestone.setProject(project);- String dueDateString = milestoneNode.get("due_on").asText(null);- if (dueDateString != null)- milestone.setDueDate(ISODateTimeFormat.dateTimeNoMillis().parseDateTime(dueDateString).toDate());- if (milestoneNode.get("state").asText().equals("closed"))- milestone.setClosed(true);-- milestones.add(milestone);- project.getMilestones().add(milestone);-- if (!dryRun)- OneDev.getInstance(MilestoneManager.class).save(milestone);+ String milestoneName = milestoneNode.get("title").asText();+ Milestone milestone = project.getMilestone(milestoneName);+ if (milestone == null) {+ milestone = new Milestone();+ milestone.setName(milestoneName);+ milestone.setDescription(milestoneNode.get("description").asText(null));+ milestone.setProject(project);+ String dueDateString = milestoneNode.get("due_on").asText(null);+ if (dueDateString != null)+ milestone.setDueDate(ISODateTimeFormat.dateTimeNoMillis().parseDateTime(dueDateString).toDate());+ if (milestoneNode.get("state").asText().equals("closed"))+ milestone.setClosed(true);++ milestones.add(milestone);+ project.getMilestones().add(milestone);++ if (!dryRun)+ OneDev.getInstance(MilestoneManager.class).save(milestone);+ }}logger.log("Importing issues from repository " + projectMapping.getGitHubRepo() + "...");diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectMapping.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectMapping.javaindex e95641a66a..9b117e6c89 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectMapping.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectMapping.java@@ -31,8 +31,7 @@ public class ProjectMapping implements Serializable {this.gitHubRepo = gitHubRepo;}- @Editable(order=200, name="OneDev Project", description="Specify OneDev project to be created as "- + "result of importing")+ @Editable(order=200, name="OneDev Project", description="Specify OneDev project to import into")@ProjectPath@NotEmptypublic String getOneDevProject() {diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProjects.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProjects.javaindex f36319dad2..ab70b4b918 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProjects.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProjects.java@@ -43,7 +43,7 @@ public class ImportProjects implements Serializable, Validatable {for (int i=0; i<projectMappings.size(); i++) {String errorMessage = null;try {- Project project = projectManager.prepareToCreate(projectMappings.get(i).getOneDevProject());+ Project project = projectManager.setup(projectMappings.get(i).getOneDevProject());if (!project.isNew())errorMessage = "Project already exists";} catch (UnauthorizedException e) {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.javaindex edc856cf41..c9b84804b1 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@@ -277,7 +277,7 @@ public class ImportServer implements Serializable, Validatable {String apiEndpoint = getApiEndpoint("/projects/" + projectMapping.getGitLabProject().replace("/", "%2F"));JsonNode projectNode = JerseyUtils.get(client, apiEndpoint, logger);ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- Project project = projectManager.prepareToCreate(projectMapping.getOneDevProject());+ Project project = projectManager.setup(projectMapping.getOneDevProject());Preconditions.checkState(project.isNew());project.setDescription(projectNode.get("description").asText(null));project.setIssueManagement(projectNode.get("issues_enabled").asBoolean());diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProjects.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProjects.javaindex 9312f0155b..07e7f5789e 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProjects.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProjects.java@@ -43,7 +43,7 @@ public class ImportProjects implements Serializable, Validatable {for (int i=0; i<projectMappings.size(); i++) {String errorMessage = null;try {- Project project = projectManager.prepareToCreate(projectMappings.get(i).getOneDevProject());+ Project project = projectManager.setup(projectMappings.get(i).getOneDevProject());if (!project.isNew())errorMessage = "Project already exists";} catch (UnauthorizedException e) {diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.javaindex 58e1d14fa5..38bcf7dc3e 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java@@ -354,7 +354,7 @@ public class ImportServer implements Serializable, Validatable {projectNode = JerseyUtils.get(client, apiEndpoint, logger);ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- Project project = projectManager.prepareToCreate(projectMapping.getOneDevProject());+ Project project = projectManager.setup(projectMapping.getOneDevProject());Preconditions.checkState(project.isNew());project.setDescription(projectNode.get("description").asText(null));diff --git a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.javaindex d76979d780..0b153a1864 100644--- a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java+++ b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java@@ -97,7 +97,7 @@ public class ImportServer implements Serializable, Validatable {if (projectPath == null)throw new ExplicitException("Invalid url: " + getUrl());- Project project = getProjectManager().prepareToCreate(projectPath);+ Project project = getProjectManager().setup(projectPath);Preconditions.checkState(project.isNew());URIBuilder builder = new URIBuilder(getUrl());@@ -153,7 +153,7 @@ public class ImportServer implements Serializable, Validatable {if (getProject() != null) {String errorMessage = null;try {- Project project = getProjectManager().prepareToCreate(getProject());+ Project project = getProjectManager().setup(getProject());if (!project.isNew())errorMessage = "Project already exists";} catch (UnauthorizedException e) {diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProjects.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProjects.javaindex 0b57dbe0f2..41a498f888 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProjects.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProjects.java@@ -45,7 +45,7 @@ public class ImportProjects implements Serializable, Validatable {for (int i=0; i<projectMappings.size(); i++) {String errorMessage = null;try {- Project project = projectManager.prepareToCreate(projectMappings.get(i).getOneDevProject());+ Project project = projectManager.setup(projectMappings.get(i).getOneDevProject());if (!project.isNew())errorMessage = "Project already exists";} catch (UnauthorizedException e) {diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.javaindex 4dbc460008..553c162de7 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java@@ -1095,7 +1095,7 @@ public class ImportServer implements Serializable, Validatable {throw new ExplicitException("Unable to find YouTrack project: " + projectMapping.getYouTrackProject());ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- Project project = projectManager.prepareToCreate(projectMapping.getOneDevProject());+ Project project = projectManager.setup(projectMapping.getOneDevProject());Preconditions.checkState(project.isNew());project.setDescription(youTrackProjectDescriptions.get(projectMapping.getYouTrackProject()));project.setIssueManagement(true);