The Unified and Autonomous Development Platform
Add data migration for GPG signature feature
Robin Shen3724d14696cb
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex d76921d518..9287ab23ab 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -113,7 +113,7 @@ public class OneDev extends AbstractPlugin implements Serializable {if (getIngressUrl() != null)logger.warn("Please set up the server at " + getIngressUrl());else- logger.warn("Please set up the server at " + guessServerUrl(false));+ logger.warn("Please set up the server at " + guessServerUrl());initStage = new InitStage("Server Setup", manualConfigs);initStage.waitForFinish();@@ -155,7 +155,7 @@ public class OneDev extends AbstractPlugin implements Serializable {}}- public String guessServerUrl(boolean ssh) {+ public String guessServerUrl() {Url serverUrl = null;String k8sService = System.getenv("k8s_service");@@ -183,12 +183,8 @@ public class OneDev extends AbstractPlugin implements Serializable {String externalIp = externalIpRef.get();- if (externalIp != null) {- if (ssh)- serverUrl = buildServerUrl(externalIp, "ssh", 22);- else- serverUrl = buildServerUrl(externalIp, "http", 80);- }+ if (externalIp != null)+ serverUrl = buildServerUrl(externalIp, "http", 80);}if (serverUrl == null) {@@ -216,9 +212,7 @@ public class OneDev extends AbstractPlugin implements Serializable {}ServerConfig serverConfig = serverConfigProvider.get();- if (ssh)- serverUrl = buildServerUrl(host, "ssh", serverConfig.getSshPort());- else if (serverConfig.getHttpsPort() != 0)+ if (serverConfig.getHttpsPort() != 0)serverUrl = buildServerUrl(host, "https", serverConfig.getHttpsPort());elseserverUrl = buildServerUrl(host, "http", serverConfig.getHttpPort());@@ -232,8 +226,7 @@ public class OneDev extends AbstractPlugin implements Serializable {serverUrl.setHost(host);serverUrl.setProtocol(protocol);- if (!protocol.equals("ssh") || port != 22)- serverUrl.setPort(port);+ serverUrl.setPort(port);return serverUrl;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Import.java b/server-core/src/main/java/io/onedev/server/buildspec/Import.javaindex 997be853f5..9562664e0d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/Import.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/Import.java@@ -38,7 +38,6 @@ import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;@@ -131,11 +130,11 @@ public class Import implements Serializable, Validatable {return new ArrayList<>();}- @Editable(order=500, description="Specify a secret to be used as access token to import build spec "- + "from above project. If not specified, OneDev will try to import build spec anonymously")+ @Editable(order=500, placeholder="Access Anonymously", description="Specify a secret to be used as "+ + "access token to import build spec from above project. If not specified, OneDev will try "+ + "to import build spec anonymously")@ChoiceProvider("getAccessTokenSecretChoices")@Nullable- @NameOfEmptyValue("Access Anonymously")public String getAccessTokenSecret() {return accessTokenSecret;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex 29fe3cddbf..56dd576277 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -7,8 +7,8 @@ import static io.onedev.server.model.Build.NAME_PULL_REQUEST;import static io.onedev.server.model.Build.NAME_TAG;import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;import static io.onedev.server.search.entity.build.BuildQueryLexer.And;-import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;import static io.onedev.server.search.entity.build.BuildQueryLexer.InPipelineOf;+import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;import java.io.Serializable;import java.util.ArrayList;@@ -60,7 +60,6 @@ import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.RetryCondition;import io.onedev.server.web.editable.annotation.SuggestionProvider;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@@ -146,10 +145,9 @@ public class Job implements NamedElement, Serializable, Validatable {return new ArrayList<>();}- @Editable(order=200, description="Optionally specify executor to execute this job. Leave empty to "- + "use any executor as long as its job requirement is satisfied")+ @Editable(order=200, placeholder="Use Any Applicable Executor", description="Optionally specify executor "+ + "to execute this job. Leave empty to use any executor as long as its job requirement is satisfied")@Interpolative(literalSuggester="suggestJobExecutors", variableSuggester="suggestVariables")- @NameOfEmptyValue("Use Any Applicable Executor")public String getJobExecutor() {return jobExecutor;}@@ -229,11 +227,11 @@ public class Job implements NamedElement, Serializable, Validatable {this.projectDependencies = projectDependencies;}- @Editable(order=9114, group="Dependencies & Services", description="Optionally specify services required by this job. "+ @Editable(order=9114, group="Dependencies & Services", placeholder="No required services",+ description="Optionally specify services required by this job. "+ "<b class='text-warning'>NOTE:</b> Services are only supported by docker aware executors "+ "(server docker executor, remote docker executor, or kubernetes executor)")@ChoiceProvider("getServiceChoices")- @NameOfEmptyValue("No required services")public List<String> getRequiredServices() {return requiredServices;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.javaindex 3ba6c8370a..7dd32c79d7 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java@@ -17,7 +17,6 @@ import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.ParamSpecProvider;import io.onedev.server.web.editable.annotation.Patterns;@@ -70,13 +69,13 @@ public class JobDependency implements Serializable {this.jobParams = jobParams;}- @Editable(order=300, name="Artifacts to Retrieve", description="Optionally specify artifacts to retrieve "- + "from the dependency into <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>. "+ @Editable(order=300, name="Artifacts to Retrieve", placeholder="Do not retrieve", description=""+ + "Optionally specify artifacts to retrieve from the dependency into "+ + "<a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>. "+ "Only published artifacts (via artifact publish step) can be retrieved. Leave empty to not "+ "retrieve any artifacts")@Interpolative(variableSuggester="suggestVariables")@Patterns(path=true)- @NameOfEmptyValue("Do not retrieve")public String getArtifacts() {return artifacts;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.javaindex a95ba358a7..30b57950cc 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java@@ -17,6 +17,7 @@ import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.SshSetting;+import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.ChoiceProvider;@@ -50,8 +51,10 @@ public class SshCredential implements GitCredential, Validatable {@Overridepublic CloneInfo newCloneInfo(Build build, String jobToken) {String cloneUrl = OneDev.getInstance(UrlManager.class).cloneUrlFor(build.getProject(), true);- SshSetting sshSetting = OneDev.getInstance(SettingManager.class).getSshSetting();- StringBuilder knownHosts = new StringBuilder(sshSetting.getServerName()).append(" ");+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);+ SystemSetting systemSetting = settingManager.getSystemSetting();+ SshSetting sshSetting = settingManager.getSshSetting();+ StringBuilder knownHosts = new StringBuilder(systemSetting.getSshServerName()).append(" ");try {PublicKeyEntry.appendPublicKeyEntry(knownHosts, sshSetting.getPublicKey());} catch (IOException e) {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.javaindex e4e5557d76..202b2c4356 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java@@ -22,7 +22,6 @@ import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.util.WicketUtils;@@ -105,11 +104,11 @@ public class ProjectDependency implements Serializable {return BuildSpec.suggestVariables(matchWith, false, false);}- @Editable(order=500, description="Specify a secret to be used as access token to retrieve artifacts "- + "from above project. If not specified, project artifacts will be accessed anonymously")+ @Editable(order=500, placeholder="Access Anonymously", description="Specify a secret to be used as "+ + "access token to retrieve artifacts from above project. If not specified, project "+ + "artifacts will be accessed anonymously")@ChoiceProvider("getAccessTokenSecretChoices")@Nullable- @NameOfEmptyValue("Access Anonymously")public String getAccessTokenSecret() {return accessTokenSecret;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.javaindex 7e059a7161..8d7964dc21 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java@@ -17,7 +17,6 @@ import io.onedev.server.util.match.Matcher;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -30,11 +29,10 @@ public class BranchUpdateTrigger extends JobTrigger {private String paths;- @Editable(name="Branches", order=100, description="Optionally specify space-separated branches "+ @Editable(name="Branches", order=100, placeholder="Any branch", description="Optionally specify space-separated branches "+ "to check. Use '**' or '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty to match all branches")@Patterns(suggester = "suggestBranches", path=true)- @NameOfEmptyValue("Any branch")public String getBranches() {return branches;}@@ -48,11 +46,10 @@ public class BranchUpdateTrigger extends JobTrigger {return SuggestionUtils.suggestBranches(Project.get(), matchWith);}- @Editable(name="Touched Files", order=200,+ @Editable(name="Touched Files", order=200, placeholder="Any file",description="Optionally specify space-separated files to check. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty to match all files")@Patterns(suggester = "getPathSuggestions", path=true)- @NameOfEmptyValue("Any file")public String getPaths() {return paths;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.javaindex c5986207b0..815883da18 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java@@ -21,7 +21,6 @@ import io.onedev.server.util.match.Matcher;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.ParamSpecProvider;import io.onedev.server.web.editable.annotation.Patterns;@@ -38,12 +37,12 @@ public abstract class JobTrigger implements Serializable {private List<ParamSupply> params = new ArrayList<>();- @Editable(name="Applicable Projects", order=900, description="Optionally specify space-separated projects "- + "applicable for this trigger. This is useful for instance when you want to prevent "- + "the job from being triggered in forked projects. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ @Editable(name="Applicable Projects", order=900, placeholder="Any project", description=""+ + "Optionally specify space-separated projects applicable for this trigger. "+ + "This is useful for instance when you want to prevent the job from being "+ + "triggered in forked projects. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty to match all projects")@Patterns(suggester="suggestProjects", path=true)- @NameOfEmptyValue("Any project")public String getProjects() {return projects;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.javaindex 923d72036c..57b8c548a3 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java@@ -14,7 +14,6 @@ import io.onedev.server.util.match.Matcher;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -26,11 +25,11 @@ public abstract class PullRequestTrigger extends JobTrigger {private String paths;- @Editable(name="Target Branches", order=100, description="Optionally specify space-separated "- + "target branches of the pull requests to check. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ @Editable(name="Target Branches", placeholder="Any branch", order=100, description=""+ + "Optionally specify space-separated target branches of the pull requests to check. "+ + "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty to match all branches")@Patterns(suggester = "suggestBranches", path=true)- @NameOfEmptyValue("Any branch")public String getBranches() {return branches;}@@ -44,11 +43,11 @@ public abstract class PullRequestTrigger extends JobTrigger {return SuggestionUtils.suggestBranches(Project.get(), matchWith);}- @Editable(name="Touched Files", order=200,- description="Optionally specify space-separated files to check. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "- + "Prefix with '-' to exclude. Leave empty to match all files")+ @Editable(name="Touched Files", order=200, placeholder="Any file", description=""+ + "Optionally specify space-separated files to check. "+ + "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ + "Prefix with '-' to exclude. Leave empty to match all files")@Patterns(suggester = "getPathSuggestions", path=true)- @NameOfEmptyValue("Any file")public String getPaths() {return paths;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.javaindex fbd7034160..f30b70d0ab 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java@@ -15,7 +15,6 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -28,11 +27,11 @@ public class TagCreateTrigger extends JobTrigger {private String branches;- @Editable(name="Tags", order=100, description="Optionally specify space-separated tags to check. "- + "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ @Editable(name="Tags", order=100, placeholder="Any tag", description=""+ + "Optionally specify space-separated tags to check. Use '**', '*' or '?' for "+ + "<a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty to match all tags")@Patterns(suggester="suggestTags", path=true)- @NameOfEmptyValue("Any tag")public String getTags() {return tags;}@@ -46,12 +45,12 @@ public class TagCreateTrigger extends JobTrigger {return SuggestionUtils.suggestTags(Project.get(), matchWith);}- @Editable(name="On Branches", order=200, description="This trigger will only be applicable "- + "if tagged commit is on branches specified here. Multiple branches should be "- + "separated with spaces. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ @Editable(name="On Branches", order=200, placeholder="Any branch", description=""+ + "This trigger will only be applicable if tagged commit is on branches specified here. "+ + "Multiple branches should be separated with spaces. Use '**', '*' or '?' for "+ + "<a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty to match all branches")@Patterns(suggester="suggestBranches", path=true)- @NameOfEmptyValue("Any branch")public String getBranches() {return branches;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ChoiceParam.javaindex b5b26e55f4..eea79cc694 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ChoiceParam.java@@ -14,7 +14,6 @@ import io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueproimport io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ShowCondition;@Editable(order=145, name=ParamSpec.ENUMERATION)@@ -40,8 +39,7 @@ public class ChoiceParam extends ParamSpec {}@ShowCondition("isDefaultValueProviderVisible")- @Editable(order=1100, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1100, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;@@ -57,8 +55,7 @@ public class ChoiceParam extends ParamSpec {}@ShowCondition("isDefaultMultiValueProviderVisible")- @Editable(order=1100, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1100, name="Default Value", placeholder="No default value")@Validpublic DefaultMultiValueProvider getDefaultMultiValueProvider() {return defaultMultiValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.javaindex aa0c1ab507..7263d4bc19 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java@@ -9,7 +9,6 @@ import io.onedev.server.model.support.inputspec.dateinput.DateInput;import io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.Constants;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=505, name=ParamSpec.DATE)public class DateParam extends ParamSpec {@@ -18,8 +17,7 @@ public class DateParam extends ParamSpec {private DefaultValueProvider defaultValueProvider;- @Editable(order=1000, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1000, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.javaindex 6ccc220f99..63aff3aac5 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java@@ -9,7 +9,6 @@ import io.onedev.server.model.support.inputspec.datetimeinput.DateTimeInput;import io.onedev.server.model.support.inputspec.datetimeinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.Constants;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=600, name=ParamSpec.DATE_TIME)public class DateTimeParam extends ParamSpec {@@ -18,8 +17,7 @@ public class DateTimeParam extends ParamSpec {private DefaultValueProvider defaultValueProvider;- @Editable(order=1000, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1000, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.javaindex 89cf706daa..8ffd8831bb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.java@@ -8,7 +8,6 @@ import javax.validation.Valid;import io.onedev.server.model.support.inputspec.floatinput.FloatInput;import io.onedev.server.model.support.inputspec.floatinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=450, name=ParamSpec.FLOAT)public class FloatParam extends ParamSpec {@@ -17,8 +16,7 @@ public class FloatParam extends ParamSpec {private DefaultValueProvider defaultValueProvider;- @Editable(order=1200, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1200, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.javaindex b5af3fdb42..46dfd438f6 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java@@ -11,7 +11,6 @@ import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=160, name=ParamSpec.GROUP)public class GroupChoiceParam extends ParamSpec {@@ -33,8 +32,7 @@ public class GroupChoiceParam extends ParamSpec {this.choiceProvider = choiceProvider;}- @Editable(order=1100, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1100, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.javaindex 26bca4a413..974be0a4f3 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.java@@ -8,7 +8,6 @@ import javax.validation.Valid;import io.onedev.server.model.support.inputspec.integerinput.IntegerInput;import io.onedev.server.model.support.inputspec.integerinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=400, name=ParamSpec.INTEGER)public class IntegerParam extends ParamSpec {@@ -39,8 +38,7 @@ public class IntegerParam extends ParamSpec {this.maxValue = maxValue;}- @Editable(order=1200, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1200, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.javaindex 98f6d3d08a..a58be4a7a3 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java@@ -14,7 +14,6 @@ import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.validation.annotation.ParamName;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.util.WicketUtils;@Editable@@ -35,8 +34,7 @@ public abstract class ParamSpec extends InputSpec {super.setName(name);}- @Editable(order=30, description="Optionally describes the param")- @NameOfEmptyValue("No description")+ @Editable(order=30, placeholder="No description", description="Optionally describes the param")@Overridepublic String getDescription() {return super.getDescription();@@ -58,8 +56,8 @@ public abstract class ParamSpec extends InputSpec {super.setAllowMultiple(allowMultiple);}- @Editable(order=40, name="Show Conditionally", description="Enable if visibility of this param depends on other params")- @NameOfEmptyValue("Always")+ @Editable(order=40, name="Show Conditionally", placeholder="Always",+ description="Enable if visibility of this param depends on other params")@Valid@Overridepublic ShowCondition getShowCondition() {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.javaindex 2c4f415d6f..8905d1b0c3 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java@@ -8,7 +8,6 @@ import javax.validation.Valid;import io.onedev.server.model.support.inputspec.textinput.TextInput;import io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=100, name=ParamSpec.TEXT)public class TextParam extends ParamSpec {@@ -40,8 +39,7 @@ public class TextParam extends ParamSpec {this.pattern = pattern;}- @Editable(order=1200, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1200, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.javaindex 0c46abb901..b58857f91a 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java@@ -16,7 +16,6 @@ import io.onedev.server.model.support.inputspec.userchoiceinput.defaultmultivaluimport io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ShowCondition;@Editable(order=150, name=ParamSpec.USER)@@ -41,9 +40,8 @@ public class UserChoiceParam extends ParamSpec {this.choiceProvider = choiceProvider;}- @Editable(order=1100, name="Default Value")+ @Editable(order=1100, name="Default Value", placeholder="No default value")@ShowCondition("isDefaultValueProviderVisible")- @NameOfEmptyValue("No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;@@ -59,8 +57,7 @@ public class UserChoiceParam extends ParamSpec {}@ShowCondition("isDefaultMultiValueProviderVisible")- @Editable(order=1100, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1100, name="Default Value", placeholder="No default value")@Validpublic DefaultMultiValueProvider getDefaultMultiValueProvider() {return defaultMultiValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/WorkingPeriodParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/WorkingPeriodParam.javaindex 1fc378bca1..e5e7eefad2 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/WorkingPeriodParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/WorkingPeriodParam.java@@ -9,7 +9,6 @@ import io.onedev.server.model.support.inputspec.workingperiodinput.WorkingPeriodimport io.onedev.server.model.support.inputspec.workingperiodinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.DateUtils;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=700, name=ParamSpec.WORKING_PERIOD)public class WorkingPeriodParam extends ParamSpec {@@ -18,8 +17,7 @@ public class WorkingPeriodParam extends ParamSpec {private DefaultValueProvider defaultValueProvider;- @Editable(order=1000, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1000, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;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 845cef44dd..26a5b47e41 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@@ -150,13 +150,24 @@ public class DefaultDataManager implements DataManager, Serializable {user.setFullName(newUserBean.getFullName());user.setPassword(passwordService.encryptPassword(newUserBean.getPassword()));userManager.replicate(user);-- EmailAddress emailAddress = new EmailAddress();- emailAddress.setValue(newUserBean.getEmailAddress());- emailAddress.setVerificationCode(null);- emailAddress.setOwner(user);- emailAddressManager.save(emailAddress);+ EmailAddress primaryEmailAddress = null;+ for (EmailAddress emailAddress: emailAddressManager.query()) {+ if (emailAddress.getOwner().equals(user) && emailAddress.isPrimary()) {+ primaryEmailAddress = emailAddress;+ break;+ }+ }++ if (primaryEmailAddress == null) {+ primaryEmailAddress = new EmailAddress();+ primaryEmailAddress.setPrimary(true);+ primaryEmailAddress.setGit(true);+ primaryEmailAddress.setVerificationCode(null);+ primaryEmailAddress.setOwner(user);+ }+ primaryEmailAddress.setValue(newUserBean.getEmailAddress());+ emailAddressManager.save(primaryEmailAddress);}});@@ -174,7 +185,7 @@ public class DefaultDataManager implements DataManager, Serializable {settingManager.saveSystemSetting(systemSetting);systemSetting = null;} else {- systemSetting.setServerUrl(OneDev.getInstance().guessServerUrl(false));+ systemSetting.setServerUrl(OneDev.getInstance().guessServerUrl());}} else {systemSetting = (SystemSetting) setting.getValue();@@ -185,7 +196,7 @@ public class DefaultDataManager implements DataManager, Serializable {}if (systemSetting != null) {- Collection<String> excludedProps = Sets.newHashSet("gravatarEnabled");+ Collection<String> excludedProps = Sets.newHashSet("sshRootUrl", "gravatarEnabled");if (Bootstrap.isInDocker()) {excludedProps.add("gitConfig");excludedProps.add("curlConfig");@@ -212,7 +223,6 @@ public class DefaultDataManager implements DataManager, Serializable {setting = settingManager.getSetting(Key.SSH);if (setting == null || setting.getValue() == null) {SshSetting sshSetting = new SshSetting();- sshSetting.setServerUrl(OneDev.getInstance().guessServerUrl(true));sshSetting.setPemPrivateKey(SshKeyUtils.generatePEMPrivateKey());settingManager.saveSshSetting(sshSetting);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 46eaddcd35..1421cdb959 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@@ -3803,8 +3803,19 @@ public class DataMigrator {Map<String, String> gitEmails = new HashMap<>();Map<String, String> alternateEmails = new HashMap<>();+ String sshServerUrl = null;+for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Users.xml")) {+ if (file.getName().startsWith("Projects.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ for (Element branchProtectionElement: element.element("branchProtections").elements())+ branchProtectionElement.addElement("signatureRequired").setText("false");+ for (Element tagProtectionElement: element.element("tagProtections").elements())+ tagProtectionElement.addElement("signatureRequired").setText("false");+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Users.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element: dom.getRootElement().elements()) {String userId = element.elementText("id").trim();@@ -3859,10 +3870,18 @@ public class DataMigrator {} else if (file.getName().startsWith("Settings.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element: dom.getRootElement().elements()) {- if (element.elementTextTrim("key").equals("SECURITY")) {+ String key = element.elementTextTrim("key");+ if (key.equals("SECURITY")) {Element valueElement = element.element("value");if (valueElement != null)valueElement.addElement("enforce2FA").setText("false");+ } else if (key.equals("SSH")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ Element sshServerUrlElement = valueElement.element("serverUrl");+ sshServerUrl = sshServerUrlElement.getText().trim();+ sshServerUrlElement.detach();+ }}}dom.writeToFile(file, false);@@ -3873,6 +3892,22 @@ public class DataMigrator {dom.writeToFile(file, false);}}++ if (sshServerUrl != null) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.elementTextTrim("key").equals("SYSTEM")) {+ Element valueElement = element.element("value");+ if (valueElement != null)+ valueElement.addElement("sshRootUrl").setText(sshServerUrl);+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }VersionedXmlDoc emailAddressesDom;File emailAddressesFile = new File(dataDir, "EmailAddresss.xml");diff --git a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java b/server-core/src/main/java/io/onedev/server/model/LinkSpec.javaindex 7c96cfc00a..4000522f60 100644--- a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java@@ -20,7 +20,6 @@ import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.search.entity.issue.IssueQueryUpdater;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable@Entity@@ -73,9 +72,9 @@ public class LinkSpec extends AbstractEntity {}- @Editable(order=160, name="Linkable Issues", description="Optionally specify criteria of issues which can be linked")+ @Editable(order=160, name="Linkable Issues", placeholder="All issues",+ description="Optionally specify criteria of issues which can be linked")@io.onedev.server.web.editable.annotation.IssueQuery- @NameOfEmptyValue("All issues")public String getIssueQuery() {return issueQuery;}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 8ffea09f4a..5953749b8e 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@@ -207,8 +207,6 @@ public class Project extends AbstractEntity {public static final String PROP_SERVICE_DESK_NAME = "serviceDeskName";- public static final String PROP_GIT_SIGN_STRATEGY = "gitSignStrategy";-public static final String NULL_SERVICE_DESK_PREFIX = "<$NullServiceDesk$>";public static final List<String> QUERY_FIELDS =diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javaindex b6f928e766..2888447403 100644--- a/server-core/src/main/java/io/onedev/server/model/Role.java+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -56,7 +56,6 @@ import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.util.validation.annotation.RoleName;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ShowCondition;/**@@ -237,10 +236,9 @@ public class Role extends AbstractEntity implements Permission, Validatable {return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldNames();}- @Editable(order=625, description="Optionally specify issue links allowed to edit")+ @Editable(order=625, placeholder="None", description="Optionally specify issue links allowed to edit")@ShowCondition("isManageIssuesDisabled")@ChoiceProvider("getIssueLinkChoices")- @NameOfEmptyValue("None")public List<String> getEditableIssueLinks() {return editableIssueLinks;}diff --git a/server-core/src/main/java/io/onedev/server/model/SshKey.java b/server-core/src/main/java/io/onedev/server/model/SshKey.javaindex 3e53de31aa..5aed857f1b 100644--- a/server-core/src/main/java/io/onedev/server/model/SshKey.java+++ b/server-core/src/main/java/io/onedev/server/model/SshKey.java@@ -55,7 +55,9 @@ public class SshKey extends AbstractEntity implements Validatable {@JoinColumn(nullable=false)private User owner;- @Editable(name="OpenSSH Public Key", description="Provide a OpenSSH public key. Normally begins with 'ssh-rsa'")+ @Editable(name="OpenSSH Public Key", placeholder="OpenSSH public key begins with 'ssh-rsa', "+ + "'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', 'ecdsa-sha2-nistp521', 'ssh-ed25519', "+ + "'[email protected]', or '[email protected]'")@NotEmpty@Multiline@OmitNamediff --git a/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.java b/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.javaindex 0caa65afc4..9d9f756803 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.java@@ -29,7 +29,7 @@ public class BaseGpgKey extends AbstractEntity implements Validatable {private transient PGPPublicKey publicKey;- @Editable(name="GPG Public Key", description="Provide a GPG public key. Begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'")+ @Editable(name="GPG Public Key", placeholder="GPG public key begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'")@NotEmpty@Multiline@OmitNamediff --git a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.javaindex c453814db7..371bb3f6b0 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java@@ -31,7 +31,6 @@ import io.onedev.server.util.usermatch.UserMatch;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;import io.onedev.server.web.editable.annotation.JobChoice;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -135,10 +134,9 @@ public class BranchProtection implements Serializable {this.signatureRequired = signatureRequired;}- @Editable(order=400, name="Required Reviewers", description="Optionally specify required reviewers for changes of "- + "specified branch")+ @Editable(order=400, name="Required Reviewers", placeholder="No one", description="Optionally specify "+ + "required reviewers for changes of specified branch")@io.onedev.server.web.editable.annotation.ReviewRequirement- @NameOfEmptyValue("No one")public String getReviewRequirement() {return reviewRequirement;}@@ -158,9 +156,8 @@ public class BranchProtection implements Serializable {reviewRequirement = parsedReviewRequirement.toString();}- @Editable(order=500, name="Required Builds", description="Optionally choose required builds")+ @Editable(order=500, name="Required Builds", placeholder="No any", description="Optionally choose required builds")@JobChoice(tagsMode=true)- @NameOfEmptyValue("No any")public List<String> getJobNames() {return jobNames;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.javaindex bafbfa97dc..11681d2ad4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java@@ -15,7 +15,6 @@ 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.JobChoice;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -75,9 +74,8 @@ public class FileProtection implements Serializable, Validatable {reviewRequirement = parsedReviewRequirement.toString();}- @Editable(order=500, name="Required Builds", description="Optionally choose required builds")+ @Editable(order=500, name="Required Builds", placeholder="No any", description="Optionally choose required builds")@JobChoice(tagsMode=true)- @NameOfEmptyValue("No any")public List<String> getJobNames() {return jobNames;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.javaindex ffdab9ea5e..8e08313da0 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.java@@ -4,7 +4,6 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.AgentQuery;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class NamedAgentQuery implements NamedQuery {@@ -34,9 +33,8 @@ public class NamedAgentQuery implements NamedQuery {this.name = name;}- @Editable+ @Editable(placeholder="All")@AgentQuery(forExecutor=false)- @NameOfEmptyValue("All")@Overridepublic String getQuery() {return query;diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.javaindex 745ee6ed0f..9b1bd41e26 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java@@ -4,7 +4,6 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.CodeCommentQuery;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class NamedCodeCommentQuery implements NamedQuery {@@ -34,9 +33,8 @@ public class NamedCodeCommentQuery implements NamedQuery {this.name = name;}- @Editable+ @Editable(placeholder="All")@CodeCommentQuery- @NameOfEmptyValue("All")@Overridepublic String getQuery() {return query;diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.javaindex cfa0abbb96..e361568d9c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java@@ -4,7 +4,6 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.CommitQuery;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class NamedCommitQuery implements NamedQuery {@@ -34,9 +33,8 @@ public class NamedCommitQuery implements NamedQuery {this.name = name;}- @Editable+ @Editable(placeholder="All")@CommitQuery- @NameOfEmptyValue("All")@Overridepublic String getQuery() {return query;diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedProjectQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedProjectQuery.javaindex 5878ea9e5d..dcc9291446 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedProjectQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedProjectQuery.java@@ -3,7 +3,6 @@ package io.onedev.server.model.support;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ProjectQuery;@Editable@@ -34,9 +33,8 @@ public class NamedProjectQuery implements NamedQuery {this.name = name;}- @Editable+ @Editable(placeholder="All")@ProjectQuery- @NameOfEmptyValue("All")@Overridepublic String getQuery() {return query;diff --git a/server-core/src/main/java/io/onedev/server/model/support/RegistryLogin.java b/server-core/src/main/java/io/onedev/server/model/support/RegistryLogin.javaindex 644d810490..ce2ff0808c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/RegistryLogin.java+++ b/server-core/src/main/java/io/onedev/server/model/support/RegistryLogin.java@@ -5,7 +5,6 @@ import java.io.Serializable;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Password;@Editable@@ -19,8 +18,8 @@ public class RegistryLogin implements Serializable {private String password;- @Editable(order=100, description="Specify registry url. Leave empty for official registry")- @NameOfEmptyValue("Default Registry")+ @Editable(order=100, placeholder="Default registry",+ description="Specify registry url. Leave empty for official registry")public String getRegistryUrl() {return registryUrl;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.javaindex 4b2026c76f..56a87e96e0 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java@@ -19,7 +19,6 @@ import io.onedev.server.util.usage.Usage;import io.onedev.server.util.validation.annotation.Code;import io.onedev.server.util.validation.annotation.RegEx;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.editable.annotation.ShowCondition;import io.onedev.server.web.util.SuggestionUtils;@@ -77,12 +76,11 @@ public class GroovyScript implements Serializable {return (boolean) EditContext.get().getInputValue("canBeUsedByBuildJobs");}- @Editable(order=400, description="Optionally specify space-separated projects allowed to "+ @Editable(order=400, placeholder="All", description="Optionally specify space-separated projects allowed to "+ "execute this script. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude. "+ "Leave empty to allow all")@Patterns(suggester="suggestProjects", path=true)@ShowCondition("isCanBeUsedByBuildJobsEnabled")- @NameOfEmptyValue("All")public String getAllowedProjects() {return allowedProjects;}@@ -91,12 +89,11 @@ public class GroovyScript implements Serializable {this.allowedProjects = allowedProjects;}- @Editable(order=500, description="Optionally specify space-separated branches allowed to "+ @Editable(order=500, placeholder="All", description="Optionally specify space-separated branches allowed to "+ "execute this script. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty to allow all")@Patterns(path=true)@ShowCondition("isCanBeUsedByBuildJobsEnabled")- @NameOfEmptyValue("All")public String getAllowedBranches() {return allowedBranches;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/IssueCreationSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueCreationSetting.javaindex 0210a7b259..31157200a2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/IssueCreationSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueCreationSetting.java@@ -23,7 +23,6 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuimport io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.FieldNamesProvider;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -39,11 +38,11 @@ public class IssueCreationSetting implements Serializable {private List<FieldSupply> issueFields = new ArrayList<>();- @Editable(order=100, name="Applicable Senders", description="Specify space-separated sender "- + "email addresses applicable for this entry. Use '*' or '?' for wildcard match. "- + "Prefix with '-' to exclude. Leave empty to match all senders")+ @Editable(order=100, name="Applicable Senders", placeholder="Any sender",+ description="Specify space-separated sender email addresses applicable for this entry. "+ + "Use '*' or '?' for wildcard match. Prefix with '-' to exclude. "+ + "Leave empty to match all senders")@Patterns- @NameOfEmptyValue("Any sender")public String getSenderEmails() {return senderEmails;}@@ -52,11 +51,10 @@ public class IssueCreationSetting implements Serializable {this.senderEmails = senderEmails;}- @Editable(order=150, description="Specify space-separated projects applicable for this entry. "+ @Editable(order=150, placeholder="Any project", description="Specify space-separated projects applicable for this entry. "+ "Use '*' or '?' for wildcard match. Prefix with '-' to exclude. Leave empty to "+ "match all projects")@Patterns(suggester="suggestProjects")- @NameOfEmptyValue("Any project")public String getApplicableProjects() {return applicableProjects;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/ProjectDesignation.java b/server-core/src/main/java/io/onedev/server/model/support/administration/ProjectDesignation.javaindex 3f2191193f..02fdcb54b1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/ProjectDesignation.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/ProjectDesignation.java@@ -11,7 +11,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;@Editable@@ -23,11 +22,11 @@ public class ProjectDesignation implements Serializable {private String project;- @Editable(order=100, name="Applicable Senders", description="Specify space-separated sender "- + "email addresses applicable for this entry. Use '*' or '?' for wildcard match. "- + "Prefix with '-' to exclude. Leave empty to match all senders")+ @Editable(order=100, name="Applicable Senders", placeholder="Any sender", description=""+ + "Specify space-separated sender email addresses applicable for this entry. "+ + "Use '*' or '?' for wildcard match. Prefix with '-' to exclude. "+ + "Leave empty to match all senders")@Patterns- @NameOfEmptyValue("Any sender")public String getSenderEmails() {return senderEmails;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.javaindex 77006e1a56..df2bf50c94 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.java@@ -15,7 +15,6 @@ import io.onedev.server.model.Role;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.editable.annotation.RoleChoice;import io.onedev.server.web.util.SuggestionUtils;@@ -31,11 +30,11 @@ public class SenderAuthorization implements Serializable {private String authorizedRoleName;- @Editable(order=100, name="Applicable Senders", description="Specify space-separated sender "- + "email addresses applicable for this entry. Use '*' or '?' for wildcard match. "- + "Prefix with '-' to exclude. Leave empty to match all senders")+ @Editable(order=100, name="Applicable Senders", placeholder="Any sender", description=""+ + "Specify space-separated sender email addresses applicable for this entry. "+ + "Use '*' or '?' for wildcard match. Prefix with '-' to exclude. "+ + "Leave empty to match all senders")@Patterns- @NameOfEmptyValue("Any sender")public String getSenderEmails() {return senderEmails;}@@ -44,11 +43,11 @@ public class SenderAuthorization implements Serializable {this.senderEmails = senderEmails;}- @Editable(order=150, description="Specify space-separated projects authorized to senders above. "- + "Use '**' or '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude. Leave empty to "- + "authorize all projects")+ @Editable(order=150, placeholder="Any project", description="Specify space-separated projects "+ + "authorized to senders above. Use '**' or '*' or '?' for "+ + "<a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ + "Prefix with '-' to exclude. Leave empty to authorize all projects")@Patterns(suggester="suggestProjects", path=true)- @NameOfEmptyValue("Any project")public String getAuthorizedProjects() {return authorizedProjects;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.javaindex 9c4bc9c4a9..69bddf62a3 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.java@@ -8,7 +8,6 @@ import java.security.PublicKey;import javax.validation.ConstraintValidatorContext;-import org.apache.commons.lang3.StringUtils;import org.apache.sshd.common.config.keys.KeyUtils;import org.apache.sshd.common.digest.BuiltinDigests;import org.hibernate.validator.constraints.NotEmpty;@@ -18,6 +17,7 @@ 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.Multiline;+import io.onedev.server.web.editable.annotation.OmitName;@Editable@ClassValidating@@ -25,23 +25,10 @@ public class SshSetting implements Serializable, Validatable {private static final long serialVersionUID = 1L;- private String serverUrl;-private String pemPrivateKey;- @Editable(name="SSH Server URL", order=90, description="This property will be used as base to construct "- + "urls of various ssh services such as git over ssh")- @NotEmpty- public String getServerUrl() {- return serverUrl;- }-- public void setServerUrl(String serverUrl) {- this.serverUrl = serverUrl;- }-- @Editable(name="Server Private Key", order=100, description="Specify the private key (in PEM format) used "- + "by ssh server to establish connections with client")+ @Editable(placeholder="PEM private key begins with '-----BEGIN RSA PRIVATE KEY-----'")+ @OmitName@Multiline@NotEmptypublic String getPemPrivateKey() {@@ -78,19 +65,8 @@ public class SshSetting implements Serializable, Validatable {}}- public String getServerName() {- String serverName = serverUrl;- if (serverName.startsWith("ssh://"))- serverName = serverName.substring("ssh://".length());- serverName = StringUtils.stripEnd(serverName, "/\\");- return StringUtils.substringBefore(serverName, ":");- }-@Overridepublic boolean isValid(ConstraintValidatorContext context) {- if (serverUrl != null)- serverUrl = StringUtils.stripEnd(serverUrl, "/\\");-boolean hasErrors = false;String propertyNode = "pemPrivateKey";try {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.javaindex 9d689f3f3c..b3e5c30050 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java@@ -1,7 +1,10 @@package io.onedev.server.model.support.administration;import java.io.Serializable;+import java.net.MalformedURLException;+import java.net.URL;+import javax.annotation.Nullable;import javax.validation.ConstraintValidatorContext;import javax.validation.Valid;import javax.validation.constraints.NotNull;@@ -9,10 +12,15 @@ import javax.validation.constraints.NotNull;import org.apache.commons.lang3.StringUtils;import org.hibernate.validator.constraints.NotEmpty;+import com.google.common.base.Preconditions;++import io.onedev.server.OneDev;import io.onedev.server.git.config.CurlConfig;import io.onedev.server.git.config.GitConfig;import io.onedev.server.git.config.SystemCurl;import io.onedev.server.git.config.SystemGit;+import io.onedev.server.util.EditContext;+import io.onedev.server.util.ServerConfig;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Editable;@@ -22,8 +30,10 @@ import io.onedev.server.web.editable.annotation.Editable;public class SystemSetting implements Serializable, Validatable {private static final long serialVersionUID = 1;-+private String serverUrl;++ private String sshRootUrl;private GitConfig gitConfig = new SystemGit();@@ -41,9 +51,44 @@ public class SystemSetting implements Serializable, Validatable {this.serverUrl = serverUrl;}+ @Editable(name="SSH Root URL", order=150, placeholderProvider="getSshRootUrlPlaceholder", description=""+ + "Optionally specify SSH root URL, which will be used to construct project clone url via SSH protocol. "+ + "Leave empty to derive from server url")+ public String getSshRootUrl() {+ return sshRootUrl;+ }++ public void setSshRootUrl(String sshRootUrl) {+ this.sshRootUrl = sshRootUrl;+ }++ @SuppressWarnings("unused")+ private static String getSshRootUrlPlaceholder() {+ return deriveSshRootUrl((String) EditContext.get().getInputValue("serverUrl"));+ }++ @Nullable+ private static String deriveSshRootUrl(@Nullable String serverUrl) {+ if (serverUrl != null) {+ try {+ URL url = new URL(serverUrl);+ if (StringUtils.isNotBlank(url.getHost())) {+ if (url.getPort() == 80 || url.getPort() == 443 || url.getPort() == -1) {+ return "ssh://" + url.getHost();+ } else {+ ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);+ return "ssh://" + url.getHost() + ":" + serverConfig.getSshPort();+ }+ }+ } catch (MalformedURLException e) {+ }+ }+ return null;+ }+@Editable(order=200, name="Git Command Line", description="OneDev requires git command line to manage repositories. The minimum "+ "required version is 2.11.1. Also make sure that git-lfs is installed if you want to retrieve "- + "LFS files in CI/CD job")+ + "LFS files in build job")@Valid@NotNull(message="may not be empty")public GitConfig getGitConfig() {@@ -64,8 +109,8 @@ public class SystemSetting implements Serializable, Validatable {public void setCurlConfig(CurlConfig curlConfig) {this.curlConfig = curlConfig;}-- @Editable(order=300, description="Whether or not to enable user gravatar (https://gravatar.com)")++ @Editable(order=500, description="Whether or not to enable user gravatar (https://gravatar.com)")public boolean isGravatarEnabled() {return gravatarEnabled;}@@ -74,10 +119,68 @@ public class SystemSetting implements Serializable, Validatable {this.gravatarEnabled = gravatarEnabled;}+ public String getEffectiveSshRootUrl() {+ if (getSshRootUrl() != null)+ return getSshRootUrl();+ else+ return Preconditions.checkNotNull(deriveSshRootUrl(getServerUrl()));+ }++ public String getSshServerName() {+ String temp = getEffectiveSshRootUrl();+ int index = temp.indexOf("://");+ if (index != -1)+ temp = temp.substring(index+3);+ index = temp.indexOf(':');+ if (index != -1)+ temp = temp.substring(0, index);+ return StringUtils.stripEnd(temp, "/\\");+ }+@Overridepublic boolean isValid(ConstraintValidatorContext context) {- if (serverUrl != null)+ boolean isValid = true;+ if (serverUrl != null) {serverUrl = StringUtils.stripEnd(serverUrl, "/\\");- return true;+ try {+ URL url = new URL(serverUrl);+ if (StringUtils.isBlank(url.getProtocol())) {+ context.buildConstraintViolationWithTemplate("Protocol is not specified")+ .addPropertyNode("serverUrl").addConstraintViolation();+ isValid = false;+ } else if (!url.getProtocol().equals("http") && !url.getProtocol().equals("https")) {+ context.buildConstraintViolationWithTemplate("Protocol should be either http or https")+ .addPropertyNode("serverUrl").addConstraintViolation();+ isValid = false;+ }+ if (StringUtils.isBlank(url.getHost())) {+ context.buildConstraintViolationWithTemplate("Host is not specified")+ .addPropertyNode("serverUrl").addConstraintViolation();+ isValid = false;+ }+ if (StringUtils.isNotBlank(url.getPath())) {+ context.buildConstraintViolationWithTemplate("Path should not be specified")+ .addPropertyNode("serverUrl").addConstraintViolation();+ isValid = false;+ }+ } catch (MalformedURLException e) {+ context.buildConstraintViolationWithTemplate("Malformed url")+ .addPropertyNode("serverUrl").addConstraintViolation();+ isValid = false;+ }+ }+ if (sshRootUrl != null) {+ sshRootUrl = StringUtils.stripEnd(sshRootUrl, "/\\");+ if (!sshRootUrl.startsWith("ssh://")) {+ context.buildConstraintViolationWithTemplate("This url should start with ssh://")+ .addPropertyNode("sshRootUrl").addConstraintViolation();+ isValid = false;+ }+ }++ if (!isValid)+ context.disableDefaultConstraintViolation();+ return isValid;}+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.javaindex fe7decbf0c..8ca2cad086 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.java@@ -8,7 +8,6 @@ import org.apache.shiro.authc.UsernamePasswordToken;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.GroupChoice;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic abstract class Authenticator implements Serializable {@@ -28,10 +27,9 @@ public abstract class Authenticator implements Serializable {this.timeout = timeout;}- @Editable(order=20000, description="Optionally add newly authenticated user to specified group if membership "- + "information is not retrieved")+ @Editable(order=20000, placeholder="No default group", description="Optionally add newly authenticated user to "+ + "specified group if membership information is not retrieved")@GroupChoice- @NameOfEmptyValue("No default group")public String getDefaultGroup() {return defaultGroup;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.javaindex 454ec014e8..cca0327d6a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java@@ -28,7 +28,6 @@ import io.onedev.server.util.usage.Usage;import io.onedev.server.util.validation.annotation.DnsName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.JobRequirement;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@ExtensionPoint@Editable@@ -63,11 +62,10 @@ public abstract class JobExecutor implements Serializable {this.name = name;}- @Editable(order=10000, name="Job Requirement", description="Optionally specify job requirement of this executor. "- + "Only satisfied jobs can use this executor")+ @Editable(order=10000, name="Job Requirement", placeholder="Can be used by any jobs",+ description="Optionally specify job requirement of this executor. Only satisfied jobs can use this executor")@JobRequirement@Nullable- @NameOfEmptyValue("Can be used by any jobs")public String getJobRequirement() {return jobRequirement;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.javaindex 128b713544..babec660ad 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java@@ -11,7 +11,6 @@ import io.onedev.server.util.match.Matcher;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;@Editable@@ -25,11 +24,11 @@ public class ServiceLocator implements Serializable {private List<NodeSelectorEntry> nodeSelector = new ArrayList<>();- @Editable(order=100, name="Applicable Names", description="Optionally specify space-separated "- + "service names applicable for this locator. Use '*' or '?' for wildcard match. "- + "Prefix with '-' to exclude. Leave empty to match all")+ @Editable(order=100, name="Applicable Names", placeholder="All", description=""+ + "Optionally specify space-separated service names applicable for this locator. "+ + "Use '*' or '?' for wildcard match. Prefix with '-' to exclude. "+ + "Leave empty to match all")@Patterns- @NameOfEmptyValue("All")public String getServiceNames() {return serviceNames;}@@ -38,11 +37,11 @@ public class ServiceLocator implements Serializable {this.serviceNames = serviceNames;}- @Editable(order=200, name="Applicable Images", description="Optionally specify space-separated "- + "service images applicable for this locator. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ @Editable(order=200, name="Applicable Images", placeholder="All", description=""+ + "Optionally specify space-separated service images applicable for this locator. "+ + "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty to match all")@Patterns(path=true)- @NameOfEmptyValue("All")public String getServiceImages() {return serviceImages;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.javaindex b3b20784b0..0f69cbc29e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java@@ -8,7 +8,6 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.GroupChoice;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic abstract class SsoConnector implements Serializable {@@ -31,10 +30,9 @@ public abstract class SsoConnector implements Serializable {public abstract String getButtonImageUrl();- @Editable(order=20000, description="Optionally add newly authenticated user to specified "- + "group if membership information is not retrieved")+ @Editable(order=20000, placeholder="No default group", description="Optionally add newly authenticated "+ + "user to specified group if membership information is not retrieved")@GroupChoice- @NameOfEmptyValue("No default group")public String getDefaultGroup() {return defaultGroup;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/BuildPreservation.java b/server-core/src/main/java/io/onedev/server/model/support/build/BuildPreservation.javaindex ef8d645d76..d8bb192df3 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/BuildPreservation.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/BuildPreservation.java@@ -4,7 +4,6 @@ import java.io.Serializable;import io.onedev.server.web.editable.annotation.BuildQuery;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class BuildPreservation implements Serializable {@@ -15,9 +14,8 @@ public class BuildPreservation implements Serializable {private Integer count;- @Editable(order=100, description="Specify the condition preserved builds must match")+ @Editable(order=100, placeholder="All", description="Specify the condition preserved builds must match")@BuildQuery(withOrder = false)- @NameOfEmptyValue("All")public String getCondition() {return condition;}@@ -26,8 +24,7 @@ public class BuildPreservation implements Serializable {this.condition = condition;}- @Editable(order=200, description="Number of builds to preserve")- @NameOfEmptyValue("Unlimited")+ @Editable(order=200, placeholder="Unlimited", description="Number of builds to preserve")public Integer getCount() {return count;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.javaindex 6fe37889fa..89796b2f96 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java@@ -11,7 +11,6 @@ import io.onedev.server.model.Project;import io.onedev.server.util.validation.annotation.SecretName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -48,13 +47,12 @@ public class JobSecret implements Serializable {this.value = value;}- @Editable(order=300, description=""+ @Editable(order=300, placeholder="All", description=""+ "Optionally specify space-separated branches to authorize.\n"+ "Only builds from authorized branches can access this secret.\n"+ "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty to authorize all branches")@Patterns(suggester = "suggestBranches", path=true)- @NameOfEmptyValue("All")public String getAuthorizedBranches() {return authorizedBranches;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java b/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.javaindex 978a9840ec..4ab6df8bc8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java@@ -5,7 +5,6 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.web.editable.annotation.BuildQuery;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class NamedBuildQuery implements NamedQuery {@@ -35,9 +34,8 @@ public class NamedBuildQuery implements NamedQuery {this.name = name;}- @Editable+ @Editable(placeholder="All")@BuildQuery(withCurrentUserCriteria = true, withUnfinishedCriteria = true)- @NameOfEmptyValue("All")@Overridepublic String getQuery() {return query;diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.javaindex 2316e0c911..644670c697 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java@@ -7,7 +7,6 @@ import java.util.List;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.model.Project;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -18,12 +17,11 @@ public abstract class ActionAuthorization implements Serializable {private String authorizedBranches;- @Editable(order=1000, description="Action is allowed only if build runs on "+ @Editable(order=1000, placeholder="All", description="Action is allowed only if build runs on "+ "specified branches. Multiple branches should be separated with space. "+ "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty to match all")@Patterns(suggester = "suggestBranches", path=true)- @NameOfEmptyValue("All")public String getAuthorizedBranches() {return authorizedBranches;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.javaindex dcf788aa4a..aea89c35bf 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java@@ -6,7 +6,6 @@ import java.util.List;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.model.Project;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -17,10 +16,9 @@ public class CloseMilestoneAuthorization extends ActionAuthorization {private String milestoneNames;- @Editable(order=100, description="Specify space-separated milestone names. Use '*' or '?' for wildcard match. "- + "Prefix with '-' to exclude. Leave empty to match all")+ @Editable(order=100, placeholder="All", description="Specify space-separated milestone names. "+ + "Use '*' or '?' for wildcard match. Prefix with '-' to exclude. Leave empty to match all")@Patterns(suggester = "suggestMilestones")- @NameOfEmptyValue("All")public String getMilestoneNames() {return milestoneNames;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.javaindex 8aa4b17f95..5cb29745f9 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java@@ -6,7 +6,6 @@ import java.util.List;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.model.Project;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -17,10 +16,10 @@ public class CreateTagAuthorization extends ActionAuthorization {private String tagNames;- @Editable(order=100, description="Specify space-separated tag names. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ @Editable(order=100, placeholder="All", description="Specify space-separated tag names. "+ + "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty to match all")@Patterns(suggester = "suggestTags", path=true)- @NameOfEmptyValue("All")public String getTagNames() {return tagNames;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.javaindex 8f948b1013..c665ba1bb2 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java@@ -8,7 +8,6 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.web.editable.annotation.Color;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -44,10 +43,10 @@ public class Choice implements Serializable {this.color = color;}- @Editable(order=300, description="Specify applicable projects separated by space. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ @Editable(order=300, placeholder="All projects", description="Specify applicable projects separated by space. "+ + "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty for all projects")@Patterns(suggester="suggestProjects", path=true)- @NameOfEmptyValue("All projects")public String getApplicableProjects() {return applicableProjects;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex c208d65d05..e396af2063 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -40,7 +40,6 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResoimport io.onedev.server.web.component.stringchoice.StringChoiceProvider;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class BoardSpec implements Serializable {@@ -75,9 +74,9 @@ public class BoardSpec implements Serializable {this.name = name;}- @Editable(order=200, description="Optionally specify a base query to filter/order issues of the board")+ @Editable(order=200, placeholder="Not specified", description="Optionally specify a base query to "+ + "filter/order issues of the board")@io.onedev.server.web.editable.annotation.IssueQuery(withCurrentUserCriteria = true)- @NameOfEmptyValue("Not specified")@Nullablepublic String getBaseQuery() {return baseQuery;@@ -87,10 +86,9 @@ public class BoardSpec implements Serializable {this.baseQuery = baseQuery;}- @Editable(order=250, description="Optionally specify a base query to filter/order issues in backlog. "+ @Editable(order=250, placeholder="Not specified", description="Optionally specify a base query to filter/order issues in backlog. "+ "Backlog issues are those not associating with any milestones")@io.onedev.server.web.editable.annotation.IssueQuery(withCurrentUserCriteria = true)- @NameOfEmptyValue("Not specified")@Nullablepublic String getBacklogBaseQuery() {return backlogBaseQuery;@@ -149,9 +147,8 @@ public class BoardSpec implements Serializable {return displayColumns;}- @Editable(order=500, description="Specify fields to display in board card")+ @Editable(order=500, placeholder="Not displaying any fields", description="Specify fields to display in board card")@ChoiceProvider("getDisplayFieldChoices")- @NameOfEmptyValue("Not displaying any fields")public List<String> getDisplayFields() {return displayFields;}@@ -160,9 +157,8 @@ public class BoardSpec implements Serializable {this.displayFields = displayFields;}- @Editable(order=600, description="Specify links to display in board card")+ @Editable(order=600, placeholder="Not displaying any links", description="Specify links to display in board card")@ChoiceProvider("getDisplayLinkChoices")- @NameOfEmptyValue("Not displaying any links")public List<String> getDisplayLinks() {return displayLinks;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.javaindex 075a4772d6..7d0d32f4fc 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java@@ -8,7 +8,6 @@ import io.onedev.server.search.entity.issue.IssueQueryUpdater;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Markdown;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class IssueTemplate implements Serializable {@@ -19,10 +18,10 @@ public class IssueTemplate implements Serializable {private String issueDescription;- @Editable(order=100, name="Applicable Issues", description="Optionally specify issues applicable for this template. "+ @Editable(order=100, name="Applicable Issues", placeholder="All",+ description="Optionally specify issues applicable for this template. "+ "Leave empty for all")@io.onedev.server.web.editable.annotation.IssueQuery(withOrder = false)- @NameOfEmptyValue("All")public String getIssueQuery() {return issueQuery;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.javaindex 615f7bdb90..3457c40384 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java@@ -10,7 +10,6 @@ import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class LinkSpecOpposite implements Serializable {@@ -45,10 +44,9 @@ public class LinkSpecOpposite implements Serializable {this.multiple = multiple;}- @Editable(order=300, name="Linkable Issues On the Other Side", description="Optionally specify criteria of "- + "issues which can be linked on the other side")+ @Editable(order=300, name="Linkable Issues On the Other Side", placeholder="All issues",+ description="Optionally specify criteria of issues which can be linked on the other side")@io.onedev.server.web.editable.annotation.IssueQuery- @NameOfEmptyValue("All issues")public String getIssueQuery() {return issueQuery;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.javaindex 379b1eae8e..30d04b5b68 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java@@ -5,7 +5,6 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.IssueQuery;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class NamedIssueQuery implements NamedQuery {@@ -35,9 +34,8 @@ public class NamedIssueQuery implements NamedQuery {this.name = name;}- @Editable+ @Editable(placeholder="All")@IssueQuery(withCurrentUserCriteria = true)- @NameOfEmptyValue("All")@Overridepublic String getQuery() {return query;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.javaindex ee06ad31d6..ec90e33e34 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java@@ -6,7 +6,6 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Color;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class StateSpec implements Serializable {@@ -29,8 +28,7 @@ public class StateSpec implements Serializable {this.name = name;}- @Editable(order=200)- @NameOfEmptyValue("No description")+ @Editable(order=200, placeholder="No description")public String getDescription() {return description;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.javaindex 52a40be52d..e034c048d6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java@@ -32,7 +32,6 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuimport io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class TransitionSpec implements Serializable {@@ -79,9 +78,9 @@ public class TransitionSpec implements Serializable {this.trigger = trigger;}- @Editable(order=1000, description="Optionally select fields to remove when this transition happens")+ @Editable(order=1000, placeholder="No fields to remove", description=""+ + "Optionally select fields to remove when this transition happens")@ChoiceProvider("getFieldChoices")- @NameOfEmptyValue("No fields to remove")public List<String> getRemoveFields() {return removeFields;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/ChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/ChoiceField.javaindex 1b40821465..792aeda773 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/ChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/ChoiceField.java@@ -15,7 +15,6 @@ import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueproviderimport io.onedev.server.util.EditContext;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ShowCondition;@Editable(order=145, name=FieldSpec.ENUMERATION)@@ -41,8 +40,7 @@ public class ChoiceField extends FieldSpec {}@ShowCondition("isDefaultValueProviderVisible")- @Editable(order=1100, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1100, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;@@ -58,8 +56,7 @@ public class ChoiceField extends FieldSpec {}@ShowCondition("isDefaultMultiValueProviderVisible")- @Editable(order=1100, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1100, name="Default Value", placeholder="No default value")@Validpublic DefaultMultiValueProvider getDefaultMultiValueProvider() {return defaultMultiValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.javaindex 5a97dafcb6..2a68bbd8a2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java@@ -9,7 +9,6 @@ import io.onedev.server.model.support.inputspec.dateinput.DateInput;import io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.Constants;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=505, name=FieldSpec.DATE)public class DateField extends FieldSpec {@@ -18,8 +17,7 @@ public class DateField extends FieldSpec {private DefaultValueProvider defaultValueProvider;- @Editable(order=1000, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1000, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.javaindex 9d733850b7..930ff35099 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java@@ -9,7 +9,6 @@ import io.onedev.server.model.support.inputspec.datetimeinput.DateTimeInput;import io.onedev.server.model.support.inputspec.datetimeinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.Constants;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=600, name=FieldSpec.DATE_TIME)public class DateTimeField extends FieldSpec {@@ -18,8 +17,7 @@ public class DateTimeField extends FieldSpec {private DefaultValueProvider defaultValueProvider;- @Editable(order=1000, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1000, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.javaindex ee8f1fddff..ad4c5ba5b4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java@@ -33,7 +33,6 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResoimport io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -65,8 +64,7 @@ public abstract class FieldSpec extends InputSpec {super.setName(name);}- @Editable(order=30, description="Optionally describes the custom field")- @NameOfEmptyValue("No description")+ @Editable(order=30, placeholder="No description", description="Optionally describes the custom field")@Overridepublic String getDescription() {return super.getDescription();@@ -88,8 +86,8 @@ public abstract class FieldSpec extends InputSpec {super.setAllowMultiple(allowMultiple);}- @Editable(order=40, name="Show Conditionally", description="Enable if visibility of this field depends on other fields")- @NameOfEmptyValue("Always")+ @Editable(order=40, name="Show Conditionally", placeholder="Always", description="Enable if visibility "+ + "of this field depends on other fields")@Valid@Overridepublic ShowCondition getShowCondition() {@@ -142,12 +140,12 @@ public abstract class FieldSpec extends InputSpec {return Boolean.TRUE.equals(EditContext.get().getInputValue("promptUponIssueOpen"));}- @Editable(order=10100, description="Specify applicable projects for above option. Multiple projects should be separated by space. "- + "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ @Editable(order=10100, placeholder="All projects", description="Specify applicable projects for above option. "+ + "Multiple projects should be separated by space. Use '**', '*' or '?' for "+ + "<a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty for all projects")@io.onedev.server.web.editable.annotation.ShowCondition("isPromptUponIssueOpenEnabled")@Patterns(suggester="suggestProjects", path=true)- @NameOfEmptyValue("All projects")public String getApplicableProjects() {return applicableProjects;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.javaindex d2c3f93425..b1fed89f88 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java@@ -8,7 +8,6 @@ import javax.validation.Valid;import io.onedev.server.model.support.inputspec.floatinput.FloatInput;import io.onedev.server.model.support.inputspec.floatinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=450, name=FieldSpec.FLOAT)public class FloatField extends FieldSpec {@@ -17,8 +16,7 @@ public class FloatField extends FieldSpec {private DefaultValueProvider defaultValueProvider;- @Editable(order=1200, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1200, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.javaindex 569176c47d..db2ada1488 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java@@ -13,7 +13,6 @@ import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueproimport io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=160, name=FieldSpec.GROUP)public class GroupChoiceField extends FieldSpec {@@ -35,8 +34,7 @@ public class GroupChoiceField extends FieldSpec {this.choiceProvider = choiceProvider;}- @Editable(order=1100, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1100, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.javaindex 0771762ed8..37781c2d7d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java@@ -8,7 +8,6 @@ import javax.validation.Valid;import io.onedev.server.model.support.inputspec.integerinput.IntegerInput;import io.onedev.server.model.support.inputspec.integerinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=400, name=FieldSpec.INTEGER)public class IntegerField extends FieldSpec {@@ -39,8 +38,7 @@ public class IntegerField extends FieldSpec {this.maxValue = maxValue;}- @Editable(order=1200, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1200, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.javaindex d080ee444e..5d3f0e4768 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java@@ -8,7 +8,6 @@ import javax.validation.Valid;import io.onedev.server.model.support.inputspec.textinput.TextInput;import io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=100, name=FieldSpec.TEXT)public class TextField extends FieldSpec {@@ -40,8 +39,7 @@ public class TextField extends FieldSpec {this.pattern = pattern;}- @Editable(order=1200, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1200, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.javaindex 2b6b5e42c7..61b0bdbf55 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java@@ -18,7 +18,6 @@ import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovimport io.onedev.server.util.EditContext;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ShowCondition;@Editable(order=150, name=FieldSpec.USER)@@ -43,9 +42,8 @@ public class UserChoiceField extends FieldSpec {this.choiceProvider = choiceProvider;}- @Editable(order=1100, name="Default Value")+ @Editable(order=1100, name="Default Value", placeholder="No default value")@ShowCondition("isDefaultValueProviderVisible")- @NameOfEmptyValue("No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;@@ -61,8 +59,7 @@ public class UserChoiceField extends FieldSpec {}@ShowCondition("isDefaultMultiValueProviderVisible")- @Editable(order=1100, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1100, name="Default Value", placeholder="No default value")@Validpublic DefaultMultiValueProvider getDefaultMultiValueProvider() {return defaultMultiValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.javaindex 5c5b1da365..91921ad279 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java@@ -9,7 +9,6 @@ import io.onedev.server.model.support.inputspec.workingperiodinput.WorkingPeriodimport io.onedev.server.model.support.inputspec.workingperiodinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.DateUtils;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=700, name=FieldSpec.WORKING_PERIOD)public class WorkingPeriodField extends FieldSpec {@@ -18,8 +17,7 @@ public class WorkingPeriodField extends FieldSpec {private DefaultValueProvider defaultValueProvider;- @Editable(order=1000, name="Default Value")- @NameOfEmptyValue("No default value")+ @Editable(order=1000, name="Default Value", placeholder="No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.javaindex 588d83fb56..446b37eab6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java@@ -8,7 +8,6 @@ import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.IssueQuery;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -24,11 +23,10 @@ public class BranchUpdateTrigger extends TransitionTrigger {.getRuleName(IssueQueryLexer.FixedInCurrentCommit));}- @Editable(order=200, name="Applicable Branches", description="Optionally specify space-separated branches "+ @Editable(order=200, name="Applicable Branches", placeholder="Any branch", description="Optionally specify space-separated branches "+ "applicable for this trigger. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty to match all")@Patterns(suggester = "suggestBranches", path=true)- @NameOfEmptyValue("Any branch")public String getBranches() {return branches;}@@ -46,9 +44,9 @@ public class BranchUpdateTrigger extends TransitionTrigger {return new ArrayList<>();}- @Editable(order=1000, name="Applicable Issues", description="Optionally specify issues applicable for this transition. Leave empty for all issues")+ @Editable(order=1000, name="Applicable Issues", placeholder="All", description="Optionally specify issues applicable "+ + "for this transition. Leave empty for all issues")@IssueQuery(withOrder = false, withCurrentCommitCriteria = true)- @NameOfEmptyValue("All")@Overridepublic String getIssueQuery() {return super.getIssueQuery();diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.javaindex b4cfaca689..0cfa491468 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java@@ -10,7 +10,6 @@ import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.IssueQuery;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -28,11 +27,10 @@ public class BuildSuccessfulTrigger extends TransitionTrigger {.getRuleName(IssueQueryLexer.FixedInCurrentBuild));}- @Editable(order=100, name="Applicable Jobs", description="Optionally specify space-separated jobs "+ @Editable(order=100, name="Applicable Jobs", placeholder="Any job", description="Optionally specify space-separated jobs "+ "applicable for this trigger. Use '*' or '?' for wildcard match. Prefix with '-' to exclude. "+ "Leave empty to match all")@Patterns(suggester = "suggestJobs")- @NameOfEmptyValue("Any job")public String getJobNames() {return jobNames;}@@ -41,11 +39,10 @@ public class BuildSuccessfulTrigger extends TransitionTrigger {this.jobNames = jobNames;}- @Editable(order=200, name="Applicable Branches", description="Optionally specify space-separated branches "+ @Editable(order=200, name="Applicable Branches", placeholder="Any branch", description="Optionally specify space-separated branches "+ "applicable for this trigger. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ "Prefix with '-' to exclude. Leave empty to match all")@Patterns(suggester = "suggestBranches", path=true)- @NameOfEmptyValue("Any branch")public String getBranches() {return branches;}@@ -72,9 +69,9 @@ public class BuildSuccessfulTrigger extends TransitionTrigger {return new ArrayList<>();}- @Editable(order=1000, name="Applicable Issues", description="Optionally specify issues applicable for this transition. Leave empty for all issues")+ @Editable(order=1000, name="Applicable Issues", placeholder="All", description="Optionally specify issues "+ + "applicable for this transition. Leave empty for all issues")@IssueQuery(withOrder = false, withCurrentBuildCriteria = true)- @NameOfEmptyValue("All")@Overridepublic String getIssueQuery() {return super.getIssueQuery();diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.javaindex 6f9ecc46eb..61ff9713a5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java@@ -31,7 +31,6 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResoimport io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.IssueQuery;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=100, name="Button is pressed")public class PressButtonTrigger extends TransitionTrigger {@@ -80,9 +79,9 @@ public class PressButtonTrigger extends TransitionTrigger {return choices;}- @Editable(order=500, description="Optionally select fields to prompt when this button is pressed")+ @Editable(order=500, placeholder="No fields to prompt", description="Optionally select fields "+ + "to prompt when this button is pressed")@ChoiceProvider("getFieldChoices")- @NameOfEmptyValue("No fields to prompt")public List<String> getPromptFields() {return promptFields;}@@ -200,9 +199,9 @@ public class PressButtonTrigger extends TransitionTrigger {}}- @Editable(order=1000, name="Applicable Issues", description="Optionally specify issues applicable for this transition. Leave empty for all issues")+ @Editable(order=1000, name="Applicable Issues", placeholder="All", description="Optionally specify "+ + "issues applicable for this transition. Leave empty for all issues")@IssueQuery(withOrder = false, withCurrentUserCriteria = true)- @NameOfEmptyValue("All")@Overridepublic String getIssueQuery() {return super.getIssueQuery();diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.javaindex 0e74464520..6f765aca0b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java@@ -10,7 +10,6 @@ import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.IssueQuery;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -25,12 +24,11 @@ public abstract class PullRequestTrigger extends TransitionTrigger {.getRuleName(IssueQueryLexer.FixedInCurrentPullRequest));}- @Editable(name="Target Branches", order=100,- description="Optionally specify space-separated target branches of the pull requests to check. "- + "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "- + "Prefix with '-' to exclude. Leave empty to match all branches")+ @Editable(name="Target Branches", order=100, placeholder="Any branch", description="Optionally specify "+ + "space-separated target branches of the pull requests to check. Use '**', '*' or '?' for "+ + "<a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "+ + "Prefix with '-' to exclude. Leave empty to match all branches")@Patterns(suggester = "suggestBranches", path=true)- @NameOfEmptyValue("Any branch")public String getBranches() {return branches;}@@ -39,9 +37,9 @@ public abstract class PullRequestTrigger extends TransitionTrigger {this.branches = branches;}- @Editable(order=1000, name="Applicable Issues", description="Optionally specify issues applicable for this transition. Leave empty for all issues")+ @Editable(order=1000, name="Applicable Issues", placeholder="All", description="Optionally specify issues "+ + "applicable for this transition. Leave empty for all issues")@IssueQuery(withOrder = false, withCurrentPullRequestCriteria = true)- @NameOfEmptyValue("All")@Overridepublic String getIssueQuery() {return super.getIssueQuery();diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.javaindex 4903bf8acf..6e83b2921b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java@@ -11,7 +11,6 @@ import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.IssueQuery;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.OmitName;@Editable(order=550, name="State of other issue is transited to")@@ -41,9 +40,9 @@ public class StateTransitionTrigger extends TransitionTrigger {return stateNames;}- @Editable(order=1000, name="Applicable Issues", description="Optionally specify issues applicable for this transition. Leave empty for all issues")+ @Editable(order=1000, name="Applicable Issues", placeholder="All", description="Optionally specify issues "+ + "applicable for this transition. Leave empty for all issues")@IssueQuery(withOrder = false, withCurrentIssueCriteria = true)- @NameOfEmptyValue("All")@Overridepublic String getIssueQuery() {return super.getIssueQuery();diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.javaindex 682340518e..41ab69de4d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java@@ -9,7 +9,6 @@ import io.onedev.server.search.entity.issue.IssueQueryUpdater;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic abstract class TransitionTrigger implements Serializable {@@ -18,9 +17,9 @@ public abstract class TransitionTrigger implements Serializable {private String issueQuery;- @Editable(order=1000, name="Applicable Issues", description="Optionally specify issues applicable for this transition. Leave empty for all issues. ")+ @Editable(order=1000, name="Applicable Issues", placeholder="All", description=""+ + "Optionally specify issues applicable for this transition. Leave empty for all issues. ")@io.onedev.server.web.editable.annotation.IssueQuery(withOrder = false)- @NameOfEmptyValue("All")public String getIssueQuery() {return issueQuery;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.javaindex f381011116..3bd31b6970 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java@@ -4,7 +4,6 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.PullRequestQuery;@Editable@@ -35,9 +34,8 @@ public class NamedPullRequestQuery implements NamedQuery {this.name = name;}- @Editable+ @Editable(placeholder="All")@PullRequestQuery- @NameOfEmptyValue("All")@Overridepublic String getQuery() {return query;diff --git a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.javaindex a50feae325..5126900189 100644--- a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java@@ -44,7 +44,7 @@ import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;import io.onedev.server.web.page.admin.serverlog.ServerLogPage;import io.onedev.server.web.page.admin.servicedesk.ServiceDeskSettingPage;-import io.onedev.server.web.page.admin.sshsetting.SshSettingPage;+import io.onedev.server.web.page.admin.sshserverkey.SshServerKeyPage;import io.onedev.server.web.page.admin.ssosetting.SsoConnectorListPage;import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;@@ -54,10 +54,11 @@ import io.onedev.server.web.page.admin.user.authorization.UserAuthorizationsPageimport io.onedev.server.web.page.admin.user.avatar.UserAvatarPage;import io.onedev.server.web.page.admin.user.create.NewUserPage;import io.onedev.server.web.page.admin.user.emailaddresses.UserEmailAddressesPage;+import io.onedev.server.web.page.admin.user.gpgkeys.UserGpgKeysPage;import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;import io.onedev.server.web.page.admin.user.password.UserPasswordPage;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;-import io.onedev.server.web.page.admin.user.ssh.UserSshKeysPage;+import io.onedev.server.web.page.admin.user.sshkeys.UserSshKeysPage;import io.onedev.server.web.page.admin.user.twofactorauthentication.UserTwoFactorAuthenticationPage;import io.onedev.server.web.page.builds.BuildListPage;import io.onedev.server.web.page.help.IncompatibilitiesPage;@@ -237,6 +238,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new DynamicPathPageMapper("administration/users/${user}/avatar", UserAvatarPage.class));add(new DynamicPathPageMapper("administration/users/${user}/password", UserPasswordPage.class));add(new DynamicPathPageMapper("administration/users/${user}/ssh-keys", UserSshKeysPage.class));+ add(new DynamicPathPageMapper("administration/users/${user}/gpg-keys", UserGpgKeysPage.class));add(new DynamicPathPageMapper("administration/users/${user}/access-token", UserAccessTokenPage.class));add(new DynamicPathPageMapper("administration/users/${user}/two-factor-authentication", UserTwoFactorAuthenticationPage.class));@@ -263,7 +265,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new DynamicPathPageMapper("administration/settings/security", SecuritySettingPage.class));add(new DynamicPathPageMapper("administration/settings/authenticator", AuthenticatorPage.class));add(new DynamicPathPageMapper("administration/settings/sso-connectors", SsoConnectorListPage.class));- add(new DynamicPathPageMapper("administration/settings/ssh", SshSettingPage.class));+ add(new DynamicPathPageMapper("administration/settings/ssh-server-key", SshServerKeyPage.class));add(new DynamicPathPageMapper("administration/settings/gpg-signing-key", GpgSigningKeyPage.class));add(new DynamicPathPageMapper("administration/settings/gpg-trusted-keys", GpgTrustedKeysPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.javaindex a748124a89..1dd4aea5db 100644--- a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java+++ b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java@@ -48,7 +48,7 @@ public class DefaultUrlManager implements UrlManager {@Overridepublic String cloneUrlFor(Project project, boolean ssh) {if (ssh)- return settingManager.getSshSetting().getServerUrl() + "/" + project.getPath();+ return settingManager.getSystemSetting().getEffectiveSshRootUrl() + "/" + project.getPath();elsereturn settingManager.getSystemSetting().getServerUrl() + "/" + project.getPath();}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/FieldsAndLinksBean.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/FieldsAndLinksBean.javaindex 8569c77816..f07b59109d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/FieldsAndLinksBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/FieldsAndLinksBean.java@@ -11,7 +11,6 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.LinkSpec;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class FieldsAndLinksBean implements Serializable {@@ -22,9 +21,9 @@ public class FieldsAndLinksBean implements Serializable {private List<String> links;- @Editable(order=100, name="Display Fields", description="Specify fields to be displayed in the issue list")+ @Editable(order=100, name="Display Fields", placeholder="Not displaying any fields",+ description="Specify fields to be displayed in the issue list")@ChoiceProvider("getFieldChoices")- @NameOfEmptyValue("Not displaying any fields")public List<String> getFields() {return fields;}@@ -42,9 +41,9 @@ public class FieldsAndLinksBean implements Serializable {return choices;}- @Editable(order=200, name="Display Links", description="Specify links to be displayed in the issue list")+ @Editable(order=200, name="Display Links", placeholder="Not displaying any links",+ description="Specify links to be displayed in the issue list")@ChoiceProvider("getLinkChoices")- @NameOfEmptyValue("Not displaying any links")public List<String> getLinks() {return links;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java b/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.javaindex 20a268aa29..2ba886391b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java@@ -48,7 +48,7 @@ abstract class AbstractSelect2Choice<T, M> extends HiddenField<M> implements IReprivate static final long serialVersionUID = 1L;- private final Settings settings = new Settings();+ private final Settings settings = new Settings(this);private ChoiceProvider<T> provider;diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/Settings.java b/server-core/src/main/java/io/onedev/server/web/component/select2/Settings.javaindex 0182c7d37c..ac450c7e6f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/select2/Settings.java+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/Settings.java@@ -18,10 +18,10 @@ import java.lang.reflect.Method;import org.json.JSONException;import org.json.JSONStringer;+import io.onedev.server.util.ComponentContext;import io.onedev.server.web.component.select2.json.Json;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.OmitName;/**@@ -34,6 +34,8 @@ public final class Settings implements Serializable {private static final long serialVersionUID = 1L;+ private AbstractSelect2Choice<?, ?> select2;+/*** Some predefined width option values*/@@ -67,6 +69,10 @@ public final class Settings implements Serializable {private String separator;private String[] tokenSeparators;private Boolean dropdownAutoWidth;++ public Settings(AbstractSelect2Choice<?, ?> select2) {+ this.select2 = select2;+ }public CharSequence toJson() {try {@@ -117,7 +123,7 @@ public final class Settings implements Serializable {throw new RuntimeException("Could not convert Select2 settings object to Json", e);}}-+public Integer getMinimumInputLength() {return minimumInputLength;}@@ -406,18 +412,23 @@ public final class Settings implements Serializable {}public void configurePlaceholder(PropertyDescriptor propertyDescriptor) {- Method propertyGetter = propertyDescriptor.getPropertyGetter();- if (propertyDescriptor.isPropertyRequired()) {- if (propertyDescriptor.getPropertyGetter().getAnnotation(OmitName.class) != null)- setPlaceholder("Choose " + propertyDescriptor.getDisplayName().toLowerCase() + "...");- else- setPlaceholder("Choose...");- } else if (propertyDescriptor.getPropertyGetter().getAnnotation(OmitName.class) != null) {- setPlaceholder(EditableUtils.getDisplayName(propertyDescriptor.getPropertyGetter()));- } else {- NameOfEmptyValue nameOfEmptyValue = propertyGetter.getAnnotation(NameOfEmptyValue.class);- if (nameOfEmptyValue != null)- setPlaceholder(nameOfEmptyValue.value());+ ComponentContext.push(new ComponentContext(select2));+ try {+ Method propertyGetter = propertyDescriptor.getPropertyGetter();+ if (propertyDescriptor.isPropertyRequired()) {+ if (propertyDescriptor.getPropertyGetter().getAnnotation(OmitName.class) != null)+ setPlaceholder("Choose " + propertyDescriptor.getDisplayName().toLowerCase() + "...");+ else+ setPlaceholder("Choose...");+ } else if (propertyDescriptor.getPropertyGetter().getAnnotation(OmitName.class) != null) {+ setPlaceholder(EditableUtils.getDisplayName(propertyDescriptor.getPropertyGetter()));+ } else {+ String placeholder = EditableUtils.getPlaceholder(propertyGetter);+ if (placeholder != null)+ setPlaceholder(placeholder);+ }+ } finally {+ ComponentContext.pop();}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ActionConditionEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/ActionConditionEditSupport.javaindex 833b523636..cd61ea59fa 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/ActionConditionEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/ActionConditionEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -33,7 +34,14 @@ public class ActionConditionEditSupport implements EditSupport {if (condition != null) {return new Label(id, condition);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.javaindex 90f004af2a..7afaa92536 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java@@ -139,4 +139,5 @@ public class BeanViewer extends Panel {}}+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.javaindex 85404ebbe0..d50a4dbc38 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -38,7 +39,14 @@ public class CodeCommentQueryEditSupport implements EditSupport {if (query != null) {return new Label(id, query);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.javaindex 6c90e386bc..bf6d0abdec 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -38,7 +39,14 @@ public class CommitQueryEditSupport implements EditSupport {if (query != null) {return new Label(id, query);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.javaindex 3acac5d4b1..65853cd369 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java@@ -134,6 +134,26 @@ public class EditableUtils {}}+ @Nullable+ public static String getPlaceholder(AnnotatedElement element) {+ Editable editable = element.getAnnotation(Editable.class);+ String placeholder = editable.placeholder();+ if (placeholder.length() != 0) {+ return placeholder;+ } else if (editable.placeholderProvider().length() != 0) {+ Class<?> clazz;+ if (element instanceof Class)+ clazz = (Class<?>) element;+ else if (element instanceof Method)+ clazz = ((Method) element).getDeclaringClass();+ else+ throw new RuntimeException("Unexpected element type: " + element);+ return (String) ReflectionUtils.invokeStaticMethod(clazz, editable.placeholderProvider());+ } else {+ return null;+ }+ }+/*** Get display order parameter defined in {@link Editable} annotation of specified element.*diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.java b/server-core/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.javaindex de5e602ac7..f33f3e776a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.java@@ -3,23 +3,42 @@ package io.onedev.server.web.editable;import java.lang.reflect.AnnotatedElement;import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.LoadableDetachableModel;import org.unbescape.html.HtmlEscape;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.util.ComponentContext;@SuppressWarnings("serial")-public class EmptyValueLabel extends Label {+public abstract class EmptyValueLabel extends Label {- public EmptyValueLabel(String id, AnnotatedElement element) {- super(id, "<i>" + getNameOfEmptyValue(element) + "</i>");- setEscapeModelStrings(false);+ public EmptyValueLabel(String id) {+ super(id);++ setDefaultModel(new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ ComponentContext.push(new ComponentContext(EmptyValueLabel.this));+ try {+ String placeholder = EditableUtils.getPlaceholder(getElement());+ if (placeholder != null)+ return HtmlEscape.escapeHtml5(placeholder);+ else+ return "Not defined";+ } finally {+ ComponentContext.pop();+ }+ }++ });}- private static String getNameOfEmptyValue(AnnotatedElement element) {- NameOfEmptyValue nameOfEmptyValue = element.getAnnotation(NameOfEmptyValue.class);- if (nameOfEmptyValue != null)- return HtmlEscape.escapeHtml5(nameOfEmptyValue.value());- else- return "Not defined";+ @Override+ protected void onInitialize() {+ super.onInitialize();+ setEscapeModelStrings(false);}++ protected abstract AnnotatedElement getElement();+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/JobRequirementEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/JobRequirementEditSupport.javaindex 4da191e134..fb9f0f3229 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/JobRequirementEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/JobRequirementEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -30,10 +31,18 @@ public class JobRequirementEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {String jobRequirement = model.getObject();- if (jobRequirement != null)+ if (jobRequirement != null) {return new Label(id, jobRequirement);- else- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ } else {+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };+ }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.javaindex 14cb85915a..1150d29779 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java@@ -20,7 +20,6 @@ import com.google.common.collect.Sets;import io.onedev.server.util.BeanUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.ReflectionUtils;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ShowCondition;public class PropertyDescriptor implements Serializable {@@ -132,15 +131,6 @@ public class PropertyDescriptor implements Serializable {return null;}- @Nullable- public String getNameOfEmptyValue() {- NameOfEmptyValue annotation = findAnnotation(NameOfEmptyValue.class);- if (annotation != null)- return annotation.value();- else- return null;- }-public boolean isPropertyVisible(Map<String, ComponentContext> componentContexts, BeanDescriptor beanDescriptor) {return isPropertyVisible(componentContexts, beanDescriptor, Sets.newHashSet());}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.javaindex 8d3e78fb9f..6d8b8cd28f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java@@ -1,11 +1,13 @@package io.onedev.server.web.editable;+import java.lang.reflect.Method;import java.util.Set;import javax.annotation.Nullable;import javax.validation.ConstraintViolation;import javax.validation.Validator;+import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;@@ -19,6 +21,7 @@ import org.apache.wicket.validation.IValidatable;import io.onedev.commons.loader.AppLoader;import io.onedev.server.util.ComponentContext;+import io.onedev.server.web.editable.annotation.OmitName;@SuppressWarnings("serial")public abstract class PropertyEditor<T> extends ValueEditor<T> {@@ -114,4 +117,27 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {public abstract boolean needExplicitSubmit();+ protected AttributeModifier newPlaceholderModifier() {+ return AttributeModifier.replace("placeholder", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ ComponentContext.push(new ComponentContext(PropertyEditor.this));+ try {+ Method getter = descriptor.getPropertyGetter();++ String placeholder = EditableUtils.getPlaceholder(getter);+ if (placeholder != null)+ return placeholder;+ else if (getter.getAnnotation(OmitName.class) != null)+ return EditableUtils.getDisplayName(getter);+ else+ return "";+ } finally {+ ComponentContext.pop();+ }+ }++ });+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.javaindex a67c1417d5..c289c74741 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -34,7 +35,14 @@ public class ReferenceAwareEditSupport implements EditSupport {if (query != null) {return new Label(id, query);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/RetryConditionEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/RetryConditionEditSupport.javaindex 953b68f56e..b5a59e31cf 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/RetryConditionEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/RetryConditionEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -33,7 +34,14 @@ public class RetryConditionEditSupport implements EditSupport {if (condition != null) {return new Label(id, condition);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.javaindex 201a953cb4..43afe852a7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.java@@ -1,8 +1,5 @@package io.onedev.server.web.editable.agentquery;-import java.lang.reflect.Method;--import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.form.FormComponent;@@ -15,11 +12,8 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.behavior.AgentQueryBehavior;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.page.admin.buildsetting.agent.AgentListPage;@SuppressWarnings("serial")@@ -39,7 +33,6 @@ public class AgentQueryEditPanel extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- Method getter = getDescriptor().getPropertyGetter();add(input = new TextField<String>("input", Model.of(getModelObject())));input.setType(getDescriptor().getPropertyClass());input.setLabel(Model.of(getDescriptor().getDisplayName()));@@ -63,13 +56,7 @@ public class AgentQueryEditPanel extends PropertyEditor<String> {});- if (getter.getAnnotation(OmitName.class) != null) {- input.add(AttributeModifier.replace("placeholder", EditableUtils.getDisplayName(getter)));- } else {- NameOfEmptyValue nameOfEmptyValue = getter.getAnnotation(NameOfEmptyValue.class);- if (nameOfEmptyValue != null)- input.add(AttributeModifier.replace("placeholder", nameOfEmptyValue.value()));- }+ input.add(newPlaceholderModifier());add(newShowSelectedAgentsLink());}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Editable.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Editable.javaindex 38bf9abf51..d908c925a7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Editable.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Editable.java@@ -15,6 +15,10 @@ public @interface Editable {String name() default "";+ String placeholder() default "";++ String placeholderProvider() default "";+int order() default 0;String description() default "";diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/NameOfEmptyValue.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/NameOfEmptyValue.javadeleted file mode 100644index ce4435f9e7..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/NameOfEmptyValue.java+++ /dev/null@@ -1,12 +0,0 @@-package io.onedev.server.web.editable.annotation;--import java.lang.annotation.ElementType;-import java.lang.annotation.Retention;-import java.lang.annotation.RetentionPolicy;-import java.lang.annotation.Target;--@Retention(RetentionPolicy.RUNTIME)-@Target(ElementType.METHOD)-public @interface NameOfEmptyValue {- String value();-}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.javaindex 507171353e..7a29d6d69a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.bean;import java.io.Serializable;+import java.lang.reflect.AnnotatedElement;import java.util.HashSet;import java.util.Set;@@ -43,7 +44,14 @@ public class BeanEditSupport implements EditSupport {}return BeanContext.view(id, model.getObject(), excludedProperties, true);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.javaindex b890756467..2735330975 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.beanlist;import java.io.Serializable;+import java.lang.reflect.AnnotatedElement;import java.util.List;import org.apache.wicket.Component;@@ -36,7 +37,14 @@ public class BeanListEditSupport implements EditSupport {if (model.getObject() != null) {return new BeanListPropertyViewer(id, propertyDescriptor, model.getObject());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.javaindex 4e0625583f..b687412b8e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.bool;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -12,7 +13,6 @@ import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.util.TextUtils;@SuppressWarnings("serial")@@ -35,11 +35,14 @@ public class BooleanEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, TextUtils.describe(model.getObject()));} else {- NameOfEmptyValue nameOfEmptyValue = propertyDescriptor.getPropertyGetter().getAnnotation(NameOfEmptyValue.class);- if (nameOfEmptyValue != null)- return new Label(id, nameOfEmptyValue.value());- else- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchChoiceEditSupport.javaindex cbfe849e09..f4ba78de87 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchChoiceEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.branchchoice;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import java.util.ArrayList;import java.util.List;@@ -43,7 +44,14 @@ public class BranchChoiceEditSupport implements EditSupport {}return new Label(id, StringUtils.join(branches, ", " ));} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}@@ -69,7 +77,14 @@ public class BranchChoiceEditSupport implements EditSupport {if (projectAndBranch != null) {return new Label(id, projectAndBranch);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/BuildQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/build/BuildQueryEditSupport.javaindex b0c195a4c7..cd6e81e297 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/BuildQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/BuildQueryEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.build;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -43,7 +44,14 @@ public class BuildQueryEditSupport implements EditSupport {if (query != null) {return new Label(id, query);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.javaindex 1e4ba506a2..5a125219df 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.build.choice;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import java.util.ArrayList;import java.util.List;@@ -53,7 +54,14 @@ public class BuildChoiceEditSupport implements EditSupport {}return new Label(id, StringUtils.join(buildNumbers, ", ")).setEscapeModelStrings(false);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}@@ -83,7 +91,14 @@ public class BuildChoiceEditSupport implements EditSupport {elsereturn new Label(id, "<i>Not Found</i>").setEscapeModelStrings(false);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditSupport.javaindex 4cc916e920..f3f20b7e79 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditSupport.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.buildspec.imports;import java.io.Serializable;+import java.lang.reflect.AnnotatedElement;import java.util.List;import org.apache.wicket.Component;@@ -31,10 +32,18 @@ public class ImportListEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null)+ if (model.getObject() != null) {return new ImportListViewPanel(id, model.getObject());- else- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ } else {+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };+ }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobChoiceEditSupport.javaindex 27d8329041..b5783f1203 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobChoiceEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.buildspec.job.choice;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import java.util.List;@@ -39,7 +40,14 @@ public class JobChoiceEditSupport implements EditSupport {if (jobNames != null && !jobNames.isEmpty()) {return new Label(id, StringUtils.join(jobNames, ", " ));} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}@@ -65,7 +73,14 @@ public class JobChoiceEditSupport implements EditSupport {if (jobName != null) {return new Label(id, jobName);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditSupport.javaindex 4e0f27cbd7..a726c88604 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditSupport.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.buildspec.job.jobdependency;import java.io.Serializable;+import java.lang.reflect.AnnotatedElement;import java.util.List;import org.apache.wicket.Component;@@ -31,10 +32,18 @@ public class JobDependencyListEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null)+ if (model.getObject() != null) {return new JobDependencyListViewPanel(id, model.getObject());- else- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ } else {+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };+ }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditSupport.javaindex c740fa3736..007063341c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditSupport.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.buildspec.job.postbuildaction;import java.io.Serializable;+import java.lang.reflect.AnnotatedElement;import java.util.List;import org.apache.wicket.Component;@@ -34,7 +35,14 @@ public class PostBuildActionListEditSupport implements EditSupport {if (model.getObject() != null) {return new PostBuildActionListViewPanel(id, model.getObject());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditSupport.javaindex 074ae72d2a..0205be2ed8 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditSupport.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.buildspec.job.projectdependency;import java.io.Serializable;+import java.lang.reflect.AnnotatedElement;import java.util.List;import org.apache.wicket.Component;@@ -31,10 +32,18 @@ public class ProjectDependencyListEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null)+ if (model.getObject() != null) {return new ProjectDependencyListViewPanel(id, model.getObject());- else- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ } else {+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };+ }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditSupport.javaindex d90b1b94a0..d6fd02e3e1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditSupport.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.buildspec.job.trigger;import java.io.Serializable;+import java.lang.reflect.AnnotatedElement;import java.util.List;import org.apache.wicket.Component;@@ -34,7 +35,14 @@ public class JobTriggerListEditSupport implements EditSupport {if (model.getObject() != null) {return new JobTriggerListViewPanel(id, model.getObject());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditSupport.javaindex 47fc38a5f1..87dad35d75 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditSupport.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.buildspec.param.spec;import java.io.Serializable;+import java.lang.reflect.AnnotatedElement;import java.util.List;import org.apache.wicket.Component;@@ -34,7 +35,14 @@ public class ParamSpecListEditSupport implements EditSupport {if (model.getObject() != null) {return new ParamSpecListViewPanel(id, elementClass, model.getObject());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditSupport.javaindex 5528bfc19c..ceb76b2615 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditSupport.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.buildspec.step;import java.io.Serializable;+import java.lang.reflect.AnnotatedElement;import java.util.List;import org.apache.wicket.Component;@@ -34,7 +35,14 @@ public class StepListEditSupport implements EditSupport {if (model.getObject() != null) {return new StepListViewPanel(id, model.getObject());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/ChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/ChoiceEditSupport.javaindex b26965fcdc..bcb8f0f14a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/ChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/ChoiceEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.choice;+import java.lang.reflect.AnnotatedElement;import java.util.List;import org.apache.wicket.Component;@@ -33,7 +34,14 @@ public class ChoiceEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, model.getObject());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}@@ -66,7 +74,14 @@ public class ChoiceEditSupport implements EditSupport {}return new Label(id, content);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.javaindex c108ab1518..39f48b8bd7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.code;+import java.lang.reflect.AnnotatedElement;import java.util.List;import org.apache.wicket.Component;@@ -36,7 +37,14 @@ public class CodeEditSupport implements EditSupport {if (code != null && !code.isEmpty()) {return new CodePropertyViewer(id, model.getObject(), annotation.language());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/color/ColorEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/color/ColorEditSupport.javaindex 4f944575b3..c79b9e5b3b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/color/ColorEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/color/ColorEditSupport.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.color;+import java.lang.reflect.AnnotatedElement;+import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;@@ -30,7 +32,14 @@ public class ColorEditSupport implements EditSupport {String html = String.format("<div style='width: 25px; height: 25px; background: %s; border-radius: 4px;'></div>", model.getObject());return new Label(id, html).setEscapeModelStrings(false);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.javaindex 02e617e00f..358f5199b8 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.date;+import java.lang.reflect.AnnotatedElement;import java.util.Date;import org.apache.wicket.Component;@@ -13,7 +14,6 @@ import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.WithTime;@SuppressWarnings("serial")@@ -40,11 +40,14 @@ public class DateEditSupport implements EditSupport {elsereturn new Label(id, DateUtils.formatDate(model.getObject()));} else {- NameOfEmptyValue nameOfEmptyValue = propertyDescriptor.getPropertyGetter().getAnnotation(NameOfEmptyValue.class);- if (nameOfEmptyValue != null)- return new Label(id, nameOfEmptyValue.value());- else- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/emaillist/EmailListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/emaillist/EmailListEditSupport.javaindex 8da21fd3a3..312d35d579 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/emaillist/EmailListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/emaillist/EmailListEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.emaillist;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import java.util.List;@@ -35,10 +36,18 @@ public class EmailListEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null && !model.getObject().isEmpty())+ if (model.getObject() != null && !model.getObject().isEmpty()) {return new Label(id, StringUtils.join(model.getObject(), ", "));- else- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ } else {+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };+ }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.javaindex 009a7a611a..61117fe3dc 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.enumeration;+import java.lang.reflect.AnnotatedElement;+import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;@@ -26,10 +28,18 @@ public class EnumEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null)+ if (model.getObject() != null) {return new Label(id, StringUtils.capitalize(model.getObject().name().replace('_', ' ').toLowerCase()));- else- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ } else {+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };+ }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.javaindex 7d82403de9..4fd73f1df5 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.enumlist;+import java.lang.reflect.AnnotatedElement;import java.util.List;import org.apache.wicket.Component;@@ -41,7 +42,14 @@ public class EnumListEditSupport implements EditSupport {}return new Label(id, content);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupChoiceEditSupport.javaindex 4c6ae23c3b..9c3114cbd0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupChoiceEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.groupchoice;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import java.util.Collection;@@ -38,7 +39,14 @@ public class GroupChoiceEditSupport implements EditSupport {if (teamNames != null && !teamNames.isEmpty()) {return new Label(id, StringUtils.join(teamNames, ", " ));} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}@@ -64,7 +72,14 @@ public class GroupChoiceEditSupport implements EditSupport {if (teamName != null) {return new Label(id, teamName);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.javaindex b45d83a42b..32e1047fe4 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.issue;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -45,7 +46,14 @@ public class IssueQueryEditSupport implements EditSupport {if (query != null) {return new Label(id, query);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.javaindex bf9aa53264..892a2342f5 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.issue.choice;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -47,7 +48,14 @@ public class IssueChoiceEditSupport implements EditSupport {return new Label(id, "<i>Not Found</i>").setEscapeModelStrings(false);}} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneChoiceEditSupport.javaindex 9e7e7bed1b..27d918e89a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneChoiceEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.milestonechoice;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import java.util.List;@@ -39,7 +40,14 @@ public class MilestoneChoiceEditSupport implements EditSupport {if (milestoneNames != null && !milestoneNames.isEmpty()) {return new Label(id, StringUtils.join(milestoneNames, ", " ));} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}@@ -64,7 +72,14 @@ public class MilestoneChoiceEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, model.getObject());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.javaindex f3d818440d..6cdbe1726b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.numeric;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -43,7 +44,14 @@ public class NumericEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, model.getObject().toString());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.javaindex 880069c91c..0302cdd24b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java@@ -1,8 +1,5 @@package io.onedev.server.web.editable.numeric;-import java.lang.reflect.Method;--import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.model.IModel;@@ -10,11 +7,8 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.editable.annotation.OmitName;@SuppressWarnings("serial")public class NumericPropertyEditor extends PropertyEditor<Number> {@@ -43,14 +37,8 @@ public class NumericPropertyEditor extends PropertyEditor<Number> {});- Method getter = getDescriptor().getPropertyGetter();- if (getter.getAnnotation(OmitName.class) != null) {- input.add(AttributeModifier.replace("placeholder", EditableUtils.getDisplayName(getter)));- } else {- NameOfEmptyValue nameOfEmptyValue = getter.getAnnotation(NameOfEmptyValue.class);- if (nameOfEmptyValue != null)- input.add(AttributeModifier.replace("placeholder", nameOfEmptyValue.value()));- }+ input.add(newPlaceholderModifier());+}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditSupport.javaindex b1c3d1535b..9506bf3887 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.parentchoice;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -34,7 +35,14 @@ public class ParentChoiceEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, model.getObject());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.javaindex 56cf9221a4..d555284845 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.password;+import java.lang.reflect.AnnotatedElement;+import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;@@ -32,7 +34,14 @@ public class PasswordEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, "******");} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}@@ -57,7 +66,14 @@ public class PasswordEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, "******");} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.javaindex cb370c138b..f8a7073123 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.polymorphic;import java.io.Serializable;+import java.lang.reflect.AnnotatedElement;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;@@ -32,7 +33,14 @@ public class PolymorphicEditSuport implements EditSupport {if (model.getObject() != null) {return new PolymorphicPropertyViewer(id, propertyDescriptor, model.getObject());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.javaindex feec21935e..b23ea6047d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java@@ -27,6 +27,7 @@ import io.onedev.commons.loader.AppLoader;import io.onedev.commons.loader.ImplementationRegistry;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;import io.onedev.server.web.editable.BeanContext;@@ -38,7 +39,6 @@ import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.ValueEditor;import io.onedev.server.web.editable.annotation.ExcludedProperties;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@SuppressWarnings("serial")public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {@@ -147,11 +147,16 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {@Overrideprotected String getNullValidDisplayValue() {- NameOfEmptyValue nameOfEmptyValue = getDescriptor().getPropertyGetter().getAnnotation(NameOfEmptyValue.class);- if (nameOfEmptyValue != null)- return nameOfEmptyValue.value();- else- return super.getNullValidDisplayValue();+ ComponentContext.push(new ComponentContext(PolymorphicPropertyEditor.this));+ try {+ String placeholder = EditableUtils.getPlaceholder(getDescriptor().getPropertyGetter());+ if (placeholder != null)+ return placeholder;+ else+ return super.getNullValidDisplayValue();+ } finally {+ ComponentContext.pop();+ }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectChoiceEditSupport.javaindex 2e1fb87ab6..3cffa7834f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectChoiceEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.project.choice;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import java.util.List;@@ -39,7 +40,14 @@ public class ProjectChoiceEditSupport implements EditSupport {if (projectPaths != null && !projectPaths.isEmpty()) {return new Label(id, StringUtils.join(projectPaths, ", " ));} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}@@ -64,7 +72,14 @@ public class ProjectChoiceEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, model.getObject());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/query/ProjectQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/project/query/ProjectQueryEditSupport.javaindex b5844b0e3b..eb9df59142 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/query/ProjectQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/query/ProjectQueryEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.project.query;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -37,7 +38,14 @@ public class ProjectQueryEditSupport implements EditSupport {if (query != null) {return new Label(id, query);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.javaindex ae0049834b..5b7dd9be85 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.pullrequest;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -41,7 +42,14 @@ public class PullRequestQueryEditSupport implements EditSupport {if (query != null) {return new Label(id, query);} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.javaindex f291a6f4fc..a01d39ea97 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.pullrequest.choice;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -47,7 +48,14 @@ public class PullRequestChoiceEditSupport implements EditSupport {return new Label(id, "<i>Not Found</i>").setEscapeModelStrings(false);}} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditSupport.javaindex 106fb5bcfc..7895fc5d09 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.revisionpick;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -30,10 +31,18 @@ public class RevisionPickEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null)+ if (model.getObject() != null) {return new Label(id, model.getObject());- else- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ } else {+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };+ }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleChoiceEditSupport.javaindex 9334040157..ad8f25613e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleChoiceEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.rolechoice;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import java.util.List;@@ -39,7 +40,14 @@ public class RoleChoiceEditSupport implements EditSupport {if (roleNames != null && !roleNames.isEmpty()) {return new Label(id, StringUtils.join(roleNames, ", " ));} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}@@ -64,7 +72,14 @@ public class RoleChoiceEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, model.getObject());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditSupport.javaindex 1737be0691..faf22142c4 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditSupport.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.scriptchoice;+import java.lang.reflect.AnnotatedElement;+import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;@@ -31,7 +33,14 @@ public class ScriptChoiceEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, model.getObject());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.javaindex 792a8ebf64..861f24d017 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.java@@ -37,7 +37,6 @@ import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.svg.SpriteImage;-import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@@ -143,38 +142,30 @@ class ServiceLocatorListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem, String componentId, IModel<ServiceLocator> rowModel) {- if (rowModel.getObject().getServiceNames() != null) {+ if (rowModel.getObject().getServiceNames() != null)cellItem.add(new Label(componentId, rowModel.getObject().getServiceNames()));- } else {- try {- cellItem.add(new EmptyValueLabel(componentId, ServiceLocator.class.getDeclaredMethod("getServiceNames")));- } catch (NoSuchMethodException | SecurityException e) {- throw new RuntimeException(e);- }- }+ else+ cellItem.add(new Label(componentId, "<i>All</i>").setEscapeModelStrings(false));}});columns.add(new AbstractColumn<ServiceLocator, Void>(Model.of("Applicable Images")) {@Override- public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem, String componentId, IModel<ServiceLocator> rowModel) {- if (rowModel.getObject().getServiceImages() != null) {+ public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem,+ String componentId, IModel<ServiceLocator> rowModel) {+ if (rowModel.getObject().getServiceImages() != null)cellItem.add(new Label(componentId, rowModel.getObject().getServiceImages()));- } else {- try {- cellItem.add(new EmptyValueLabel(componentId, ServiceLocator.class.getDeclaredMethod("getServiceImages")));- } catch (NoSuchMethodException | SecurityException e) {- throw new RuntimeException(e);- }- }+ else+ cellItem.add(new Label(componentId, "<i>All</i>").setEscapeModelStrings(false));}});columns.add(new AbstractColumn<ServiceLocator, Void>(Model.of("#Node Selector Entries")) {@Override- public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem, String componentId, IModel<ServiceLocator> rowModel) {+ public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem,+ String componentId, IModel<ServiceLocator> rowModel) {cellItem.add(new Label(componentId, rowModel.getObject().getNodeSelector().size()));}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditSupport.javaindex 23c200b1c1..6de8ab212e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditSupport.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.servicelocator;import java.io.Serializable;+import java.lang.reflect.AnnotatedElement;import java.util.List;import org.apache.wicket.Component;@@ -31,10 +32,18 @@ public class ServiceLocatorListEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null)+ if (model.getObject() != null) {return new ServiceLocatorListViewPanel(id, model.getObject());- else- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ } else {+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };+ }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListViewPanel.javaindex 411aa5996d..e5f0fbedae 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListViewPanel.java@@ -32,7 +32,6 @@ import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;import io.onedev.server.web.component.offcanvas.OffCanvasPanel.Placement;import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.EmptyValueLabel;@SuppressWarnings("serial")class ServiceLocatorListViewPanel extends Panel {@@ -60,15 +59,10 @@ class ServiceLocatorListViewPanel extends Panel {@Overrideprotected Component newLabel(String componentId) {- if (rowModel.getObject().getServiceNames() != null) {+ if (rowModel.getObject().getServiceNames() != null)return new Label("label", rowModel.getObject().getServiceNames());- } else {- try {- return new EmptyValueLabel("label", ServiceLocator.class.getDeclaredMethod("getServiceNames"));- } catch (NoSuchMethodException | SecurityException e) {- throw new RuntimeException(e);- }- }+ else+ return new Label("label", "<i>All</i>").setEscapeModelStrings(false);}});@@ -83,15 +77,10 @@ class ServiceLocatorListViewPanel extends Panel {@Overrideprotected Component newLabel(String componentId) {- if (rowModel.getObject().getServiceImages() != null) {+ if (rowModel.getObject().getServiceImages() != null)return new Label("label", rowModel.getObject().getServiceImages());- } else {- try {- return new EmptyValueLabel("label", ServiceLocator.class.getDeclaredMethod("getServiceImages"));- } catch (NoSuchMethodException | SecurityException e) {- throw new RuntimeException(e);- }- }+ else+ return new Label("label", "<i>All</i>").setEscapeModelStrings(false);}});diff --git a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.javaindex 5f249da692..774a1bc227 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java@@ -2,7 +2,6 @@ package io.onedev.server.web.editable.string;import java.lang.reflect.Method;-import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.form.FormComponent;@@ -15,12 +14,9 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;-import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.Multiline;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.editable.annotation.OmitName;@SuppressWarnings("serial")public class StringPropertyEditor extends PropertyEditor<String> {@@ -74,14 +70,9 @@ public class StringPropertyEditor extends PropertyEditor<String> {}});++ input.add(newPlaceholderModifier());- if (getter.getAnnotation(OmitName.class) != null) {- input.add(AttributeModifier.replace("placeholder", EditableUtils.getDisplayName(getter)));- } else {- NameOfEmptyValue nameOfEmptyValue = getter.getAnnotation(NameOfEmptyValue.class);- if (nameOfEmptyValue != null)- input.add(AttributeModifier.replace("placeholder", nameOfEmptyValue.value()));- }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.javaindex 84d7879966..b70f2e9389 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.string;+import java.lang.reflect.AnnotatedElement;+import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.unbescape.html.HtmlEscape;@@ -20,10 +22,18 @@ public class StringPropertyViewer extends PropertyViewer {@Overrideprotected Component newContent(String id, PropertyDescriptor descriptor) {- if (value != null)+ if (value != null) {return new Label(id, "<pre class='mb-0'>" + HtmlEscape.escapeHtml5(value) + "</pre>").setEscapeModelStrings(false);- else- return new EmptyValueLabel(id, descriptor.getPropertyGetter());+ } else {+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return descriptor.getPropertyGetter();+ }++ };+ }}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserChoiceEditSupport.javaindex 414d841e66..d84e445be1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserChoiceEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.userchoice;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import java.util.List;@@ -39,7 +40,14 @@ public class UserChoiceEditSupport implements EditSupport {if (userNames != null && !userNames.isEmpty()) {return new Label(id, StringUtils.join(userNames, ", " ));} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}@@ -64,7 +72,14 @@ public class UserChoiceEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, model.getObject());} else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodEditSupport.javaindex 2a87c9e791..aa75f3f072 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodEditSupport.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.workingperiod;+import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;import org.apache.wicket.Component;@@ -32,10 +33,18 @@ public class WorkingPeriodEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null)+ if (model.getObject() != null) {return new Label(id, DateUtils.formatWorkingPeriod(model.getObject()));- else- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ } else {+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };+ }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.javaindex 7fe41fc05a..daa7d1c28d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java@@ -1,10 +1,7 @@package io.onedev.server.web.editable.workingperiod;-import java.lang.reflect.Method;-import javax.validation.ValidationException;-import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.model.IModel;@@ -14,11 +11,8 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.editable.annotation.OmitName;@SuppressWarnings("serial")public class WorkingPeriodPropertyEditor extends PropertyEditor<Integer> {@@ -50,15 +44,7 @@ public class WorkingPeriodPropertyEditor extends PropertyEditor<Integer> {}});-- Method getter = getDescriptor().getPropertyGetter();- if (getter.getAnnotation(OmitName.class) != null) {- input.add(AttributeModifier.replace("placeholder", EditableUtils.getDisplayName(getter)));- } else {- NameOfEmptyValue nameOfEmptyValue = getter.getAnnotation(NameOfEmptyValue.class);- if (nameOfEmptyValue != null)- input.add(AttributeModifier.replace("placeholder", nameOfEmptyValue.value()));- }+ input.add(newPlaceholderModifier());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.cssindex 5bc2e16c5b..40ef455b43 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css@@ -1,4 +1,4 @@-.ssh-setting textarea {+.ssh-server-key textarea {font-family: monospace;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.javaindex 25bd0da324..6b9e4055cf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.java@@ -4,7 +4,6 @@ import java.io.Serializable;import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class AuthenticatorBean implements Serializable {@@ -13,8 +12,7 @@ public class AuthenticatorBean implements Serializable {private Authenticator authenticator;- @Editable- @NameOfEmptyValue("No external authentication")+ @Editable(placeholder="No external authentication")public Authenticator getAuthenticator() {return authenticator;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sshsetting/SshSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/sshserverkey/SshServerKeyPage.htmlsimilarity index 64%rename from server-core/src/main/java/io/onedev/server/web/page/admin/sshsetting/SshSettingPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/sshserverkey/SshServerKeyPage.htmlindex ee5edfeed1..cf376ed267 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sshsetting/SshSettingPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/sshserverkey/SshServerKeyPage.html@@ -1,6 +1,9 @@<wicket:extend>- <div class="card ssh-setting">+ <div class="card ssh-server-key"><div class="card-body">+ <div class="alert alert-light alert-notice mb-4">+ Specify the private key (in PEM format) used by SSH server to establish connections with client+ </div><form wicket:id="form" class="leave-confirm"><div wicket:id="editor" class="mb-4"></div><input type="submit" class="btn btn-primary dirty-aware mr-1" value="Save Setting">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sshsetting/SshSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/sshserverkey/SshServerKeyPage.javasimilarity index 91%rename from server-core/src/main/java/io/onedev/server/web/page/admin/sshsetting/SshSettingPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/sshserverkey/SshServerKeyPage.javaindex 4f59855350..f46c8787d4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sshsetting/SshSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/sshserverkey/SshServerKeyPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.admin.sshsetting;+package io.onedev.server.web.page.admin.sshserverkey;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -18,9 +18,9 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")-public class SshSettingPage extends AdministrationPage {+public class SshServerKeyPage extends AdministrationPage {- public SshSettingPage(PageParameters params) {+ public SshServerKeyPage(PageParameters params) {super(params);}@@ -40,7 +40,7 @@ public class SshSettingPage extends AdministrationPage {OneDev.getInstance(SettingManager.class).saveSshSetting(sshSetting);getSession().success("SSH setting has been saved");- setResponsePage(SshSettingPage.class);+ setResponsePage(SshServerKeyPage.class);}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex f0ecf74293..b805f08a9b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -27,10 +27,11 @@ import io.onedev.server.web.page.admin.user.accesstoken.UserAccessTokenPage;import io.onedev.server.web.page.admin.user.authorization.UserAuthorizationsPage;import io.onedev.server.web.page.admin.user.avatar.UserAvatarPage;import io.onedev.server.web.page.admin.user.emailaddresses.UserEmailAddressesPage;+import io.onedev.server.web.page.admin.user.gpgkeys.UserGpgKeysPage;import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;import io.onedev.server.web.page.admin.user.password.UserPasswordPage;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;-import io.onedev.server.web.page.admin.user.ssh.UserSshKeysPage;+import io.onedev.server.web.page.admin.user.sshkeys.UserSshKeysPage;import io.onedev.server.web.page.admin.user.twofactorauthentication.UserTwoFactorAuthenticationPage;@SuppressWarnings("serial")@@ -74,6 +75,7 @@ public abstract class UserPage extends AdministrationPage {tabs.add(new UserTab("Belonging Groups", "group", UserMembershipsPage.class));tabs.add(new UserTab("Authorized Projects", "project", UserAuthorizationsPage.class));tabs.add(new UserTab("SSH Keys", "key", UserSshKeysPage.class));+ tabs.add(new UserTab("GPG Keys", "key", UserGpgKeysPage.class));tabs.add(new UserTab("Access Token", "token", UserAccessTokenPage.class));tabs.add(new UserTab("Two-factor Authentication", "shield", UserTwoFactorAuthenticationPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/gpgkeys/UserGpgKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/gpgkeys/UserGpgKeysPage.htmlnew file mode 100644index 0000000000..b03bd38886--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/gpgkeys/UserGpgKeysPage.html@@ -0,0 +1,7 @@+<wicket:extend>+ <div class="user-gpg-key-list">+ <div class="alert alert-light alert-notice mb-4">Add GPG keys here to verify commits/tags signed by this user</div>+ <a wicket:id="newKey" class="btn btn-primary btn-icon mb-4" title="Add GPG Key"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <div wicket:id="keyList"></div>+ </div>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/gpgkeys/UserGpgKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/gpgkeys/UserGpgKeysPage.javanew file mode 100644index 0000000000..398db74293--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/gpgkeys/UserGpgKeysPage.java@@ -0,0 +1,81 @@+package io.onedev.server.web.page.admin.user.gpgkeys;++import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.model.GpgKey;+import io.onedev.server.model.User;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.user.gpgkey.GpgKeyListPanel;+import io.onedev.server.web.component.user.gpgkey.InsertGpgKeyPanel;+import io.onedev.server.web.page.admin.user.UserPage;++@SuppressWarnings("serial")+public class UserGpgKeysPage extends UserPage {++ private GpgKeyListPanel keyList;++ public UserGpgKeysPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ModalLink("newKey") {++ @Override+ protected String getModalCssClass() {+ return "modal-lg";+ }++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new InsertGpgKeyPanel(id) {++ @Override+ protected void onSave(AjaxRequestTarget target) {+ target.add(keyList);+ modal.close();+ }++ @Override+ protected User getUser() {+ return UserGpgKeysPage.this.getUser();+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ };+ }++ });++ keyList = new GpgKeyListPanel("keyList", new LoadableDetachableModel<List<GpgKey>>() {++ @Override+ protected List<GpgKey> load() {+ return getUser().getGpgKeys();+ }++ });++ add(keyList.setOutputMarkupId(true));+ }++ @Override+ protected Component newTopbarTitle(String componentId) {+ return new Label(componentId, "User GPG Keys");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.htmldeleted file mode 100644index 94cdb8830c..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html+++ /dev/null@@ -1,11 +0,0 @@-<wicket:extend>- <div class="user-ssh-key-list list">- <div class="head">- <div wicket:id="sshKeyNote" class="alert alert-notice alert-light-warning mb-4"></div>- <a class="add-new btn-icon btn btn-primary" title="Add SSH key" wicket:id="newKey"><wicket:svg href="plus" class="icon"></wicket:svg></a>- </div>- <div class="body">- <div wicket:id="keyList"></div>- </div>- </div>-</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.htmlnew file mode 100644index 0000000000..0c45679ab5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.html@@ -0,0 +1,7 @@+<wicket:extend>+ <div class="user-ssh-key-list">+ <div wicket:id="sshKeyNote" class="alert alert-notice alert-light-warning mb-4"></div>+ <a class="add-new btn-icon btn btn-primary mb-4" title="Add SSH key" wicket:id="newKey"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <div wicket:id="keyList"></div>+ </div>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.javaindex aca2b59c8f..9145c7c0b2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.admin.user.ssh;+package io.onedev.server.web.page.admin.user.sshkeys;import java.util.ArrayList;import java.util.List;@@ -41,6 +41,11 @@ public class UserSshKeysPage extends UserPage {add(new ModalLink("newKey") {+ @Override+ protected String getModalCssClass() {+ return "modal-lg";+ }+@Overrideprotected Component newContent(String id, ModalPanel modal) {return new InsertSshKeyPanel(id) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 6a21e4ad57..ea74dc47a4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -73,7 +73,7 @@ import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;import io.onedev.server.web.page.admin.serverlog.ServerLogPage;import io.onedev.server.web.page.admin.servicedesk.ServiceDeskSettingPage;-import io.onedev.server.web.page.admin.sshsetting.SshSettingPage;+import io.onedev.server.web.page.admin.sshserverkey.SshServerKeyPage;import io.onedev.server.web.page.admin.ssosetting.SsoConnectorListPage;import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;import io.onedev.server.web.page.admin.user.UserListPage;@@ -128,6 +128,8 @@ public abstract class LayoutPage extends BasePage {List<SidebarMenuItem> administrationMenuItems = new ArrayList<>();administrationMenuItems.add(new SidebarMenuItem.Page(null, "System Setting",SystemSettingPage.class, new PageParameters()));+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Security Setting",+ SecuritySettingPage.class, new PageParameters()));administrationMenuItems.add(new SidebarMenuItem.Page(null, "User Management", UserListPage.class,new PageParameters(), Lists.newArrayList(NewUserPage.class, UserPage.class)));administrationMenuItems.add(new SidebarMenuItem.Page(null, "Role Management", RoleListPage.class,@@ -135,21 +137,23 @@ public abstract class LayoutPage extends BasePage {administrationMenuItems.add(new SidebarMenuItem.Page(null, "Group Management", GroupListPage.class,new PageParameters(), Lists.newArrayList(NewGroupPage.class, GroupPage.class)));- List<SidebarMenuItem> securitySettingMenuItems = new ArrayList<>();- securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "General Setting",- SecuritySettingPage.class, new PageParameters()));- securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "External Authentication",+ List<SidebarMenuItem> authenticationMenuItems = new ArrayList<>();+ authenticationMenuItems.add(new SidebarMenuItem.Page(null, "External Authentication",AuthenticatorPage.class, new PageParameters()));- securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "Single Sign On",+ authenticationMenuItems.add(new SidebarMenuItem.Page(null, "Single Sign On",SsoConnectorListPage.class, new PageParameters()));- securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "SSH Server Key",- SshSettingPage.class, new PageParameters()));- securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "GPG Signing Key",++ administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Authentication Source", authenticationMenuItems));++ List<SidebarMenuItem> keyManagementMenuItems = new ArrayList<>();+ keyManagementMenuItems.add(new SidebarMenuItem.Page(null, "SSH Server Key",+ SshServerKeyPage.class, new PageParameters()));+ keyManagementMenuItems.add(new SidebarMenuItem.Page(null, "GPG Signing Key",GpgSigningKeyPage.class, new PageParameters()));- securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "GPG Trusted Keys",+ keyManagementMenuItems.add(new SidebarMenuItem.Page(null, "GPG Trusted Keys",GpgTrustedKeysPage.class, new PageParameters()));- administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Security Setting", securitySettingMenuItems));+ administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "SSH & GPG Keys", keyManagementMenuItems));List<SidebarMenuItem> issueSettingMenuItems = new ArrayList<>();issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Custom Fields",diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.javaindex 97f4914757..53787a7199 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java@@ -43,6 +43,11 @@ public class MySshKeysPage extends MyPage {add(new ModalLink("newKey") {@Override+ protected String getModalCssClass() {+ return "modal-lg";+ }++ @Overrideprotected Component newContent(String id, ModalPanel modal) {return new InsertSshKeyPanel(id) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/DefaultRoleBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/DefaultRoleBean.javaindex 77828503ed..e08b280e94 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/DefaultRoleBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/DefaultRoleBean.java@@ -8,7 +8,6 @@ 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.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.RoleChoice;@Editable@@ -18,11 +17,10 @@ public class DefaultRoleBean implements Serializable {private String roleName;- @Editable(name="Default Role", description="Default role determines default permissions granted to everyone in the system. "- + "A permission is default permission of the project, if it is contained in any default role of the project "- + "hierarchy (current and all ancestor projects)")+ @Editable(name="Default Role", placeholder="No default role", description="Default role determines default "+ + "permissions granted to everyone in the system. A permission is default permission of the project, "+ + "if it is contained in any default role of the project hierarchy (current and all ancestor projects)")@RoleChoice- @NameOfEmptyValue("No default role")public String getRoleName() {return roleName;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/ParentBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/ParentBean.javaindex 2cb659e8d3..3d8ae606a1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/ParentBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/ParentBean.java@@ -6,7 +6,6 @@ import javax.annotation.Nullable;import io.onedev.server.util.validation.annotation.ProjectPath;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ParentChoice;@Editable@@ -16,11 +15,10 @@ public class ParentBean implements Serializable {private String parentPath;- @Editable(name="Parent Project", description="Settings and permissions of parent project will be inherited "- + "by this project")+ @Editable(name="Parent Project", placeholder="No parent", description="Settings and permissions "+ + "of parent project will be inherited by this project")@ProjectPath@ParentChoice- @NameOfEmptyValue("No parent")public String getParentPath() {return parentPath;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ServiceDeskSettingBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ServiceDeskSettingBean.javaindex 2ff40827fe..3ceff6cf60 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ServiceDeskSettingBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ServiceDeskSettingBean.java@@ -4,7 +4,6 @@ import java.io.Serializable;import io.onedev.server.util.validation.annotation.ProjectName;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic class ServiceDeskSettingBean implements Serializable {@@ -15,11 +14,11 @@ public class ServiceDeskSettingBean implements Serializable {private String serviceDeskName;- @Editable(order=100, description="Service desk name can be used to construct service desk email address of current project, "- + "which takes the form <tt><system email address name>+<service desk name>@<system email address domain></tt>. "+ @Editable(order=100, placeholder="Use project path", description="Service desk name can be used to "+ + "construct service desk email address of current project, which takes the form "+ + "<tt><system email address name>+<service desk name>@<system email address domain></tt>. "+ "Issues can be created in this project by sending email to this address")@ProjectName- @NameOfEmptyValue("Use project path")public String getServiceDeskName() {return serviceDeskName;}diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/ActiveDirectoryAuthenticator.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/ActiveDirectoryAuthenticator.javaindex 89143b593f..a4aa91bfcd 100644--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/ActiveDirectoryAuthenticator.java+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/ActiveDirectoryAuthenticator.java@@ -3,7 +3,6 @@ package io.onedev.server.plugin.authenticator.ldap;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(name="Active Directory", order=100)public class ActiveDirectoryAuthenticator extends LdapAuthenticator {@@ -64,12 +63,11 @@ public class ActiveDirectoryAuthenticator extends LdapAuthenticator {super.setUserSearchFilter(userSearchFilter);}- @Editable(order=1000, description=""+ @Editable(order=1000, placeholder="Do not retrieve groups", description=""+ "Optionally specify group search base if you want to retrieve group membership information "+ "of the user. For example: <i>cn=Users, dc=example, dc=com</i>. To give appropriate "+ "permissions to a Active Directory group, a OneDev group with same name should be defined. "+ "Leave empty to manage group memberships at OneDev side")- @NameOfEmptyValue("Do not retrieve groups")public String getGroupSearchBase() {return groupSearchBase;}diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex 8f338f5796..68dac31778 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -85,7 +85,6 @@ import io.onedev.server.util.PKCS12CertExtractor;import io.onedev.server.util.ServerConfig;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.util.Testable;@@ -159,11 +158,10 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatathis.serviceLocators = serviceLocators;}- @Editable(name="Kubectl Config File", order=26000, group="More Settings", description=- "Specify absolute path to the config file used by kubectl to access the "- + "cluster. Leave empty to have kubectl determining cluster access "- + "information automatically")- @NameOfEmptyValue("Use default")+ @Editable(name="Kubectl Config File", order=26000, group="More Settings",+ placeholder="Use default", description="Specify absolute path to the config file "+ + "used by kubectl to access the cluster. Leave empty to have kubectl "+ + "determining cluster access information automatically")public String getConfigFile() {return configFile;}@@ -172,10 +170,9 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatathis.configFile = configFile;}- @Editable(name="Path to kubectl", order=27000, group="More Settings", description=- "Specify absolute path to the kubectl utility, for instance: <i>/usr/bin/kubectl</i>. "+ @Editable(name="Path to kubectl", order=27000, group="More Settings", placeholder="Use default",+ description="Specify absolute path to the kubectl utility, for instance: <i>/usr/bin/kubectl</i>. "+ "If left empty, OneDev will try to find the utility from system path")- @NameOfEmptyValue("Use default")public String getKubeCtlPath() {return kubeCtlPath;}diff --git a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.javaindex 248424d7e9..7b88f39ff8 100644--- a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java+++ b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java@@ -28,7 +28,6 @@ import io.onedev.server.search.entity.agent.AgentQuery;import io.onedev.server.tasklog.JobLogManager;import io.onedev.server.util.CollectionUtils;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=210, description="This executor runs build jobs as docker containers on remote machines via <a href='/administration/agents' target='_blank'>agents</a>")public class RemoteDockerExecutor extends ServerDockerExecutor {@@ -37,9 +36,9 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {private String agentQuery;- @Editable(order=390, name="Agent Selector", description="Specify agents applicable for this executor")+ @Editable(order=390, name="Agent Selector", placeholder="Any agent",+ description="Specify agents applicable for this executor")@io.onedev.server.web.editable.annotation.AgentQuery(forExecutor=true)- @NameOfEmptyValue("Any agent")public String getAgentQuery() {return agentQuery;}diff --git a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.javaindex 2c81afcfa7..7e97ddec08 100644--- a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java+++ b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java@@ -26,7 +26,6 @@ import io.onedev.server.search.entity.agent.AgentQuery;import io.onedev.server.tasklog.JobLogManager;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable(order=500, name="Remote Shell Executor", description="This executor runs build jobs with remote machines's shell facility via <a href='/administration/agents' target='_blank'>agents</a>")@Horizontal@@ -36,9 +35,9 @@ public class RemoteShellExecutor extends ServerShellExecutor {private String agentQuery;- @Editable(order=390, name="Agent Selector", description="Specify agents applicable for this executor")+ @Editable(order=390, name="Agent Selector", placeholder="Any agent",+ description="Specify agents applicable for this executor")@io.onedev.server.web.editable.annotation.AgentQuery(forExecutor=true)- @NameOfEmptyValue("Any agent")public String getAgentQuery() {return agentQuery;}diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex 294b8561c2..2a01836d95 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java@@ -80,7 +80,6 @@ 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.Horizontal;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.util.Testable;@@ -122,9 +121,9 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDathis.runOptions = runOptions;}- @Editable(order=50100, group="More Settings", description="Optionally specify docker executable, for instance <i>/usr/local/bin/docker</i>. "+ @Editable(order=50100, group="More Settings", placeholder="Use default", description=""+ + "Optionally specify docker executable, for instance <i>/usr/local/bin/docker</i>. "+ "Leave empty to use docker executable in PATH")- @NameOfEmptyValue("Use default")public String getDockerExecutable() {return dockerExecutable;}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 a96bf27a34..684fdcd076 100644--- a/server-product/src/test/java/io/onedev/server/product/Test.java+++ b/server-product/src/test/java/io/onedev/server/product/Test.java@@ -1,9 +1,13 @@package io.onedev.server.product;+import java.net.MalformedURLException;+import java.net.URL;+public class Test {@org.junit.Test- public void test() {+ public void test() throws MalformedURLException {+ System.out.println(new URL("ssh://localhost:6611").getHost());}}\ No newline at end of file