The Unified and Autonomous Development Platform
Access contributed setting via RESTful api
Robin Shenaef415eb3b71
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 4a69b239ff..e90227b1e8 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -288,10 +288,12 @@ import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EditSupportLocator;import io.onedev.server.web.editable.EditSupportRegistry;import io.onedev.server.web.mapper.DynamicPathPageMapper;+import io.onedev.server.web.page.layout.ContributedAdministrationSetting;import io.onedev.server.web.page.layout.AdministrationSettingContribution;import io.onedev.server.web.page.layout.DefaultMainMenuCustomization;import io.onedev.server.web.page.layout.MainMenuCustomization;import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;+import io.onedev.server.web.page.project.setting.ContributedProjectSetting;import io.onedev.server.web.page.project.setting.ProjectSettingContribution;import io.onedev.server.web.page.test.TestPage;import io.onedev.server.web.websocket.BuildEventBroadcaster;@@ -516,7 +518,7 @@ public class CoreModule extends AbstractPluginModule {contribute(AdministrationSettingContribution.class, new AdministrationSettingContribution() {@Override- public List<Class<? extends Serializable>> getSettingClasses() {+ public List<Class<? extends ContributedAdministrationSetting>> getSettingClasses() {return new ArrayList<>();}@@ -524,7 +526,7 @@ public class CoreModule extends AbstractPluginModule {contribute(ProjectSettingContribution.class, new ProjectSettingContribution() {@Override- public List<Class<? extends Serializable>> getSettingClasses() {+ public List<Class<? extends ContributedProjectSetting>> getSettingClasses() {return new ArrayList<>();}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.javaindex dfb83a1a09..77bfb44260 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java@@ -1,6 +1,5 @@package io.onedev.server.entitymanager;-import java.io.Serializable;import java.util.List;import java.util.Map;@@ -21,6 +20,7 @@ import io.onedev.server.model.support.administration.authenticator.Authenticatorimport io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.model.support.administration.sso.SsoConnector;import io.onedev.server.persistence.dao.EntityManager;+import io.onedev.server.web.page.layout.ContributedAdministrationSetting;public interface SettingManager extends EntityManager<Setting> {@@ -137,13 +137,14 @@ public interface SettingManager extends EntityManager<Setting> {void saveSsoConnectors(List<SsoConnector> ssoConnectors);- Map<Class<? extends Serializable>, Serializable> getContributedSettings();+ Map<String, ContributedAdministrationSetting> getContributedSettings();- void saveContributedSettings(Map<Class<? extends Serializable>, Serializable> contributedSettings);+ void saveContributedSettings(Map<String, ContributedAdministrationSetting> contributedSettings);@Nullable- <T extends Serializable> T getContributedSetting(Class<T> settingClass);+ <T extends ContributedAdministrationSetting> T getContributedSetting(Class<T> settingClass);- void saveContributedSetting(Class<? extends Serializable> settingClass, @Nullable Serializable setting);+ void saveContributedSetting(Class<? extends ContributedAdministrationSetting> settingClass,+ @Nullable ContributedAdministrationSetting setting);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.javaindex bea4ff81b4..3c5c5e2cb7 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java@@ -4,13 +4,16 @@ import java.io.Serializable;import java.util.List;import java.util.Map;+import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;+import javax.validation.Validator;import org.hibernate.criterion.Restrictions;import com.google.common.base.Preconditions;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.maintenance.DataManager;import io.onedev.server.model.Setting;@@ -33,6 +36,7 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.web.page.layout.ContributedAdministrationSetting;@Singletonpublic class DefaultSettingManager extends BaseEntityManager<Setting> implements SettingManager {@@ -427,7 +431,7 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements@SuppressWarnings("unchecked")@Override- public Map<Class<? extends Serializable>, Serializable> getContributedSettings() {+ public Map<String, ContributedAdministrationSetting> getContributedSettings() {Setting setting;if (contributedSettingsId == null) {setting = getSetting(Key.CONTRIBUTED_SETTINGS);@@ -436,12 +440,12 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements} else {setting = load(contributedSettingsId);}- return (Map<Class<? extends Serializable>, Serializable>) setting.getValue();+ return (Map<String, ContributedAdministrationSetting>) setting.getValue();}@Transactional@Override- public void saveContributedSettings(Map<Class<? extends Serializable>, Serializable> contributedSettings) {+ public void saveContributedSettings(Map<String, ContributedAdministrationSetting> contributedSettings) {Setting setting = getSetting(Key.CONTRIBUTED_SETTINGS);if (setting == null) {setting = new Setting();@@ -451,17 +455,27 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implementsdao.persist(setting);}+ @Nullable@SuppressWarnings("unchecked")- @Override- public <T extends Serializable> T getContributedSetting(Class<T> settingClass) {- return (T) getContributedSettings().get(settingClass);+ public <T extends ContributedAdministrationSetting> T getContributedSetting(Class<T> settingClass) {+ T contributedSetting = (T) getContributedSettings().get(settingClass.getName());+ if (contributedSetting == null) {+ try {+ T value = settingClass.newInstance();+ if (OneDev.getInstance(Validator.class).validate(value).isEmpty())+ contributedSetting = value;+ } catch (InstantiationException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }+ }++ return contributedSetting;}- @Transactional- @Override- public void saveContributedSetting(Class<? extends Serializable> settingClass, Serializable setting) {- Map<Class<? extends Serializable>, Serializable> contributedSettings = getContributedSettings();- contributedSettings.put(settingClass, setting);+ public void saveContributedSetting(Class<? extends ContributedAdministrationSetting> settingClass,+ @Nullable ContributedAdministrationSetting setting) {+ Map<String, ContributedAdministrationSetting> contributedSettings = getContributedSettings();+ contributedSettings.put(settingClass.getName(), setting);saveContributedSettings(contributedSettings);}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex 416e2d790c..66670285c3 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -5,11 +5,8 @@ import java.io.ObjectStreamException;import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;-import java.util.HashSet;-import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;import java.util.Set;import javax.inject.Inject;@@ -63,7 +60,6 @@ import io.onedev.server.util.init.ManualConfig;import io.onedev.server.util.init.Skippable;import io.onedev.server.util.schedule.SchedulableTask;import io.onedev.server.util.schedule.TaskScheduler;-import io.onedev.server.web.page.layout.AdministrationSettingContribution;@Singletonpublic class DefaultDataManager implements DataManager, Serializable {@@ -84,16 +80,13 @@ public class DefaultDataManager implements DataManager, Serializable {private final RoleManager roleManager;- private final Set<AdministrationSettingContribution> administrationSettingContributions;-private String backupTaskId;@Injectpublic DefaultDataManager(UserManager userManager,SettingManager settingManager, PersistManager persistManager,MailManager mailManager, Validator validator, TaskScheduler taskScheduler,- PasswordService passwordService, RoleManager roleManager,- Set<AdministrationSettingContribution> administrationSettingContributions) {+ PasswordService passwordService, RoleManager roleManager) {this.userManager = userManager;this.settingManager = settingManager;this.validator = validator;@@ -102,10 +95,9 @@ public class DefaultDataManager implements DataManager, Serializable {this.mailManager = mailManager;this.passwordService = passwordService;this.roleManager = roleManager;- this.administrationSettingContributions = administrationSettingContributions;}- @SuppressWarnings({ "serial", "unchecked" })+ @SuppressWarnings({"serial"})@Transactional@Overridepublic List<ManualConfig> init() {@@ -223,33 +215,8 @@ public class DefaultDataManager implements DataManager, Serializable {}setting = settingManager.getSetting(Key.CONTRIBUTED_SETTINGS);- Map<Class<? extends Serializable>, Serializable> contributedSettings;if (setting == null)- contributedSettings = new LinkedHashMap<>();- else- contributedSettings = (Map<Class<? extends Serializable>, Serializable>) setting.getValue();-- Collection<Class<? extends Serializable>> contributedSettingClasses = new HashSet<>();- for (AdministrationSettingContribution contribution: administrationSettingContributions) {- contributedSettingClasses.addAll(contribution.getSettingClasses());- for (Class<? extends Serializable> settingClass: contribution.getSettingClasses()) {- if (contributedSettings.get(settingClass) == null) {- try {- Serializable contributedSetting = settingClass.newInstance();- if (validator.validate(contributedSetting).isEmpty())- contributedSettings.put(settingClass, contributedSetting);- } catch (InstantiationException | IllegalAccessException e) {- throw new RuntimeException(e);- }- }- }- }- for (Iterator<Map.Entry<Class<? extends Serializable>, Serializable>> it = contributedSettings.entrySet().iterator(); it.hasNext();) {- if (!contributedSettingClasses.contains(it.next().getKey()))- it.remove();- }-- settingManager.saveContributedSettings(contributedSettings);+ settingManager.saveContributedSettings(new LinkedHashMap<>());setting = settingManager.getSetting(Key.MAIL);if (setting == null) {diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 9df0cde6ba..06d9b37a90 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -2538,4 +2538,16 @@ public class DataMigrator {}}+ private void migrate58(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Projects.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ element.addElement("contributedSettings");+ }+ dom.writeToFile(file, false);+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 90c4e9eb06..6976008345 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -8,7 +8,6 @@ import java.io.FileOutputStream;import java.io.IOException;import java.io.InputStream;import java.io.OutputStream;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -130,6 +129,7 @@ import io.onedev.server.util.usermatch.UserMatch;import io.onedev.server.util.validation.annotation.ProjectName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Markdown;+import io.onedev.server.web.page.project.setting.ContributedProjectSetting;import io.onedev.server.web.util.ProjectAware;import io.onedev.server.web.util.WicketUtils;@@ -224,7 +224,7 @@ public class Project extends AbstractEntity implements NameAware {@JsonIgnore@Lob@Column(nullable=false, length=65535)- private LinkedHashMap<Class<? extends Serializable>, Serializable> contributedSettings = new LinkedHashMap<>();+ private LinkedHashMap<String, ContributedProjectSetting> contributedSettings = new LinkedHashMap<>();@Column(nullable=false)private Date createDate = new Date();@@ -1547,10 +1547,14 @@ public class Project extends AbstractEntity implements NameAware {}}+ public LinkedHashMap<String, ContributedProjectSetting> getContributedSettings() {+ return contributedSettings;+ }+@Nullable@SuppressWarnings("unchecked")- public <T extends Serializable> T getContributedSetting(Class<T> settingClass) {- T contributedSetting = (T) contributedSettings.get(settingClass);+ public <T extends ContributedProjectSetting> T getContributedSetting(Class<T> settingClass) {+ T contributedSetting = (T) contributedSettings.get(settingClass.getName());if (contributedSetting == null) {try {T value = settingClass.newInstance();@@ -1564,8 +1568,9 @@ public class Project extends AbstractEntity implements NameAware {return contributedSetting;}- public void setContributedSetting(Class<? extends Serializable> settingClass, @Nullable Serializable setting) {- contributedSettings.put(settingClass, setting);+ public void setContributedSetting(Class<? extends ContributedProjectSetting> settingClass,+ @Nullable ContributedProjectSetting setting) {+ contributedSettings.put(settingClass.getName(), setting);}}diff --git a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.javaindex 0d2628ff88..9914d17cba 100644--- a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java@@ -5,6 +5,7 @@ import java.time.LocalDate;import java.util.ArrayList;import java.util.Collection;import java.util.Date;+import java.util.LinkedHashMap;import java.util.List;import javax.inject.Inject;@@ -50,6 +51,7 @@ import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Day;+import io.onedev.server.web.page.project.setting.ContributedProjectSetting;@Api(order=1000)@Path("/projects")@@ -98,6 +100,7 @@ public class ProjectResource {setting.namedCommitQueries = project.getNamedCommitQueries();setting.pullRequestSetting = project.getPullRequestSetting();setting.webHooks = project.getWebHooks();+ setting.contributedSettings = project.getContributedSettings();return setting;}@@ -267,6 +270,8 @@ public class ProjectResource {private ArrayList<NamedCodeCommentQuery> namedCodeCommentQueries = new ArrayList<>();private ArrayList<WebHook> webHooks = new ArrayList<>();++ private LinkedHashMap<String, ContributedProjectSetting> contributedSettings = new LinkedHashMap<>();public ArrayList<BranchProtection> getBranchProtections() {return branchProtections;@@ -331,6 +336,14 @@ public class ProjectResource {public void setWebHooks(ArrayList<WebHook> webHooks) {this.webHooks = webHooks;}++ public LinkedHashMap<String, ContributedProjectSetting> getContributedSettings() {+ return contributedSettings;+ }++ public void setContributedSettings(LinkedHashMap<String, ContributedProjectSetting> contributedSettings) {+ this.contributedSettings = contributedSettings;+ }}diff --git a/server-core/src/main/java/io/onedev/server/rest/SettingResource.java b/server-core/src/main/java/io/onedev/server/rest/SettingResource.javaindex 0c775382fd..b296d9558e 100644--- a/server-core/src/main/java/io/onedev/server/rest/SettingResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/SettingResource.java@@ -1,6 +1,7 @@package io.onedev.server.rest;import java.util.List;+import java.util.Map;import javax.inject.Inject;import javax.inject.Singleton;@@ -31,6 +32,7 @@ import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.model.support.administration.sso.SsoConnector;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.page.layout.ContributedAdministrationSetting;@Api(order=100000)@Path("/settings")@@ -163,6 +165,15 @@ public class SettingResource {return settingManager.getSsoConnectors();}+ @Api(order=1450)+ @Path("/contributed-settings")+ @GET+ public Map<String, ContributedAdministrationSetting> getContributedSettings() {+ if (!SecurityUtils.isAdministrator())+ throw new UnauthorizedException();+ return settingManager.getContributedSettings();+ }+@Api(order=1500)@Path("/system")@POST@@ -293,4 +304,14 @@ public class SettingResource {return Response.ok().build();}+ @Api(order=2800)+ @Path("/contributed-settings")+ @POST+ public Response setContributedSettings(@NotNull Map<String, ContributedAdministrationSetting> contributedSettings) {+ if (!SecurityUtils.isAdministrator())+ throw new UnauthorizedException();+ settingManager.saveContributedSettings(contributedSettings);+ return Response.ok().build();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.javaindex bc71f70642..d8037b7383 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java@@ -21,6 +21,7 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.page.layout.ContributedAdministrationSetting;import io.onedev.server.web.page.layout.AdministrationSettingContribution;@SuppressWarnings("serial")@@ -28,7 +29,7 @@ public class ContributedAdministrationSettingPage extends AdministrationPage {public static final String PARAM_SETTING = "setting";- private Class<? extends Serializable> settingClass;+ private Class<? extends ContributedAdministrationSetting> settingClass;public ContributedAdministrationSettingPage(PageParameters params) {super(params);@@ -37,7 +38,7 @@ public class ContributedAdministrationSettingPage extends AdministrationPage {for (AdministrationSettingContribution contribution:OneDev.getExtensions(AdministrationSettingContribution.class)) {- for (Class<? extends Serializable> each: contribution.getSettingClasses()) {+ for (Class<? extends ContributedAdministrationSetting> each: contribution.getSettingClasses()) {if (getSettingName(each).equals(settingName)) {settingClass = each;break;@@ -73,7 +74,7 @@ public class ContributedAdministrationSettingPage extends AdministrationPage {Component editor = get("editor");if (editor instanceof BeanEditor && editor.isVisible())- getSettingManager().saveContributedSetting(settingClass, ((BeanEditor)editor).getModelObject());+ getSettingManager().saveContributedSetting(settingClass, (ContributedAdministrationSetting) ((BeanEditor)editor).getModelObject());elsegetSettingManager().saveContributedSetting(settingClass, null);diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.javaindex 4503280c94..93b2b26f6b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java@@ -33,6 +33,10 @@ import io.onedev.server.model.AbstractEntity;import io.onedev.server.rest.annotation.Api;import io.onedev.server.util.BeanUtils;import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.web.page.layout.ContributedAdministrationSetting;+import io.onedev.server.web.page.layout.AdministrationSettingContribution;+import io.onedev.server.web.page.project.setting.ContributedProjectSetting;+import io.onedev.server.web.page.project.setting.ProjectSettingContribution;public class ApiHelpUtils {@@ -102,16 +106,7 @@ public class ApiHelpUtils {if (parsedTypes.add(valueClass)) {Class<?> instantiationClass;if (Modifier.isAbstract(valueClass.getModifiers())) {- List<Class<?>> implementations = new ArrayList<>(- OneDev.getInstance(ImplementationRegistry.class).getImplementations(valueClass));- Collections.sort(implementations, new Comparator<Class<?>>() {-- @Override- public int compare(Class<?> o1, Class<?> o2) {- return o1.getName().compareTo(o2.getName());- }-- });+ List<Class<?>> implementations = getImplementations(valueClass);instantiationClass = implementations.iterator().next();} else {instantiationClass = valueClass;@@ -144,6 +139,38 @@ public class ApiHelpUtils {return (Serializable) value;}+ public static List<Class<?>> getImplementations(Class<?> clazz) {+ List<Class<?>> implementations = new ArrayList<>();+ if (clazz == ContributedAdministrationSetting.class) {+ for (AdministrationSettingContribution contribution:+ OneDev.getExtensions(AdministrationSettingContribution.class)) {+ implementations.addAll(contribution.getSettingClasses());+ }+ if (implementations.isEmpty())+ implementations.add(ExamplePluginSetting.class);+ } else if (clazz == ContributedProjectSetting.class) {+ for (ProjectSettingContribution contribution:+ OneDev.getExtensions(ProjectSettingContribution.class)) {+ implementations.addAll(contribution.getSettingClasses());+ }+ if (implementations.isEmpty())+ implementations.add(ExamplePluginSetting.class);+ } else {+ implementations.addAll(OneDev.getInstance(ImplementationRegistry.class).getImplementations(clazz));+ }++ Collections.sort(implementations, new Comparator<Class<?>>() {++ @Override+ public int compare(Class<?> o1, Class<?> o2) {+ return o1.getName().compareTo(o2.getName());+ }++ });++ return implementations;+ }+public static List<Field> getJsonFields(Class<?> beanClass) {List<Field> fields = new ArrayList<>();for (Field field: BeanUtils.findFields(beanClass)) {@@ -168,6 +195,5 @@ public class ApiHelpUtils {Collections.sort(fields, new ApiComparator());return fields;- }-+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ExamplePluginSetting.java b/server-core/src/main/java/io/onedev/server/web/page/help/ExamplePluginSetting.javanew file mode 100644index 0000000000..656dfb8cbb--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ExamplePluginSetting.java@@ -0,0 +1,23 @@+package io.onedev.server.web.page.help;++import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.page.layout.ContributedAdministrationSetting;+import io.onedev.server.web.page.project.setting.ContributedProjectSetting;++@Editable+public class ExamplePluginSetting implements ContributedAdministrationSetting, ContributedProjectSetting {++ private static final long serialVersionUID = 1L;++ private String exampleProperty;++ @Editable+ public String getExampleProperty() {+ return exampleProperty;+ }++ public void setExampleProperty(String exampleProperty) {+ this.exampleProperty = exampleProperty;+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.javaindex d46a1a9596..ae9dd16e56 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java@@ -7,7 +7,6 @@ import java.lang.reflect.Modifier;import java.lang.reflect.Type;import java.util.ArrayList;import java.util.Collection;-import java.util.Comparator;import java.util.Date;import java.util.EnumSet;import java.util.HashMap;@@ -45,8 +44,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;-import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.launcher.loader.ImplementationRegistry;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.WordUtils;import io.onedev.server.OneDev;@@ -498,24 +495,14 @@ public class ExampleValuePanel extends Panel {}}, valueInfoModel, requestBodyClass));-+typeInfoFragment.add(new MenuLink("implementations") {@Overrideprotected List<MenuItem> getMenuItems(FloatingPanel dropdown) {List<MenuItem> items = new ArrayList<>();- List<Class<?>> implementations = new ArrayList<>(- OneDev.getInstance(ImplementationRegistry.class).getImplementations(getDeclaredClass()));- Collections.sort(implementations, new Comparator<Class<?>>() {-- @Override- public int compare(Class<?> o1, Class<?> o2) {- return o1.getName().compareTo(o2.getName());- }-- });- for (Class<?> clazz: implementations) {+ for (Class<?> clazz: ApiHelpUtils.getImplementations(getDeclaredClass())) {items.add(new MenuItem() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/AdministrationSettingContribution.java b/server-core/src/main/java/io/onedev/server/web/page/layout/AdministrationSettingContribution.javaindex 2e2066886e..2a2df7f540 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/AdministrationSettingContribution.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/AdministrationSettingContribution.java@@ -1,6 +1,5 @@package io.onedev.server.web.page.layout;-import java.io.Serializable;import java.util.List;import io.onedev.commons.launcher.loader.ExtensionPoint;@@ -8,6 +7,6 @@ import io.onedev.commons.launcher.loader.ExtensionPoint;@ExtensionPointpublic interface AdministrationSettingContribution {- List<Class<? extends Serializable>> getSettingClasses();+ List<Class<? extends ContributedAdministrationSetting>> getSettingClasses();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/ContributedAdministrationSetting.java b/server-core/src/main/java/io/onedev/server/web/page/layout/ContributedAdministrationSetting.javanew file mode 100644index 0000000000..f7ed0d84c8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/ContributedAdministrationSetting.java@@ -0,0 +1,6 @@+package io.onedev.server.web.page.layout;++import java.io.Serializable;++public interface ContributedAdministrationSetting extends Serializable {+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex ddc475d75b..d2ae2a0752 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -1,6 +1,5 @@package io.onedev.server.web.page.project;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Comparator;@@ -59,6 +58,7 @@ import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;+import io.onedev.server.web.page.project.setting.ContributedProjectSetting;import io.onedev.server.web.page.project.setting.ProjectSettingContribution;import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;@@ -237,7 +237,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {WebHooksPage.class, WebHooksPage.paramsOf(getProject())));for (ProjectSettingContribution contribution:OneDev.getExtensions(ProjectSettingContribution.class)) {- for (Class<? extends Serializable> settingClass: contribution.getSettingClasses()) {+ for (Class<? extends ContributedProjectSetting> settingClass: contribution.getSettingClasses()) {settingMenuItems.add(new SidebarMenuItem.Page(null,EditableUtils.getDisplayName(settingClass),diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.javaindex 897711a546..cb87e9e1fd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java@@ -172,6 +172,15 @@ public class NoCommitsPanel extends Panel {tag.setName("span");}+ });+ add(new WebMarkupContainer("setupBuildSpec") {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("span");+ }+});add(new WebMarkupContainer("pushInstructions") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ContributedProjectSetting.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ContributedProjectSetting.javanew file mode 100644index 0000000000..0ceefaa6d8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ContributedProjectSetting.java@@ -0,0 +1,7 @@+package io.onedev.server.web.page.project.setting;++import java.io.Serializable;++public interface ContributedProjectSetting extends Serializable {++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingContribution.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingContribution.javaindex c0e299c587..2f81e6a4b5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingContribution.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingContribution.java@@ -1,6 +1,5 @@package io.onedev.server.web.page.project.setting;-import java.io.Serializable;import java.util.List;import io.onedev.commons.launcher.loader.ExtensionPoint;@@ -8,6 +7,6 @@ import io.onedev.commons.launcher.loader.ExtensionPoint;@ExtensionPointpublic interface ProjectSettingContribution {- List<Class<? extends Serializable>> getSettingClasses();+ List<Class<? extends ContributedProjectSetting>> getSettingClasses();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.javaindex 9b24977d21..a3ac873777 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java@@ -21,6 +21,7 @@ import io.onedev.server.model.Project;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.page.project.setting.ContributedProjectSetting;import io.onedev.server.web.page.project.setting.ProjectSettingContribution;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@@ -29,7 +30,7 @@ public class ContributedProjectSettingPage extends ProjectSettingPage {public static final String PARAM_SETTING = "setting";- private Class<? extends Serializable> settingClass;+ private Class<? extends ContributedProjectSetting> settingClass;public ContributedProjectSettingPage(PageParameters params) {super(params);@@ -38,7 +39,7 @@ public class ContributedProjectSettingPage extends ProjectSettingPage {for (ProjectSettingContribution contribution:OneDev.getExtensions(ProjectSettingContribution.class)) {- for (Class<? extends Serializable> each: contribution.getSettingClasses()) {+ for (Class<? extends ContributedProjectSetting> each: contribution.getSettingClasses()) {if (getSettingName(each).equals(settingName)) {settingClass = each;break;@@ -70,7 +71,7 @@ public class ContributedProjectSettingPage extends ProjectSettingPage {Component editor = get("editor");if (editor instanceof BeanEditor && editor.isVisible())- getProject().setContributedSetting(settingClass, ((BeanEditor)editor).getModelObject());+ getProject().setContributedSetting(settingClass, (ContributedProjectSetting) ((BeanEditor)editor).getModelObject());elsegetProject().setContributedSetting(settingClass, null);diff --git a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.java b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.javaindex 64922dae14..085fd9d528 100644--- a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.java+++ b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.java@@ -1,15 +1,11 @@package io.onedev.server.plugin.buildspec.maven;-import java.io.Serializable;-import java.util.List;-import com.google.common.collect.Lists;import io.onedev.commons.launcher.loader.AbstractPluginModule;import io.onedev.server.buildspec.job.JobSuggestion;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.util.script.ScriptContribution;-import io.onedev.server.web.page.project.setting.ProjectSettingContribution;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -36,15 +32,6 @@ public class MavenModule extends AbstractPluginModule {});- contribute(ProjectSettingContribution.class, new ProjectSettingContribution() {-- @Override- public List<Class<? extends Serializable>> getSettingClasses() {- return Lists.newArrayList(MavenSetting.class);- }-- });-}}diff --git a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenSetting.java b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenSetting.javadeleted file mode 100644index 80b7194ad6..0000000000--- a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenSetting.java+++ /dev/null@@ -1,26 +0,0 @@-package io.onedev.server.plugin.buildspec.maven;--import java.io.Serializable;--import org.hibernate.validator.constraints.NotEmpty;--import io.onedev.server.web.editable.annotation.Editable;--@Editable-public class MavenSetting implements Serializable {-- private static final long serialVersionUID = 1L;-- private String mavenPath;-- @Editable- @NotEmpty- public String getMavenPath() {- return mavenPath;- }-- public void setMavenPath(String mavenPath) {- this.mavenPath = mavenPath;- }--}diff --git a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.java b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.javaindex 9cd8fd52ab..68d0a5a375 100644--- a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.java+++ b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.java@@ -31,6 +31,7 @@ public class NodePluginModule extends AbstractPluginModule {}});+}}