The Unified and Autonomous Development Platform
Fix issue #369 - Import code and issues from Gitea
Robin Shenb34848eb9d10
diff --git a/server-core/src/main/java/io/onedev/server/imports/Importer.java b/server-core/src/main/java/io/onedev/server/imports/Importer.javanew file mode 100644index 0000000000..2108262788--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/imports/Importer.java@@ -0,0 +1,45 @@+package io.onedev.server.imports;++import java.io.Serializable;+import java.util.List;++import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.util.SimpleLogger;++public abstract class Importer<Where extends Serializable, What extends Serializable, How extends Serializable> implements Serializable {++ private static final long serialVersionUID = 1L;++ private final Class<Where> whereClass;++ private final Class<What> whatClass;++ private final Class<How> howClass;++ @SuppressWarnings("unchecked")+ public Importer() {+ List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(Importer.class, getClass());+ whereClass = (Class<Where>) typeArguments.get(0);+ whatClass = (Class<What>) typeArguments.get(1);+ howClass = (Class<How>) typeArguments.get(2);+ }++ public Class<Where> getWhereClass() {+ return whereClass;+ }++ public Class<What> getWhatClass() {+ return whatClass;+ }++ public Class<How> getHowClass() {+ return howClass;+ }++ public abstract String getName();++ public abstract What getWhat(Where where, SimpleLogger logger);++ public abstract How getHow(Where where, What what, SimpleLogger logger);++}diff --git a/server-core/src/main/java/io/onedev/server/imports/IssueImporter2.java b/server-core/src/main/java/io/onedev/server/imports/IssueImporter2.javanew file mode 100644index 0000000000..73dd8c67f3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/imports/IssueImporter2.java@@ -0,0 +1,19 @@+package io.onedev.server.imports;++import java.io.Serializable;++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>+ extends Importer<Where, What, How> {++ private static final long serialVersionUID = 1L;++ @Nullable+ public abstract String doImport(Where where, What what, How how, Project project,+ boolean dryRun, SimpleLogger logger);++}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.javanew file mode 100644index 0000000000..62f60df065--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/imports/IssueImporterContribution2.java@@ -0,0 +1,15 @@+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/ProjectImporter2.javanew file mode 100644index 0000000000..50925123a4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/imports/ProjectImporter2.java@@ -0,0 +1,18 @@+package io.onedev.server.imports;++import java.io.Serializable;++import javax.annotation.Nullable;++import io.onedev.server.util.SimpleLogger;++public abstract class ProjectImporter2<Where extends Serializable, What extends Serializable, How extends Serializable>+ extends Importer<Where, What, How> {++ private static final long serialVersionUID = 1L;++ @Nullable+ public abstract String doImport(Where where, What what, How how,+ boolean dryRun, SimpleLogger logger);++}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.javanew file mode 100644index 0000000000..7e4e55b67f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/imports/ProjectImporterContribution2.java@@ -0,0 +1,15 @@+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/imports/ImportPanel.html b/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.htmlnew file mode 100644index 0000000000..7df986fcf4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.html@@ -0,0 +1,10 @@+<wicket:panel>+ <form wicket:id="form">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <input wicket:id="back" type="button" class="btn btn-light-primary mr-1" value="Back">+ <input wicket:id="next" type="submit" class="btn btn-primary mr-1" value="Next">+ <input wicket:id="dryRun" type="submit" class="btn btn-light-primary mr-1" value="Dry Run">+ <input wicket:id="import" type="submit" class="btn btn-primary mr-1" value="Import">+ </form>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.java b/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.javanew file mode 100644index 0000000000..39a6023b7c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.java@@ -0,0 +1,202 @@+package io.onedev.server.web.component.imports;++import java.io.Serializable;+import java.util.concurrent.Callable;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import io.onedev.server.OneDev;+import io.onedev.server.buildspec.job.log.StyleBuilder;+import io.onedev.server.imports.Importer;+import io.onedev.server.persistence.TransactionManager;+import io.onedev.server.util.SimpleLogger;+import io.onedev.server.web.ajaxlistener.ShowGlobalAjaxIndicatorListener;+import io.onedev.server.web.component.taskbutton.TaskButton;+import io.onedev.server.web.editable.BeanContext;++@SuppressWarnings("serial")+public abstract class ImportPanel<Where extends Serializable, What extends Serializable, How extends Serializable>+ extends Panel {++ private static final Logger logger = LoggerFactory.getLogger(ImportPanel.class);++ private Where where;++ private What what;++ private How how;++ public ImportPanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ try {+ where = getImporter().getWhereClass().newInstance();+ } catch (InstantiationException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }++ Form<?> form = new Form<Void>("form");+ form.add(new FencedFeedbackPanel("feedback", form));+ form.add(BeanContext.edit("editor", where));++ form.add(new AjaxLink<Void>("back") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (how != null) {+ how = null;+ form.replace(BeanContext.edit("editor", what));+ form.get("import").setVisible(false);+ form.get("dryRun").setVisible(false);+ } else {+ what = null;+ form.replace(BeanContext.edit("editor", where));+ setVisible(false);+ }++ form.get("next").setVisible(true);++ target.add(form);+ }++ }.setVisible(false));++ form.add(new AjaxButton("next") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ShowGlobalAjaxIndicatorListener());+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ if (what == null) {+ what = getImporter().getWhat(where, new SimpleLogger() {++ @Override+ public void log(String message, StyleBuilder styleBuilder) {+ logger.info(message);+ }++ });+ form.replace(BeanContext.edit("editor", what));+ form.get("back").setVisible(true);+ } else {+ how = getImporter().getHow(where, what, new SimpleLogger() {++ @Override+ public void log(String message, StyleBuilder styleBuilder) {+ logger.info(message);+ }++ });+ form.replace(BeanContext.edit("editor", how));+ form.get("next").setVisible(false);+ form.get("import").setVisible(true);+ form.get("dryRun").setVisible(true);+ }++ target.add(form);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });++ form.add(new TaskButton("import") {++ @Override+ protected void onCompleted(AjaxRequestTarget target, boolean successful) {+ super.onCompleted(target, successful);++ if (successful)+ onImportSuccessful(target);+ }++ @Override+ protected String runTask(SimpleLogger logger) {+ return OneDev.getInstance(TransactionManager.class).call(new Callable<String>() {++ @Override+ public String call() throws Exception {+ return doImport(where, what, how, false, logger);+ }++ });+ }++ @Override+ protected String getTitle() {+ return "Importing from " + getImporter().getName();+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ }.setVisible(false));++ form.add(new TaskButton("dryRun") {++ @Override+ protected String runTask(SimpleLogger logger) {+ return OneDev.getInstance(TransactionManager.class).call(new Callable<String>() {++ @Override+ public String call() throws Exception {+ return doImport(where, what, how, true, logger);+ }++ });+ }++ @Override+ protected String getTitle() {+ return "Test importing from " + getImporter().getName();+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ }.setVisible(false));++ form.setOutputMarkupId(true);+ add(form);+ }++ protected abstract Importer<Where, What, How> getImporter();++ @Nullable+ protected abstract String doImport(Where where, What what, How how,+ boolean dryRun, SimpleLogger logger);++ protected abstract void onImportSuccessful(AjaxRequestTarget target);++}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 337dd8ee2c..494c603ab0 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,6 +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.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -104,8 +106,6 @@ import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.page.project.issues.create.NewIssuePage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.issues.imports.IssueImportPage;-import io.onedev.server.web.page.project.issues.imports.IssueImporter;-import io.onedev.server.web.page.project.issues.imports.IssueImporterContribution;import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.LoadableDetachableDataProvider;@@ -312,24 +312,24 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected List<MenuItem> getMenuItems(FloatingPanel dropdown) {- Collection<IssueImporter<? extends Serializable, ? extends Serializable>> importers = new ArrayList<>();+ Collection<IssueImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable>> importers = new ArrayList<>();- List<IssueImporterContribution> contributions =- new ArrayList<>(OneDev.getExtensions(IssueImporterContribution.class));- Collections.sort(contributions, new Comparator<IssueImporterContribution>() {+ List<IssueImporterContribution2> contributions =+ new ArrayList<>(OneDev.getExtensions(IssueImporterContribution2.class));+ Collections.sort(contributions, new Comparator<IssueImporterContribution2>() {@Override- public int compare(IssueImporterContribution o1, IssueImporterContribution o2) {+ public int compare(IssueImporterContribution2 o1, IssueImporterContribution2 o2) {return o1.getOrder() - o2.getOrder();}});- for (IssueImporterContribution contribution: contributions)+ for (IssueImporterContribution2 contribution: contributions)importers.addAll(contribution.getImporters());List<MenuItem> menuItems = new ArrayList<>();- for (IssueImporter<? extends Serializable, ? extends Serializable> importer: importers) {+ for (IssueImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable> importer: importers) {menuItems.add(new MenuItem() {@Override@@ -339,9 +339,8 @@ public abstract class IssueListPanel extends Panel {@Overridepublic WebMarkupContainer newLink(String id) {- String url = urlFor(getPage().getClass(), getPage().getPageParameters()).toString();return new BookmarkablePageLink<Void>(id, IssueImportPage.class,- IssueImportPage.paramsOf(getProject(), importer.getName(), url));+ IssueImportPage.paramsOf(getProject(), importer.getName()));}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 83cfbb8b61..8a1f381f45 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,6 +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.model.Project;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntitySort;@@ -68,8 +70,6 @@ import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.page.project.NewProjectPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.imports.ProjectImportPage;-import io.onedev.server.web.page.project.imports.ProjectImporter;-import io.onedev.server.web.page.project.imports.ProjectImporterContribution;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;@@ -246,23 +246,23 @@ public class ProjectListPanel extends Panel {@Overrideprotected List<MenuItem> getMenuItems(FloatingPanel dropdown) {- Collection<ProjectImporter<? extends Serializable, ? extends Serializable>> importers = new ArrayList<>();- List<ProjectImporterContribution> contributions =- new ArrayList<>(OneDev.getExtensions(ProjectImporterContribution.class));- Collections.sort(contributions, new Comparator<ProjectImporterContribution>() {+ 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>() {@Override- public int compare(ProjectImporterContribution o1, ProjectImporterContribution o2) {+ public int compare(ProjectImporterContribution2 o1, ProjectImporterContribution2 o2) {return o1.getOrder() - o2.getOrder();}});- for (ProjectImporterContribution contribution: contributions)+ for (ProjectImporterContribution2 contribution: contributions)importers.addAll(contribution.getImporters());List<MenuItem> menuItems = new ArrayList<>();- for (ProjectImporter<? extends Serializable, ? extends Serializable> importer: importers) {+ for (ProjectImporter2<? 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.html b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.htmlindex a50aaa96ce..315da2b63f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.html@@ -1,13 +1,5 @@<wicket:extend><div class="project-import card m-2 m-sm-5">- <div class="card-body">- <form wicket:id="form">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- <input wicket:id="next" type="submit" class="btn btn-primary" value="Next">- <input wicket:id="import" type="submit" class="btn btn-primary mr-1" value="Import">- <input wicket:id="dryRun" type="submit" class="btn btn-light-primary" value="Dry Run">- </form>- </div>+ <div wicket:id="importer" class="card-body"></div></div></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.javaindex d71a89653d..96f6506c52 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@@ -1,59 +1,45 @@package io.onedev.server.web.page.project.imports;import java.io.Serializable;-import java.util.concurrent.Callable;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.buildspec.job.log.StyleBuilder;+import io.onedev.server.imports.Importer;+import io.onedev.server.imports.ProjectImporter2;+import io.onedev.server.imports.ProjectImporterContribution2;import io.onedev.server.model.Project;-import io.onedev.server.persistence.TransactionManager;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.SimpleLogger;-import io.onedev.server.web.ajaxlistener.ShowGlobalAjaxIndicatorListener;-import io.onedev.server.web.component.taskbutton.TaskButton;-import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.component.imports.ImportPanel;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.project.ProjectListPage;@SuppressWarnings("serial")-public class ProjectImportPage<T extends Serializable, S extends Serializable> extends LayoutPage {+public class ProjectImportPage<Where extends Serializable, What extends Serializable, How extends Serializable> extends LayoutPage {private static final String PARAM_IMPORTER = "importer";- private static final Logger logger = LoggerFactory.getLogger(ProjectImportPage.class);-- private ProjectImporter<T, S> importer;-- private T importSource;-- private S importOption;+ private ProjectImporter2<Where, What, How> importer;@SuppressWarnings("unchecked")public ProjectImportPage(PageParameters params) {super(params);String importerName = params.get(PARAM_IMPORTER).toString();- for (ProjectImporterContribution contribution: OneDev.getExtensions(ProjectImporterContribution.class)) {- for (ProjectImporter<? extends Serializable, ? extends Serializable> importer: contribution.getImporters()) {+ for (ProjectImporterContribution2 contribution: OneDev.getExtensions(ProjectImporterContribution2.class)) {+ for (ProjectImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable> importer: contribution.getImporters()) {if (importer.getName().equals(importerName)) {- this.importer = (ProjectImporter<T, S>) importer;+ this.importer = (ProjectImporter2<Where, What, How>) importer;break;}}@@ -67,124 +53,30 @@ public class ProjectImportPage<T extends Serializable, S extends Serializable> eprotected void onInitialize() {super.onInitialize();- try {- importSource = importer.getSourceClass().newInstance();- } catch (InstantiationException | IllegalAccessException e) {- throw new RuntimeException(e);- }-- Form<?> form = new Form<Void>("form");- form.add(new FencedFeedbackPanel("feedback", form));- form.add(BeanContext.edit("editor", importSource));-- form.add(new AjaxButton("next") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ShowGlobalAjaxIndicatorListener());- }-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- importOption = importer.getImportOption(importSource, new SimpleLogger() {-- @Override- public void log(String message, StyleBuilder styleBuilder) {- logger.info(message);- }-- });-- form.replace(BeanContext.edit("editor", importOption));- setVisible(false);-- form.get("import").setVisible(true);- form.get("dryRun").setVisible(true);-- target.add(form);- }+ add(new ImportPanel<Where, What, How>("importer") {@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);+ protected Importer<Where, What, How> getImporter() {+ return importer;}- });-- form.add(new TaskButton("import") {-@Override- protected void onCompleted(AjaxRequestTarget target, boolean successful) {- super.onCompleted(target, successful);-- if (successful) {- EntitySort sort = new EntitySort();- sort.setField(Project.NAME_UPDATE_DATE);- sort.setDirection(Direction.DESCENDING);- ProjectQuery query = new ProjectQuery(null, Lists.newArrayList(sort));- PageParameters params = ProjectListPage.paramsOf(query.toString(), 0, 0);- throw new RestartResponseException(ProjectListPage.class, params);- }+ protected String doImport(Where where, What what, How how,+ boolean dryRun, SimpleLogger logger) {+ return importer.doImport(where, what, how, dryRun, logger);}@Override- protected String runTask(SimpleLogger logger) {- return OneDev.getInstance(TransactionManager.class).call(new Callable<String>() {-- @Override- public String call() throws Exception {- return importer.doImport(importSource, importOption, false, logger);- }-- });+ protected void onImportSuccessful(AjaxRequestTarget target) {+ EntitySort sort = new EntitySort();+ sort.setField(Project.NAME_UPDATE_DATE);+ sort.setDirection(Direction.DESCENDING);+ ProjectQuery query = new ProjectQuery(null, Lists.newArrayList(sort));+ PageParameters params = ProjectListPage.paramsOf(query.toString(), 0, 0);+ throw new RestartResponseException(ProjectListPage.class, params);}- @Override- protected String getTitle() {- return "Importing from " + importer.getName();- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);- }-- }.setVisible(false));-- form.add(new TaskButton("dryRun") {-- @Override- protected String runTask(SimpleLogger logger) {- return OneDev.getInstance(TransactionManager.class).call(new Callable<String>() {-- @Override- public String call() throws Exception {- return importer.doImport(importSource, importOption, true, logger);- }-- });- }-- @Override- protected String getTitle() {- return "Test importing from " + importer.getName();- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);- }-- }.setVisible(false));-- form.setOutputMarkupId(true);- add(form);+ });}@Override@@ -194,7 +86,7 @@ public class ProjectImportPage<T extends Serializable, S extends Serializable> e@Overrideprotected Component newTopbarTitle(String componentId) {- return new Label(componentId, "Importing Projects from " + importer.getName());+ return new Label(componentId, "Importing projects from " + importer.getName());}public static PageParameters paramsOf(String importer) {@@ -203,12 +95,4 @@ public class ProjectImportPage<T extends Serializable, S extends Serializable> ereturn params;}- public T getImportSource() {- return importSource;- }-- public S getImportOption() {- return importOption;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.htmlindex 4121f0f061..01bcc25067 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.html@@ -1,13 +1,5 @@<wicket:extend><div class="issue-import card m-2 m-sm-5">- <div class="card-body">- <form wicket:id="form">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- <input wicket:id="next" type="submit" class="btn btn-primary" value="Next">- <input wicket:id="import" type="submit" class="btn btn-primary mr-1" value="Import">- <input wicket:id="dryRun" type="submit" class="btn btn-light-primary" value="Dry Run">- </form>- </div>+ <div wicket:id="importer" class="card-body"></div></div></wicket:extend>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 3978cda020..dab327edd0 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@@ -1,61 +1,46 @@package io.onedev.server.web.page.project.issues.imports;import java.io.Serializable;-import java.util.concurrent.Callable;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.buildspec.job.log.StyleBuilder;-import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.imports.Importer;+import io.onedev.server.imports.IssueImporter2;+import io.onedev.server.imports.IssueImporterContribution2;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.persistence.TransactionManager;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.SimpleLogger;-import io.onedev.server.web.ajaxlistener.ShowGlobalAjaxIndicatorListener;-import io.onedev.server.web.component.taskbutton.TaskButton;-import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.component.imports.ImportPanel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;@SuppressWarnings("serial")-public class IssueImportPage<T extends Serializable, S extends Serializable> extends ProjectPage {+public class IssueImportPage<Where extends Serializable, What extends Serializable, How extends Serializable> extends ProjectPage {private static final String PARAM_IMPORTER = "importer";- private static final Logger logger = LoggerFactory.getLogger(IssueImportPage.class);-- private IssueImporter<T, S> importer;-- private T importSource;-- private S importOption;+ private IssueImporter2<Where, What, How> importer;@SuppressWarnings("unchecked")public IssueImportPage(PageParameters params) {super(params);String importerName = params.get(PARAM_IMPORTER).toString();- for (IssueImporterContribution contribution: OneDev.getExtensions(IssueImporterContribution.class)) {- for (IssueImporter<? extends Serializable, ? extends Serializable> importer: contribution.getImporters()) {+ for (IssueImporterContribution2 contribution: OneDev.getExtensions(IssueImporterContribution2.class)) {+ for (IssueImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable> importer: contribution.getImporters()) {if (importer.getName().equals(importerName)) {- this.importer = (IssueImporter<T, S>) importer;+ this.importer = (IssueImporter2<Where, What, How>) importer;break;}}@@ -68,144 +53,33 @@ public class IssueImportPage<T extends Serializable, S extends Serializable> ext@Overrideprotected void onInitialize() {super.onInitialize();-- try {- importSource = importer.getSourceClass().newInstance();- } catch (InstantiationException | IllegalAccessException e) {- throw new RuntimeException(e);- }-- Form<?> form = new Form<Void>("form");- form.add(new FencedFeedbackPanel("feedback", form));- form.add(BeanContext.edit("editor", importSource));-- form.add(new AjaxButton("next") {- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ShowGlobalAjaxIndicatorListener());- }+ add(new ImportPanel<Where, What, How>("importer") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- importOption = importer.getImportOption(importSource, new SimpleLogger() {-- @Override- public void log(String message, StyleBuilder styleBuilder) {- logger.info(message);- }-- });-- form.replace(BeanContext.edit("editor", importOption));- setVisible(false);-- form.get("import").setVisible(true);- form.get("dryRun").setVisible(true);-- target.add(form);+ protected Importer<Where, What, How> getImporter() {+ return importer;}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);+ protected String doImport(Where where, What what, How how, boolean dryRun,+ SimpleLogger logger) {+ return importer.doImport(where, what, how, getProject(), dryRun, logger);}- });-- Long projectId = getProject().getId();-- form.add(new TaskButton("import") {-@Override- protected void onCompleted(AjaxRequestTarget target, boolean successful) {- super.onCompleted(target, successful);+ protected void onImportSuccessful(AjaxRequestTarget target) {+ EntitySort sort = new EntitySort();+ sort.setField(Issue.NAME_NUMBER);+ sort.setDirection(Direction.DESCENDING);+ IssueQuery query = new IssueQuery(null, Lists.newArrayList(sort));- if (successful) {- EntitySort sort = new EntitySort();- sort.setField(Issue.NAME_NUMBER);- sort.setDirection(Direction.DESCENDING);- IssueQuery query = new IssueQuery(null, Lists.newArrayList(sort));-- PageParameters params = ProjectIssueListPage.paramsOf(getProject(), query.toString(), 0);- throw new RestartResponseException(ProjectIssueListPage.class, params);- }- }-- @Override- protected String runTask(SimpleLogger logger) {- return OneDev.getInstance(TransactionManager.class).call(new Callable<String>() {-- @Override- public String call() throws Exception {- Project project = OneDev.getInstance(ProjectManager.class).load(projectId);- return importer.doImport(project, importSource, importOption, false, logger);- }-- });- }-- @Override- protected String getTitle() {- return "Importing from " + importer.getName();- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);- }-- }.setVisible(false));-- form.add(new TaskButton("dryRun") {-- @Override- protected String runTask(SimpleLogger logger) {- return OneDev.getInstance(TransactionManager.class).call(new Callable<String>() {-- @Override- public String call() throws Exception {- Project project = OneDev.getInstance(ProjectManager.class).load(projectId);- return importer.doImport(project, importSource, importOption, true, logger);- }-- });+ PageParameters params = ProjectIssueListPage.paramsOf(getProject(), query.toString(), 0);+ throw new RestartResponseException(ProjectIssueListPage.class, params);}- @Override- protected String getTitle() {- return "Test importing from " + importer.getName();- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);- }-- }.setVisible(false));+ });- form.setOutputMarkupId(true);- add(form);- }-- public static PageParameters paramsOf(Project project, String importer, String prevUrl) {- PageParameters params = ProjectPage.paramsOf(project);- params.add(PARAM_IMPORTER, importer);- return params;- }-- public T getImportSource() {- return importSource;- }-- public S getImportOption() {- return importOption;}@Override@@ -215,7 +89,13 @@ public class IssueImportPage<T extends Serializable, S extends Serializable> ext@Overrideprotected Component newProjectTitle(String componentId) {- return new Label(componentId, "Import Issues from " + importer.getName());+ return new Label(componentId, "Importing Issues from " + importer.getName());+ }++ public static PageParameters paramsOf(Project project, String importer) {+ PageParameters params = ProjectPage.paramsOf(project);+ params.add(PARAM_IMPORTER, importer);+ return params;}}diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex bd0eb90f8f..80c4adaba7 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -31,5 +31,6 @@<module>server-plugin-import-github</module><module>server-plugin-import-youtrack</module><module>server-plugin-import-gitlab</module>+ <module>server-plugin-import-gitea</module></modules></project>\ No newline at end of filediff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xmlnew file mode 100644index 0000000000..75f57e9f45--- /dev/null+++ b/server-plugin/server-plugin-import-gitea/pom.xml@@ -0,0 +1,13 @@+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server-plugin-import-gitea</artifactId>+ <parent>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin</artifactId>+ <version>4.8.1</version>+ </parent>+ <properties>+ <moduleClass>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/server/plugin/imports/gitea/GiteaIssueImporter.javanew file mode 100644index 0000000000..5eeef63bd2--- /dev/null+++ b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/GiteaIssueImporter.java@@ -0,0 +1,44 @@+package server.plugin.imports.gitea;++import java.util.HashMap;+import java.util.Map;+import java.util.Optional;++import com.google.common.collect.Lists;++import io.onedev.server.imports.IssueImporter2;+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> {++ private static final long serialVersionUID = 1L;++ @Override+ public String getName() {+ return ImportUtils.NAME;+ }++ @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.buildIssueImportOption(where, Lists.newArrayList(what.getRepository()), logger);+ }++ @Override+ public String doImport(ImportServer where, IssueImportSource what, IssueImportOption how,+ Project project, boolean dryRun, SimpleLogger logger) {+ logger.log("Importing issues from repository " + what.getRepository() + "...");+ Map<String, Optional<User>> users = new HashMap<>();+ return ImportUtils.importIssues(where, what.getRepository(), project, false, how, users, dryRun, logger)+ .toHtml("Issues imported successfully");+ }++}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/server/plugin/imports/gitea/GiteaPluginModule.javanew file mode 100644index 0000000000..e24582fec9--- /dev/null+++ b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/GiteaPluginModule.java@@ -0,0 +1,55 @@+package server.plugin.imports.gitea;++import java.io.Serializable;+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;++/**+ * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.+ *+ */+public class GiteaPluginModule extends AbstractPluginModule {++ @Override+ protected void configure() {+ super.configure();++ // put your guice bindings here+ contribute(ProjectImporterContribution2.class, new ProjectImporterContribution2() {++ @Override+ public Collection<ProjectImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters() {+ return Lists.newArrayList(new GiteaProjectImporter());+ }++ @Override+ public int getOrder() {+ return 500;+ }++ });++ contribute(IssueImporterContribution2.class, new IssueImporterContribution2() {++ @Override+ public Collection<IssueImporter2<? extends Serializable, ? extends Serializable, ? extends Serializable>> getImporters() {+ return Lists.newArrayList(new GiteaIssueImporter());+ }++ @Override+ public int getOrder() {+ return 500;+ }++ });++ }++}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/server/plugin/imports/gitea/GiteaProjectImporter.javanew file mode 100644index 0000000000..0f532583d7--- /dev/null+++ b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/GiteaProjectImporter.java@@ -0,0 +1,138 @@+package server.plugin.imports.gitea;++import java.util.ArrayList;+import java.util.Collection;+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;++import org.apache.http.client.utils.URIBuilder;+import org.joda.time.format.ISODateTimeFormat;++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.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> {++ private static final long serialVersionUID = 1L;++ @Override+ public String getName() {+ return ImportUtils.NAME;+ }++ @Override+ public ProjectImportSource getWhat(ImportServer where, SimpleLogger logger) {+ ProjectImportSource importSource = new ProjectImportSource();+ Client client = ImportUtils.newClient(where);+ try {+ String apiEndpoint = where.getApiEndpoint("/user/repos");+ for (JsonNode repoNode: ImportUtils.list(client, apiEndpoint, logger)) {+ String repoName = repoNode.get("name").asText();+ String ownerName = repoNode.get("owner").get("login").asText();+ ProjectMapping projectMapping = new ProjectMapping();+ projectMapping.setGiteaRepo(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> repos = what.getProjectMappings().stream().map(it->it.getGiteaRepo()).collect(Collectors.toList());+ importOption.setIssueImportOption(ImportUtils.buildIssueImportOption(where, repos, logger));+ return importOption;+ }++ @Override+ public String doImport(ImportServer where, ProjectImportSource what, ProjectImportOption how,+ boolean dryRun, SimpleLogger logger) {+ Collection<Long> projectIds = new ArrayList<>();+ Client client = ImportUtils.newClient(where);+ try {+ Map<String, Optional<User>> users = new HashMap<>();+ ImportResult result = new ImportResult();+ for (ProjectMapping projectMapping: what.getProjectMappings()) {+ logger.log("Cloning code from repository " + projectMapping.getGiteaRepo() + "...");++ String apiEndpoint = where.getApiEndpoint("/repos/" + projectMapping.getGiteaRepo());+ JsonNode repoNode = ImportUtils.get(client, apiEndpoint, logger);+ Project project = new Project();+ project.setName(projectMapping.getOneDevProject());+ project.setDescription(repoNode.get("description").asText(null));+ project.setIssueManagementEnabled(repoNode.get("has_issues").asBoolean());++ boolean isPrivate = repoNode.get("private").asBoolean();+ if (!isPrivate && how.getPublicRole() != null)+ project.setDefaultRole(how.getPublicRole());++ URIBuilder builder = new URIBuilder(repoNode.get("clone_url").asText());+ if (isPrivate)+ builder.setUserInfo("git", where.getAccessToken());++ if (!dryRun) {+ OneDev.getInstance(ProjectManager.class).clone(project, builder.build().toString());+ projectIds.add(project.getId());+ }++ if (how.getIssueImportOption() != null) {+ List<Milestone> milestones = new ArrayList<>();+ logger.log("Importing milestones from repository " + projectMapping.getGiteaRepo() + "...");+ apiEndpoint = where.getApiEndpoint("/repos/" + projectMapping.getGiteaRepo() + "/milestones?state=all");+ for (JsonNode milestoneNode: ImportUtils.list(client, apiEndpoint, logger)) {+ Milestone milestone = new Milestone();+ milestone.setName(milestoneNode.get("title").asText());+ milestone.setDescription(milestoneNode.get("description").asText(null));+ milestone.setProject(project);+ String dueDateString = milestoneNode.get("due_on").asText(null);+ if (dueDateString != null)+ milestone.setDueDate(ISODateTimeFormat.dateTimeNoMillis().parseDateTime(dueDateString).toDate());+ if (milestoneNode.get("state").asText().equals("closed"))+ milestone.setClosed(true);++ milestones.add(milestone);+ project.getMilestones().add(milestone);++ if (!dryRun)+ OneDev.getInstance(MilestoneManager.class).save(milestone);+ }++ logger.log("Importing issues from repository " + projectMapping.getGiteaRepo() + "...");+ ImportResult currentResult = ImportUtils.importIssues(where, projectMapping.getGiteaRepo(),+ project, true, how.getIssueImportOption(), users, dryRun, logger);+ result.nonExistentLogins.addAll(currentResult.nonExistentLogins);+ result.nonExistentMilestones.addAll(currentResult.nonExistentMilestones);+ result.unmappedIssueLabels.addAll(currentResult.unmappedIssueLabels);+ result.issuesImported |= currentResult.issuesImported;+ }+ }++ return result.toHtml("Repositories imported successfully");+ } catch (Exception e) {+ for (Long projectId: projectIds)+ OneDev.getInstance(StorageManager.class).deleteProjectDir(projectId);+ throw new RuntimeException(e);+ } finally {+ client.close();+ }+ }++}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/server/plugin/imports/gitea/ImportResult.javanew file mode 100644index 0000000000..1878b5c4ac--- /dev/null+++ b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ImportResult.java@@ -0,0 +1,67 @@+package server.plugin.imports.gitea;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.List;+import java.util.Set;++import org.unbescape.html.HtmlEscape;++public class ImportResult {++ private static final int MAX_DISPLAY_ENTRIES = 100;++ Set<String> nonExistentLogins = new HashSet<>();++ Set<String> unmappedIssueLabels = new HashSet<>();++ Set<String> nonExistentMilestones = new HashSet<>();++ boolean issuesImported = false;++ private String getEntryFeedback(String entryDescription, Collection<String> entries) {+ if (entries.size() > MAX_DISPLAY_ENTRIES) {+ List<String> entriesToDisplay = new ArrayList<>(entries).subList(0, MAX_DISPLAY_ENTRIES);+ return "<li> " + entryDescription + ": " + HtmlEscape.escapeHtml5(entriesToDisplay.toString()) + " and more";+ } else {+ return "<li> " + entryDescription + ": " + HtmlEscape.escapeHtml5(entries.toString());+ }+ }++ public String toHtml(String leadingText) {+ StringBuilder feedback = new StringBuilder(leadingText);++ boolean hasNotice = false;++ if (!nonExistentMilestones.isEmpty() || !unmappedIssueLabels.isEmpty()+ || !nonExistentLogins.isEmpty() || issuesImported) {+ hasNotice = true;+ }++ if (hasNotice)+ feedback.append("<br><br><b>NOTE:</b><ul>");++ if (!nonExistentMilestones.isEmpty())+ feedback.append(getEntryFeedback("Non existent milestones", nonExistentLogins));+ if (!unmappedIssueLabels.isEmpty())+ feedback.append(getEntryFeedback("Gitea issue labels not mapped to OneDev custom field", unmappedIssueLabels));+ if (!nonExistentLogins.isEmpty()) {+ feedback.append(getEntryFeedback("Gitea logins without email or email can not be mapped to OneDev account",+ nonExistentLogins));+ }++ if (issuesImported) {+ feedback.append("<li> Attachments in issue description and comments are not imported as Gitea does not "+ + "provide attachment api currently");+ feedback.append("<li> Issue dependencies are not imported as Gitea does not "+ + "provide public api to access this information");+ }++ if (hasNotice)+ feedback.append("</ul>");++ return feedback.toString();++ }+}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/server/plugin/imports/gitea/ImportServer.javanew file mode 100644index 0000000000..4c96df144c--- /dev/null+++ b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ImportServer.java@@ -0,0 +1,112 @@+package server.plugin.imports.gitea;++import java.io.Serializable;++import javax.validation.ConstraintValidatorContext;+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.wicket.MetaDataKey;+import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport;+import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.util.JerseyUtils;+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.Password;++@Editable+@ClassValidating+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";++ private String apiUrl;++ private String accessToken;++ @Editable(order=10, name="Gitea API URL", description="Specify Gitea API url, for instance <tt>https://gitea.example.com/api/v1</tt>")+ @NotEmpty+ public String getApiUrl() {+ return apiUrl;+ }++ public void setApiUrl(String apiUrl) {+ this.apiUrl = apiUrl;+ }++ @Editable(order=100, name="Gitea Personal Access Token")+ @Password+ @NotEmpty+ public String getAccessToken() {+ return accessToken;+ }++ public void setAccessToken(String accessToken) {+ this.accessToken = accessToken;+ }++ public String getApiEndpoint(String apiPath) {+ return StringUtils.stripEnd(apiUrl, "/") + "/" + StringUtils.stripStart(apiPath, "/");+ }++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ Client client = ClientBuilder.newClient();+ client.register(OAuth2ClientSupport.feature(accessToken));+ try {+ String apiEndpoint = getApiEndpoint("/user");+ 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 Gitea api url")+ .addPropertyNode(PROP_API_URL).addConstraintViolation();+ return false;+ } else if (response.getStatus() == 401) {+ context.disableDefaultConstraintViolation();+ String errorMessage = "Authentication failed";+ context.buildConstraintViolationWithTemplate(errorMessage)+ .addPropertyNode(PROP_ACCESS_TOKEN).addConstraintViolation();+ return false;+ } else {+ String errorMessage = JerseyUtils.checkStatus(apiEndpoint, response);+ if (errorMessage != null) {+ context.disableDefaultConstraintViolation();+ context.buildConstraintViolationWithTemplate(errorMessage)+ .addPropertyNode(PROP_API_URL).addConstraintViolation();+ return false;+ }+ }+ }+ } catch (Exception e) {+ context.disableDefaultConstraintViolation();+ String errorMessage = "Error connecting api service";+ if (e.getMessage() != null)+ errorMessage += ": " + e.getMessage();+ context.buildConstraintViolationWithTemplate(errorMessage)+ .addPropertyNode(PROP_API_URL).addConstraintViolation();+ return false;+ } finally {+ client.close();+ }+ return true;+ }++}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/server/plugin/imports/gitea/ImportUtils.javanew file mode 100644index 0000000000..61f0aadb58--- /dev/null+++ b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ImportUtils.java@@ -0,0 +1,444 @@+package server.plugin.imports.gitea;++import java.net.URI;+import java.net.URISyntaxException;+import java.time.Instant;+import java.time.format.DateTimeFormatter;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Date;+import java.util.HashMap;+import java.util.HashSet;+import java.util.LinkedHashMap;+import java.util.LinkedHashSet;+import java.util.List;+import java.util.Map;+import java.util.Optional;+import java.util.Set;+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;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueComment;+import io.onedev.server.model.IssueField;+import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.model.support.LastUpdate;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.util.DateUtils;+import io.onedev.server.util.Pair;+import io.onedev.server.util.ReferenceMigrator;+import io.onedev.server.util.SimpleLogger;++public class ImportUtils {++ public static final String NAME = "Gitea";++ static final int PER_PAGE = 50;++ static IssueImportOption buildIssueImportOption(ImportServer server, Collection<String> repositories, SimpleLogger logger) {+ IssueImportOption importOption = new IssueImportOption();+ Client client = newClient(server);+ try {+ Set<String> labels = new LinkedHashSet<>();+ for (String repo: repositories) {+ String apiEndpoint = server.getApiEndpoint("/repos/" + repo + "/labels");+ for (JsonNode labelNode: list(client, apiEndpoint, logger))+ labels.add(labelNode.get("name").asText());+ try {+ apiEndpoint = server.getApiEndpoint("/orgs/" + StringUtils.substringBefore(repo, "/") + "/labels");+ for (JsonNode labelNode: list(client, apiEndpoint, logger))+ labels.add(labelNode.get("name").asText());+ } catch (Exception e) {+ // ignore as exception might be thrown if repo belongs to a user account+ }+ }++ for (String label: labels) {+ IssueLabelMapping mapping = new IssueLabelMapping();+ mapping.setGiteaIssueLabel(label);+ importOption.getIssueLabelMappings().add(mapping);+ }+ } finally {+ client.close();+ }+ return importOption;+ }++ @Nullable+ static User getUser(Map<String, Optional<User>> users, JsonNode userNode, SimpleLogger logger) {+ String login = userNode.get("login").asText();+ Optional<User> userOpt = users.get(login);+ if (userOpt == null) {+ String email = null;+ if (userNode.hasNonNull("email"))+ email = userNode.get("email").asText(null);+ if (email != null)+ userOpt = Optional.ofNullable(OneDev.getInstance(UserManager.class).findByEmail(email));+ else+ userOpt = Optional.empty();+ users.put(login, userOpt);+ }+ return userOpt.orElse(null);+ }++ 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);+ try {+ Set<String> nonExistentMilestones = new HashSet<>();+ Set<String> nonExistentLogins = new HashSet<>();+ Set<String> unmappedIssueLabels = new HashSet<>();++ Map<String, Pair<FieldSpec, String>> labelMappings = new HashMap<>();+ Map<String, Milestone> milestoneMappings = new HashMap<>();++ for (IssueLabelMapping mapping: importOption.getIssueLabelMappings()) {+ String oneDevFieldName = StringUtils.substringBefore(mapping.getOneDevIssueField(), "::");+ String oneDevFieldValue = StringUtils.substringAfter(mapping.getOneDevIssueField(), "::");+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(oneDevFieldName);+ if (fieldSpec == null)+ throw new ExplicitException("No field spec found: " + oneDevFieldName);+ labelMappings.put(mapping.getGiteaIssueLabel(), new Pair<>(fieldSpec, oneDevFieldValue));+ }++ for (Milestone milestone: oneDevProject.getMilestones())+ milestoneMappings.put(milestone.getName(), milestone);++ String initialIssueState = getIssueSetting().getInitialStateSpec().getName();++ List<Issue> issues = new ArrayList<>();++ Map<Long, Long> issueNumberMappings = new HashMap<>();++ AtomicInteger numOfImportedIssues = new AtomicInteger(0);+ PageDataConsumer pageDataConsumer = new PageDataConsumer() {++ private String joinAsMultilineHtml(List<String> values) {+ List<String> escapedValues = new ArrayList<>();+ for (String value: values)+ escapedValues.add(HtmlEscape.escapeHtml5(value));+ return StringUtils.join(escapedValues, "<br>");+ }++ @Override+ public void consume(List<JsonNode> pageData) throws InterruptedException {+ for (JsonNode issueNode: pageData) {+ if (Thread.interrupted())+ throw new InterruptedException();++ Map<String, String> extraIssueInfo = new LinkedHashMap<>();++ Issue issue = new Issue();+ issue.setProject(oneDevProject);+ issue.setTitle(issueNode.get("title").asText());+ issue.setDescription(issueNode.get("body").asText(null));++ issue.setNumberScope(oneDevProject.getForkRoot());++ Long oldNumber = issueNode.get("number").asLong();+ Long newNumber;+ if (dryRun || useExistingIssueNumbers)+ newNumber = oldNumber;+ else+ newNumber = OneDev.getInstance(IssueManager.class).getNextNumber(oneDevProject);+ issue.setNumber(newNumber);+ issueNumberMappings.put(oldNumber, newNumber);++ String issueFQN = giteaRepo + "#" + oldNumber;++ if (issueNode.get("state").asText().equals("closed"))+ issue.setState(importOption.getClosedIssueState());+ else+ issue.setState(initialIssueState);++ if (issueNode.hasNonNull("milestone")) {+ String milestoneName = issueNode.get("milestone").get("title").asText();+ Milestone milestone = milestoneMappings.get(milestoneName);+ if (milestone != null) {+ issue.setMilestone(milestone);+ } else {+ extraIssueInfo.put("Milestone", milestoneName);+ nonExistentMilestones.add(milestoneName);+ }+ }++ JsonNode userNode = issueNode.get("user");+ User user = getUser(users, userNode, logger);+ if (user != null) {+ issue.setSubmitter(user);+ } else {+ String submitterName = userNode.get("full_name").asText();+ if (StringUtils.isBlank(submitterName))+ submitterName = userNode.get("login").asText();+ issue.setSubmitterName(submitterName);+ nonExistentLogins.add(userNode.get("login").asText());+ }++ String created_at = issueNode.get("created_at").asText();+ issue.setSubmitDate(Date.from(Instant.from(+ DateTimeFormatter.ISO_DATE_TIME.parse(created_at))));++ LastUpdate lastUpdate = new LastUpdate();+ lastUpdate.setActivity("Opened");+ lastUpdate.setDate(issue.getSubmitDate());+ lastUpdate.setUser(issue.getSubmitter());+ lastUpdate.setUserName(issue.getSubmitterName());+ issue.setLastUpdate(lastUpdate);++ List<JsonNode> assigneeNodes = new ArrayList<>();+ if (issueNode.hasNonNull("assignees")) {+ for (JsonNode assigneeNode: issueNode.get("assignees"))+ assigneeNodes.add(assigneeNode);+ } else if (issueNode.hasNonNull("assignee")) {+ assigneeNodes.add(issueNode.get("assignee"));+ }++ for (JsonNode assigneeNode: assigneeNodes) {+ IssueField assigneeField = new IssueField();+ assigneeField.setIssue(issue);+ assigneeField.setName(importOption.getAssigneesIssueField());+ assigneeField.setType(InputSpec.USER);++ user = getUser(users, assigneeNode, logger);+ if (user != null) {+ assigneeField.setValue(user.getName());+ issue.getFields().add(assigneeField);+ } else {+ nonExistentLogins.add(assigneeNode.get("login").asText());+ }+ }++ if (importOption.getDueDateIssueField() != null) {+ String dueDate = issueNode.get("due_date").asText(null);+ if (dueDate != null) {+ IssueField issueField = new IssueField();+ issueField.setIssue(issue);+ issueField.setName(importOption.getDueDateIssueField());+ issueField.setType(InputSpec.DATE);+ issueField.setValue(DateUtils.formatDate(Date.from(+ Instant.from(DateTimeFormatter.ISO_DATE_TIME.parse(dueDate)))));+ issue.getFields().add(issueField);+ }+ }++ List<String> currentUnmappedLabels = new ArrayList<>();+ for (JsonNode labelNode: issueNode.get("labels")) {+ String labelName = labelNode.get("name").asText();+ Pair<FieldSpec, String> mapped = labelMappings.get(labelName);+ if (mapped != null) {+ IssueField labelField = new IssueField();+ labelField.setIssue(issue);+ labelField.setName(mapped.getFirst().getName());+ labelField.setType(InputSpec.ENUMERATION);+ labelField.setValue(mapped.getSecond());+ labelField.setOrdinal(mapped.getFirst().getOrdinal(mapped.getSecond()));+ issue.getFields().add(labelField);+ } else {+ currentUnmappedLabels.add(HtmlEscape.escapeHtml5(labelName));+ unmappedIssueLabels.add(HtmlEscape.escapeHtml5(labelName));+ }+ }++ if (!currentUnmappedLabels.isEmpty())+ extraIssueInfo.put("Labels", joinAsMultilineHtml(currentUnmappedLabels));++ String apiEndpoint = server.getApiEndpoint("/repos/" + giteaRepo+ + "/issues/" + oldNumber + "/comments");+ for (JsonNode commentNode: list(client, apiEndpoint, logger)) {+ String commentContent = commentNode.get("body").asText(null);+ if (commentContent != null) {+ IssueComment comment = new IssueComment();+ comment.setIssue(issue);+ comment.setContent(commentContent);++ created_at = commentNode.get("created_at").asText();+ comment.setDate(Date.from(Instant.from(+ DateTimeFormatter.ISO_DATE_TIME.parse(created_at))));++ userNode = commentNode.get("user");+ user = getUser(users, userNode, logger);+ if (user != null) {+ comment.setUser(user);+ } else {+ String fullName = userNode.get("full_name").asText();+ if (StringUtils.isBlank(fullName))+ fullName = userNode.get("login").asText();+ comment.setUserName(fullName);+ nonExistentLogins.add(userNode.get("username").asText());+ }+ issue.getComments().add(comment);+ }+ }++ issue.setCommentCount(issue.getComments().size());++ Set<String> fieldAndValues = new HashSet<>();+ for (IssueField field: issue.getFields()) {+ String fieldAndValue = field.getName() + "::" + field.getValue();+ if (!fieldAndValues.add(fieldAndValue)) {+ String errorMessage = String.format(+ "Duplicate issue field mapping (issue: %s, field: %s)",+ issueFQN, fieldAndValue);+ throw new ExplicitException(errorMessage);+ }+ }++ if (!extraIssueInfo.isEmpty()) {+ StringBuilder builder = new StringBuilder("|");+ for (String key: extraIssueInfo.keySet())+ builder.append(key).append("|");+ builder.append("\n|");+ extraIssueInfo.keySet().stream().forEach(it->builder.append("---|"));+ builder.append("\n|");+ for (String value: extraIssueInfo.values())+ builder.append(value).append("|");++ if (issue.getDescription() != null)+ issue.setDescription(builder.toString() + "\n\n" + issue.getDescription());+ else+ issue.setDescription(builder.toString());+ }+ issues.add(issue);+ }+ logger.log("Imported " + numOfImportedIssues.addAndGet(pageData.size()) + " issues");+ }++ };++ String apiEndpoint = server.getApiEndpoint("/repos/" + giteaRepo + "/issues?state=all");+ list(client, apiEndpoint, pageDataConsumer, logger);++ if (!dryRun) {+ ReferenceMigrator migrator = new ReferenceMigrator(Issue.class, issueNumberMappings);+ for (Issue issue: issues) {+ if (issue.getDescription() != null)+ issue.setDescription(migrator.migratePrefixed(issue.getDescription(), "#"));++ OneDev.getInstance(IssueManager.class).save(issue);+ for (IssueField field: issue.getFields())+ OneDev.getInstance(Dao.class).persist(field);+ for (IssueComment comment: issue.getComments()) {+ comment.setContent(migrator.migratePrefixed(comment.getContent(), "#"));+ OneDev.getInstance(Dao.class).persist(comment);+ }+ }+ }++ ImportResult result = new ImportResult();+ result.nonExistentLogins.addAll(nonExistentLogins);+ result.nonExistentMilestones.addAll(nonExistentMilestones);+ result.unmappedIssueLabels.addAll(unmappedIssueLabels);++ if (numOfImportedIssues.get() != 0)+ result.issuesImported = true;++ return result;+ } finally {+ client.close();+ }+ }++ static GlobalIssueSetting getIssueSetting() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting();+ }++ static List<JsonNode> list(Client client, String apiEndpoint, SimpleLogger logger) {+ List<JsonNode> result = new ArrayList<>();+ list(client, apiEndpoint, new PageDataConsumer() {++ @Override+ public void consume(List<JsonNode> pageData) {+ result.addAll(pageData);+ }++ }, logger);+ return result;+ }++ static void list(Client client, String apiEndpoint, PageDataConsumer pageDataConsumer,+ SimpleLogger logger) {+ URI uri;+ try {+ uri = new URIBuilder(apiEndpoint)+ .addParameter("limit", String.valueOf(PER_PAGE)).build();+ } catch (URISyntaxException e) {+ throw new RuntimeException(e);+ }++ int page = 1;+ while (true) {+ try {+ URIBuilder builder = new URIBuilder(uri);+ builder.addParameter("page", String.valueOf(page));+ List<JsonNode> pageData = new ArrayList<>();+ for (JsonNode each: get(client, builder.build().toString(), logger))+ pageData.add(each);+ pageDataConsumer.consume(pageData);+ if (pageData.size() < PER_PAGE)+ break;+ page++;+ } catch (URISyntaxException|InterruptedException e) {+ throw new RuntimeException(e);+ }+ }+ }++ static JsonNode get(Client client, String apiEndpoint, SimpleLogger logger) {+ WebTarget target = client.target(apiEndpoint);+ Invocation.Builder builder = target.request();+ while (true) {+ try (Response response = builder.get()) {+ int status = response.getStatus();+ if (status != 200) {+ String errorMessage = response.readEntity(String.class);+ if (StringUtils.isNotBlank(errorMessage)) {+ throw new ExplicitException(String.format("Http request failed (url: %s, status code: %d, error message: %s)",+ apiEndpoint, status, errorMessage));+ } else {+ throw new ExplicitException(String.format("Http request failed (status: %s)", status));+ }+ }+ return response.readEntity(JsonNode.class);+ }+ }+ }++ 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/server/plugin/imports/gitea/IssueImportOption.javanew file mode 100644index 0000000000..b645fefb74--- /dev/null+++ b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/IssueImportOption.java@@ -0,0 +1,109 @@+package server.plugin.imports.gitea;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;+import java.util.stream.Collectors;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class IssueImportOption implements Serializable {++ private static final long serialVersionUID = 1L;++ private String closedIssueState;++ private String assigneesIssueField;++ private String dueDateIssueField;++ private List<IssueLabelMapping> issueLabelMappings = new ArrayList<>();++ @Editable(order=300, description="Specify which issue state to use for closed Gitea issues.<br>"+ + "<b>NOTE: </b> You may customize OneDev issue states in case there is no appropriate option here")+ @ChoiceProvider("getCloseStateChoices")+ @NotEmpty+ public String getClosedIssueState() {+ return closedIssueState;+ }++ public void setClosedIssueState(String closedIssueState) {+ this.closedIssueState = closedIssueState;+ }++ private static GlobalIssueSetting getIssueSetting() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting();+ }++ @SuppressWarnings("unused")+ private static List<String> getCloseStateChoices() {+ List<String> choices = getIssueSetting().getStateSpecs().stream()+ .map(it->it.getName()).collect(Collectors.toList());+ choices.remove(0);+ return choices;+ }++ @Editable(order=350, description="Specify a multi-value user field to hold assignees information."+ + "<b>NOTE: </b> You may customize OneDev issue fields in case there is no appropriate option here")+ @ChoiceProvider("getAssigneesIssueFieldChoices")+ @NotEmpty+ public String getAssigneesIssueField() {+ return assigneesIssueField;+ }++ public void setAssigneesIssueField(String assigneesIssueField) {+ this.assigneesIssueField = assigneesIssueField;+ }++ @SuppressWarnings("unused")+ private static List<String> getAssigneesIssueFieldChoices() {+ List<String> choices = new ArrayList<>();+ for (FieldSpec field: getIssueSetting().getFieldSpecs()) {+ if (field.getType().equals(InputSpec.USER) && field.isAllowMultiple())+ choices.add(field.getName());+ }+ return choices;+ }++ @Editable(order=360, description="Optionally specify a date field to hold due date information.<br>"+ + "<b>NOTE: </b> You may customize OneDev issue fields in case there is no appropriate option here")+ @ChoiceProvider("getDueDateIssueFieldChoices")+ public String getDueDateIssueField() {+ return dueDateIssueField;+ }++ public void setDueDateIssueField(String dueDateIssueField) {+ this.dueDateIssueField = dueDateIssueField;+ }++ @SuppressWarnings("unused")+ private static List<String> getDueDateIssueFieldChoices() {+ List<String> choices = new ArrayList<>();+ for (FieldSpec field: getIssueSetting().getFieldSpecs()) {+ if (field.getType().equals(InputSpec.DATE))+ choices.add(field.getName());+ }+ return choices;+ }++ @Editable(order=400, description="Specify how to map Gitea issue labels to OneDev custom "+ + "fields. Unmapped labels will be reflected in issue description.<br>"+ + "<b>NOTE: </b> You may customize OneDev issue fields in case there is no appropriate option here")+ public List<IssueLabelMapping> getIssueLabelMappings() {+ return issueLabelMappings;+ }++ public void setIssueLabelMappings(List<IssueLabelMapping> issueLabelMappings) {+ this.issueLabelMappings = issueLabelMappings;+ }++}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/server/plugin/imports/gitea/IssueImportSource.javanew file mode 100644index 0000000000..c1afe26168--- /dev/null+++ b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/IssueImportSource.java@@ -0,0 +1,72 @@+package server.plugin.imports.gitea;++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=400, name="Gitea Repository", description="Choose Gitea repository to import issues from")+ @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 = ImportUtils.newClient(server);+ try {+ String apiEndpoint = server.getApiEndpoint("/user/repos");+ for (JsonNode repoNode: ImportUtils.list(client, apiEndpoint, new SimpleLogger() {++ @Override+ public void log(String message, StyleBuilder styleBuilder) {+ logger.info(message);+ }++ })) {+ 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-gitea/src/main/java/server/plugin/imports/gitea/IssueLabelMapping.java b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/IssueLabelMapping.javanew file mode 100644index 0000000000..36b6661670--- /dev/null+++ b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/IssueLabelMapping.java@@ -0,0 +1,60 @@+package server.plugin.imports.gitea;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class IssueLabelMapping implements Serializable {++ private static final long serialVersionUID = 1L;++ private String giteaIssueLabel;++ private String oneDevIssueField;++ @Editable(order=100, name="Gitea Issue Label")+ @NotEmpty+ public String getGiteaIssueLabel() {+ return giteaIssueLabel;+ }++ public void setGiteaIssueLabel(String giteaIssueLabel) {+ this.giteaIssueLabel = giteaIssueLabel;+ }++ @Editable(order=200, name="OneDev Issue Field", description="Specify a custom field of Enum type")+ @ChoiceProvider("getOneDevIssueFieldChoices")+ @NotEmpty+ public String getOneDevIssueField() {+ return oneDevIssueField;+ }++ public void setOneDevIssueField(String oneDevIssueField) {+ this.oneDevIssueField = oneDevIssueField;+ }++ @SuppressWarnings("unused")+ private static List<String> getOneDevIssueFieldChoices() {+ List<String> choices = new ArrayList<>();+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ for (FieldSpec field: issueSetting.getFieldSpecs()) {+ if (field.getType().equals(InputSpec.ENUMERATION)) {+ for (String value: field.getPossibleValues())+ choices.add(field.getName() + "::" + value);+ }+ }+ return choices;+ }++}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/server/plugin/imports/gitea/ProjectImportOption.javanew file mode 100644index 0000000000..43fabe3b18--- /dev/null+++ b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ProjectImportOption.java@@ -0,0 +1,51 @@+package server.plugin.imports.gitea;++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")+ public IssueImportOption getIssueImportOption() {+ return issueImportOption;+ }++ public void setIssueImportOption(IssueImportOption issueImportOption) {+ this.issueImportOption = 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/server/plugin/imports/gitea/ProjectImportSource.javanew file mode 100644index 0000000000..ca7bc9505d--- /dev/null+++ b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ProjectImportSource.java@@ -0,0 +1,64 @@+package server.plugin.imports.gitea;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import javax.validation.ConstraintValidatorContext;+import javax.validation.constraints.Size;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.util.validation.Validatable;+import io.onedev.server.util.validation.annotation.ClassValidating;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+@ClassValidating+public class ProjectImportSource implements Serializable, Validatable {++ private static final long serialVersionUID = 1L;++ private List<ProjectMapping> projectMappings = new ArrayList<>();++ @Editable(order=100, name="Repositories to Import")+ @Size(min=1, max=10000, message="No repositories 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-gitea/src/main/java/server/plugin/imports/gitea/ProjectMapping.java b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ProjectMapping.javanew file mode 100644index 0000000000..c668d1ed1b--- /dev/null+++ b/server-plugin/server-plugin-import-gitea/src/main/java/server/plugin/imports/gitea/ProjectMapping.java@@ -0,0 +1,44 @@+package server.plugin.imports.gitea;++import java.io.Serializable;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.validation.annotation.ProjectName;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class ProjectMapping implements Serializable {++ private static final long serialVersionUID = 1L;++ public static final String PROP_ONEDEV_PROJECT = "oneDevProject";++ private String giteaRepo;++ private String oneDevProject;++ @Editable(order=100, name="Gitea Repository", description="Specify Gitea repository in form of "+ + "<tt>organization/repository</tt>")+ @NotEmpty+ public String getGiteaRepo() {+ return giteaRepo;+ }++ public void setGiteaRepo(String giteaRepo) {+ this.giteaRepo = giteaRepo;+ }++ @Editable(order=200, name="OneDev Project", description="Specify OneDev project to be created as "+ + "result of importing")+ @ProjectName+ @NotEmpty+ public String getOneDevProject() {+ return oneDevProject;+ }++ public void setOneDevProject(String oneDevProject) {+ this.oneDevProject = oneDevProject;+ }++}\ No newline at end of filediff --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/GitHubImportUtils.javaindex 42007acc17..d51be53885 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/GitHubImportUtils.java@@ -158,7 +158,7 @@ public class GitHubImportUtils {issue.setProject(oneDevProject);issue.setTitle(issueNode.get("title").asText());issue.setDescription(issueNode.get("body").asText(null));- issue.setNumberScope(oneDevProject);+ issue.setNumberScope(oneDevProject.getForkRoot());Long oldNumber = issueNode.get("number").asLong();Long newNumber;@@ -215,11 +215,10 @@ public class GitHubImportUtils {user = getUser(client, importSource, users, login, logger);if (user != null) {assigneeField.setValue(user.getName());+ issue.getFields().add(assigneeField);} else {- assigneeField.setValue(login);nonExistentLogins.add(login);}- issue.getFields().add(assigneeField);}String apiEndpoint = importSource.getApiEndpoint("/repos/" + gitHubRepo@@ -274,7 +273,7 @@ public class GitHubImportUtils {String fieldAndValue = field.getName() + "::" + field.getValue();if (!fieldAndValues.add(fieldAndValue)) {String errorMessage = String.format(- "Duplicate issue field mapping (issue: #%d, field: %s)",+ "Duplicate issue field mapping (issue: %s, field: %s)",gitHubRepo + "#" + oldNumber, fieldAndValue);throw new ExplicitException(errorMessage);}diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.javaindex c08ca7eaa8..15c07c9bb9 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.java@@ -33,7 +33,7 @@ public class IssueLabelMapping implements Serializable {this.gitHubIssueLabel = gitHubIssueLabel;}- @Editable(order=200, name="OneDev Issue Field", description="Specify a multi-value enum custom field")+ @Editable(order=200, name="OneDev Issue Field", description="Specify a custom field of Enum type")@ChoiceProvider("getOneDevIssueFieldChoices")@NotEmptypublic String getOneDevIssueField() {diff --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/GitLabImportResult.javaindex 1b0d6deb9b..ead9b375e4 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/GitLabImportResult.java@@ -38,7 +38,8 @@ public class GitLabImportResult {boolean hasNotice = false;if (!nonExistentMilestones.isEmpty() || !unmappedIssueLabels.isEmpty()- || !nonExistentLogins.isEmpty() || !tooLargeAttachments.isEmpty()) {+ || !nonExistentLogins.isEmpty() || !tooLargeAttachments.isEmpty()+ || !errorAttachments.isEmpty()) {hasNotice = true;}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/GitLabImportUtils.javaindex c5cd4c7de0..55e7acba79 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/GitLabImportUtils.java@@ -206,7 +206,7 @@ public class GitLabImportUtils {issue.setTitle(issueNode.get("title").asText());issue.setDescription(issueNode.get("description").asText(null));- issue.setNumberScope(oneDevProject);+ issue.setNumberScope(oneDevProject.getForkRoot());Long oldNumber = issueNode.get("iid").asLong();Long newNumber;@@ -272,12 +272,10 @@ public class GitLabImportUtils {user = getUser(client, importSource, users, assigneeNode.get("id").asText(), logger);if (user != null) {assigneeField.setValue(user.getName());+ issue.getFields().add(assigneeField);} else {- String assigneeLogin = assigneeNode.get("username").asText();- assigneeField.setValue(assigneeLogin);- nonExistentLogins.add(assigneeLogin);+ nonExistentLogins.add(assigneeNode.get("username").asText());}- issue.getFields().add(assigneeField);}if (importOption.getDueDateIssueField() != null) {@@ -321,13 +319,13 @@ public class GitLabImportUtils {String labelName = labelNode.asText();Pair<FieldSpec, String> mapped = labelMappings.get(labelName);if (mapped != null) {- IssueField tagField = new IssueField();- tagField.setIssue(issue);- tagField.setName(mapped.getFirst().getName());- tagField.setType(InputSpec.ENUMERATION);- tagField.setValue(mapped.getSecond());- tagField.setOrdinal(mapped.getFirst().getOrdinal(mapped.getSecond()));- issue.getFields().add(tagField);+ IssueField labelField = new IssueField();+ labelField.setIssue(issue);+ labelField.setName(mapped.getFirst().getName());+ labelField.setType(InputSpec.ENUMERATION);+ labelField.setValue(mapped.getSecond());+ labelField.setOrdinal(mapped.getFirst().getOrdinal(mapped.getSecond()));+ issue.getFields().add(labelField);} else {currentUnmappedLabels.add(HtmlEscape.escapeHtml5(labelName));unmappedIssueLabels.add(HtmlEscape.escapeHtml5(labelName));@@ -382,7 +380,7 @@ public class GitLabImportUtils {String fieldAndValue = field.getName() + "::" + field.getValue();if (!fieldAndValues.add(fieldAndValue)) {String errorMessage = String.format(- "Duplicate issue field mapping (issue: #%d, field: %s)",+ "Duplicate issue field mapping (issue: %s, field: %s)",issueFQN, fieldAndValue);throw new ExplicitException(errorMessage);}diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.javaindex 59a2d64af4..902818511e 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.java@@ -33,7 +33,7 @@ public class IssueLabelMapping implements Serializable {this.gitLabIssueLabel = gitLabIssueLabel;}- @Editable(order=200, name="OneDev Issue Field", description="Specify a multi-value enum custom field")+ @Editable(order=200, name="OneDev Issue Field", description="Specify a custom field of Enum type")@ChoiceProvider("getOneDevIssueFieldChoices")@NotEmptypublic String getOneDevIssueField() {diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.javaindex 2e52b7f52b..a85b4bd59a 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.java@@ -33,7 +33,7 @@ public class IssueTagMapping implements Serializable {this.youTrackIssueTag = youTrackIssueTag;}- @Editable(order=200, name="OneDev Issue Field", description="Specify a multi-value enum custom field")+ @Editable(order=200, name="OneDev Issue Field", description="Specify a custom field of Enum type")@ChoiceProvider("getOneDevIssueFieldChoices")@NotEmptypublic String getOneDevIssueField() {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/YouTrackImportUtils.javaindex fd848510b1..4f574ce528 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/YouTrackImportUtils.java@@ -292,7 +292,7 @@ public class YouTrackImportUtils {issue.setDescription(issueNode.get("description").asText(null));issue.setSubmitDate(new Date(issueNode.get("created").asLong(System.currentTimeMillis())));issue.setProject(oneDevProject);- issue.setNumberScope(oneDevProject);+ issue.setNumberScope(oneDevProject.getForkRoot());if (!dryRun) {List<JsonNode> attachmentNodes = new ArrayList<>();@@ -469,20 +469,22 @@ public class YouTrackImportUtils {if (user != null) {fieldValue = user.getName();} else {- fieldValue = fullName;+ fieldValue = null;nonExistentLogins.add(login);}} else {- fieldValue = fullName;+ fieldValue = null;nonExistentLogins.add(login);}- IssueField issueField = new IssueField();- issueField.setIssue(issue);- issueField.setName(mapped.getFirst().getName());- issueField.setType(InputSpec.USER);- issueField.setValue(fieldValue);- issue.getFields().add(issueField);+ if (fieldValue != null) {+ IssueField issueField = new IssueField();+ issueField.setIssue(issue);+ issueField.setName(mapped.getFirst().getName());+ issueField.setType(InputSpec.USER);+ issueField.setValue(fieldValue);+ issue.getFields().add(issueField);+ }}}break;@@ -501,7 +503,6 @@ public class YouTrackImportUtils {} else {for (JsonNode valueNode: customFieldNode.get("value")) {String login = valueNode.get("login").asText();- String fullName = valueNode.get("name").asText();String email = getEmail(valueNode);if (email != null) {@@ -509,20 +510,22 @@ public class YouTrackImportUtils {if (user != null) {fieldValue = user.getName();} else {- fieldValue = fullName;+ fieldValue = null;nonExistentLogins.add(login);}} else {- fieldValue = fullName;+ fieldValue = null;nonExistentLogins.add(login);}-- IssueField issueField = new IssueField();- issueField.setIssue(issue);- issueField.setName(mapped.getFirst().getName());- issueField.setType(InputSpec.USER);- issueField.setValue(fieldValue);- issue.getFields().add(issueField);++ if (fieldValue != null) {+ IssueField issueField = new IssueField();+ issueField.setIssue(issue);+ issueField.setName(mapped.getFirst().getName());+ issueField.setType(InputSpec.USER);+ issueField.setValue(fieldValue);+ issue.getFields().add(issueField);+ }}}}@@ -762,7 +765,7 @@ public class YouTrackImportUtils {String fieldAndValue = field.getName() + "::" + field.getValue();if (!fieldAndValues.add(fieldAndValue)) {String errorMessage = String.format(- "Duplicate issue field mapping (issue: #%d, field: %s)",+ "Duplicate issue field mapping (issue: %s, field: %s)",readableId, fieldAndValue);throw new ExplicitException(errorMessage);}diff --git a/server-product/pom.xml b/server-product/pom.xmlindex 6c808bf700..ddcb480de2 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -80,6 +80,11 @@<artifactId>server-plugin-import-gitlab</artifactId><version>${project.version}</version></dependency>+ <dependency>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin-import-gitea</artifactId>+ <version>${project.version}</version>+ </dependency><dependency><groupId>io.onedev</groupId><artifactId>server-plugin-import-youtrack</artifactId>diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.javaindex e061411771..a96bf27a34 100644--- a/server-product/src/test/java/io/onedev/server/product/Test.java+++ b/server-product/src/test/java/io/onedev/server/product/Test.java@@ -1,25 +1,9 @@package io.onedev.server.product;-import java.util.concurrent.ExecutionException;-import java.util.regex.Matcher;-import java.util.regex.Pattern;-public class Test {@org.junit.Test- public void test() throws InterruptedException, ExecutionException {- Pattern PATTERN_ATTACHMENT = Pattern.compile("\\[(.+?)\\]\\s*\\((/uploads/.+?)\\)");-- StringBuffer buffer = new StringBuffer();- Matcher matcher = PATTERN_ATTACHMENT.matcher("hello [kb.txt](/uploads/kb.txt)");- while (matcher.find()) {- System.out.println(matcher.group(1));- System.out.println(matcher.group(2));- matcher.appendReplacement(buffer, "[kb.txt](hello.txt)");- }- matcher.appendTail(buffer);-- System.out.println(buffer);+ public void test() {}}\ No newline at end of file