Add doCheckDisplayNameOrNull to jenkins core

core/src/main/java/hudson/model/AbstractProject.java

@@ -134,7 +134,7 @@
  * @see AbstractBuild
  */
 @SuppressWarnings("rawtypes")
 public abstract class AbstractProject<P extends AbstractProject<P, R>, R extends AbstractBuild<P, R>> extends Job<P, R> implements BuildableItem, LazyBuildMixIn.LazyLoadingJob<P, R>, ParameterizedJobMixIn.ParameterizedJob<P, R> {
 
     /**
      * {@link SCM} associated with the project.
@@ -682,7 +682,7 @@
     /**
      * Validates the retry count Regex
      */
     public FormValidation doCheckRetryCount(@QueryParameter String value)throws IOException, ServletException {
         // retry count is optional so this is ok
         if (value == null || value.trim().isEmpty())
             return FormValidation.ok();
@@ -1934,13 +1934,8 @@
             return true;
         }
 
-        @Restricted(DoNotUse.class)
-        public FormValidation doCheckDisplayNameOrNull(@AncestorInPath AbstractProject project, @QueryParameter String value) {
-            return Jenkins.get().doCheckDisplayName(value, project.getName());
-        }
-
         @Restricted(DoNotUse.class)
         public FormValidation doCheckAssignedLabelString(@AncestorInPath AbstractProject<?, ?> project,
                                                          @QueryParameter String value) {
           // Provide a legacy interface in case plugins are not going through p:config-assignedLabel
           // see: JENKINS-25372
@@ -1948,7 +1943,7 @@
           return doCheckLabel(project, value);
         }
 
         public FormValidation doCheckLabel(@AncestorInPath AbstractProject<?, ?> project,
                                            @QueryParameter String value) {
             return LabelExpression.validate(value, project);
         }
@@ -1965,14 +1960,14 @@
             return LabelExpression.validate(value, project);
         }
 
         public FormValidation doCheckCustomWorkspace(@QueryParameter String customWorkspace) {
             if (Util.fixEmptyAndTrim(customWorkspace) == null)
                 return FormValidation.error(Messages.AbstractProject_CustomWorkspaceEmpty());
             else
                 return FormValidation.ok();
         }
 
         public AutoCompletionCandidates doAutoCompleteUpstreamProjects(@QueryParameter String value) {
             AutoCompletionCandidates candidates = new AutoCompletionCandidates();
             List<TopLevelItem> jobs = Jenkins.get().getItems(j -> j instanceof Job && j.getFullName().startsWith(value));
             for (TopLevelItem job : jobs) {
@@ -1982,14 +1977,14 @@
         }
 
         @Restricted(DoNotUse.class)
         public AutoCompletionCandidates doAutoCompleteAssignedLabelString(@QueryParameter String value) {
           // Provide a legacy interface in case plugins are not going through p:config-assignedLabel
           // see: JENKINS-25372
           LOGGER.log(Level.WARNING, "autocompleting label via legacy '_.assignedLabelString'");
           return doAutoCompleteLabel(value);
         }
 
         public AutoCompletionCandidates doAutoCompleteLabel(@QueryParameter String value) {
             return LabelExpression.autoComplete(value);
         }
 

core/src/main/java/hudson/model/TopLevelItemDescriptor.java

@@ -27,6 +27,7 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.ExtensionList;
+import hudson.util.FormValidation;
 import java.io.StringWriter;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -37,7 +38,11 @@
 import org.jenkins.ui.icon.Icon;
 import org.jenkins.ui.icon.IconSet;
 import org.jenkins.ui.icon.IconSpec;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.MetaClass;
+import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.WebApp;
@@ -286,4 +291,8 @@
         return Items.all();
     }
 
+    @Restricted(NoExternalUse.class)
+    public FormValidation doCheckDisplayNameOrNull(@AncestorInPath TopLevelItem item, @QueryParameter String value) {
+        return Jenkins.get().doCheckDisplayName(value, item.getName());
+    }
 }