Merge branch 'master' into update-forms

bom/pom.xml

@@ -191,7 +191,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>com.github.jnr</groupId>
         <artifactId>jnr-posix</artifactId>
-        <version>3.1.12</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.kohsuke</groupId>

core/pom.xml

@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>com.infradna.tool</groupId>
       <artifactId>bridge-method-annotation</artifactId>
-      <version>1.21</version>
+      <version>${bridge-method-injector.version}</version>
     </dependency>
 
     <dependency><!-- until we get this version through Stapler -->
@@ -380,6 +380,11 @@ THE SOFTWARE.
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci</groupId>
+      <artifactId>test-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
@@ -407,6 +412,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-inline</artifactId>
+      <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency><!-- needed by Jelly -->

core/src/main/java/hudson/FilePath.java

@@ -1197,7 +1197,7 @@ public abstract static class AbstractInterceptorCallableWrapper<T> implements De
 
         private final DelegatingCallable<T, IOException> callable;
 
-        public AbstractInterceptorCallableWrapper(DelegatingCallable<T, IOException> callable) {
+        protected AbstractInterceptorCallableWrapper(DelegatingCallable<T, IOException> callable) {
             this.callable = callable;
         }
 
@@ -1674,8 +1674,8 @@ public String invoke(File dir, VirtualChannel channel) throws IOException {
 
     /**
      * Deletes this file.
-     * @throws IOException if it exists but could not be successfully deleted
      * @return true, for a modicum of compatibility
+     * @throws IOException if it exists but could not be successfully deleted
      */
     public boolean delete() throws IOException, InterruptedException {
         act(new Delete());

core/src/main/java/hudson/Launcher.java

@@ -97,7 +97,7 @@ public abstract class Launcher {
     @Restricted(Beta.class)
     protected EnvVarsFilterRuleWrapper envVarsFilterRuleWrapper;
 
-    public Launcher(@NonNull TaskListener listener, @CheckForNull VirtualChannel channel) {
+    protected Launcher(@NonNull TaskListener listener, @CheckForNull VirtualChannel channel) {
         this.listener = listener;
         this.channel = channel;
     }

core/src/main/java/hudson/PluginManager.java

@@ -351,7 +351,7 @@ PluginManager doCreate(@NonNull Class<? extends PluginManager> klass,
      */
     private final PluginStrategy strategy;
 
-    public PluginManager(ServletContext context, File rootDir) {
+    protected PluginManager(ServletContext context, File rootDir) {
         this.context = context;
 
         this.rootDir = rootDir;

core/src/main/java/hudson/ProxyConfiguration.java

@@ -176,10 +176,10 @@ public String getPassword() {
     }
 
     /**
+     * @return the encrypted proxy password
+     *
      * @deprecated
      *      Use {@link #getSecretPassword()}
-     *
-     * @return the encrypted proxy password
      */
     @Deprecated
     public String getEncryptedPassword() {

core/src/main/java/hudson/WebAppMain.java

@@ -120,7 +120,8 @@ public class WebAppMain implements ServletContextListener {
         }
     };
 
-    /**This getter returns the int DEFAULT_RING_BUFFER_SIZE from the class RingBufferLogHandler from a static context.
+    /**
+     * This getter returns the int DEFAULT_RING_BUFFER_SIZE from the class RingBufferLogHandler from a static context.
      * Exposes access from RingBufferLogHandler.DEFAULT_RING_BUFFER_SIZE to WebAppMain.
      * Written for the requirements of JENKINS-50669
      * @return int This returns DEFAULT_RING_BUFFER_SIZE

core/src/main/java/hudson/XmlFile.java

@@ -263,8 +263,8 @@ public String toString() {
      * Opens a {@link Reader} that loads XML.
      * This method uses {@link #sniffEncoding() the right encoding},
      * not just the system default encoding.
-     * @throws IOException Encoding issues
      * @return Reader for the file. should be close externally once read.
+     * @throws IOException Encoding issues
      */
     public Reader readRaw() throws IOException {
         try {
@@ -304,10 +304,10 @@ public void writeRawTo(Writer w) throws IOException {
     /**
      * Parses the beginning of the file and determines the encoding.
      *
-     * @throws IOException
-     *      if failed to detect encoding.
      * @return
      *      always non-null.
+     * @throws IOException
+     *      if failed to detect encoding.
      */
     public String sniffEncoding() throws IOException {
         class Eureka extends SAXException {

core/src/main/java/hudson/cli/declarative/MethodBinder.java

@@ -31,6 +31,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
+import java.util.Objects;
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
@@ -171,5 +172,22 @@ public Class<? extends Annotation> annotationType() {
         public boolean hidden() {
             return base.hidden();
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (!(o instanceof ArgumentImpl)) {
+                return false;
+            }
+            ArgumentImpl argument = (ArgumentImpl) o;
+            return Objects.equals(base, argument.base) && bias == argument.bias;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(base, bias);
+        }
     }
 }

core/src/main/java/hudson/console/ConsoleAnnotationDescriptor.java

@@ -42,11 +42,11 @@
  * @since 1.349
  */
 public abstract class ConsoleAnnotationDescriptor extends Descriptor<ConsoleNote<?>> implements ExtensionPoint {
-    public ConsoleAnnotationDescriptor(Class<? extends ConsoleNote<?>> clazz) {
+    protected ConsoleAnnotationDescriptor(Class<? extends ConsoleNote<?>> clazz) {
         super(clazz);
     }
 
-    public ConsoleAnnotationDescriptor() {
+    protected ConsoleAnnotationDescriptor() {
     }
 
     /**

core/src/main/java/hudson/logging/LogRecorder.java

@@ -31,11 +31,6 @@
 import hudson.RestrictedSince;
 import hudson.Util;
 import hudson.XmlFile;
-import hudson.util.CopyOnWriteList;
-import hudson.util.HttpResponses;
-import java.util.Objects;
-import jenkins.util.MemoryReductionUtil;
-import jenkins.model.Jenkins;
 import hudson.model.AbstractModelObject;
 import hudson.model.AutoCompletionCandidates;
 import hudson.model.Computer;
@@ -45,6 +40,8 @@
 import hudson.remoting.Channel;
 import hudson.remoting.VirtualChannel;
 import hudson.slaves.ComputerListener;
+import hudson.util.CopyOnWriteList;
+import hudson.util.HttpResponses;
 import hudson.util.RingBufferLogHandler;
 import hudson.util.XStream2;
 import java.io.File;
@@ -61,6 +58,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeMap;
@@ -70,7 +68,9 @@
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 import javax.servlet.ServletException;
+import jenkins.model.Jenkins;
 import jenkins.security.MasterToSlaveCallable;
+import jenkins.util.MemoryReductionUtil;
 import net.sf.json.JSONObject;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -98,14 +98,14 @@
 public class LogRecorder extends AbstractModelObject implements Saveable {
     private volatile String name;
 
-    @Deprecated
-    @Restricted(NoExternalUse.class)
-    @RestrictedSince("TODO")
     /**
      * No longer used.
      *
      * @deprecated use {@link #getLoggers()}
      */
+    @Deprecated
+    @Restricted(NoExternalUse.class)
+    @RestrictedSince("TODO")
     public final transient CopyOnWriteList<Target> targets = new CopyOnWriteList<>();
     private List<Target> loggers = new ArrayList<>();
     private static final TargetComparator TARGET_COMPARATOR = new TargetComparator();

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

@@ -251,7 +251,7 @@ public List<TerminationRequest> getTerminatedBy() {
         return new ArrayList<>(terminatedBy);
     }
 
-    public Computer(Node node) {
+    protected Computer(Node node) {
         setNode(node);
     }
 
@@ -462,10 +462,11 @@ public final Future<?> connect(boolean forceReconnect) {
     protected abstract Future<?> _connect(boolean forceReconnect);
 
     /**
-     * @deprecated Implementation of CLI command "connect-node" moved to {@link hudson.cli.ConnectNodeCommand}.
      *
      * @param force
      *      If true cancel any currently pending connect operation and retry from scratch
+     *
+     * @deprecated Implementation of CLI command "connect-node" moved to {@link hudson.cli.ConnectNodeCommand}.
      */
     @Deprecated
     public void cliConnect(boolean force) throws ExecutionException, InterruptedException {
@@ -524,10 +525,10 @@ public Future<?> disconnect() {
     }
 
     /**
-     * @deprecated Implementation of CLI command "disconnect-node" moved to {@link hudson.cli.DisconnectNodeCommand}.
-     *
      * @param cause
      *      Record the note about why you are disconnecting this node
+     *
+     * @deprecated Implementation of CLI command "disconnect-node" moved to {@link hudson.cli.DisconnectNodeCommand}.
      */
     @Deprecated
     public void cliDisconnect(String cause) throws ExecutionException, InterruptedException {
@@ -536,10 +537,10 @@ public void cliDisconnect(String cause) throws ExecutionException, InterruptedEx
     }
 
     /**
-     * @deprecated  Implementation of CLI command "offline-node" moved to {@link hudson.cli.OfflineNodeCommand}.
-     *
      * @param cause
      *      Record the note about why you are disconnecting this node
+     *
+     * @deprecated  Implementation of CLI command "offline-node" moved to {@link hudson.cli.OfflineNodeCommand}.
      */
     @Deprecated
     public void cliOffline(String cause) throws ExecutionException, InterruptedException {

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

@@ -26,7 +26,6 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.FilePath;
 import hudson.Util;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -54,7 +53,6 @@
 import java.util.stream.Stream;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
-
 import jenkins.model.Jenkins;
 import jenkins.security.MasterToSlaveCallable;
 import jenkins.security.ResourceDomainConfiguration;

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

@@ -68,12 +68,11 @@ default void buildEnvironment(@NonNull Run<?, ?> run, @NonNull EnvVars env) {
     /**
      * Called by {@link AbstractBuild} to allow plugins to contribute environment variables.
      *
-     * @deprecated Use {@link #buildEnvironment} instead
-     *
      * @param build
      *      The calling build. Never null.
      * @param env
      *      Environment variables should be added to this map.
+     * @deprecated Use {@link #buildEnvironment} instead
      */
     @Deprecated
     @Restricted(ProtectedExternally.class)

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

@@ -44,7 +44,7 @@ public abstract class FullDuplexHttpChannel extends FullDuplexHttpService {
     private Channel channel;
     private final boolean restricted;
 
-    public FullDuplexHttpChannel(UUID uuid, boolean restricted) throws IOException {
+    protected FullDuplexHttpChannel(UUID uuid, boolean restricted) throws IOException {
         super(uuid);
         this.restricted = restricted;
     }

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

@@ -99,8 +99,8 @@ default Stream<T> getItemsStream(Predicate<T> pred) {
 
     /**
      * Gets the {@link Item} inside this group that has a given name, or null if it does not exist.
-     * @throws AccessDeniedException if the current user has {@link Item#DISCOVER} but not {@link Item#READ} on this item
      * @return an item whose {@link Item#getName} is {@code name} and whose {@link Item#getParent} is {@code this}, or null if there is no such item, or there is but the current user lacks both {@link Item#DISCOVER} and {@link Item#READ} on it
+     * @throws AccessDeniedException if the current user has {@link Item#DISCOVER} but not {@link Item#READ} on this item
      */
     @CheckForNull T getItem(String name) throws AccessDeniedException;
 

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

@@ -97,7 +97,7 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
     @NonNull
     public final transient NodeProvisioner nodeProvisioner;
 
-    public Label(@NonNull String name) {
+    protected Label(@NonNull String name) {
         this.name = name;
          // passing these causes an infinite loop - getTotalExecutors(),getBusyExecutors());
         this.loadStatistics = new LoadStatistics(0,0) {

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

@@ -102,7 +102,7 @@ public abstract class ParameterDefinition implements
 
     private String description;
 
-    public ParameterDefinition(@NonNull String name) {
+    protected ParameterDefinition(@NonNull String name) {
         if (name == null) {
             throw new IllegalArgumentException("Parameter name must be non-null");
         }
@@ -113,7 +113,7 @@ public ParameterDefinition(@NonNull String name) {
      * @deprecated Prefer {@link #ParameterDefinition(String)} with a {@link org.kohsuke.stapler.DataBoundConstructor} and allow {@link #setDescription} to be used as needed
      */
     @Deprecated
-    public ParameterDefinition(@NonNull String name, String description) {
+    protected ParameterDefinition(@NonNull String name, String description) {
         this(name);
         setDescription(description);
     }

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

@@ -86,7 +86,7 @@ public abstract class Project<P extends Project<P,B>,B extends Build<P,B>>
     /**
      * Creates a new project.
      */
-    public Project(ItemGroup parent,String name) {
+    protected Project(ItemGroup parent,String name) {
         super(parent,name);
     }
 

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

@@ -1380,7 +1380,7 @@ public class Artifact {
         private String treeNodeId;
 
         /**
-         *length of this artifact for files.
+         * length of this artifact for files.
          */
         private String length;
 

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

@@ -164,7 +164,7 @@ public abstract class Slave extends Node implements Serializable {
      * @deprecated since 2.184
      */
     @Deprecated
-    public Slave(String name, String nodeDescription, String remoteFS, String numExecutors,
+    protected Slave(String name, String nodeDescription, String remoteFS, String numExecutors,
                  Mode mode, String labelString, ComputerLauncher launcher, RetentionStrategy retentionStrategy, List<? extends NodeProperty<?>> nodeProperties) throws FormException, IOException {
         this(name,nodeDescription,remoteFS,Util.tryParseNumber(numExecutors, 1).intValue(),mode,labelString,launcher,retentionStrategy, nodeProperties);
     }
@@ -173,12 +173,12 @@ public Slave(String name, String nodeDescription, String remoteFS, String numExe
      * @deprecated since 2009-02-20.
      */
     @Deprecated
-    public Slave(String name, String nodeDescription, String remoteFS, int numExecutors,
+    protected Slave(String name, String nodeDescription, String remoteFS, int numExecutors,
             Mode mode, String labelString, ComputerLauncher launcher, RetentionStrategy retentionStrategy) throws FormException, IOException {
     	this(name, nodeDescription, remoteFS, numExecutors, mode, labelString, launcher, retentionStrategy, new ArrayList());
     }
 
-    public Slave(@NonNull String name, String remoteFS, ComputerLauncher launcher) throws FormException, IOException {
+    protected Slave(@NonNull String name, String remoteFS, ComputerLauncher launcher) throws FormException, IOException {
         this.name = name;
         this.remoteFS = remoteFS;
         this.launcher = launcher;
@@ -189,7 +189,7 @@ public Slave(@NonNull String name, String remoteFS, ComputerLauncher launcher) t
      *      Use {@link #Slave(String, String, ComputerLauncher)} and set the rest through setters.
      */
     @Deprecated
-    public Slave(@NonNull String name, String nodeDescription, String remoteFS, int numExecutors,
+    protected Slave(@NonNull String name, String nodeDescription, String remoteFS, int numExecutors,
                  Mode mode, String labelString, ComputerLauncher launcher, RetentionStrategy retentionStrategy, List<? extends NodeProperty<?>> nodeProperties) throws FormException, IOException {
         this.name = name;
         this.description = nodeDescription;