OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-14 20:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4086 from KostyaSha/slaveconstructors

Browse Source 
Adjust Deprecation tree according to Slave javadocs.
This commit is contained in:
Oleg Nenashev authored and GitHub committed 2019-07-05 15:26:04 +02:00
2 parents a0095dc1ee 04aa4f1763
commit c58a3ccfe8
2 files changed
+30 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/model/Slave.java
+5
View File
@@ -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<? extends NodeProperty<?>> nodeProperties) throws FormException, IOException {
this(name,nodeDescription,remoteFS,Util.tryParseNumber(numExecutors, 1).intValue(),mode,labelString,launcher,retentionStrategy, nodeProperties);
core/src/main/java/hudson/slaves/AbstractCloudSlave.java
+25 -2
View File
@@ -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<? extends NodeProperty<?>> 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<? extends NodeProperty<?>> 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<? extends NodeProperty<?>> 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<? extends NodeProperty<?>> nodeProperties)
throws FormException, IOException {
super(name, nodeDescription, remoteFS, numExecutors, mode, labelString, launcher, retentionStrategy, nodeProperties);
}