Skip to content

The Unified and Autonomous Development Platform

feat: Able to import projects from child projects view (OD-2565)

Robin Shen05f0ffd1b20c
diff --git a/pom.xml b/pom.xml
index 31abe2a64f..788c59533f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -677,7 +677,7 @@
</repositories>
<properties>
<commons.version>3.1.9</commons.version>
- <agent.version>2.3.12</agent.version>
+ <agent.version>2.3.13</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/imports/ProjectImporter.java b/server-core/src/main/java/io/onedev/server/imports/ProjectImporter.java
index e7e19ca2bd..8d12537d9d 100644
--- a/server-core/src/main/java/io/onedev/server/imports/ProjectImporter.java
+++ b/server-core/src/main/java/io/onedev/server/imports/ProjectImporter.java
@@ -1,18 +1,31 @@
package io.onedev.server.imports;
+import java.io.Serializable;
+import java.util.List;
+
+import org.jspecify.annotations.Nullable;
+
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.web.component.taskbutton.TaskResult;
import io.onedev.server.web.util.ImportStep;
-import java.io.Serializable;
-import java.util.List;
-
-public interface ProjectImporter extends Serializable {
+public abstract class ProjectImporter implements Serializable {
- String getName();
+ private String parentProjectPath;
+
+ public abstract String getName();
- List<ImportStep<? extends Serializable>> getSteps();
+ public abstract List<ImportStep<? extends Serializable>> getSteps();
- TaskResult doImport(boolean dryRun, TaskLogger logger);
+ public abstract TaskResult doImport(boolean dryRun, TaskLogger logger);
+ public void setParentProjectPath(@Nullable String parentProjectPath) {
+ this.parentProjectPath = parentProjectPath;
+ }
+
+ @Nullable
+ public String getParentProjectPath() {
+ return parentProjectPath;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index eeb7dcd1ac..6392ea29b2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -997,7 +997,7 @@ public class ProjectListPanel extends Panel {
});
- if (getParentProject() == null && canCreateProjects) {
+ if (canCreateProjects) {
add(new MenuLink("importProjects") {
@Override
@@ -1028,8 +1028,9 @@ public class ProjectListPanel extends Panel {
@Override
public WebMarkupContainer newLink(String id) {
+ String parentProjectPath = getParentProject() != null ? getParentProject().getPath() : null;
return new BookmarkablePageLink<Void>(id, ProjectImportPage.class,
- ProjectImportPage.paramsOf(importer.getName()));
+ ProjectImportPage.paramsOf(importer.getName(), parentProjectPath));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java
index 17150003fe..1cb549dccb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java
@@ -106,6 +106,10 @@ public class ProjectChildrenPage extends ProjectPage {
return params;
}
+ public static PageParameters paramsOf(String projectPath) {
+ return ProjectPage.paramsOf(projectPath);
+ }
+
@Override
protected Component newProjectTitle(String componentId) {
return new Label(componentId, _T("Child Projects"));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java
index 2d56eb609a..f5aa8419e1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java
@@ -12,6 +12,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.jspecify.annotations.Nullable;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
@@ -24,17 +25,22 @@ import io.onedev.server.web.component.taskbutton.TaskResult;
import io.onedev.server.web.component.wizard.WizardPanel;
import io.onedev.server.web.page.layout.LayoutPage;
import io.onedev.server.web.page.project.ProjectListPage;
+import io.onedev.server.web.page.project.children.ProjectChildrenPage;
public class ProjectImportPage extends LayoutPage {
private static final String PARAM_IMPORTER = "importer";
- private ProjectImporter importer;
+ private static final String PARAM_PARENT_PROJECT = "parentProject";
+ private ProjectImporter importer;
+
public ProjectImportPage(PageParameters params) {
super(params);
String importerName = params.get(PARAM_IMPORTER).toString();
+ var parentProjectPath = params.get(PARAM_PARENT_PROJECT).toOptionalString();
+
for (ProjectImporterContribution contribution: OneDev.getExtensions(ProjectImporterContribution.class)) {
for (ProjectImporter importer: contribution.getImporters()) {
if (importer.getName().equals(importerName)) {
@@ -46,6 +52,7 @@ public class ProjectImportPage extends LayoutPage {
if (importer == null)
throw new RuntimeException("Undefined importer: " + importerName);
+ importer.setParentProjectPath(parentProjectPath);
}
@Override
@@ -65,9 +72,14 @@ public class ProjectImportPage extends LayoutPage {
super.onCompleted(target, successful);
if (successful) {
- ProjectQuery query = new ProjectQuery();
- PageParameters params = ProjectListPage.paramsOf(query.toString(), 0, 0);
- throw new RestartResponseException(ProjectListPage.class, params);
+ if (importer.getParentProjectPath() != null) {
+ throw new RestartResponseException(ProjectChildrenPage.class,
+ ProjectChildrenPage.paramsOf(importer.getParentProjectPath()));
+ } else {
+ ProjectQuery query = new ProjectQuery();
+ PageParameters params = ProjectListPage.paramsOf(query.toString(), 0, 0);
+ throw new RestartResponseException(ProjectListPage.class, params);
+ }
}
}
@@ -126,8 +138,14 @@ public class ProjectImportPage extends LayoutPage {
}
public static PageParameters paramsOf(String importer) {
+ return paramsOf(importer, null);
+ }
+
+ public static PageParameters paramsOf(String importer, @Nullable String parentProjectPath) {
PageParameters params = new PageParameters();
params.add(PARAM_IMPORTER, importer);
+ if (parentProjectPath != null)
+ params.add(PARAM_PARENT_PROJECT, parentProjectPath);
return params;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/ImportStep.java b/server-core/src/main/java/io/onedev/server/web/util/ImportStep.java
index 82a1f37633..c0f7685d81 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/ImportStep.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/ImportStep.java
@@ -38,5 +38,5 @@ public abstract class ImportStep<T extends Serializable> implements WizardStep {
public T getSetting() {
return setting;
}
-
+
}
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/BitbucketProjectImporter.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/BitbucketProjectImporter.java
index 009b650e02..2f0785b1b1 100644
--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/BitbucketProjectImporter.java
+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/BitbucketProjectImporter.java
@@ -1,17 +1,18 @@
package io.onedev.server.plugin.imports.bitbucketcloud;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.io.Serializable;
+import java.util.List;
+
import com.google.common.collect.Lists;
+
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.imports.ProjectImporter;
import io.onedev.server.web.component.taskbutton.TaskResult;
import io.onedev.server.web.util.ImportStep;
-import static io.onedev.server.web.translation.Translation._T;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class BitbucketProjectImporter implements ProjectImporter {
+public class BitbucketProjectImporter extends ProjectImporter {
private static final long serialVersionUID = 1L;
@@ -42,11 +43,15 @@ public class BitbucketProjectImporter implements ProjectImporter {
@Override
protected ImportRepositories newSetting() {
- ImportRepositories repositories = new ImportRepositories();
+ ImportRepositories repositories;
+ if (getParentProjectPath() != null)
+ repositories = new ChildrenImportRepositories();
+ else
+ repositories = new ImportRepositories();
repositories.server = serverStep.getSetting();
return repositories;
}
-
+
};
private final ImportStep<ImportOption> optionStep = new ImportStep<ImportOption>() {
@@ -73,6 +78,8 @@ public class BitbucketProjectImporter implements ProjectImporter {
@Override
public TaskResult doImport(boolean dryRun, TaskLogger logger) {
ImportRepositories repositories = repositoriesStep.getSetting();
+ if (getParentProjectPath() != null)
+ repositories.setParentOneDevProject(getParentProjectPath());
ImportOption option = optionStep.getSetting();
return serverStep.getSetting().importProjects(repositories, option, dryRun, logger);
}
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ChildrenImportRepositories.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ChildrenImportRepositories.java
new file mode 100644
index 0000000000..ba6d0a3f7c
--- /dev/null
+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ChildrenImportRepositories.java
@@ -0,0 +1,15 @@
+package io.onedev.server.plugin.imports.bitbucketcloud;
+
+import io.onedev.server.annotation.Editable;
+
+@Editable
+public class ChildrenImportRepositories extends ImportRepositories {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getParentOneDevProject() {
+ return super.getParentOneDevProject();
+ }
+
+}
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.java
index 3c7f90d9d3..70dc5c5941 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
@@ -23,7 +23,7 @@ import io.onedev.server.web.editable.BeanEditor;
public class ImportRepositories extends ImportWorkspace implements Validatable {
private static final long serialVersionUID = 1L;
-
+
private String parentOneDevProject;
private boolean all;
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.java
index 3e29781cd5..5f3a98e5d1 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
@@ -34,13 +34,13 @@ import io.onedev.server.annotation.ClassValidating;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Password;
import io.onedev.server.data.migration.VersionedXmlDoc;
-import io.onedev.server.service.AuditService;
-import io.onedev.server.service.BaseAuthorizationService;
-import io.onedev.server.service.ProjectService;
import io.onedev.server.git.command.LsRemoteCommand;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.TransactionService;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.AuditService;
+import io.onedev.server.service.BaseAuthorizationService;
+import io.onedev.server.service.ProjectService;
import io.onedev.server.util.CollectionUtils;
import io.onedev.server.util.JerseyUtils;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
@@ -181,17 +181,16 @@ public class ImportServer implements Serializable, Validatable {
}
}
- TaskResult importProjects(ImportRepositories repositories, ImportOption option, boolean dryRun, TaskLogger logger) {
+ TaskResult importProjects(ImportRepositories repositories,
+ ImportOption option, boolean dryRun, TaskLogger logger) {
Client client = newClient();
try {
for (var bitbucketRepository : repositories.getImportRepositories()) {
OneDev.getInstance(TransactionService.class).run(() -> {
try {
- String oneDevProjectPath;
+ String oneDevProjectPath = bitbucketRepository;
if (repositories.getParentOneDevProject() != null)
- oneDevProjectPath = repositories.getParentOneDevProject() + "/" + bitbucketRepository;
- else
- oneDevProjectPath = bitbucketRepository;
+ oneDevProjectPath = repositories.getParentOneDevProject() + "/" + oneDevProjectPath;
logger.log("Importing from '" + bitbucketRepository + "' to '" + oneDevProjectPath + "'...");
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ChildrenImportRepositories.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ChildrenImportRepositories.java
new file mode 100644
index 0000000000..34b6c7c79b
--- /dev/null
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ChildrenImportRepositories.java
@@ -0,0 +1,13 @@
+package io.onedev.server.plugin.imports.gitea;
+
+import io.onedev.server.annotation.Editable;
+
+@Editable
+public class ChildrenImportRepositories extends ImportRepositories {
+
+ @Override
+ public String getParentOneDevProject() {
+ return super.getParentOneDevProject();
+ }
+
+}
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.java
index 73e7f820c1..51b8b11082 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.java
@@ -1,17 +1,18 @@
package io.onedev.server.plugin.imports.gitea;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.io.Serializable;
+import java.util.List;
+
import com.google.common.collect.Lists;
+
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.imports.ProjectImporter;
import io.onedev.server.web.component.taskbutton.TaskResult;
import io.onedev.server.web.util.ImportStep;
-import static io.onedev.server.web.translation.Translation._T;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class GiteaProjectImporter implements ProjectImporter {
+public class GiteaProjectImporter extends ProjectImporter {
private static final long serialVersionUID = 1L;
@@ -42,11 +43,15 @@ public class GiteaProjectImporter implements ProjectImporter {
@Override
protected ImportRepositories newSetting() {
- ImportRepositories repositories = new ImportRepositories();
+ ImportRepositories repositories;
+ if (getParentProjectPath() != null)
+ repositories = new ChildrenImportRepositories();
+ else
+ repositories = new ImportRepositories();
repositories.server = serverStep.getSetting();
return repositories;
}
-
+
};
private final ImportStep<ProjectImportOption> optionStep = new ImportStep<ProjectImportOption>() {
@@ -75,6 +80,8 @@ public class GiteaProjectImporter implements ProjectImporter {
@Override
public TaskResult doImport(boolean dryRun, TaskLogger logger) {
ImportRepositories repositories = repositoriesStep.getSetting();
+ if (getParentProjectPath() != null)
+ repositories.setParentOneDevProject(getParentProjectPath());
ProjectImportOption option = optionStep.getSetting();
return serverStep.getSetting().importProjects(repositories, option, dryRun, logger);
}
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.java
index cb427a8458..4d4dfb8b09 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
@@ -25,7 +25,7 @@ import io.onedev.server.web.editable.BeanEditor;
public class ImportRepositories extends ImportOrganization implements Validatable {
private static final long serialVersionUID = 1L;
-
+
private String parentOneDevProject;
private boolean all;
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 50be567c95..e01dcef5aa 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
@@ -501,8 +501,8 @@ public class ImportServer implements Serializable, Validatable {
}
}
- TaskResult importProjects(ImportRepositories repositories, ProjectImportOption option,
- boolean dryRun, TaskLogger logger) {
+ TaskResult importProjects(ImportRepositories repositories,
+ ProjectImportOption option, boolean dryRun, TaskLogger logger) {
Client client = newClient();
try {
Map<String, Optional<Long>> userIds = new HashMap<>();
@@ -510,11 +510,9 @@ public class ImportServer implements Serializable, Validatable {
for (var giteaRepository : repositories.getImportRepositories()) {
OneDev.getInstance(TransactionService.class).run(() -> {
try {
- String oneDevProjectPath;
+ String oneDevProjectPath = giteaRepository;
if (repositories.getParentOneDevProject() != null)
- oneDevProjectPath = repositories.getParentOneDevProject() + "/" + giteaRepository;
- else
- oneDevProjectPath = giteaRepository;
+ oneDevProjectPath = repositories.getParentOneDevProject() + "/" + oneDevProjectPath;
logger.log("Importing from '" + giteaRepository + "' to '" + oneDevProjectPath + "'...");
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ChildrenImportRepositories.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ChildrenImportRepositories.java
new file mode 100644
index 0000000000..fe3c4cf99e
--- /dev/null
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ChildrenImportRepositories.java
@@ -0,0 +1,13 @@
+package io.onedev.server.plugin.imports.github;
+
+import io.onedev.server.annotation.Editable;
+
+@Editable
+public class ChildrenImportRepositories extends ImportRepositories {
+
+ @Override
+ public String getParentOneDevProject() {
+ return super.getParentOneDevProject();
+ }
+
+}
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java
index e0a654e3ae..3093c60ce4 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java
@@ -1,17 +1,18 @@
package io.onedev.server.plugin.imports.github;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.io.Serializable;
+import java.util.List;
+
import com.google.common.collect.Lists;
+
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.imports.ProjectImporter;
import io.onedev.server.web.component.taskbutton.TaskResult;
import io.onedev.server.web.util.ImportStep;
-import static io.onedev.server.web.translation.Translation._T;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class GitHubProjectImporter implements ProjectImporter {
+public class GitHubProjectImporter extends ProjectImporter {
private static final long serialVersionUID = 1L;
@@ -42,7 +43,11 @@ public class GitHubProjectImporter implements ProjectImporter {
@Override
protected ImportRepositories newSetting() {
- ImportRepositories repositories = new ImportRepositories();
+ ImportRepositories repositories;
+ if (getParentProjectPath() != null)
+ repositories = new ChildrenImportRepositories();
+ else
+ repositories = new ImportRepositories();
repositories.server = serverStep.getSetting();
return repositories;
}
@@ -76,6 +81,8 @@ public class GitHubProjectImporter implements ProjectImporter {
public TaskResult doImport(boolean dryRun, TaskLogger logger) {
ImportServer server = serverStep.getSetting();
ImportRepositories repositories = repositoriesStep.getSetting();
+ if (getParentProjectPath() != null)
+ repositories.setParentOneDevProject(getParentProjectPath());
ProjectImportOption option = optionStep.getSetting();
return server.importProjects(repositories, option, dryRun, logger);
}
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 a391a3c0ed..511f3c1692 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
@@ -552,7 +552,8 @@ public class ImportServer implements Serializable, Validatable {
}
}
- TaskResult importProjects(ImportRepositories repositories, ProjectImportOption option, boolean dryRun, TaskLogger logger) {
+ TaskResult importProjects(ImportRepositories repositories,
+ ProjectImportOption option, boolean dryRun, TaskLogger logger) {
Client client = newClient();
try {
Map<String, Optional<Long>> userIds = new HashMap<>();
@@ -560,11 +561,9 @@ public class ImportServer implements Serializable, Validatable {
for (var gitHubRepository: repositories.getImportRepositories()) {
OneDev.getInstance(TransactionService.class).run(() -> {
try {
- String oneDevProjectPath;
+ String oneDevProjectPath = gitHubRepository;
if (repositories.getParentOneDevProject() != null)
- oneDevProjectPath = repositories.getParentOneDevProject() + "/" + gitHubRepository;
- else
- oneDevProjectPath = gitHubRepository;
+ oneDevProjectPath = repositories.getParentOneDevProject() + "/" + oneDevProjectPath;
logger.log("Importing from '" + gitHubRepository + "' to '" + oneDevProjectPath + "'...");
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ChildrenImportProjects.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ChildrenImportProjects.java
new file mode 100644
index 0000000000..bf1fda27de
--- /dev/null
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ChildrenImportProjects.java
@@ -0,0 +1,13 @@
+package io.onedev.server.plugin.imports.gitlab;
+
+import io.onedev.server.annotation.Editable;
+
+@Editable
+public class ChildrenImportProjects extends ImportProjects {
+
+ @Override
+ public String getParentOneDevProject() {
+ return super.getParentOneDevProject();
+ }
+
+}
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImporter.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImporter.java
index 62b321c57a..201153faa2 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImporter.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImporter.java
@@ -1,17 +1,18 @@
package io.onedev.server.plugin.imports.gitlab;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.io.Serializable;
+import java.util.List;
+
import com.google.common.collect.Lists;
+
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.imports.ProjectImporter;
import io.onedev.server.web.component.taskbutton.TaskResult;
import io.onedev.server.web.util.ImportStep;
-import static io.onedev.server.web.translation.Translation._T;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class GitLabProjectImporter implements ProjectImporter {
+public class GitLabProjectImporter extends ProjectImporter {
private static final long serialVersionUID = 1L;
@@ -42,7 +43,11 @@ public class GitLabProjectImporter implements ProjectImporter {
@Override
protected ImportProjects newSetting() {
- ImportProjects projects = new ImportProjects();
+ ImportProjects projects;
+ if (getParentProjectPath() != null)
+ projects = new ChildrenImportProjects();
+ else
+ projects = new ImportProjects();
projects.server = serverStep.getSetting();
return projects;
}
@@ -75,7 +80,10 @@ public class GitLabProjectImporter implements ProjectImporter {
@Override
public TaskResult doImport(boolean dryRun, TaskLogger logger) {
ImportServer server = serverStep.getSetting();
- return server.importProjects(projectsStep.getSetting(), optionStep.getSetting(), dryRun, logger);
+ ImportProjects projects = projectsStep.getSetting();
+ if (getParentProjectPath() != null)
+ projects.setParentOneDevProject(getParentProjectPath());
+ return server.importProjects(projects, optionStep.getSetting(), dryRun, logger);
}
@Override
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.java
index 7c1886efd1..7301519f67 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
@@ -2,19 +2,25 @@ package io.onedev.server.plugin.imports.gitlab;
import java.util.Collection;
import java.util.List;
+import java.util.stream.Collectors;
+import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.Size;
import io.onedev.server.annotation.ChoiceProvider;
+import io.onedev.server.annotation.ClassValidating;
import io.onedev.server.annotation.DependsOn;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.ProjectChoice;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.security.permission.CreateChildren;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
+import io.onedev.server.validation.Validatable;
import io.onedev.server.web.editable.BeanEditor;
@Editable
-public class ImportProjects extends ImportGroup {
+@ClassValidating
+public class ImportProjects extends ImportGroup implements Validatable {
private static final long serialVersionUID = 1L;
@@ -28,7 +34,7 @@ public class ImportProjects extends ImportGroup {
@Editable(order=200, name="Parent OneDev Project", description = "Optionally specify a OneDev project " +
"to be used as parent of imported projects. Leave empty to import as root projects")
- @ProjectChoice
+ @ChoiceProvider("getParentOneDevProjectChoices")
public String getParentOneDevProject() {
return parentOneDevProject;
}
@@ -36,6 +42,12 @@ public class ImportProjects extends ImportGroup {
public void setParentOneDevProject(String parentOneDevProject) {
this.parentOneDevProject = parentOneDevProject;
}
+
+ @SuppressWarnings("unused")
+ private static List<String> getParentOneDevProjectChoices() {
+ return SecurityUtils.getAuthorizedProjects(new CreateChildren()).stream()
+ .map(it->it.getPath()).sorted().collect(Collectors.toList());
+ }
@Editable(order=300, name="Import All Projects")
public boolean isAll() {
@@ -83,4 +95,18 @@ public class ImportProjects extends ImportGroup {
return getGitLabProjects();
}
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ if (parentOneDevProject == null && !SecurityUtils.canCreateRootProjects()) {
+ context.disableDefaultConstraintViolation();
+ var errorMessage = "No permission to import as root projects, please specify parent project";
+ context.buildConstraintViolationWithTemplate(errorMessage)
+ .addPropertyNode("parentOneDevProject")
+ .addConstraintViolation();
+ return false;
+ } else {
+ return true;
+ }
+ }
+
}
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 a60e8caa5c..b0497c28a8 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
@@ -282,7 +282,8 @@ public class ImportServer implements Serializable, Validatable {
return iteration;
}
- TaskResult importProjects(ImportProjects projects, ProjectImportOption option, boolean dryRun, TaskLogger logger) {
+ TaskResult importProjects(ImportProjects projects,
+ ProjectImportOption option, boolean dryRun, TaskLogger logger) {
Client client = newClient();
try {
Map<String, Optional<Long>> userIds = new HashMap<>();
@@ -290,11 +291,9 @@ public class ImportServer implements Serializable, Validatable {
for (var gitLabProject: projects.getImportProjects()) {
OneDev.getInstance(TransactionService.class).run(() -> {
try {
- String oneDevProjectPath;
+ String oneDevProjectPath = gitLabProject;
if (projects.getParentOneDevProject() != null)
- oneDevProjectPath = projects.getParentOneDevProject() + "/" + gitLabProject;
- else
- oneDevProjectPath = gitLabProject;
+ oneDevProjectPath = projects.getParentOneDevProject() + "/" + oneDevProjectPath;
logger.log("Importing from '" + gitLabProject + "' to '" + oneDevProjectPath + "'...");
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ChildrenImportProjects.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ChildrenImportProjects.java
new file mode 100644
index 0000000000..0d96068bbf
--- /dev/null
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ChildrenImportProjects.java
@@ -0,0 +1,13 @@
+package io.onedev.server.plugin.imports.jiracloud;
+
+import io.onedev.server.annotation.Editable;
+
+@Editable
+public class ChildrenImportProjects extends ImportProjects {
+
+ @Override
+ public String getParentOneDevProject() {
+ return super.getParentOneDevProject();
+ }
+
+}
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.java
index 6bad93c1a6..1cb1eeaee8 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,11 +354,9 @@ public class ImportServer implements Serializable, Validatable {
ImportResult result = new ImportResult();
for (var jiraProject: projects.getImportProjects()) {
OneDev.getInstance(TransactionService.class).run(() -> {
- String oneDevProjectPath;
+ String oneDevProjectPath = jiraProject;
if (projects.getParentOneDevProject() != null)
- oneDevProjectPath = projects.getParentOneDevProject() + "/" + jiraProject;
- else
- oneDevProjectPath = jiraProject;
+ oneDevProjectPath = projects.getParentOneDevProject() + "/" + oneDevProjectPath;
logger.log("Importing from '" + jiraProject + "' to '" + oneDevProjectPath + "'...");
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraProjectImporter.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraProjectImporter.java
index 7af214403a..7c5ce83948 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraProjectImporter.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraProjectImporter.java
@@ -1,6 +1,12 @@
package io.onedev.server.plugin.imports.jiracloud;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.io.Serializable;
+import java.util.List;
+
import com.google.common.collect.Lists;
+
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.imports.ProjectImporter;
@@ -8,12 +14,7 @@ import io.onedev.server.persistence.TransactionService;
import io.onedev.server.web.component.taskbutton.TaskResult;
import io.onedev.server.web.util.ImportStep;
-import static io.onedev.server.web.translation.Translation._T;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class JiraProjectImporter implements ProjectImporter {
+public class JiraProjectImporter extends ProjectImporter {
private static final long serialVersionUID = 1L;
@@ -44,7 +45,11 @@ public class JiraProjectImporter implements ProjectImporter {
@Override
protected ImportProjects newSetting() {
- ImportProjects projects = new ImportProjects();
+ ImportProjects projects;
+ if (getParentProjectPath() != null)
+ projects = new ChildrenImportProjects();
+ else
+ projects = new ImportProjects();
projects.server = serverStep.getSetting();
return projects;
}
@@ -75,8 +80,10 @@ public class JiraProjectImporter implements ProjectImporter {
@Override
public TaskResult doImport(boolean dryRun, TaskLogger logger) {
return OneDev.getInstance(TransactionService.class).call(() -> {
- return serverStep.getSetting().importProjects(
- projectsStep.getSetting(), optionStep.getSetting(), dryRun, logger);
+ ImportProjects projects = projectsStep.getSetting();
+ if (getParentProjectPath() != null)
+ projects.setParentOneDevProject(getParentProjectPath());
+ return serverStep.getSetting().importProjects(projects, optionStep.getSetting(), dryRun, logger);
});
}
diff --git a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ChildrenImportServer.java b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ChildrenImportServer.java
new file mode 100644
index 0000000000..bb4c3c1cac
--- /dev/null
+++ b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ChildrenImportServer.java
@@ -0,0 +1,21 @@
+package io.onedev.server.plugin.imports.url;
+
+import io.onedev.server.annotation.Editable;
+
+@Editable
+public class ChildrenImportServer extends ImportServer {
+
+ private static final long serialVersionUID = 1L;
+
+ @Editable(order=200, name="Child Project", placeholderProvider="getProjectPlaceholder", description="Specify child project to import into at OneDev side")
+ @Override
+ public String getProject() {
+ return super.getProject();
+ }
+
+ @Override
+ public void setProject(String project) {
+ super.setProject(project);
+ }
+
+}
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.java
index bb6ff2b636..57ca1ea41c 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
@@ -92,7 +92,7 @@ public class ImportServer implements Serializable, Validatable {
return null;
}
- TaskResult importProject(boolean dryRun, TaskLogger logger) {
+ TaskResult importProject(@Nullable String parentProjectPath, boolean dryRun, TaskLogger logger) {
return OneDev.getInstance(TransactionService.class).call(() -> {
try {
String projectPath = getProject();
@@ -100,6 +100,9 @@ public class ImportServer implements Serializable, Validatable {
projectPath = deriveProjectPath(getUrl());
if (projectPath == null)
throw new ExplicitException("Invalid url: " + getUrl());
+
+ if (parentProjectPath != null)
+ projectPath = parentProjectPath + "/" + projectPath;
logger.log("Importing from '" + getUrl() + "' to '" + projectPath + "'...");
diff --git a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/UrlProjectImporter.java b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/UrlProjectImporter.java
index 77259d72f1..0a181e2d8e 100644
--- a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/UrlProjectImporter.java
+++ b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/UrlProjectImporter.java
@@ -9,7 +9,7 @@ import io.onedev.server.web.util.ImportStep;
import java.io.Serializable;
import java.util.List;
-public class UrlProjectImporter implements ProjectImporter {
+public class UrlProjectImporter extends ProjectImporter {
private static final long serialVersionUID = 1L;
@@ -24,7 +24,10 @@ public class UrlProjectImporter implements ProjectImporter {
@Override
protected ImportServer newSetting() {
- return new ImportServer();
+ if (getParentProjectPath() != null)
+ return new ChildrenImportServer();
+ else
+ return new ImportServer();
}
};
@@ -36,7 +39,7 @@ public class UrlProjectImporter implements ProjectImporter {
@Override
public TaskResult doImport(boolean dryRun, TaskLogger logger) {
- return serverStep.getSetting().importProject(dryRun, logger);
+ return serverStep.getSetting().importProject(getParentProjectPath(), dryRun, logger);
}
@Override
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ChildrenImportProjects.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ChildrenImportProjects.java
new file mode 100644
index 0000000000..1e125e1304
--- /dev/null
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ChildrenImportProjects.java
@@ -0,0 +1,13 @@
+package io.onedev.server.plugin.imports.youtrack;
+
+import io.onedev.server.annotation.Editable;
+
+@Editable
+public class ChildrenImportProjects extends ImportProjects {
+
+ @Override
+ public String getParentOneDevProject() {
+ return super.getParentOneDevProject();
+ }
+
+}
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.java
index 15b05f04b3..9bebd9ace0 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
@@ -23,7 +23,7 @@ import io.onedev.server.web.editable.BeanEditor;
public class ImportProjects implements Serializable, Validatable {
private static final long serialVersionUID = 1L;
-
+
ImportServer server;
private String parentOneDevProject;
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
index 25f89ff341..dba60e61fb 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
@@ -1070,11 +1070,9 @@ public class ImportServer implements Serializable, Validatable {
for (var youTrackProject : projects.getImportProjects()) {
OneDev.getInstance(TransactionService.class).run(() -> {
- String oneDevProjectPath;
+ String oneDevProjectPath = youTrackProject;
if (projects.getParentOneDevProject() != null)
- oneDevProjectPath = projects.getParentOneDevProject() + "/" + youTrackProject;
- else
- oneDevProjectPath = youTrackProject;
+ oneDevProjectPath = projects.getParentOneDevProject() + "/" + oneDevProjectPath;
logger.log("Importing from '" + youTrackProject + "' to '" + oneDevProjectPath + "'...");
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImporter.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImporter.java
index 43409047cb..73140a7889 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImporter.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImporter.java
@@ -1,17 +1,18 @@
package io.onedev.server.plugin.imports.youtrack;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.io.Serializable;
+import java.util.List;
+
import com.google.common.collect.Lists;
+
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.imports.ProjectImporter;
import io.onedev.server.web.component.taskbutton.TaskResult;
import io.onedev.server.web.util.ImportStep;
-import static io.onedev.server.web.translation.Translation._T;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class YouTrackProjectImporter implements ProjectImporter {
+public class YouTrackProjectImporter extends ProjectImporter {
private static final long serialVersionUID = 1L;
@@ -42,7 +43,11 @@ public class YouTrackProjectImporter implements ProjectImporter {
@Override
protected ImportProjects newSetting() {
- ImportProjects projects = new ImportProjects();
+ ImportProjects projects;
+ if (getParentProjectPath() != null)
+ projects = new ChildrenImportProjects();
+ else
+ projects = new ImportProjects();
projects.server = serverStep.getSetting();
return projects;
}
@@ -76,6 +81,8 @@ public class YouTrackProjectImporter implements ProjectImporter {
public TaskResult doImport(boolean dryRun, TaskLogger logger) {
ImportServer server = serverStep.getSetting();
ImportProjects projects = projectsStep.getSetting();
+ if (getParentProjectPath() != null)
+ projects.setParentOneDevProject(getParentProjectPath());
ImportOption option = optionStep.getSetting();
return server.importProjects(projects, option, dryRun, logger);
}
diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.java
index 923f397282..9d6c2d5908 100644
--- a/server-product/src/test/java/io/onedev/server/product/Test.java
+++ b/server-product/src/test/java/io/onedev/server/product/Test.java
@@ -1,9 +1,5 @@
package io.onedev.server.product;
-import io.onedev.commons.utils.FileUtils;
-
-import java.io.File;
-
public class Test {
@org.junit.Test