From 04aa4f17637bef65dd55ce5569164e3405ef0bc2 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Thu, 20 Jun 2019 17:27:59 +0300 Subject: [PATCH] Adjust Deprecation tree according to Slave javadocs. Slave constructor wants implementations to use setters, but AbstractCloudSlave has no corresponding constructor. --- core/src/main/java/hudson/model/Slave.java | 5 ++++ .../hudson/slaves/AbstractCloudSlave.java | 27 +++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java index 6d4804d400..ac3a0783d1 100644 --- a/core/src/main/java/hudson/model/Slave.java +++ b/core/src/main/java/hudson/model/Slave.java @@ -159,6 +159,11 @@ public abstract class Slave extends Node implements Serializable { */ private String userId; + /** + * Use {@link #Slave(String, String, ComputerLauncher)} and set the rest through setters. + * @deprecated since FIXME + */ + @Deprecated public Slave(String name, String nodeDescription, String remoteFS, String numExecutors, Mode mode, String labelString, ComputerLauncher launcher, RetentionStrategy retentionStrategy, List> nodeProperties) throws FormException, IOException { this(name,nodeDescription,remoteFS,Util.tryParseNumber(numExecutors, 1).intValue(),mode,labelString,launcher,retentionStrategy, nodeProperties); diff --git a/core/src/main/java/hudson/slaves/AbstractCloudSlave.java b/core/src/main/java/hudson/slaves/AbstractCloudSlave.java index 180d5c7386..3787d57c6f 100644 --- a/core/src/main/java/hudson/slaves/AbstractCloudSlave.java +++ b/core/src/main/java/hudson/slaves/AbstractCloudSlave.java @@ -30,6 +30,7 @@ import hudson.model.Slave; import hudson.model.TaskListener; import hudson.util.StreamTaskListener; +import javax.annotation.Nonnull; import java.io.IOException; import java.nio.charset.Charset; import java.util.List; @@ -43,11 +44,33 @@ import java.util.logging.Logger; * @since 1.382 */ public abstract class AbstractCloudSlave extends Slave { - public AbstractCloudSlave(String name, String nodeDescription, String remoteFS, String numExecutors, Mode mode, String labelString, ComputerLauncher launcher, RetentionStrategy retentionStrategy, List> nodeProperties) throws FormException, IOException { + + public AbstractCloudSlave(@Nonnull String name, String remoteFS, ComputerLauncher launcher) + throws FormException, IOException { + super(name, remoteFS, launcher); + } + + /** + * Use {@link #AbstractCloudSlave(java.lang.String, java.lang.String, hudson.slaves.ComputerLauncher)} + * @deprecated since FIXME + */ + @Deprecated + public AbstractCloudSlave(String name, String nodeDescription, String remoteFS, String numExecutors, + Mode mode, String labelString, ComputerLauncher launcher, + RetentionStrategy retentionStrategy, List> nodeProperties) + throws FormException, IOException { super(name, nodeDescription, remoteFS, numExecutors, mode, labelString, launcher, retentionStrategy, nodeProperties); } - public AbstractCloudSlave(String name, String nodeDescription, String remoteFS, int numExecutors, Mode mode, String labelString, ComputerLauncher launcher, RetentionStrategy retentionStrategy, List> nodeProperties) throws FormException, IOException { + /** + * Use {@link #AbstractCloudSlave(java.lang.String, java.lang.String, hudson.slaves.ComputerLauncher)} + * @deprecated since FIXME + */ + @Deprecated + public AbstractCloudSlave(String name, String nodeDescription, String remoteFS, int numExecutors, + Mode mode, String labelString, ComputerLauncher launcher, + RetentionStrategy retentionStrategy, List> nodeProperties) + throws FormException, IOException { super(name, nodeDescription, remoteFS, numExecutors, mode, labelString, launcher, retentionStrategy, nodeProperties); } -- GitLab