The Unified and Autonomous Development Platform
Refactor project/issue import facilities
Robin Shen7d7f2bddfe00
diff --git a/server-core/src/main/java/io/onedev/server/imports/IssueImporter2.java b/server-core/src/main/java/io/onedev/server/imports/IssueImporter.javasimilarity index 77%rename from server-core/src/main/java/io/onedev/server/imports/IssueImporter2.javarename to server-core/src/main/java/io/onedev/server/imports/IssueImporter.javaindex 73dd8c67f3..d9bcbc8c65 100644--- a/server-core/src/main/java/io/onedev/server/imports/IssueImporter2.java+++ b/server-core/src/main/java/io/onedev/server/imports/IssueImporter.java@@ -7,7 +7,7 @@ import javax.annotation.Nullable;import io.onedev.server.model.Project;import io.onedev.server.util.SimpleLogger;-public abstract class IssueImporter2<Where extends Serializable, What extends Serializable, How extends Serializable>+public abstract class IssueImporter<Where extends Serializable, What extends Serializable, How extends Serializable>extends Importer<Where, What, How> {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImporterContribution.java b/server-core/src/main/java/io/onedev/server/imports/IssueImporterContribution.javasimilarity index 75%rename from server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImporterContribution.javarename to server-core/src/main/java/io/onedev/server/imports/IssueImporterContribution.javaindex b8edb1f561..209420722e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImporterContribution.java+++ b/server-core/src/main/java/io/onedev/server/imports/IssueImporterContribution.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.issues.imports;+package io.onedev.server.imports;import java.io.Serializable;import java.util.Collection;@@ -8,7 +8,7 @@ import io.onedev.commons.launcher.loader.ExtensionPoint;@ExtensionPointpublic interface IssueImporterContribution {- Collection<IssueImporter<? extends Serializable, ? extends Serializable>> getImporters();+ Collection<IssueImporter<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters();int getOrder();diff --git a/server-core/src/main/java/io/onedev/server/imports/IssueImporterContribution2.java b/server-core/src/main/java/io/onedev/server/imports/IssueImporterContribution2.javadeleted file mode 100644index 62f60df065..0000000000--- a/server-core/src/main/java/io/onedev/server/imports/IssueImporterContribution2.java+++ /dev/null@@ -1,15 +0,0 @@-package io.onedev.server.imports;--import java.io.Serializable;-import java.util.Collection;--import io.onedev.commons.launcher.loader.ExtensionPoint;--@ExtensionPoint-public interface IssueImporterContribution2 {-- Collection<IssueImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters();-- int getOrder();--}diff --git a/server-core/src/main/java/io/onedev/server/imports/ProjectImporter2.java b/server-core/src/main/java/io/onedev/server/imports/ProjectImporter.javasimilarity index 74%rename from server-core/src/main/java/io/onedev/server/imports/ProjectImporter2.javarename to server-core/src/main/java/io/onedev/server/imports/ProjectImporter.javaindex 50925123a4..65f8db6ecb 100644--- a/server-core/src/main/java/io/onedev/server/imports/ProjectImporter2.java+++ b/server-core/src/main/java/io/onedev/server/imports/ProjectImporter.java@@ -6,7 +6,7 @@ import javax.annotation.Nullable;import io.onedev.server.util.SimpleLogger;-public abstract class ProjectImporter2<Where extends Serializable, What extends Serializable, How extends Serializable>+public abstract class ProjectImporter<Where extends Serializable, What extends Serializable, How extends Serializable>extends Importer<Where, What, How> {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImporterContribution.java b/server-core/src/main/java/io/onedev/server/imports/ProjectImporterContribution.javasimilarity index 75%rename from server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImporterContribution.javarename to server-core/src/main/java/io/onedev/server/imports/ProjectImporterContribution.javaindex 520c6612ac..94d9a78f2f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImporterContribution.java+++ b/server-core/src/main/java/io/onedev/server/imports/ProjectImporterContribution.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.imports;+package io.onedev.server.imports;import java.io.Serializable;import java.util.Collection;@@ -8,7 +8,7 @@ import io.onedev.commons.launcher.loader.ExtensionPoint;@ExtensionPointpublic interface ProjectImporterContribution {- Collection<ProjectImporter<? extends Serializable, ? extends Serializable>> getImporters();+ Collection<ProjectImporter<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters();int getOrder();diff --git a/server-core/src/main/java/io/onedev/server/imports/ProjectImporterContribution2.java b/server-core/src/main/java/io/onedev/server/imports/ProjectImporterContribution2.javadeleted file mode 100644index 7e4e55b67f..0000000000--- a/server-core/src/main/java/io/onedev/server/imports/ProjectImporterContribution2.java+++ /dev/null@@ -1,15 +0,0 @@-package io.onedev.server.imports;--import java.io.Serializable;-import java.util.Collection;--import io.onedev.commons.launcher.loader.ExtensionPoint;--@ExtensionPoint-public interface ProjectImporterContribution2 {-- Collection<ProjectImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters();-- int getOrder();--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 494c603ab0..ccf735bb59 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -57,8 +57,8 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.imports.IssueImporter2;-import io.onedev.server.imports.IssueImporterContribution2;+import io.onedev.server.imports.IssueImporter;+import io.onedev.server.imports.IssueImporterContribution;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -312,24 +312,24 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected List<MenuItem> getMenuItems(FloatingPanel dropdown) {- Collection<IssueImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable>> importers = new ArrayList<>();+ Collection<IssueImporter<? extends Serializable, ? extends Serializable, ? extends Serializable>> importers = new ArrayList<>();- List<IssueImporterContribution2> contributions =- new ArrayList<>(OneDev.getExtensions(IssueImporterContribution2.class));- Collections.sort(contributions, new Comparator<IssueImporterContribution2>() {+ List<IssueImporterContribution> contributions =+ new ArrayList<>(OneDev.getExtensions(IssueImporterContribution.class));+ Collections.sort(contributions, new Comparator<IssueImporterContribution>() {@Override- public int compare(IssueImporterContribution2 o1, IssueImporterContribution2 o2) {+ public int compare(IssueImporterContribution o1, IssueImporterContribution o2) {return o1.getOrder() - o2.getOrder();}});- for (IssueImporterContribution2 contribution: contributions)+ for (IssueImporterContribution contribution: contributions)importers.addAll(contribution.getImporters());List<MenuItem> menuItems = new ArrayList<>();- for (IssueImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable> importer: importers) {+ for (IssueImporter<? extends Serializable, ? extends Serializable, ? extends Serializable> importer: importers) {menuItems.add(new MenuItem() {@Overridediff --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.javaindex 8a1f381f45..6ddfdee6c0 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@@ -44,8 +44,8 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.imports.ProjectImporter2;-import io.onedev.server.imports.ProjectImporterContribution2;+import io.onedev.server.imports.ProjectImporter;+import io.onedev.server.imports.ProjectImporterContribution;import io.onedev.server.model.Project;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntitySort;@@ -246,23 +246,23 @@ public class ProjectListPanel extends Panel {@Overrideprotected List<MenuItem> getMenuItems(FloatingPanel dropdown) {- Collection<ProjectImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable>> importers = new ArrayList<>();- List<ProjectImporterContribution2> contributions =- new ArrayList<>(OneDev.getExtensions(ProjectImporterContribution2.class));- Collections.sort(contributions, new Comparator<ProjectImporterContribution2>() {+ Collection<ProjectImporter<? extends Serializable, ? extends Serializable, ? extends Serializable>> importers = new ArrayList<>();+ List<ProjectImporterContribution> contributions =+ new ArrayList<>(OneDev.getExtensions(ProjectImporterContribution.class));+ Collections.sort(contributions, new Comparator<ProjectImporterContribution>() {@Override- public int compare(ProjectImporterContribution2 o1, ProjectImporterContribution2 o2) {+ public int compare(ProjectImporterContribution o1, ProjectImporterContribution o2) {return o1.getOrder() - o2.getOrder();}});- for (ProjectImporterContribution2 contribution: contributions)+ for (ProjectImporterContribution contribution: contributions)importers.addAll(contribution.getImporters());List<MenuItem> menuItems = new ArrayList<>();- for (ProjectImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable> importer: importers) {+ for (ProjectImporter<? extends Serializable, ? extends Serializable, ? extends Serializable> importer: importers) {menuItems.add(new MenuItem() {@Overridediff --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.javaindex 96f6506c52..84ee2f1427 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,8 +12,8 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.imports.Importer;-import io.onedev.server.imports.ProjectImporter2;-import io.onedev.server.imports.ProjectImporterContribution2;+import io.onedev.server.imports.ProjectImporter;+import io.onedev.server.imports.ProjectImporterContribution;import io.onedev.server.model.Project;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;@@ -29,17 +29,17 @@ public class ProjectImportPage<Where extends Serializable, What extends Serializprivate static final String PARAM_IMPORTER = "importer";- private ProjectImporter2<Where, What, How> importer;+ private ProjectImporter<Where, What, How> importer;@SuppressWarnings("unchecked")public ProjectImportPage(PageParameters params) {super(params);String importerName = params.get(PARAM_IMPORTER).toString();- for (ProjectImporterContribution2 contribution: OneDev.getExtensions(ProjectImporterContribution2.class)) {- for (ProjectImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable> importer: contribution.getImporters()) {+ for (ProjectImporterContribution contribution: OneDev.getExtensions(ProjectImporterContribution.class)) {+ for (ProjectImporter<? extends Serializable, ? extends Serializable, ? extends Serializable> importer: contribution.getImporters()) {if (importer.getName().equals(importerName)) {- this.importer = (ProjectImporter2<Where, What, How>) importer;+ this.importer = (ProjectImporter<Where, What, How>) importer;break;}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImporter.java b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImporter.javadeleted file mode 100644index 313f024caa..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImporter.java+++ /dev/null@@ -1,41 +0,0 @@-package io.onedev.server.web.page.project.imports;--import java.io.Serializable;-import java.util.List;--import javax.annotation.Nullable;--import io.onedev.server.util.ReflectionUtils;-import io.onedev.server.util.SimpleLogger;--public abstract class ProjectImporter<T extends Serializable, S extends Serializable> implements Serializable {-- private static final long serialVersionUID = 1L;-- private final Class<T> sourceClass;-- private final Class<S> optionClass;-- @SuppressWarnings("unchecked")- public ProjectImporter() {- List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(ProjectImporter.class, getClass());- sourceClass = (Class<T>) typeArguments.get(0);- optionClass = (Class<S>) typeArguments.get(1);- }-- public Class<T> getSourceClass() {- return sourceClass;- }-- public Class<S> getOptionClass() {- return optionClass;- }-- public abstract String getName();-- public abstract S getImportOption(T importSource, SimpleLogger logger);-- @Nullable- public abstract String doImport(T importSource, S importOption, boolean dryRun, SimpleLogger logger);--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.javaindex dab327edd0..d8dc05cb6a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java@@ -12,8 +12,8 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.imports.Importer;-import io.onedev.server.imports.IssueImporter2;-import io.onedev.server.imports.IssueImporterContribution2;+import io.onedev.server.imports.IssueImporter;+import io.onedev.server.imports.IssueImporterContribution;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.search.entity.EntitySort;@@ -30,17 +30,17 @@ public class IssueImportPage<Where extends Serializable, What extends Serializabprivate static final String PARAM_IMPORTER = "importer";- private IssueImporter2<Where, What, How> importer;+ private IssueImporter<Where, What, How> importer;@SuppressWarnings("unchecked")public IssueImportPage(PageParameters params) {super(params);String importerName = params.get(PARAM_IMPORTER).toString();- for (IssueImporterContribution2 contribution: OneDev.getExtensions(IssueImporterContribution2.class)) {- for (IssueImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable> importer: contribution.getImporters()) {+ for (IssueImporterContribution contribution: OneDev.getExtensions(IssueImporterContribution.class)) {+ for (IssueImporter<? extends Serializable, ? extends Serializable, ? extends Serializable> importer: contribution.getImporters()) {if (importer.getName().equals(importerName)) {- this.importer = (IssueImporter2<Where, What, How>) importer;+ this.importer = (IssueImporter<Where, What, How>) importer;break;}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImporter.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImporter.javadeleted file mode 100644index 98de01607b..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImporter.java+++ /dev/null@@ -1,42 +0,0 @@-package io.onedev.server.web.page.project.issues.imports;--import java.io.Serializable;-import java.util.List;--import javax.annotation.Nullable;--import io.onedev.server.model.Project;-import io.onedev.server.util.ReflectionUtils;-import io.onedev.server.util.SimpleLogger;--public abstract class IssueImporter<T extends Serializable, S extends Serializable> implements Serializable {-- private static final long serialVersionUID = 1L;-- private final Class<T> sourceClass;-- private final Class<S> optionClass;-- @SuppressWarnings("unchecked")- public IssueImporter() {- List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(IssueImporter.class, getClass());- sourceClass = (Class<T>) typeArguments.get(0);- optionClass = (Class<S>) typeArguments.get(1);- }-- public Class<T> getSourceClass() {- return sourceClass;- }-- public Class<S> getOptionClass() {- return optionClass;- }-- public abstract String getName();-- public abstract S getImportOption(T importSource, SimpleLogger logger);-- @Nullable- public abstract String doImport(Project project, T importSource, S importOption, boolean dryRun, SimpleLogger logger);--}diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xmlindex 75f57e9f45..155079e169 100644--- a/server-plugin/server-plugin-import-gitea/pom.xml+++ b/server-plugin/server-plugin-import-gitea/pom.xml@@ -8,6 +8,6 @@<version>4.8.1</version></parent><properties>- <moduleClass>server.plugin.imports.gitea.GiteaPluginModule</moduleClass>+ <moduleClass>io.onedev.server.plugin.imports.gitea.GiteaPluginModule</moduleClass></properties></project>diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/GiteaIssueImporter.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaIssueImporter.javasimilarity index 86%rename from server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/GiteaIssueImporter.javarename to server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaIssueImporter.javaindex 5eeef63bd2..d8051a9f14 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/GiteaIssueImporter.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaIssueImporter.java@@ -1,4 +1,4 @@-package server.plugin.imports.gitea;+package io.onedev.server.plugin.imports.gitea;import java.util.HashMap;import java.util.Map;@@ -6,13 +6,13 @@ import java.util.Optional;import com.google.common.collect.Lists;-import io.onedev.server.imports.IssueImporter2;+import io.onedev.server.imports.IssueImporter;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.util.SimpleLogger;import io.onedev.server.web.util.WicketUtils;-public class GiteaIssueImporter extends IssueImporter2<ImportServer, IssueImportSource, IssueImportOption> {+public class GiteaIssueImporter extends IssueImporter<ImportServer, IssueImportSource, IssueImportOption> {private static final long serialVersionUID = 1L;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/GiteaPluginModule.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaPluginModule.javasimilarity index 50%rename from server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/GiteaPluginModule.javarename to server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaPluginModule.javaindex e24582fec9..fe14872f07 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/GiteaPluginModule.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaPluginModule.java@@ -1,4 +1,4 @@-package server.plugin.imports.gitea;+package io.onedev.server.plugin.imports.gitea;import java.io.Serializable;import java.util.Collection;@@ -6,10 +6,10 @@ import java.util.Collection;import com.google.common.collect.Lists;import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.server.imports.IssueImporter2;-import io.onedev.server.imports.IssueImporterContribution2;-import io.onedev.server.imports.ProjectImporter2;-import io.onedev.server.imports.ProjectImporterContribution2;+import io.onedev.server.imports.IssueImporter;+import io.onedev.server.imports.IssueImporterContribution;+import io.onedev.server.imports.ProjectImporter;+import io.onedev.server.imports.ProjectImporterContribution;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -22,30 +22,30 @@ public class GiteaPluginModule extends AbstractPluginModule {super.configure();// put your guice bindings here- contribute(ProjectImporterContribution2.class, new ProjectImporterContribution2() {+ contribute(ProjectImporterContribution.class, new ProjectImporterContribution() {@Override- public Collection<ProjectImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters() {+ public Collection<ProjectImporter<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters() {return Lists.newArrayList(new GiteaProjectImporter());}@Overridepublic int getOrder() {- return 500;+ return 300;}});- contribute(IssueImporterContribution2.class, new IssueImporterContribution2() {+ contribute(IssueImporterContribution.class, new IssueImporterContribution() {@Override- public Collection<IssueImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters() {+ public Collection<IssueImporter<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters() {return Lists.newArrayList(new GiteaIssueImporter());}@Overridepublic int getOrder() {- return 500;+ return 300;}});diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/GiteaProjectImporter.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.javasimilarity index 94%rename from server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/GiteaProjectImporter.javarename to server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.javaindex 0f532583d7..dafaec691b 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/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,4 +1,4 @@-package server.plugin.imports.gitea;+package io.onedev.server.plugin.imports.gitea;import java.util.ArrayList;import java.util.Collection;@@ -18,14 +18,14 @@ import com.fasterxml.jackson.databind.JsonNode;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.imports.ProjectImporter2;+import io.onedev.server.imports.ProjectImporter;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.SimpleLogger;-public class GiteaProjectImporter extends ProjectImporter2<ImportServer, ProjectImportSource, ProjectImportOption> {+public class GiteaProjectImporter extends ProjectImporter<ImportServer, ProjectImportSource, ProjectImportOption> {private static final long serialVersionUID = 1L;@@ -37,7 +37,7 @@ public class GiteaProjectImporter extends ProjectImporter2<ImportServer, Project@Overridepublic ProjectImportSource getWhat(ImportServer where, SimpleLogger logger) {ProjectImportSource importSource = new ProjectImportSource();- Client client = ImportUtils.newClient(where);+ Client client = where.newClient();try {String apiEndpoint = where.getApiEndpoint("/user/repos");for (JsonNode repoNode: ImportUtils.list(client, apiEndpoint, logger)) {@@ -66,7 +66,7 @@ public class GiteaProjectImporter extends ProjectImporter2<ImportServer, Projectpublic String doImport(ImportServer where, ProjectImportSource what, ProjectImportOption how,boolean dryRun, SimpleLogger logger) {Collection<Long> projectIds = new ArrayList<>();- Client client = ImportUtils.newClient(where);+ Client client = where.newClient();try {Map<String, Optional<User>> users = new HashMap<>();ImportResult result = new ImportResult();diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ImportResult.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportResult.javasimilarity index 97%rename from server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ImportResult.javarename to server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportResult.javaindex 1878b5c4ac..16f059df09 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ImportResult.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportResult.java@@ -1,4 +1,4 @@-package server.plugin.imports.gitea;+package io.onedev.server.plugin.imports.gitea;import java.util.ArrayList;import java.util.Collection;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ImportServer.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.javasimilarity index 91%rename from server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ImportServer.javarename to server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.javaindex 4c96df144c..8b271133c2 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ImportServer.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java@@ -1,4 +1,4 @@-package server.plugin.imports.gitea;+package io.onedev.server.plugin.imports.gitea;import java.io.Serializable;@@ -10,6 +10,7 @@ import javax.ws.rs.client.WebTarget;import javax.ws.rs.core.Response;import org.apache.wicket.MetaDataKey;+import org.glassfish.jersey.client.ClientProperties;import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport;import org.hibernate.validator.constraints.NotEmpty;@@ -109,4 +110,11 @@ public class ImportServer implements Serializable, Validatable {return true;}+ Client newClient() {+ Client client = ClientBuilder.newClient();+ client.property(ClientProperties.FOLLOW_REDIRECTS, true);+ client.register(OAuth2ClientSupport.feature(getAccessToken()));+ return client;+ }+}diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ImportUtils.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.javasimilarity index 96%rename from server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ImportUtils.javarename to server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.javaindex 61f0aadb58..8618deb7c3 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ImportUtils.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.java@@ -1,4 +1,4 @@-package server.plugin.imports.gitea;+package io.onedev.server.plugin.imports.gitea;import java.net.URI;import java.net.URISyntaxException;@@ -19,15 +19,12 @@ import java.util.concurrent.atomic.AtomicInteger;import javax.annotation.Nullable;import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;import javax.ws.rs.client.Invocation;import javax.ws.rs.client.WebTarget;import javax.ws.rs.core.Response;import org.apache.commons.lang3.StringUtils;import org.apache.http.client.utils.URIBuilder;-import org.glassfish.jersey.client.ClientProperties;-import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport;import org.unbescape.html.HtmlEscape;import com.fasterxml.jackson.databind.JsonNode;@@ -61,7 +58,7 @@ public class ImportUtils {static IssueImportOption buildIssueImportOption(ImportServer server, Collection<String> repositories, SimpleLogger logger) {IssueImportOption importOption = new IssueImportOption();- Client client = newClient(server);+ Client client = server.newClient();try {Set<String> labels = new LinkedHashSet<>();for (String repo: repositories) {@@ -108,7 +105,7 @@ public class ImportUtils {static ImportResult importIssues(ImportServer server, String giteaRepo, Project oneDevProject,boolean useExistingIssueNumbers, IssueImportOption importOption, Map<String, Optional<User>> users,boolean dryRun, SimpleLogger logger) {- Client client = newClient(server);+ Client client = server.newClient();try {Set<String> nonExistentMilestones = new HashSet<>();Set<String> nonExistentLogins = new HashSet<>();@@ -428,13 +425,6 @@ public class ImportUtils {}}- static Client newClient(ImportServer importServer) {- Client client = ClientBuilder.newClient();- client.property(ClientProperties.FOLLOW_REDIRECTS, true);- client.register(OAuth2ClientSupport.feature(importServer.getAccessToken()));- return client;- }-static interface PageDataConsumer {void consume(List<JsonNode> pageData) throws InterruptedException;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/IssueImportOption.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.javasimilarity index 98%rename from server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/IssueImportOption.javarename to server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.javaindex b645fefb74..f7834fe811 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/IssueImportOption.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.java@@ -1,4 +1,4 @@-package server.plugin.imports.gitea;+package io.onedev.server.plugin.imports.gitea;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/IssueImportSource.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportSource.javasimilarity index 94%rename from server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/IssueImportSource.javarename to server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportSource.javaindex c1afe26168..0083aeb4c3 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/IssueImportSource.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportSource.java@@ -1,4 +1,4 @@-package server.plugin.imports.gitea;+package io.onedev.server.plugin.imports.gitea;import java.io.Serializable;import java.util.ArrayList;@@ -45,7 +45,7 @@ public class IssueImportSource implements Serializable {ImportServer server = WicketUtils.getPage().getMetaData(ImportServer.META_DATA_KEY);- Client client = ImportUtils.newClient(server);+ Client client = server.newClient();try {String apiEndpoint = server.getApiEndpoint("/user/repos");for (JsonNode repoNode: ImportUtils.list(client, apiEndpoint, new SimpleLogger() {@@ -60,7 +60,6 @@ public class IssueImportSource implements Serializable {String ownerName = repoNode.get("owner").get("login").asText();choices.add(ownerName + "/" + repoName);}- } catch (Exception e) {} finally {client.close();}diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/IssueLabelMapping.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.javasimilarity index 97%rename from server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/IssueLabelMapping.javarename to server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.javaindex 36b6661670..e7cbbcf5e6 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/IssueLabelMapping.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.java@@ -1,4 +1,4 @@-package server.plugin.imports.gitea;+package io.onedev.server.plugin.imports.gitea;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ProjectImportOption.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectImportOption.javasimilarity index 95%rename from server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ProjectImportOption.javarename to server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectImportOption.javaindex 43fabe3b18..da5a3a26b6 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ProjectImportOption.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectImportOption.java@@ -1,4 +1,4 @@-package server.plugin.imports.gitea;+package io.onedev.server.plugin.imports.gitea;import java.io.Serializable;@@ -40,6 +40,7 @@ public class ProjectImportOption implements Serializable {}@Editable(order=200, name="Import Issues")+ @Nullablepublic IssueImportOption getIssueImportOption() {return issueImportOption;}diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ProjectImportSource.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectImportSource.javasimilarity index 97%rename from server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ProjectImportSource.javarename to server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectImportSource.javaindex ca7bc9505d..304390fb62 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ProjectImportSource.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectImportSource.java@@ -1,4 +1,4 @@-package server.plugin.imports.gitea;+package io.onedev.server.plugin.imports.gitea;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ProjectMapping.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectMapping.javasimilarity index 95%rename from server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ProjectMapping.javarename to server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectMapping.javaindex c668d1ed1b..cf226b452a 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ProjectMapping.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectMapping.java@@ -1,4 +1,4 @@-package server.plugin.imports.gitea;+package io.onedev.server.plugin.imports.gitea;import java.io.Serializable;diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImportSource.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImportSource.javadeleted file mode 100644index 51fcde98d1..0000000000--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImportSource.java+++ /dev/null@@ -1,89 +0,0 @@-package io.onedev.server.plugin.imports.github;--import static io.onedev.server.plugin.imports.github.GitHubImportUtils.get;-import static io.onedev.server.plugin.imports.github.GitHubImportUtils.list;--import java.util.ArrayList;-import java.util.Collections;-import java.util.List;--import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;--import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;-import org.hibernate.validator.constraints.NotEmpty;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.fasterxml.jackson.databind.JsonNode;--import io.onedev.commons.utils.StringUtils;-import io.onedev.server.buildspec.job.log.StyleBuilder;-import io.onedev.server.util.EditContext;-import io.onedev.server.util.SimpleLogger;-import io.onedev.server.util.validation.annotation.ClassValidating;-import io.onedev.server.web.editable.annotation.ChoiceProvider;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-@ClassValidating-public class GitHubIssueImportSource extends GitHubProjectImportSource {-- private static final long serialVersionUID = 1L;-- private static final Logger logger = LoggerFactory.getLogger(GitHubIssueImportSource.class);-- private String repository;-- @Editable(order=400, name="GitHub Repository", description="Choose GitHub repository to "- + "import issues from. Available repositories will be populated when above options "- + "are specified")- @ChoiceProvider("getRepositoryChoices")- @NotEmpty- public String getRepository() {- return repository;- }-- public void setRepository(String repository) {- this.repository = repository;- }-- @SuppressWarnings("unused")- private static List<String> getRepositoryChoices() {- List<String> choices = new ArrayList<>();-- String apiUrl = (String) EditContext.get().getInputValue(PROP_API_URL);- String accessToken = (String) EditContext.get().getInputValue(PROP_ACCESS_TOKEN);-- if (StringUtils.isNotBlank(apiUrl) && StringUtils.isNotBlank(accessToken)) {- Client client = ClientBuilder.newClient();- client.register(HttpAuthenticationFeature.basic("git", accessToken));- try {- String apiEndpoint = getApiEndpoint(apiUrl, "/user");- SimpleLogger logger = new SimpleLogger() {-- @Override- public void log(String message, StyleBuilder styleBuilder) {- GitHubIssueImportSource.logger.info(message);- }-- };- get(client, apiEndpoint, logger);-- apiEndpoint = getApiEndpoint(apiUrl, "/user/repos");- for (JsonNode repoNode: list(client, apiEndpoint, logger)) {- String repoName = repoNode.get("name").asText();- String ownerName = repoNode.get("owner").get("login").asText();- choices.add(ownerName + "/" + repoName);- }- } catch (Exception e) {- } finally {- client.close();- }- }-- Collections.sort(choices);- return choices;- }--}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 b820c737c2..76f332c29d 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@@ -1,19 +1,22 @@package io.onedev.server.plugin.imports.github;-import static io.onedev.server.plugin.imports.github.GitHubImportUtils.NAME;-import static io.onedev.server.plugin.imports.github.GitHubImportUtils.buildImportOption;-import static io.onedev.server.plugin.imports.github.GitHubImportUtils.importIssues;+import static io.onedev.server.plugin.imports.github.ImportUtils.NAME;+import static io.onedev.server.plugin.imports.github.ImportUtils.buildImportOption;+import static io.onedev.server.plugin.imports.github.ImportUtils.importIssues;import java.util.HashMap;import java.util.Map;import java.util.Optional;+import com.google.common.collect.Lists;++import io.onedev.server.imports.IssueImporter;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.util.SimpleLogger;-import io.onedev.server.web.page.project.issues.imports.IssueImporter;+import io.onedev.server.web.util.WicketUtils;-public class GitHubIssueImporter extends IssueImporter<GitHubIssueImportSource, GitHubIssueImportOption> {+public class GitHubIssueImporter extends IssueImporter<ImportServer, IssueImportSource, IssueImportOption> {private static final long serialVersionUID = 1L;@@ -23,18 +26,23 @@ public class GitHubIssueImporter extends IssueImporter<GitHubIssueImportSource,}@Override- public GitHubIssueImportOption getImportOption(GitHubIssueImportSource importSource, SimpleLogger logger) {- GitHubIssueImportOption importOption = buildImportOption(importSource, importSource.getRepository(), logger);- return importOption;- }-- @Override- public String doImport(Project project, GitHubIssueImportSource importSource, GitHubIssueImportOption importOption,+ public String doImport(ImportServer where, IssueImportSource what, IssueImportOption how, Project project,boolean dryRun, SimpleLogger logger) {- logger.log("Importing issues from repository " + importSource.getRepository() + "...");+ logger.log("Importing issues from repository " + what.getRepository() + "...");Map<String, Optional<User>> users = new HashMap<>();- return importIssues(importSource, importSource.getRepository(), project, false, importOption, users, dryRun, logger)+ return importIssues(where, what.getRepository(), project, false, how, users, dryRun, logger).toHtml("Issues imported successfully");}++ @Override+ public IssueImportSource getWhat(ImportServer where, SimpleLogger logger) {+ WicketUtils.getPage().setMetaData(ImportServer.META_DATA_KEY, where);+ return new IssueImportSource();+ }++ @Override+ public IssueImportOption getHow(ImportServer where, IssueImportSource what, SimpleLogger logger) {+ return buildImportOption(where, Lists.newArrayList(what.getRepository()), logger);+ }}\ No newline at end of filediff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubPluginModule.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubPluginModule.javaindex 1f49c2c0b1..0f5692c49d 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubPluginModule.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubPluginModule.java@@ -6,10 +6,10 @@ import java.util.Collection;import com.google.common.collect.Lists;import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.server.web.page.project.imports.ProjectImporter;-import io.onedev.server.web.page.project.imports.ProjectImporterContribution;-import io.onedev.server.web.page.project.issues.imports.IssueImporter;-import io.onedev.server.web.page.project.issues.imports.IssueImporterContribution;+import io.onedev.server.imports.IssueImporter;+import io.onedev.server.imports.IssueImporterContribution;+import io.onedev.server.imports.ProjectImporter;+import io.onedev.server.imports.ProjectImporterContribution;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -24,7 +24,7 @@ public class GitHubPluginModule extends AbstractPluginModule {contribute(ProjectImporterContribution.class, new ProjectImporterContribution() {@Override- public Collection<ProjectImporter<? extends Serializable, ? extends Serializable>> getImporters() {+ public Collection<ProjectImporter<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters() {return Lists.newArrayList(new GitHubProjectImporter());}@@ -38,7 +38,7 @@ public class GitHubPluginModule extends AbstractPluginModule {contribute(IssueImporterContribution.class, new IssueImporterContribution() {@Override- public Collection<IssueImporter<? extends Serializable, ? extends Serializable>> getImporters() {+ public Collection<IssueImporter<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters() {return Lists.newArrayList(new GitHubIssueImporter());}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.javaindex cf37bec44e..513fc5c05d 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,11 +1,9 @@package io.onedev.server.plugin.imports.github;-import static io.onedev.server.plugin.imports.github.GitHubImportUtils.NAME;-import static io.onedev.server.plugin.imports.github.GitHubImportUtils.buildImportOption;-import static io.onedev.server.plugin.imports.github.GitHubImportUtils.get;-import static io.onedev.server.plugin.imports.github.GitHubImportUtils.importIssues;-import static io.onedev.server.plugin.imports.github.GitHubImportUtils.list;-import static io.onedev.server.plugin.imports.github.GitHubImportUtils.newClient;+import static io.onedev.server.plugin.imports.github.ImportUtils.NAME;+import static io.onedev.server.plugin.imports.github.ImportUtils.get;+import static io.onedev.server.plugin.imports.github.ImportUtils.importIssues;+import static io.onedev.server.plugin.imports.github.ImportUtils.list;import java.util.ArrayList;import java.util.Collection;@@ -13,6 +11,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;import java.util.Optional;+import java.util.stream.Collectors;import javax.ws.rs.client.Client;@@ -24,14 +23,14 @@ import com.fasterxml.jackson.databind.JsonNode;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.imports.ProjectImporter;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.SimpleLogger;-import io.onedev.server.web.page.project.imports.ProjectImporter;-public class GitHubProjectImporter extends ProjectImporter<GitHubProjectImportSource, GitHubProjectImportOption> {+public class GitHubProjectImporter extends ProjectImporter<ImportServer, ProjectImportSource, ProjectImportOption> {private static final long serialVersionUID = 1L;@@ -41,41 +40,17 @@ public class GitHubProjectImporter extends ProjectImporter<GitHubProjectImportSo}@Override- public GitHubProjectImportOption getImportOption(GitHubProjectImportSource importSource, SimpleLogger logger) {- GitHubProjectImportOption importOption = new GitHubProjectImportOption();- Client client = newClient(importSource);- try {- String apiEndpoint = importSource.getApiEndpoint("/user/repos");- for (JsonNode repoNode: list(client, apiEndpoint, logger)) {- String repoName = repoNode.get("name").asText();- String ownerName = repoNode.get("owner").get("login").asText();- ProjectMapping projectMapping = new ProjectMapping();- projectMapping.setGitHubRepo(ownerName + "/" + repoName);- projectMapping.setOneDevProject(ownerName + "-" + repoName);- importOption.getProjectMappings().add(projectMapping);- }- GitHubIssueImportOption issueImportOption = buildImportOption(importSource, null, logger);- importOption.setAssigneesIssueField(issueImportOption.getAssigneesIssueField());- importOption.setClosedIssueState(issueImportOption.getClosedIssueState());- importOption.setIssueLabelMappings(issueImportOption.getIssueLabelMappings());- } finally {- client.close();- }- return importOption;- }-- @Override- public String doImport(GitHubProjectImportSource importSource, GitHubProjectImportOption importOption,+ public String doImport(ImportServer where, ProjectImportSource what, ProjectImportOption how,boolean dryRun, SimpleLogger logger) {Collection<Long> projectIds = new ArrayList<>();- Client client = newClient(importSource);+ Client client = where.newClient();try {Map<String, Optional<User>> users = new HashMap<>();- GitHubImportResult result = new GitHubImportResult();- for (ProjectMapping projectMapping: importOption.getProjectMappings()) {+ ImportResult result = new ImportResult();+ for (ProjectMapping projectMapping: what.getProjectMappings()) {logger.log("Cloning code from repository " + projectMapping.getGitHubRepo() + "...");- String apiEndpoint = importSource.getApiEndpoint("/repos/" + projectMapping.getGitHubRepo());+ String apiEndpoint = where.getApiEndpoint("/repos/" + projectMapping.getGitHubRepo());JsonNode repoNode = get(client, apiEndpoint, logger);Project project = new Project();project.setName(projectMapping.getOneDevProject());@@ -83,22 +58,22 @@ public class GitHubProjectImporter extends ProjectImporter<GitHubProjectImportSoproject.setIssueManagementEnabled(repoNode.get("has_issues").asBoolean());boolean isPrivate = repoNode.get("private").asBoolean();- if (!isPrivate && importOption.getPublicRole() != null)- project.setDefaultRole(importOption.getPublicRole());+ if (!isPrivate && how.getPublicRole() != null)+ project.setDefaultRole(how.getPublicRole());URIBuilder builder = new URIBuilder(repoNode.get("clone_url").asText());if (isPrivate)- builder.setUserInfo("git", importSource.getAccessToken());+ builder.setUserInfo("git", where.getAccessToken());if (!dryRun) {OneDev.getInstance(ProjectManager.class).clone(project, builder.build().toString());projectIds.add(project.getId());}- if (projectMapping.isImportIssues()) {+ if (how.getIssueImportOption() != null) {List<Milestone> milestones = new ArrayList<>();logger.log("Importing milestones from repository " + projectMapping.getGitHubRepo() + "...");- apiEndpoint = importSource.getApiEndpoint("/repos/" + projectMapping.getGitHubRepo() + "/milestones?state=all");+ apiEndpoint = where.getApiEndpoint("/repos/" + projectMapping.getGitHubRepo() + "/milestones?state=all");for (JsonNode milestoneNode: list(client, apiEndpoint, logger)) {Milestone milestone = new Milestone();milestone.setName(milestoneNode.get("title").asText());@@ -118,8 +93,8 @@ public class GitHubProjectImporter extends ProjectImporter<GitHubProjectImportSo}logger.log("Importing issues from repository " + projectMapping.getGitHubRepo() + "...");- GitHubImportResult currentResult = importIssues(importSource, projectMapping.getGitHubRepo(),- project, true, importOption, users, dryRun, logger);+ ImportResult currentResult = importIssues(where, projectMapping.getGitHubRepo(),+ project, true, how.getIssueImportOption(), users, dryRun, logger);result.nonExistentLogins.addAll(currentResult.nonExistentLogins);result.nonExistentMilestones.addAll(currentResult.nonExistentMilestones);result.unmappedIssueLabels.addAll(currentResult.unmappedIssueLabels);@@ -137,5 +112,34 @@ public class GitHubProjectImporter extends ProjectImporter<GitHubProjectImportSoclient.close();}}++ @Override+ public ProjectImportSource getWhat(ImportServer where, SimpleLogger logger) {+ ProjectImportSource importSource = new ProjectImportSource();+ Client client = where.newClient();+ try {+ String apiEndpoint = where.getApiEndpoint("/user/repos");+ for (JsonNode repoNode: list(client, apiEndpoint, logger)) {+ String repoName = repoNode.get("name").asText();+ String ownerName = repoNode.get("owner").get("login").asText();+ ProjectMapping projectMapping = new ProjectMapping();+ projectMapping.setGitHubRepo(ownerName + "/" + repoName);+ projectMapping.setOneDevProject(ownerName + "-" + repoName);+ importSource.getProjectMappings().add(projectMapping);+ }+ } finally {+ client.close();+ }+ return importSource;+ }++ @Override+ public ProjectImportOption getHow(ImportServer where, ProjectImportSource what, SimpleLogger logger) {+ ProjectImportOption importOption = new ProjectImportOption();+ List<String> gitHubRepos = what.getProjectMappings().stream()+ .map(it->it.getGitHubRepo()).collect(Collectors.toList());+ importOption.setIssueImportOption(ImportUtils.buildImportOption(where, gitHubRepos, logger));+ return importOption;+ }}\ No newline at end of filediff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImportResult.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportResult.javasimilarity index 98%rename from server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImportResult.javarename to server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportResult.javaindex b3bb792d98..a4a8d3f692 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImportResult.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportResult.java@@ -8,7 +8,7 @@ import java.util.Set;import org.unbescape.html.HtmlEscape;-public class GitHubImportResult {+public class ImportResult {private static final int MAX_DISPLAY_ENTRIES = 100;diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImportSource.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.javasimilarity index 87%rename from server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImportSource.javarename to server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.javaindex dd225660ca..ec0eab87bd 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImportSource.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java@@ -9,6 +9,8 @@ import javax.ws.rs.client.Invocation;import javax.ws.rs.client.WebTarget;import javax.ws.rs.core.Response;+import org.apache.wicket.MetaDataKey;+import org.glassfish.jersey.client.ClientProperties;import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;import org.hibernate.validator.constraints.NotEmpty;@@ -21,10 +23,16 @@ import io.onedev.server.web.editable.annotation.Password;@Editable@ClassValidating-public class GitHubProjectImportSource implements Serializable, Validatable {+public class ImportServer implements Serializable, Validatable {private static final long serialVersionUID = 1L;+ static final MetaDataKey<ImportServer> META_DATA_KEY = new MetaDataKey<ImportServer>() {++ private static final long serialVersionUID = 1L;++ };+static final String PROP_API_URL = "apiUrl";static final String PROP_ACCESS_TOKEN = "accessToken";@@ -55,12 +63,8 @@ public class GitHubProjectImportSource implements Serializable, Validatable {this.accessToken = accessToken;}- public static String getApiEndpoint(String apiUrl, String apiPath) {- return StringUtils.stripEnd(apiUrl, "/") + "/" + StringUtils.stripStart(apiPath, "/");- }-public String getApiEndpoint(String apiPath) {- return getApiEndpoint(apiUrl, apiPath);+ return StringUtils.stripEnd(apiUrl, "/") + "/" + StringUtils.stripStart(apiPath, "/");}@Override@@ -107,4 +111,11 @@ public class GitHubProjectImportSource implements Serializable, Validatable {return true;}+ Client newClient() {+ Client client = ClientBuilder.newClient();+ client.property(ClientProperties.FOLLOW_REDIRECTS, true);+ client.register(HttpAuthenticationFeature.basic("git", getAccessToken()));+ return client;+ }+}diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImportUtils.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.javasimilarity index 86%rename from server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImportUtils.javarename to server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.javaindex d51be53885..504d3737fa 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImportUtils.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.java@@ -3,6 +3,7 @@ package io.onedev.server.plugin.imports.github;import java.net.URI;import java.net.URISyntaxException;import java.util.ArrayList;+import java.util.Collection;import java.util.HashMap;import java.util.HashSet;import java.util.LinkedHashMap;@@ -15,15 +16,12 @@ import java.util.concurrent.atomic.AtomicInteger;import javax.annotation.Nullable;import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;import javax.ws.rs.client.Invocation;import javax.ws.rs.client.WebTarget;import javax.ws.rs.core.Response;import org.apache.commons.lang3.StringUtils;import org.apache.http.client.utils.URIBuilder;-import org.glassfish.jersey.client.ClientProperties;-import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;import org.joda.time.format.ISODateTimeFormat;import org.unbescape.html.HtmlEscape;@@ -49,32 +47,19 @@ import io.onedev.server.util.Pair;import io.onedev.server.util.ReferenceMigrator;import io.onedev.server.util.SimpleLogger;-public class GitHubImportUtils {+public class ImportUtils {static final String NAME = "GitHub";- static final int PER_PAGE = 100;+ static final int PER_PAGE = 50;- static GitHubIssueImportOption buildImportOption(GitHubProjectImportSource importSource,- @Nullable String gitHubRepo, SimpleLogger logger) {- GitHubIssueImportOption importOption = new GitHubIssueImportOption();- Client client = newClient(importSource);+ static IssueImportOption buildImportOption(ImportServer server, Collection<String> gitHubRepos, SimpleLogger logger) {+ IssueImportOption importOption = new IssueImportOption();+ Client client = server.newClient();try {- List<String> gitHubRepos = new ArrayList<>();- if (gitHubRepo == null) {- String apiEndpoint = importSource.getApiEndpoint("/user/repos");- for (JsonNode repoNode: list(client, apiEndpoint, logger)) {- String repoName = repoNode.get("name").asText();- String ownerName = repoNode.get("owner").get("login").asText();- gitHubRepos.add(ownerName + "/" + repoName);- }- } else {- gitHubRepos.add(gitHubRepo);- }-Set<String> labels = new LinkedHashSet<>();for (String each: gitHubRepos) {- String apiEndpoint = importSource.getApiEndpoint("/repos/" + each + "/labels");+ String apiEndpoint = server.getApiEndpoint("/repos/" + each + "/labels");for (JsonNode labelNode: list(client, apiEndpoint, logger))labels.add(labelNode.get("name").asText());}@@ -91,7 +76,7 @@ public class GitHubImportUtils {}@Nullable- static User getUser(Client client, GitHubProjectImportSource importSource,+ static User getUser(Client client, ImportServer importSource,Map<String, Optional<User>> users, String login, SimpleLogger logger) {Optional<User> userOpt = users.get(login);if (userOpt == null) {@@ -106,10 +91,10 @@ public class GitHubImportUtils {return userOpt.orElse(null);}- static GitHubImportResult importIssues(GitHubProjectImportSource importSource, String gitHubRepo, Project oneDevProject,- boolean useExistingIssueNumbers, GitHubIssueImportOption importOption, Map<String, Optional<User>> users,+ static ImportResult importIssues(ImportServer server, String gitHubRepo, Project oneDevProject,+ boolean useExistingIssueNumbers, IssueImportOption importOption, Map<String, Optional<User>> users,boolean dryRun, SimpleLogger logger) {- Client client = newClient(importSource);+ Client client = server.newClient();try {Set<String> nonExistentMilestones = new HashSet<>();Set<String> nonExistentLogins = new HashSet<>();@@ -186,7 +171,7 @@ public class GitHubImportUtils {}String login = issueNode.get("user").get("login").asText(null);- User user = getUser(client, importSource, users, login, logger);+ User user = getUser(client, server, users, login, logger);if (user != null) {issue.setSubmitter(user);} else {@@ -212,7 +197,7 @@ public class GitHubImportUtils {assigneeField.setType(InputSpec.USER);login = assigneeNode.get("login").asText();- user = getUser(client, importSource, users, login, logger);+ user = getUser(client, server, users, login, logger);if (user != null) {assigneeField.setValue(user.getName());issue.getFields().add(assigneeField);@@ -221,7 +206,7 @@ public class GitHubImportUtils {}}- String apiEndpoint = importSource.getApiEndpoint("/repos/" + gitHubRepo+ String apiEndpoint = server.getApiEndpoint("/repos/" + gitHubRepo+ "/issues/" + oldNumber + "/comments");for (JsonNode commentNode: list(client, apiEndpoint, logger)) {IssueComment comment = new IssueComment();@@ -232,7 +217,7 @@ public class GitHubImportUtils {.toDate());login = commentNode.get("user").get("login").asText();- user = getUser(client, importSource, users, login, logger);+ user = getUser(client, server, users, login, logger);if (user != null) {comment.setUser(user);} else {@@ -245,7 +230,7 @@ public class GitHubImportUtils {issue.setCommentCount(issue.getComments().size());- apiEndpoint = importSource.getApiEndpoint("/repos/" + gitHubRepo+ apiEndpoint = server.getApiEndpoint("/repos/" + gitHubRepo+ "/issues/" + oldNumber + "/labels");List<String> currentUnmappedLabels = new ArrayList<>();for (JsonNode labelNode: list(client, apiEndpoint, logger)) {@@ -301,7 +286,7 @@ public class GitHubImportUtils {};- String apiEndpoint = importSource.getApiEndpoint("/repos/" + gitHubRepo + "/issues?state=all");+ String apiEndpoint = server.getApiEndpoint("/repos/" + gitHubRepo + "/issues?state=all&direction=asc");list(client, apiEndpoint, pageDataConsumer, logger);if (!dryRun) {@@ -320,7 +305,7 @@ public class GitHubImportUtils {}}- GitHubImportResult result = new GitHubImportResult();+ ImportResult result = new ImportResult();result.nonExistentLogins.addAll(nonExistentLogins);result.nonExistentMilestones.addAll(nonExistentMilestones);result.unmappedIssueLabels.addAll(unmappedIssueLabels);@@ -410,13 +395,6 @@ public class GitHubImportUtils {}}- static Client newClient(GitHubProjectImportSource importSource) {- Client client = ClientBuilder.newClient();- client.property(ClientProperties.FOLLOW_REDIRECTS, true);- client.register(HttpAuthenticationFeature.basic("git", importSource.getAccessToken()));- return client;- }-static interface PageDataConsumer {void consume(List<JsonNode> pageData) throws InterruptedException;diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImportOption.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.javasimilarity index 97%rename from server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImportOption.javarename to server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.javaindex 122e785746..d16f875917 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImportOption.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.java@@ -16,7 +16,7 @@ import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@Editable-public class GitHubIssueImportOption implements Serializable {+public class IssueImportOption implements Serializable {private static final long serialVersionUID = 1L;diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportSource.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportSource.javanew file mode 100644index 0000000000..928e49fb33--- /dev/null+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportSource.java@@ -0,0 +1,76 @@+package io.onedev.server.plugin.imports.github;++import static io.onedev.server.plugin.imports.github.ImportUtils.list;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collections;+import java.util.List;++import javax.ws.rs.client.Client;++import org.hibernate.validator.constraints.NotEmpty;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.fasterxml.jackson.databind.JsonNode;++import io.onedev.server.buildspec.job.log.StyleBuilder;+import io.onedev.server.util.SimpleLogger;+import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.util.WicketUtils;++@Editable+public class IssueImportSource implements Serializable {++ private static final long serialVersionUID = 1L;++ private static final Logger logger = LoggerFactory.getLogger(IssueImportSource.class);++ private String repository;++ @Editable(order=100, name="GitHub Repository", description="Choose GitHub repository to "+ + "import issues from. Available repositories will be populated when above options "+ + "are specified")+ @ChoiceProvider("getRepositoryChoices")+ @NotEmpty+ public String getRepository() {+ return repository;+ }++ public void setRepository(String repository) {+ this.repository = repository;+ }++ @SuppressWarnings("unused")+ private static List<String> getRepositoryChoices() {+ List<String> choices = new ArrayList<>();++ ImportServer server = WicketUtils.getPage().getMetaData(ImportServer.META_DATA_KEY);++ Client client = server.newClient();+ try {+ String apiEndpoint = server.getApiEndpoint("/user/repos");+ SimpleLogger logger = new SimpleLogger() {++ @Override+ public void log(String message, StyleBuilder styleBuilder) {+ IssueImportSource.logger.info(message);+ }++ };+ for (JsonNode repoNode: list(client, apiEndpoint, logger)) {+ String repoName = repoNode.get("name").asText();+ String ownerName = repoNode.get("owner").get("login").asText();+ choices.add(ownerName + "/" + repoName);+ }+ } finally {+ client.close();+ }++ Collections.sort(choices);+ return choices;+ }++}diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectImportOption.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectImportOption.javanew file mode 100644index 0000000000..c8e9b5d758--- /dev/null+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectImportOption.java@@ -0,0 +1,52 @@+package io.onedev.server.plugin.imports.github;++import java.io.Serializable;++import javax.annotation.Nullable;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.RoleManager;+import io.onedev.server.model.Role;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.RoleChoice;++@Editable+public class ProjectImportOption implements Serializable {++ private static final long serialVersionUID = 1L;++ private String publicRoleName;++ private IssueImportOption issueImportOption;++ @Editable(order=100, name="Public Role", description="If specified, all public repositories imported from GitHub "+ + "will use this as default role. Private repositories are not affected")+ @RoleChoice+ @Nullable+ public String getPublicRoleName() {+ return publicRoleName;+ }++ public void setPublicRoleName(String publicRoleName) {+ this.publicRoleName = publicRoleName;+ }++ @Nullable+ public Role getPublicRole() {+ if (publicRoleName != null)+ return OneDev.getInstance(RoleManager.class).find(publicRoleName);+ else+ return null;+ }++ @Editable(order=200, name="Import Issues")+ @Nullable+ public IssueImportOption getIssueImportOption() {+ return issueImportOption;+ }++ public void setIssueImportOption(IssueImportOption issueImportOption) {+ this.issueImportOption = issueImportOption;+ }++}diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImportOption.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectImportSource.javasimilarity index 70%rename from server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImportOption.javarename to server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectImportSource.javaindex 1c76c42bad..2fe876b7a0 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImportOption.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectImportSource.java@@ -1,51 +1,26 @@package io.onedev.server.plugin.imports.github;+import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.annotation.Nullable;import javax.validation.ConstraintValidatorContext;import javax.validation.constraints.Size;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.RoleManager;-import io.onedev.server.model.Role;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.RoleChoice;@Editable@ClassValidating-public class GitHubProjectImportOption extends GitHubIssueImportOption implements Validatable {+public class ProjectImportSource implements Serializable, Validatable {private static final long serialVersionUID = 1L;private List<ProjectMapping> projectMappings = new ArrayList<>();- private String publicRoleName;-- @Editable(order=200, name="Public Role", description="If specified, all public repositories imported from GitHub "- + "will use this as default role. Private repositories are not affected")- @RoleChoice- @Nullable- public String getPublicRoleName() {- return publicRoleName;- }-- public void setPublicRoleName(String publicRoleName) {- this.publicRoleName = publicRoleName;- }-- @Nullable- public Role getPublicRole() {- if (publicRoleName != null)- return OneDev.getInstance(RoleManager.class).find(publicRoleName);- else- return null;- }-@Editable(order=100, name="Repositories to Import")@Size(min=1, max=10000, message="No repositories to import")public List<ProjectMapping> getProjectMappings() {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 477202bdf1..cdccb48a7e 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@@ -18,8 +18,6 @@ public class ProjectMapping implements Serializable {private String oneDevProject;- private boolean importIssues = true;-@Editable(order=100, name="GitHub Repository", description="Specify GitHub repository in form of "+ "<tt>organization/repository</tt>")@NotEmpty@@ -43,13 +41,4 @@ public class ProjectMapping implements Serializable {this.oneDevProject = oneDevProject;}- @Editable(order=400)- public boolean isImportIssues() {- return importIssues;- }-- public void setImportIssues(boolean importIssues) {- this.importIssues = importIssues;- }-}\ No newline at end of filediff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImportSource.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImportSource.javadeleted file mode 100644index 24e760a68d..0000000000--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImportSource.java+++ /dev/null@@ -1,86 +0,0 @@-package io.onedev.server.plugin.imports.gitlab;--import static io.onedev.server.plugin.imports.gitlab.GitLabImportUtils.get;-import static io.onedev.server.plugin.imports.gitlab.GitLabImportUtils.list;--import java.util.ArrayList;-import java.util.Collections;-import java.util.List;--import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;--import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport;-import org.hibernate.validator.constraints.NotEmpty;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.fasterxml.jackson.databind.JsonNode;--import io.onedev.commons.utils.StringUtils;-import io.onedev.server.buildspec.job.log.StyleBuilder;-import io.onedev.server.util.EditContext;-import io.onedev.server.util.SimpleLogger;-import io.onedev.server.util.validation.annotation.ClassValidating;-import io.onedev.server.web.editable.annotation.ChoiceProvider;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-@ClassValidating-public class GitLabIssueImportSource extends GitLabProjectImportSource {-- private static final long serialVersionUID = 1L;-- private static final Logger logger = LoggerFactory.getLogger(GitLabIssueImportSource.class);-- private String project;-- @Editable(order=400, name="GitLab Project", description="Choose GitLab project to "- + "import issues from. Available projects will be populated when above options "- + "are specified")- @ChoiceProvider("getProjectChoices")- @NotEmpty- public String getProject() {- return project;- }-- public void setProject(String project) {- this.project = project;- }-- @SuppressWarnings("unused")- private static List<String> getProjectChoices() {- List<String> choices = new ArrayList<>();-- String apiUrl = (String) EditContext.get().getInputValue(PROP_API_URL);- String accessToken = (String) EditContext.get().getInputValue(PROP_ACCESS_TOKEN);-- if (StringUtils.isNotBlank(apiUrl) && StringUtils.isNotBlank(accessToken)) {- Client client = ClientBuilder.newClient();- client.register(OAuth2ClientSupport.feature(accessToken));- try {- String apiEndpoint = getApiEndpoint(apiUrl, "/user");- SimpleLogger logger = new SimpleLogger() {-- @Override- public void log(String message, StyleBuilder styleBuilder) {- GitLabIssueImportSource.logger.info(message);- }-- };- get(client, apiEndpoint, logger);-- apiEndpoint = getApiEndpoint(apiUrl, "/projects?membership=true");- for (JsonNode projectNode: list(client, apiEndpoint, logger))- choices.add(projectNode.get("path_with_namespace").asText());- } catch (Exception e) {- } finally {- client.close();- }- }-- Collections.sort(choices);- return choices;- }--}diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImporter.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImporter.javaindex 6509547b37..f6e9e420fe 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImporter.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImporter.java@@ -1,19 +1,21 @@package io.onedev.server.plugin.imports.gitlab;-import static io.onedev.server.plugin.imports.gitlab.GitLabImportUtils.NAME;-import static io.onedev.server.plugin.imports.gitlab.GitLabImportUtils.buildImportOption;-import static io.onedev.server.plugin.imports.gitlab.GitLabImportUtils.importIssues;+import static io.onedev.server.plugin.imports.gitlab.ImportUtils.NAME;+import static io.onedev.server.plugin.imports.gitlab.ImportUtils.importIssues;import java.util.HashMap;import java.util.Map;import java.util.Optional;+import com.google.common.collect.Lists;++import io.onedev.server.imports.IssueImporter;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.util.SimpleLogger;-import io.onedev.server.web.page.project.issues.imports.IssueImporter;+import io.onedev.server.web.util.WicketUtils;-public class GitLabIssueImporter extends IssueImporter<GitLabIssueImportSource, GitLabIssueImportOption> {+public class GitLabIssueImporter extends IssueImporter<ImportServer, IssueImportSource, IssueImportOption> {private static final long serialVersionUID = 1L;@@ -23,17 +25,23 @@ public class GitLabIssueImporter extends IssueImporter<GitLabIssueImportSource,}@Override- public GitLabIssueImportOption getImportOption(GitLabIssueImportSource importSource, SimpleLogger logger) {- return buildImportOption(importSource, importSource.getProject(), logger);- }-- @Override- public String doImport(Project project, GitLabIssueImportSource importSource, GitLabIssueImportOption importOption,+ public String doImport(ImportServer where, IssueImportSource what, IssueImportOption how, Project project,boolean dryRun, SimpleLogger logger) {- logger.log("Importing issues from project " + importSource.getProject() + "...");+ logger.log("Importing issues from project " + what.getProject() + "...");Map<String, Optional<User>> users = new HashMap<>();- return importIssues(importSource, importSource.getProject(), project, false, importOption, users, dryRun, logger)+ return importIssues(where, what.getProject(), project, false, how, users, dryRun, logger).toHtml("Issues imported successfully");}++ @Override+ public IssueImportSource getWhat(ImportServer where, SimpleLogger logger) {+ WicketUtils.getPage().setMetaData(ImportServer.META_DATA_KEY, where);+ return new IssueImportSource();+ }++ @Override+ public IssueImportOption getHow(ImportServer where, IssueImportSource what, SimpleLogger logger) {+ return ImportUtils.buildImportOption(where, Lists.newArrayList(what.getProject()), logger);+ }}\ No newline at end of filediff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabPluginModule.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabPluginModule.javaindex aa3dbd53e7..f6a6d90af9 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabPluginModule.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabPluginModule.java@@ -6,10 +6,10 @@ import java.util.Collection;import com.google.common.collect.Lists;import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.server.web.page.project.imports.ProjectImporter;-import io.onedev.server.web.page.project.imports.ProjectImporterContribution;-import io.onedev.server.web.page.project.issues.imports.IssueImporter;-import io.onedev.server.web.page.project.issues.imports.IssueImporterContribution;+import io.onedev.server.imports.IssueImporter;+import io.onedev.server.imports.IssueImporterContribution;+import io.onedev.server.imports.ProjectImporter;+import io.onedev.server.imports.ProjectImporterContribution;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -24,7 +24,7 @@ public class GitLabPluginModule extends AbstractPluginModule {contribute(ProjectImporterContribution.class, new ProjectImporterContribution() {@Override- public Collection<ProjectImporter<? extends Serializable, ? extends Serializable>> getImporters() {+ public Collection<ProjectImporter<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters() {return Lists.newArrayList(new GitLabProjectImporter());}@@ -38,7 +38,7 @@ public class GitLabPluginModule extends AbstractPluginModule {contribute(IssueImporterContribution.class, new IssueImporterContribution() {@Override- public Collection<IssueImporter<? extends Serializable, ? extends Serializable>> getImporters() {+ public Collection<IssueImporter<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters() {return Lists.newArrayList(new GitLabIssueImporter());}diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImportOption.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImportOption.javadeleted file mode 100644index c82bf68fb8..0000000000--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImportOption.java+++ /dev/null@@ -1,89 +0,0 @@-package io.onedev.server.plugin.imports.gitlab;--import java.util.ArrayList;-import java.util.List;--import javax.annotation.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.Size;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.RoleManager;-import io.onedev.server.model.Role;-import io.onedev.server.util.validation.Validatable;-import io.onedev.server.util.validation.annotation.ClassValidating;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.RoleChoice;--@Editable-@ClassValidating-public class GitLabProjectImportOption extends GitLabIssueImportOption implements Validatable {-- private static final long serialVersionUID = 1L;-- private List<ProjectMapping> projectMappings = new ArrayList<>();-- private String publicRoleName;-- @Editable(order=200, name="Public Role", description="If specified, all public and internal projects imported from GitLab "- + "will use this as default role. Private projects are not affected")- @RoleChoice- @Nullable- public String getPublicRoleName() {- return publicRoleName;- }-- public void setPublicRoleName(String publicRoleName) {- this.publicRoleName = publicRoleName;- }-- @Nullable- public Role getPublicRole() {- if (publicRoleName != null)- return OneDev.getInstance(RoleManager.class).find(publicRoleName);- else- return null;- }-- @Editable(order=100, name="Projects to Import")- @Size(min=1, max=10000, message="No projects to import")- public List<ProjectMapping> getProjectMappings() {- return projectMappings;- }-- public void setProjectMappings(List<ProjectMapping> projectMappings) {- this.projectMappings = projectMappings;- }-- @Override- public boolean isValid(ConstraintValidatorContext context) {- boolean isValid = true;- ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- for (int i=0; i<projectMappings.size(); i++) {- if (projectManager.find(projectMappings.get(i).getOneDevProject()) != null) {- context.buildConstraintViolationWithTemplate("Project name already used")- .addPropertyNode("projectMappings")- .addPropertyNode(ProjectMapping.PROP_ONEDEV_PROJECT)- .inIterable().atIndex(i).addConstraintViolation();- isValid = false;- } else {- for (int j=0; j<projectMappings.size(); j++) {- if (j != i && projectMappings.get(j).getOneDevProject().equals(projectMappings.get(i).getOneDevProject())) {- context.buildConstraintViolationWithTemplate("Duplicate project name")- .addPropertyNode("projectMappings")- .addPropertyNode(ProjectMapping.PROP_ONEDEV_PROJECT)- .inIterable().atIndex(i).addConstraintViolation();- isValid = false;- break;- }- }- }- }-- if (!isValid)- context.disableDefaultConstraintViolation();- return isValid;- }--}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.javaindex 1377e1ae1e..fdef174dff 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,11 +1,8 @@package io.onedev.server.plugin.imports.gitlab;-import static io.onedev.server.plugin.imports.gitlab.GitLabImportUtils.NAME;-import static io.onedev.server.plugin.imports.gitlab.GitLabImportUtils.buildImportOption;-import static io.onedev.server.plugin.imports.gitlab.GitLabImportUtils.get;-import static io.onedev.server.plugin.imports.gitlab.GitLabImportUtils.importIssues;-import static io.onedev.server.plugin.imports.gitlab.GitLabImportUtils.list;-import static io.onedev.server.plugin.imports.gitlab.GitLabImportUtils.newClient;+import static io.onedev.server.plugin.imports.gitlab.ImportUtils.NAME;+import static io.onedev.server.plugin.imports.gitlab.ImportUtils.get;+import static io.onedev.server.plugin.imports.gitlab.ImportUtils.list;import java.util.ArrayList;import java.util.Collection;@@ -13,6 +10,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;import java.util.Optional;+import java.util.stream.Collectors;import javax.ws.rs.client.Client;@@ -24,14 +22,14 @@ import com.fasterxml.jackson.databind.JsonNode;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.imports.ProjectImporter;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.SimpleLogger;-import io.onedev.server.web.page.project.imports.ProjectImporter;-public class GitLabProjectImporter extends ProjectImporter<GitLabProjectImportSource, GitLabProjectImportOption> {+public class GitLabProjectImporter extends ProjectImporter<ImportServer, ProjectImportSource, ProjectImportOption> {private static final long serialVersionUID = 1L;@@ -40,42 +38,18 @@ public class GitLabProjectImporter extends ProjectImporter<GitLabProjectImportSoreturn NAME;}- @Override- public GitLabProjectImportOption getImportOption(GitLabProjectImportSource importSource, SimpleLogger logger) {- GitLabProjectImportOption importOption = new GitLabProjectImportOption();- Client client = newClient(importSource);- try {- String apiEndpoint = importSource.getApiEndpoint("/projects?membership=true");- for (JsonNode projectNode: list(client, apiEndpoint, logger)) {- String pathWithNamespace = projectNode.get("path_with_namespace").asText();- ProjectMapping projectMapping = new ProjectMapping();- projectMapping.setGitLabProject(pathWithNamespace);- projectMapping.setOneDevProject(pathWithNamespace.replace('/', '-'));- importOption.getProjectMappings().add(projectMapping);- }- GitLabIssueImportOption issueImportOption = buildImportOption(importSource, null, logger);- importOption.setAssigneesIssueField(issueImportOption.getAssigneesIssueField());- importOption.setClosedIssueState(issueImportOption.getClosedIssueState());- importOption.setIssueLabelMappings(issueImportOption.getIssueLabelMappings());- } finally {- client.close();- }- return importOption;- }-- private List<Milestone> getMilestones(GitLabProjectImportSource importSource,- String groupId, SimpleLogger logger) {- Client client = newClient(importSource);+ private List<Milestone> getMilestones(ImportServer server, String groupId, SimpleLogger logger) {+ Client client = server.newClient();try {List<Milestone> milestones = new ArrayList<>();- String apiEndpoint = importSource.getApiEndpoint("/groups/" + groupId + "/milestones");+ String apiEndpoint = server.getApiEndpoint("/groups/" + groupId + "/milestones");for (JsonNode milestoneNode: list(client, apiEndpoint, logger))milestones.add(getMilestone(milestoneNode));- apiEndpoint = importSource.getApiEndpoint("/groups/" + groupId);+ apiEndpoint = server.getApiEndpoint("/groups/" + groupId);JsonNode groupNode = get(client, apiEndpoint, logger);JsonNode parentIdNode = groupNode.get("parent_id");if (parentIdNode != null && parentIdNode.asText(null) != null)- milestones.addAll(getMilestones(importSource, parentIdNode.asText(), logger));+ milestones.addAll(getMilestones(server, parentIdNode.asText(), logger));return milestones;} finally {client.close();@@ -95,17 +69,17 @@ public class GitLabProjectImporter extends ProjectImporter<GitLabProjectImportSo}@Override- public String doImport(GitLabProjectImportSource importSource, GitLabProjectImportOption importOption,+ public String doImport(ImportServer where, ProjectImportSource what, ProjectImportOption how,boolean dryRun, SimpleLogger logger) {Collection<Long> projectIds = new ArrayList<>();- Client client = newClient(importSource);+ Client client = where.newClient();try {Map<String, Optional<User>> users = new HashMap<>();- GitLabImportResult result = new GitLabImportResult();- for (ProjectMapping projectMapping: importOption.getProjectMappings()) {+ ImportResult result = new ImportResult();+ for (ProjectMapping projectMapping: what.getProjectMappings()) {logger.log("Cloning code from project " + projectMapping.getGitLabProject() + "...");- String apiEndpoint = importSource.getApiEndpoint("/projects/" + projectMapping.getGitLabProject().replace("/", "%2F"));+ String apiEndpoint = where.getApiEndpoint("/projects/" + projectMapping.getGitLabProject().replace("/", "%2F"));JsonNode projectNode = get(client, apiEndpoint, logger);Project project = new Project();project.setName(projectMapping.getOneDevProject());@@ -113,29 +87,29 @@ public class GitLabProjectImporter extends ProjectImporter<GitLabProjectImportSoproject.setIssueManagementEnabled(projectNode.get("issues_enabled").asBoolean());String visibility = projectNode.get("visibility").asText();- if (!visibility.equals("private") && importOption.getPublicRole() != null)- project.setDefaultRole(importOption.getPublicRole());+ if (!visibility.equals("private") && how.getPublicRole() != null)+ project.setDefaultRole(how.getPublicRole());URIBuilder builder = new URIBuilder(projectNode.get("http_url_to_repo").asText());if (!visibility.equals("public"))- builder.setUserInfo("git", importSource.getAccessToken());+ builder.setUserInfo("git", where.getAccessToken());if (!dryRun) {OneDev.getInstance(ProjectManager.class).clone(project, builder.build().toString());projectIds.add(project.getId());}- if (projectMapping.isImportIssues()) {+ if (how.getIssueImportOption() != null) {List<Milestone> milestones = new ArrayList<>();logger.log("Importing milestones from project " + projectMapping.getGitLabProject() + "...");- apiEndpoint = importSource.getApiEndpoint("/projects/"+ apiEndpoint = where.getApiEndpoint("/projects/"+ projectMapping.getGitLabProject().replace("/", "%2F") + "/milestones");for (JsonNode milestoneNode: list(client, apiEndpoint, logger))milestones.add(getMilestone(milestoneNode));JsonNode namespaceNode = projectNode.get("namespace");if (namespaceNode.get("kind").asText().equals("group")) {String groupId = namespaceNode.get("id").asText();- milestones.addAll(getMilestones(importSource, groupId, logger));+ milestones.addAll(getMilestones(where, groupId, logger));}for (Milestone milestone: milestones) {@@ -146,8 +120,8 @@ public class GitLabProjectImporter extends ProjectImporter<GitLabProjectImportSo}logger.log("Importing issues from project " + projectMapping.getGitLabProject() + "...");- GitLabImportResult currentResult = importIssues(importSource, projectMapping.getGitLabProject(),- project, true, importOption, users, dryRun, logger);+ ImportResult currentResult = ImportUtils.importIssues(where, projectMapping.getGitLabProject(),+ project, true, how.getIssueImportOption(), users, dryRun, logger);result.nonExistentLogins.addAll(currentResult.nonExistentLogins);result.nonExistentMilestones.addAll(currentResult.nonExistentMilestones);result.unmappedIssueLabels.addAll(currentResult.unmappedIssueLabels);@@ -165,5 +139,33 @@ public class GitLabProjectImporter extends ProjectImporter<GitLabProjectImportSoclient.close();}}++ @Override+ public ProjectImportSource getWhat(ImportServer where, SimpleLogger logger) {+ ProjectImportSource importSource = new ProjectImportSource();+ Client client = where.newClient();+ try {+ String apiEndpoint = where.getApiEndpoint("/projects?membership=true");+ for (JsonNode projectNode: list(client, apiEndpoint, logger)) {+ String pathWithNamespace = projectNode.get("path_with_namespace").asText();+ ProjectMapping projectMapping = new ProjectMapping();+ projectMapping.setGitLabProject(pathWithNamespace);+ projectMapping.setOneDevProject(pathWithNamespace.replace('/', '-'));+ importSource.getProjectMappings().add(projectMapping);+ }+ } finally {+ client.close();+ }+ return importSource;+ }++ @Override+ public ProjectImportOption getHow(ImportServer where, ProjectImportSource what, SimpleLogger logger) {+ List<String> gitLabProjects = what.getProjectMappings().stream()+ .map(it->it.getGitLabProject()).collect(Collectors.toList());+ ProjectImportOption importOption = new ProjectImportOption();+ importOption.setIssueImportOption(ImportUtils.buildImportOption(where, gitLabProjects, logger));+ return importOption;+ }}\ No newline at end of filediff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabImportResult.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportResult.javasimilarity index 98%rename from server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabImportResult.javarename to server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportResult.javaindex ead9b375e4..d0bc674b68 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabImportResult.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportResult.java@@ -9,7 +9,7 @@ import java.util.Set;import org.unbescape.html.HtmlEscape;-public class GitLabImportResult {+public class ImportResult {private static final int MAX_DISPLAY_ENTRIES = 100;diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImportSource.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.javasimilarity index 87%rename from server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImportSource.javarename to server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.javaindex ea32e75093..90f9340881 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImportSource.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java@@ -9,6 +9,8 @@ import javax.ws.rs.client.Invocation;import javax.ws.rs.client.WebTarget;import javax.ws.rs.core.Response;+import org.apache.wicket.MetaDataKey;+import org.glassfish.jersey.client.ClientProperties;import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport;import org.hibernate.validator.constraints.NotEmpty;@@ -21,10 +23,16 @@ import io.onedev.server.web.editable.annotation.Password;@Editable@ClassValidating-public class GitLabProjectImportSource implements Serializable, Validatable {+public class ImportServer implements Serializable, Validatable {private static final long serialVersionUID = 1L;+ static final MetaDataKey<ImportServer> META_DATA_KEY = new MetaDataKey<ImportServer>() {++ private static final long serialVersionUID = 1L;++ };+static final String PROP_API_URL = "apiUrl";static final String PROP_ACCESS_TOKEN = "accessToken";@@ -55,12 +63,9 @@ public class GitLabProjectImportSource implements Serializable, Validatable {this.accessToken = accessToken;}- public static String getApiEndpoint(String apiUrl, String apiPath) {- return StringUtils.stripEnd(apiUrl, "/") + "/" + StringUtils.stripStart(apiPath, "/");- }public String getApiEndpoint(String apiPath) {- return getApiEndpoint(apiUrl, apiPath);+ return StringUtils.stripEnd(apiUrl, "/") + "/" + StringUtils.stripStart(apiPath, "/");}@Override@@ -107,4 +112,11 @@ public class GitLabProjectImportSource implements Serializable, Validatable {return true;}+ Client newClient() {+ Client client = ClientBuilder.newClient();+ client.property(ClientProperties.FOLLOW_REDIRECTS, true);+ client.register(OAuth2ClientSupport.feature(getAccessToken()));+ return client;+ }+}diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabImportUtils.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.javasimilarity index 88%rename from server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabImportUtils.javarename to server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.javaindex 55e7acba79..83f168611e 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabImportUtils.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.java@@ -5,6 +5,7 @@ import java.io.InputStream;import java.net.URI;import java.net.URISyntaxException;import java.util.ArrayList;+import java.util.Collection;import java.util.HashMap;import java.util.HashSet;import java.util.LinkedHashMap;@@ -19,15 +20,12 @@ import java.util.regex.Pattern;import javax.annotation.Nullable;import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;import javax.ws.rs.client.Invocation;import javax.ws.rs.client.WebTarget;import javax.ws.rs.core.Response;import org.apache.commons.lang3.StringUtils;import org.apache.http.client.utils.URIBuilder;-import org.glassfish.jersey.client.ClientProperties;-import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport;import org.joda.time.format.ISODateTimeFormat;import org.unbescape.html.HtmlEscape;@@ -56,31 +54,21 @@ import io.onedev.server.util.Pair;import io.onedev.server.util.ReferenceMigrator;import io.onedev.server.util.SimpleLogger;-public class GitLabImportUtils {+public class ImportUtils {static final String NAME = "GitLab";- static final int PER_PAGE = 100;+ static final int PER_PAGE = 50;private static final Pattern PATTERN_ATTACHMENT = Pattern.compile("\\[(.+?)\\]\\s*\\((/uploads/.+?)\\)");- static GitLabIssueImportOption buildImportOption(GitLabProjectImportSource importSource,- @Nullable String gitLabProject, SimpleLogger logger) {- GitLabIssueImportOption importOption = new GitLabIssueImportOption();- Client client = newClient(importSource);+ static IssueImportOption buildImportOption(ImportServer server, Collection<String> gitLabProjects, SimpleLogger logger) {+ IssueImportOption importOption = new IssueImportOption();+ Client client = server.newClient();try {- List<String> gitLabProjects = new ArrayList<>();- if (gitLabProject == null) {- String apiEndpoint = importSource.getApiEndpoint("/projects?membership=true");- for (JsonNode projectNode: list(client, apiEndpoint, logger))- gitLabProjects.add(projectNode.get("path_with_namespace").asText());- } else {- gitLabProjects.add(gitLabProject);- }-Set<String> labels = new LinkedHashSet<>();for (String each: gitLabProjects) {- String apiEndpoint = importSource.getApiEndpoint("/projects/" + each.replace("/", "%2F") + "/labels");+ String apiEndpoint = server.getApiEndpoint("/projects/" + each.replace("/", "%2F") + "/labels");for (JsonNode labelNode: list(client, apiEndpoint, logger))labels.add(labelNode.get("name").asText());}@@ -97,7 +85,7 @@ public class GitLabImportUtils {}@Nullable- static User getUser(Client client, GitLabProjectImportSource importSource, Map<String, Optional<User>> users,+ static User getUser(Client client, ImportServer importSource, Map<String, Optional<User>> users,String userId, SimpleLogger logger) {Optional<User> userOpt = users.get(userId);if (userOpt == null) {@@ -117,10 +105,10 @@ public class GitLabImportUtils {return userOpt.orElse(null);}- static GitLabImportResult importIssues(GitLabProjectImportSource importSource, String gitLabProject, Project oneDevProject,- boolean useExistingIssueNumbers, GitLabIssueImportOption importOption, Map<String, Optional<User>> users,+ static ImportResult importIssues(ImportServer server, String gitLabProject, Project oneDevProject,+ boolean useExistingIssueNumbers, IssueImportOption importOption, Map<String, Optional<User>> users,boolean dryRun, SimpleLogger logger) {- Client client = newClient(importSource);+ Client client = server.newClient();try {Set<String> nonExistentMilestones = new HashSet<>();Set<String> nonExistentLogins = new HashSet<>();@@ -236,7 +224,7 @@ public class GitLabImportUtils {}JsonNode authorNode = issueNode.get("author");- User user = getUser(client, importSource, users, authorNode.get("id").asText(), logger);+ User user = getUser(client, server, users, authorNode.get("id").asText(), logger);if (user != null) {issue.setSubmitter(user);} else {@@ -259,7 +247,7 @@ public class GitLabImportUtils {if (issueNode.hasNonNull("assignees")) {for (JsonNode assigneeNode: issueNode.get("assignees"))assigneeNodes.add(assigneeNode);- } else {+ } else if (issueNode.hasNonNull("assignee")) {assigneeNodes.add(issueNode.get("assignee"));}@@ -269,7 +257,7 @@ public class GitLabImportUtils {assigneeField.setName(importOption.getAssigneesIssueField());assigneeField.setType(InputSpec.USER);- user = getUser(client, importSource, users, assigneeNode.get("id").asText(), logger);+ user = getUser(client, server, users, assigneeNode.get("id").asText(), logger);if (user != null) {assigneeField.setValue(user.getName());issue.getFields().add(assigneeField);@@ -342,7 +330,25 @@ public class GitLabImportUtils {issue.getDescription(), attachmentRootUrl, tooLargeAttachments));}- String apiEndpoint = importSource.getApiEndpoint("/projects/" + gitLabProject.replace("/", "%2F")+ String apiEndpoint = server.getApiEndpoint("/projects/" + gitLabProject.replace("/", "%2F")+ + "/issues/" + oldNumber + "/links");+ Map<String, List<String>> links = new LinkedHashMap<>();+ for (JsonNode linkNode: list(client, apiEndpoint, logger)) {+ String linkIssueNumber = linkNode.get("iid").asText();+ if (linkNode.get("references").get("full").asText().equals(gitLabProject + "#" + linkIssueNumber)) {+ String linkType = linkNode.get("link_type").asText();+ List<String> linksOfType = links.get(linkType);+ if (linksOfType == null) {+ linksOfType = new ArrayList<>();+ links.put(linkType, linksOfType);+ }+ linksOfType.add("#" + linkIssueNumber);+ }+ }+ for (Map.Entry<String, List<String>> entry: links.entrySet())+ extraIssueInfo.put(entry.getKey(), joinAsMultilineHtml(entry.getValue()));++ apiEndpoint = server.getApiEndpoint("/projects/" + gitLabProject.replace("/", "%2F")+ "/issues/" + oldNumber + "/notes?sort=asc");for (JsonNode noteNode: list(client, apiEndpoint, logger)) {if (!noteNode.get("system").asBoolean()) {@@ -361,7 +367,7 @@ public class GitLabImportUtils {.toDate());authorNode = noteNode.get("author");- user = getUser(client, importSource, users, authorNode.get("id").asText(), logger);+ user = getUser(client, server, users, authorNode.get("id").asText(), logger);if (user != null) {comment.setUser(user);} else {@@ -408,7 +414,7 @@ public class GitLabImportUtils {};- String apiEndpoint = importSource.getApiEndpoint("/projects/" + gitLabProject.replace("/", "%2F") + "/issues?sort=asc");+ String apiEndpoint = server.getApiEndpoint("/projects/" + gitLabProject.replace("/", "%2F") + "/issues?sort=asc");list(client, apiEndpoint, pageDataConsumer, logger);if (!dryRun) {@@ -427,7 +433,7 @@ public class GitLabImportUtils {}}- GitLabImportResult result = new GitLabImportResult();+ ImportResult result = new ImportResult();result.nonExistentLogins.addAll(nonExistentLogins);result.nonExistentMilestones.addAll(nonExistentMilestones);result.unmappedIssueLabels.addAll(unmappedIssueLabels);@@ -505,13 +511,6 @@ public class GitLabImportUtils {}}- static Client newClient(GitLabProjectImportSource importSource) {- Client client = ClientBuilder.newClient();- client.property(ClientProperties.FOLLOW_REDIRECTS, true);- client.register(OAuth2ClientSupport.feature(importSource.getAccessToken()));- return client;- }-static interface PageDataConsumer {void consume(List<JsonNode> pageData) throws InterruptedException;diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImportOption.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.javasimilarity index 98%rename from server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImportOption.javarename to server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.javaindex 3886ab8266..52e59b4063 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImportOption.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java@@ -16,7 +16,7 @@ import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@Editable-public class GitLabIssueImportOption implements Serializable {+public class IssueImportOption implements Serializable {private static final long serialVersionUID = 1L;diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportSource.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportSource.javanew file mode 100644index 0000000000..fe55d9eebf--- /dev/null+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportSource.java@@ -0,0 +1,70 @@+package io.onedev.server.plugin.imports.gitlab;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.List;++import javax.ws.rs.client.Client;++import org.hibernate.validator.constraints.NotEmpty;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.fasterxml.jackson.databind.JsonNode;++import io.onedev.server.buildspec.job.log.StyleBuilder;+import io.onedev.server.util.SimpleLogger;+import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.util.WicketUtils;++@Editable+public class IssueImportSource implements Serializable {++ private static final long serialVersionUID = 1L;++ private static final Logger logger = LoggerFactory.getLogger(IssueImportSource.class);++ private String project;++ @Editable(order=400, name="GitLab Project", description="Choose GitLab project to import issues from")+ @ChoiceProvider("getProjectChoices")+ @NotEmpty+ public String getProject() {+ return project;+ }++ public void setProject(String project) {+ this.project = project;+ }++ @SuppressWarnings("unused")+ private static List<String> getProjectChoices() {+ List<String> choices = new ArrayList<>();++ ImportServer server = WicketUtils.getPage().getMetaData(ImportServer.META_DATA_KEY);++ Client client = server.newClient();+ try {+ String apiEndpoint = server.getApiEndpoint("/projects?membership=true");+ Collection<JsonNode> projectNodes = ImportUtils.list(client, apiEndpoint, new SimpleLogger() {++ @Override+ public void log(String message, StyleBuilder styleBuilder) {+ logger.info(message);+ }++ });+ for (JsonNode projectNode: projectNodes)+ choices.add(projectNode.get("path_with_namespace").asText());+ } finally {+ client.close();+ }++ Collections.sort(choices);+ return choices;+ }++}diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectImportOption.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectImportOption.javanew file mode 100644index 0000000000..c8cf6579c5--- /dev/null+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectImportOption.java@@ -0,0 +1,52 @@+package io.onedev.server.plugin.imports.gitlab;++import java.io.Serializable;++import javax.annotation.Nullable;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.RoleManager;+import io.onedev.server.model.Role;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.RoleChoice;++@Editable+public class ProjectImportOption implements Serializable {++ private static final long serialVersionUID = 1L;++ private String publicRoleName;++ private IssueImportOption issueImportOption;++ @Editable(order=100, name="Public Role", description="If specified, all public and internal projects imported from GitLab "+ + "will use this as default role. Private projects are not affected")+ @RoleChoice+ @Nullable+ public String getPublicRoleName() {+ return publicRoleName;+ }++ public void setPublicRoleName(String publicRoleName) {+ this.publicRoleName = publicRoleName;+ }++ @Nullable+ public Role getPublicRole() {+ if (publicRoleName != null)+ return OneDev.getInstance(RoleManager.class).find(publicRoleName);+ else+ return null;+ }++ @Editable(order=200, name="Import Issues")+ @Nullable+ public IssueImportOption getIssueImportOption() {+ return issueImportOption;+ }++ public void setIssueImportOption(IssueImportOption issueImportOption) {+ this.issueImportOption = issueImportOption;+ }++}diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImportOption.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectImportSource.javasimilarity index 73%rename from server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImportOption.javarename to server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectImportSource.javaindex 8ab178712b..b7d883d1d5 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImportOption.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectImportSource.java@@ -1,5 +1,6 @@-package io.onedev.server.plugin.imports.youtrack;+package io.onedev.server.plugin.imports.gitlab;+import java.io.Serializable;import java.util.ArrayList;import java.util.List;@@ -14,36 +15,36 @@ import io.onedev.server.web.editable.annotation.Editable;@Editable@ClassValidating-public class YouTrackProjectImportOption extends YouTrackIssueImportOption implements Validatable {+public class ProjectImportSource implements Serializable, Validatable {private static final long serialVersionUID = 1L;- private List<ProjectMapping> projecMappings = new ArrayList<>();+ private List<ProjectMapping> projectMappings = new ArrayList<>();@Editable(order=100, name="Projects to Import")@Size(min=1, max=10000, message="No projects to import")public List<ProjectMapping> getProjectMappings() {- return projecMappings;+ return projectMappings;}public void setProjectMappings(List<ProjectMapping> projectMappings) {- this.projecMappings = projectMappings;+ this.projectMappings = projectMappings;}@Overridepublic boolean isValid(ConstraintValidatorContext context) {boolean isValid = true;ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- for (int i=0; i<projecMappings.size(); i++) {- if (projectManager.find(projecMappings.get(i).getOneDevProject()) != null) {+ for (int i=0; i<projectMappings.size(); i++) {+ if (projectManager.find(projectMappings.get(i).getOneDevProject()) != null) {context.buildConstraintViolationWithTemplate("Project name already used").addPropertyNode("projectMappings").addPropertyNode(ProjectMapping.PROP_ONEDEV_PROJECT).inIterable().atIndex(i).addConstraintViolation();isValid = false;} else {- for (int j=0; j<projecMappings.size(); j++) {- if (j != i && projecMappings.get(j).getOneDevProject().equals(projecMappings.get(i).getOneDevProject())) {+ for (int j=0; j<projectMappings.size(); j++) {+ if (j != i && projectMappings.get(j).getOneDevProject().equals(projectMappings.get(i).getOneDevProject())) {context.buildConstraintViolationWithTemplate("Duplicate project name").addPropertyNode("projectMappings").addPropertyNode(ProjectMapping.PROP_ONEDEV_PROJECT)diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectMapping.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectMapping.javaindex 7c5d46f56f..add759087c 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectMapping.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectMapping.java@@ -18,8 +18,6 @@ public class ProjectMapping implements Serializable {private String oneDevProject;- private boolean importIssues = true;-@Editable(order=100, name="GitLab Project", description="Specify GitLab project in form of "+ "<tt>group/subgroup/project</tt>")@NotEmpty@@ -43,13 +41,4 @@ public class ProjectMapping implements Serializable {this.oneDevProject = oneDevProject;}- @Editable(order=400)- public boolean isImportIssues() {- return importIssues;- }-- public void setImportIssues(boolean importIssues) {- this.importIssues = importIssues;- }-}\ No newline at end of filediff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImportOption.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportOption.javasimilarity index 97%rename from server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImportOption.javarename to server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportOption.javaindex 080239e9d4..0201a13554 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImportOption.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportOption.java@@ -7,7 +7,7 @@ import java.util.List;import io.onedev.server.web.editable.annotation.Editable;@Editable-public class YouTrackIssueImportOption implements Serializable {+public class ImportOption implements Serializable {private static final long serialVersionUID = 1L;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackImportResult.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportResult.javasimilarity index 98%rename from server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackImportResult.javarename to server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportResult.javaindex ef6357e125..cdde89990d 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackImportResult.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportResult.java@@ -10,7 +10,7 @@ import java.util.Set;import org.unbescape.html.HtmlEscape;-public class YouTrackImportResult {+public class ImportResult {private static final int MAX_DISPLAY_ENTRIES = 100;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImportSource.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.javasimilarity index 70%rename from server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImportSource.javarename to server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.javaindex 5968f61249..df2ccfb803 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImportSource.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java@@ -1,6 +1,9 @@package io.onedev.server.plugin.imports.youtrack;import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collections;+import java.util.List;import javax.validation.ConstraintValidatorContext;import javax.ws.rs.client.Client;@@ -9,13 +12,18 @@ import javax.ws.rs.client.Invocation;import javax.ws.rs.client.WebTarget;import javax.ws.rs.core.Response;+import org.apache.wicket.MetaDataKey;import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;import org.hibernate.validator.constraints.NotEmpty;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;import com.fasterxml.jackson.databind.JsonNode;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.buildspec.job.log.StyleBuilder;import io.onedev.server.util.JerseyUtils;+import io.onedev.server.util.SimpleLogger;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Editable;@@ -23,10 +31,18 @@ import io.onedev.server.web.editable.annotation.Password;@Editable@ClassValidating-public class YouTrackProjectImportSource implements Serializable, Validatable {+public class ImportServer implements Serializable, Validatable {private static final long serialVersionUID = 1L;+ private static final Logger logger = LoggerFactory.getLogger(ImportServer.class);++ static final MetaDataKey<ImportServer> META_DATA_KEY = new MetaDataKey<ImportServer>() {++ private static final long serialVersionUID = 1L;++ };+protected static final String PROP_API_URL = "apiUrl";protected static final String PROP_USER_NAME = "userName";@@ -75,12 +91,8 @@ public class YouTrackProjectImportSource implements Serializable, Validatable {this.password = password;}- static String getApiEndpoint(String apiUrl, String apiPath) {- return StringUtils.stripEnd(apiUrl, "/") + "/" + StringUtils.stripStart(apiPath, "/");- }-public String getApiEndpoint(String apiPath) {- return getApiEndpoint(apiUrl, apiPath);+ return StringUtils.stripEnd(apiUrl, "/") + "/" + StringUtils.stripStart(apiPath, "/");}@Override@@ -92,6 +104,12 @@ public class YouTrackProjectImportSource implements Serializable, Validatable {WebTarget target = client.target(apiEndpoint);Invocation.Builder builder = target.request();try (Response response = builder.get()) {+ if (!response.getMediaType().toString().startsWith("application/json")) {+ context.disableDefaultConstraintViolation();+ context.buildConstraintViolationWithTemplate("This does not seem like a YouTrack api url")+ .addPropertyNode(PROP_API_URL).addConstraintViolation();+ return false;+ }String errorMessage = JerseyUtils.checkStatus(apiEndpoint, response);if (errorMessage != null) {context.disableDefaultConstraintViolation();@@ -125,4 +143,34 @@ public class YouTrackProjectImportSource implements Serializable, Validatable {return true;}+ List<String> getProjectChoices() {+ List<String> choices = new ArrayList<>();++ Client client = newClient();+ try {+ SimpleLogger logger = new SimpleLogger() {++ @Override+ public void log(String message, StyleBuilder styleBuilder) {+ ImportServer.logger.info(message);+ }++ };+ String apiEndpoint = getApiEndpoint("/admin/projects?fields=name");+ for (JsonNode projectNode: ImportUtils.list(client, apiEndpoint, logger))+ choices.add(projectNode.get("name").asText());+ } finally {+ client.close();+ }++ Collections.sort(choices);+ return choices;+ }++ Client newClient() {+ Client client = ClientBuilder.newClient();+ client.register(HttpAuthenticationFeature.basic(getUserName(), getPassword()));+ return client;+ }+}diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackImportUtils.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.javasimilarity index 94%rename from server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackImportUtils.javarename to server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.javaindex 4f574ce528..cb2b49a36e 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackImportUtils.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java@@ -5,6 +5,7 @@ import java.io.InputStream;import java.net.URI;import java.net.URISyntaxException;import java.util.ArrayList;+import java.util.Collection;import java.util.Date;import java.util.HashMap;import java.util.HashSet;@@ -17,14 +18,12 @@ import java.util.concurrent.atomic.AtomicInteger;import javax.annotation.Nullable;import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;import javax.ws.rs.client.Invocation;import javax.ws.rs.client.WebTarget;import javax.ws.rs.core.Response;import org.apache.commons.lang3.StringUtils;import org.apache.http.client.utils.URIBuilder;-import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;import org.unbescape.html.HtmlEscape;import com.fasterxml.jackson.databind.JsonNode;@@ -60,32 +59,19 @@ import io.onedev.server.util.Pair;import io.onedev.server.util.ReferenceMigrator;import io.onedev.server.util.SimpleLogger;-public class YouTrackImportUtils {+public class ImportUtils {static final String NAME = "YouTrack";- static final int PER_PAGE = 100;+ static final int PER_PAGE = 50;- static YouTrackIssueImportOption buildImportOption(YouTrackProjectImportSource importSource, @Nullable String youTrackProjectId, SimpleLogger logger) {- YouTrackIssueImportOption importOption = new YouTrackIssueImportOption();- Client client = newClient(importSource);+ static ImportOption buildImportOption(ImportServer server, Collection<JsonNode> projectNodes, SimpleLogger logger) {+ ImportOption importOption = new ImportOption();+ Client client = server.newClient();try {- String fields = "customFields(field(name),bundle(values(name)))";-Set<String> youTrackIssueStates = new LinkedHashSet<>();Set<String> youTrackIssueFields = new LinkedHashSet<>();- List<JsonNode> projectNodes = new ArrayList<>();-- if (youTrackProjectId != null) {- String apiEndpoint = importSource.getApiEndpoint("/admin/projects/" + youTrackProjectId + "?fields=" + fields);- projectNodes.add(get(client, apiEndpoint, logger));- } else {- String apiEndpoint = importSource.getApiEndpoint("/admin/projects?fields=" + fields);- for (JsonNode projectNode: list(client, apiEndpoint, logger))- projectNodes.add(projectNode);- }-for (JsonNode projectNode: projectNodes) {for (JsonNode customFieldNode: projectNode.get("customFields")) {String fieldName = customFieldNode.get("field").get("name").asText();@@ -119,7 +105,7 @@ public class YouTrackImportUtils {importOption.getIssueFieldMappings().add(mapping);}- String apiEndpoint = importSource.getApiEndpoint("/issueTags?fields=name");+ String apiEndpoint = server.getApiEndpoint("/issueTags?fields=name");for (JsonNode tagNode: list(client, apiEndpoint, logger)) {IssueTagMapping mapping = new IssueTagMapping();mapping.setYouTrackIssueTag(tagNode.get("name").asText());@@ -132,12 +118,12 @@ public class YouTrackImportUtils {return importOption;}- static YouTrackImportResult importIssues(YouTrackProjectImportSource importSource, String youTrackProjectId,- Project oneDevProject, boolean useExistingIssueNumbers, YouTrackIssueImportOption importOption,+ static ImportResult importIssues(ImportServer server, String youTrackProjectId,+ Project oneDevProject, boolean useExistingIssueNumbers, ImportOption importOption,boolean dryRun, SimpleLogger logger) {- Client client = newClient(importSource);+ Client client = server.newClient();try {- String apiEndpoint = importSource.getApiEndpoint("/admin/projects/" + youTrackProjectId + "?fields=shortName");+ String apiEndpoint = server.getApiEndpoint("/admin/projects/" + youTrackProjectId + "?fields=shortName");String youTrackProjectShortName = get(client, apiEndpoint, logger).get("shortName").asText();Map<String, String> stateMappings = new HashMap<>();@@ -218,7 +204,7 @@ public class YouTrackImportUtils {throw new ExplicitException("Unexpected attachment url: " + attachmentUrl);attachmentUrl = attachmentUrl.substring("/api".length());- String endpoint = importSource.getApiEndpoint(attachmentUrl);+ String endpoint = server.getApiEndpoint(attachmentUrl);WebTarget target = client.target(endpoint);Invocation.Builder builder = target.request();try (Response response = builder.get()) {@@ -793,7 +779,7 @@ public class YouTrackImportUtils {};- apiEndpoint = importSource.getApiEndpoint("/admin/projects/" + youTrackProjectId + "/issues?fields=" + fields);+ apiEndpoint = server.getApiEndpoint("/admin/projects/" + youTrackProjectId + "/issues?fields=" + fields);list(client, apiEndpoint, pageDataConsumer, logger);if (!dryRun) {@@ -812,7 +798,7 @@ public class YouTrackImportUtils {}}- YouTrackImportResult result = new YouTrackImportResult();+ ImportResult result = new ImportResult();result.mismatchedIssueFields.putAll(mismatchedIssueFields);result.nonExistentLogins.addAll(nonExistentLogins);result.tooLargeAttachments.addAll(tooLargeAttachments);@@ -882,12 +868,6 @@ public class YouTrackImportUtils {}}- static Client newClient(YouTrackProjectImportSource importSource) {- Client client = ClientBuilder.newClient();- client.register(HttpAuthenticationFeature.basic(importSource.getUserName(), importSource.getPassword()));- return client;- }-private static interface PageDataConsumer {void consume(List<JsonNode> pageData) throws InterruptedException;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueImportSource.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueImportSource.javanew file mode 100644index 0000000000..bff3d7a5cb--- /dev/null+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueImportSource.java@@ -0,0 +1,37 @@+package io.onedev.server.plugin.imports.youtrack;++import java.io.Serializable;+import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.util.WicketUtils;++@Editable+public class IssueImportSource implements Serializable {++ private static final long serialVersionUID = 1L;++ private String project;++ @Editable(order=100, name="YouTrack Project", description="Choose YouTrack project to "+ + "import issues from. Available projects will be populated when above options "+ + "are specified")+ @ChoiceProvider("getProjectChoices")+ @NotEmpty+ public String getProject() {+ return project;+ }++ public void setProject(String project) {+ this.project = project;+ }++ @SuppressWarnings("unused")+ private static List<String> getProjectChoices() {+ return WicketUtils.getPage().getMetaData(ImportServer.META_DATA_KEY).getProjectChoices();+ }++}diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ProjectImportSource.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ProjectImportSource.javanew file mode 100644index 0000000000..5ebb00c016--- /dev/null+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ProjectImportSource.java@@ -0,0 +1,25 @@+package io.onedev.server.plugin.imports.youtrack;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class ProjectImportSource implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<ProjectMapping> projectMappings = new ArrayList<>();++ @Editable(order=100, name="Projects to Import")+ public List<ProjectMapping> getProjectMappings() {+ return projectMappings;+ }++ public void setProjectMappings(List<ProjectMapping> projectMappings) {+ this.projectMappings = projectMappings;+ }++}diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ProjectMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ProjectMapping.javaindex 9f302f2399..37279ea4a9 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ProjectMapping.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ProjectMapping.java@@ -1,11 +1,14 @@package io.onedev.server.plugin.imports.youtrack;import java.io.Serializable;+import java.util.List;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.util.validation.annotation.ProjectName;+import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.util.WicketUtils;@Editablepublic class ProjectMapping implements Serializable {@@ -20,6 +23,7 @@ public class ProjectMapping implements Serializable {@Editable(order=100, name="YouTrack Project", description="Issues will be imported from specified "+ "YouTrack project")+ @ChoiceProvider("getProjectChoices")@NotEmptypublic String getYouTrackProject() {return youTrackProject;@@ -41,4 +45,9 @@ public class ProjectMapping implements Serializable {this.oneDevProject = oneDevProject;}+ @SuppressWarnings("unused")+ private static List<String> getProjectChoices() {+ return WicketUtils.getPage().getMetaData(ImportServer.META_DATA_KEY).getProjectChoices();+ }+}\ No newline at end of filediff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImportSource.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImportSource.javadeleted file mode 100644index fb831fa8e6..0000000000--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImportSource.java+++ /dev/null@@ -1,86 +0,0 @@-package io.onedev.server.plugin.imports.youtrack;--import static io.onedev.server.plugin.imports.youtrack.YouTrackImportUtils.get;-import static io.onedev.server.plugin.imports.youtrack.YouTrackImportUtils.list;--import java.util.ArrayList;-import java.util.Collections;-import java.util.List;--import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;--import org.apache.commons.lang3.StringUtils;-import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;-import org.hibernate.validator.constraints.NotEmpty;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.fasterxml.jackson.databind.JsonNode;--import io.onedev.server.buildspec.job.log.StyleBuilder;-import io.onedev.server.util.EditContext;-import io.onedev.server.util.SimpleLogger;-import io.onedev.server.web.editable.annotation.ChoiceProvider;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-public class YouTrackIssueImportSource extends YouTrackProjectImportSource {-- private static final long serialVersionUID = 1L;-- private static final Logger logger = LoggerFactory.getLogger(YouTrackIssueImportSource.class);-- private String project;-- @Editable(order=400, name="YouTrack Project", description="Choose YouTrack project to "- + "import issues from. Available projects will be populated when above options "- + "are specified")- @ChoiceProvider("getProjectChoices")- @NotEmpty- public String getProject() {- return project;- }-- public void setProject(String project) {- this.project = project;- }-- @SuppressWarnings("unused")- private static List<String> getProjectChoices() {- List<String> choices = new ArrayList<>();-- String apiUrl = (String) EditContext.get().getInputValue(PROP_API_URL);- String userName = (String) EditContext.get().getInputValue(PROP_USER_NAME);- String password = (String) EditContext.get().getInputValue(PROP_PASSWORD);-- if (StringUtils.isNotBlank(apiUrl) && StringUtils.isNotBlank(userName)- && StringUtils.isNotBlank(password)) {- Client client = ClientBuilder.newClient();- try {- client.register(HttpAuthenticationFeature.basic(userName, password));- SimpleLogger logger = new SimpleLogger() {-- @Override- public void log(String message, StyleBuilder styleBuilder) {- YouTrackIssueImportSource.logger.info(message);- }-- };- String apiEndpoint = getApiEndpoint(apiUrl, "/users/me?fields=guest");- if (!get(client, apiEndpoint, logger).get("guest").asBoolean()) {- apiEndpoint = getApiEndpoint(apiUrl, "/admin/projects?fields=name");- for (JsonNode projectNode: list(client, apiEndpoint, logger))- choices.add(projectNode.get("name").asText());- }- } catch (Exception e) {- } finally {- client.close();- }- }-- Collections.sort(choices);- return choices;- }--}diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImporter.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImporter.javaindex 5e0c0273fd..7c6367ce86 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImporter.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImporter.java@@ -1,21 +1,23 @@package io.onedev.server.plugin.imports.youtrack;-import static io.onedev.server.plugin.imports.youtrack.YouTrackImportUtils.NAME;-import static io.onedev.server.plugin.imports.youtrack.YouTrackImportUtils.buildImportOption;-import static io.onedev.server.plugin.imports.youtrack.YouTrackImportUtils.importIssues;-import static io.onedev.server.plugin.imports.youtrack.YouTrackImportUtils.list;-import static io.onedev.server.plugin.imports.youtrack.YouTrackImportUtils.newClient;+import static io.onedev.server.plugin.imports.youtrack.ImportUtils.NAME;+import static io.onedev.server.plugin.imports.youtrack.ImportUtils.importIssues;+import static io.onedev.server.plugin.imports.youtrack.ImportUtils.list;++import java.util.ArrayList;+import java.util.List;import javax.ws.rs.client.Client;import com.fasterxml.jackson.databind.JsonNode;import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.imports.IssueImporter;import io.onedev.server.model.Project;import io.onedev.server.util.SimpleLogger;-import io.onedev.server.web.page.project.issues.imports.IssueImporter;+import io.onedev.server.web.util.WicketUtils;-public class YouTrackIssueImporter extends IssueImporter<YouTrackIssueImportSource, YouTrackIssueImportOption> {+public class YouTrackIssueImporter extends IssueImporter<ImportServer, IssueImportSource, ImportOption> {private static final long serialVersionUID = 1L;@@ -24,34 +26,48 @@ public class YouTrackIssueImporter extends IssueImporter<YouTrackIssueImportSourreturn NAME;}- private String getYouTrackProjectId(YouTrackProjectImportSource importSource,- String youTrackProjectName, SimpleLogger logger) {- Client client = newClient(importSource);+ @Override+ public String doImport(ImportServer where, IssueImportSource what, ImportOption how, Project project,+ boolean dryRun, SimpleLogger logger) {+ logger.log("Importing issues from '" + what.getProject() + "'...");+ Client client = where.newClient();try {- String apiEndpoint = importSource.getApiEndpoint("/admin/projects?fields=id,name");+ String apiEndpoint = where.getApiEndpoint("/admin/projects?fields=id,name");for (JsonNode projectNode: list(client, apiEndpoint, logger)) {- if (youTrackProjectName.equals(projectNode.get("name").asText()))- return projectNode.get("id").asText();+ if (what.getProject().equals(projectNode.get("name").asText())) {+ ImportResult result = importIssues(where, projectNode.get("id").asText(),+ project, false, how, dryRun, logger);+ return result.toHtml("Issues imported successfully");+ }}- throw new ExplicitException("Unable to find YouTrack project: " + youTrackProjectName);+ throw new ExplicitException("Unable to find YouTrack project: " + what.getProject());} finally {client.close();}}-+@Override- public YouTrackIssueImportOption getImportOption(YouTrackIssueImportSource importSource, SimpleLogger logger) {- String youTrackProjectId = getYouTrackProjectId(importSource, importSource.getProject(), logger);- return buildImportOption(importSource, youTrackProjectId, logger);+ public IssueImportSource getWhat(ImportServer where, SimpleLogger logger) {+ WicketUtils.getPage().setMetaData(ImportServer.META_DATA_KEY, where);+ return new IssueImportSource();}-+@Override- public String doImport(Project project, YouTrackIssueImportSource importSource,- YouTrackIssueImportOption importOption, boolean dryRun, SimpleLogger logger) {- logger.log("Importing issues from '" + importSource.getProject() + "'...");- String youTrackProjectId = getYouTrackProjectId(importSource, importSource.getProject(), logger);- return importIssues(importSource, youTrackProjectId, project, false, importOption, dryRun, logger)- .toHtml("Issues imported successfully");+ public ImportOption getHow(ImportServer where, IssueImportSource what, SimpleLogger logger) {+ Client client = where.newClient();+ try {+ String apiEndpoint = where.getApiEndpoint("/admin/projects?fields=id,name,customFields(field(name),bundle(values(name)))");+ for (JsonNode projectNode: list(client, apiEndpoint, logger)) {+ if (what.getProject().equals(projectNode.get("name").asText())) {+ List<JsonNode> projectNodes = new ArrayList<>();+ projectNodes.add(projectNode);+ return ImportUtils.buildImportOption(where, projectNodes, logger);+ }+ }+ throw new ExplicitException("Unable to find YouTrack project: " + what.getProject());+ } finally {+ client.close();+ }}}\ No newline at end of filediff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackPluginModule.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackPluginModule.javaindex a789f9da0d..af95dd6490 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackPluginModule.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackPluginModule.java@@ -6,8 +6,10 @@ import java.util.Collection;import com.google.common.collect.Lists;import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.server.web.page.project.issues.imports.IssueImporter;-import io.onedev.server.web.page.project.issues.imports.IssueImporterContribution;+import io.onedev.server.imports.IssueImporter;+import io.onedev.server.imports.IssueImporterContribution;+import io.onedev.server.imports.ProjectImporter;+import io.onedev.server.imports.ProjectImporterContribution;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -20,16 +22,30 @@ public class YouTrackPluginModule extends AbstractPluginModule {super.configure();// put your guice bindings here+ contribute(ProjectImporterContribution.class, new ProjectImporterContribution() {++ @Override+ public Collection<ProjectImporter<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters() {+ return Lists.newArrayList(new YouTrackProjectImporter());+ }++ @Override+ public int getOrder() {+ return 400;+ }++ });+contribute(IssueImporterContribution.class, new IssueImporterContribution() {@Override- public Collection<IssueImporter<? extends Serializable, ? extends Serializable>> getImporters() {+ public Collection<IssueImporter<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters() {return Lists.newArrayList(new YouTrackIssueImporter());}@Overridepublic int getOrder() {- return 300;+ return 400;}});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.javanew file mode 100644index 0000000000..5d29f7bf0f--- /dev/null+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImporter.java@@ -0,0 +1,116 @@+package io.onedev.server.plugin.imports.youtrack;++import static io.onedev.server.plugin.imports.youtrack.ImportUtils.list;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.Set;+import java.util.stream.Collectors;++import javax.ws.rs.client.Client;++import com.fasterxml.jackson.databind.JsonNode;++import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.imports.ProjectImporter;+import io.onedev.server.model.Project;+import io.onedev.server.storage.StorageManager;+import io.onedev.server.util.SimpleLogger;+import io.onedev.server.web.util.WicketUtils;++public class YouTrackProjectImporter extends ProjectImporter<ImportServer, ProjectImportSource, ImportOption> {++ private static final long serialVersionUID = 1L;++ @Override+ public String getName() {+ return ImportUtils.NAME;+ }++ @Override+ public String doImport(ImportServer where, ProjectImportSource what, ImportOption how,+ boolean dryRun, SimpleLogger logger) {+ Map<String, String> youTrackProjectIds = new HashMap<>();+ Map<String, String> youTrackProjectDescriptions = new HashMap<>();+ Collection<Long> projectIds = new ArrayList<>();++ Client client = where.newClient();+ try {+ String apiEndpoint = where.getApiEndpoint("/admin/projects?fields=id,name,description");+ for (JsonNode projectNode: list(client, apiEndpoint, logger)) {+ String projectName = projectNode.get("name").asText();+ youTrackProjectIds.put(projectName, projectNode.get("id").asText());+ youTrackProjectDescriptions.put(projectName, projectNode.get("description").asText(null));+ }++ ImportResult result = new ImportResult();++ for (ProjectMapping projectMapping: what.getProjectMappings()) {+ logger.log("Importing project '" + projectMapping.getYouTrackProject() + "'...");++ String youTrackProjectId = youTrackProjectIds.get(projectMapping.getYouTrackProject());+ if (youTrackProjectId == null)+ throw new ExplicitException("Unable to find YouTrack project: " + projectMapping.getYouTrackProject());++ Project project = new Project();+ project.setName(projectMapping.getOneDevProject());+ project.setDescription(youTrackProjectDescriptions.get(projectMapping.getYouTrackProject()));+ project.setIssueManagementEnabled(true);++ if (!dryRun) {+ OneDev.getInstance(ProjectManager.class).create(project);+ projectIds.add(project.getId());+ }++ ImportResult currentResult = ImportUtils.importIssues(where, youTrackProjectId, project, true,+ how, dryRun, logger);+ result.mismatchedIssueFields.putAll(currentResult.mismatchedIssueFields);+ result.nonExistentLogins.addAll(currentResult.nonExistentLogins);+ result.tooLargeAttachments.addAll(currentResult.tooLargeAttachments);+ result.unmappedIssueFields.addAll(currentResult.unmappedIssueFields);+ result.unmappedIssueStates.addAll(currentResult.unmappedIssueStates);+ result.unmappedIssueTags.addAll(currentResult.unmappedIssueTags);+ }++ return result.toHtml("Projects imported successfully");+ } catch (Exception e) {+ for (Long projectId: projectIds)+ OneDev.getInstance(StorageManager.class).deleteProjectDir(projectId);+ throw ExceptionUtils.unchecked(e);+ } finally {+ client.close();+ }+ }++ @Override+ public ProjectImportSource getWhat(ImportServer where, SimpleLogger logger) {+ WicketUtils.getPage().setMetaData(ImportServer.META_DATA_KEY, where);+ return new ProjectImportSource();+ }++ @Override+ public ImportOption getHow(ImportServer where, ProjectImportSource what, SimpleLogger logger) {+ Client client = where.newClient();+ try {+ List<JsonNode> projectNodes = new ArrayList<>();+ String apiEndpoint = where.getApiEndpoint("/admin/projects?fields=id,name,customFields(field(name),bundle(values(name)))");+ Set<String> projectNames = what.getProjectMappings().stream()+ .map(it->it.getYouTrackProject()).collect(Collectors.toSet());+ for (JsonNode projectNode: list(client, apiEndpoint, logger)) {+ if (projectNames.contains(projectNode.get("name").asText()))+ projectNodes.add(projectNode);+ }++ return ImportUtils.buildImportOption(where, projectNodes, logger);+ } finally {+ client.close();+ }+ }++}\ No newline at end of file