Fix warnings for deprecated methods

Author: brd

src/main/java/org/jenkinsci/plugins/scripted_cloud/ScriptedCloud.java

@@ -123,7 +123,7 @@ private boolean canProvisionSlaveTemplate(@Nonnull ScriptedCloudSlaveTemplate te
     }
 
     private int getTemplateInstancesCount(@Nonnull ScriptedCloudSlaveTemplate template) {
-        Computer[] computers = Jenkins.getInstance().getComputers();
+        Computer[] computers = Jenkins.get().getComputers();
 
         int count = 0;
         for (Computer computer : computers){
@@ -138,7 +138,7 @@ private int getTemplateInstancesCount(@Nonnull ScriptedCloudSlaveTemplate templa
     }
 
     private int getInstancesCount() {
-        Computer[] computers = Jenkins.getInstance().getComputers();
+        Computer[] computers = Jenkins.get().getComputers();
 
         int count = 0;
         for (Computer computer : computers){
@@ -188,7 +188,7 @@ public Node call() throws Exception {
                             template.getSecToWaitOnline(),
                             template.getReusable());
 
-            Jenkins.getInstance().addNode(slave);
+            Jenkins.get().addNode(slave);
 
 
             LOGGER.log(Level.INFO, String.format("Asking ScriptedCloud %s to schedule new Jenkins slave %s", name, slaveName));
@@ -284,11 +284,11 @@ private void executeCommand(String command, String name, List<EnvironmentVariabl
         environmentVariables.forEach(ev -> envVars.put(ev.getKey(), ev.getValue()));
 
         envVars.put("SLAVE_NAME", name);
-        envVars.put("JENKINS_URL", Jenkins.getInstance().getRootUrl());
+        envVars.put("JENKINS_URL", Jenkins.get().getRootUrl());
 
         // Support for Jenkins security
-        if (Jenkins.getInstance().isUseSecurity()) {
-            envVars.put("JNLP_SECRET", jenkins.slaves.JnlpSlaveAgentProtocol.SLAVE_SECRET.mac(name));
+        if (Jenkins.get().isUseSecurity()) {
+            envVars.put("JNLP_SECRET", jenkins.slaves.JnlpAgentReceiver.SLAVE_SECRET.mac(name));
         }
 
 

src/main/java/org/jenkinsci/plugins/scripted_cloud/ScriptedCloudSlave.java

@@ -54,9 +54,7 @@ public ScriptedCloudSlave(String name, String nodeDescription,
                               List<? extends NodeProperty<?>> nodeProperties,
                               String cloudName, List<EnvironmentVariable> envVars,
                               String secToWaitOnline, Boolean reusable) throws FormException, IOException {
-        super(name, nodeDescription, remoteFS, numExecutors, mode, labelString,
-                new ScriptedCloudLauncher(delegateLauncher, Util.tryParseNumber(secToWaitOnline, 10 * 60).intValue())
-                , retentionStrategy, nodeProperties);
+        super(name, remoteFS, new ScriptedCloudLauncher(delegateLauncher, Util.tryParseNumber(secToWaitOnline, 10 * 60).intValue()) );
 
         this.cloudName = cloudName;
         this.reusable = reusable;
@@ -82,7 +80,7 @@ public String getCloudName() {
     }
 
     public Cloud getCloud() {
-        return Jenkins.getInstance().getCloud(getCloudName());
+        return Jenkins.get().getCloud(getCloudName());
     }
 
     public String getSecToWaitOnline() {
@@ -101,7 +99,7 @@ public int getSecToWaitOnlineInt(){
      */
     @Nonnull
     public ScriptedCloud getScriptedCloud() {
-        Cloud cloud = Jenkins.getInstance().getCloud(getCloudName());
+        Cloud cloud = Jenkins.get().getCloud(getCloudName());
         if (cloud instanceof ScriptedCloud) {
             return (ScriptedCloud) cloud;
         } else {
@@ -248,7 +246,7 @@ public boolean configure(StaplerRequest req, JSONObject o)
 
         public List<ScriptedCloud> getScriptedClouds() {
             List<ScriptedCloud> result = new ArrayList<ScriptedCloud>();
-            for (Cloud cloud : Jenkins.getInstance().clouds) {
+            for (Cloud cloud : Jenkins.get().clouds) {
                 if (cloud instanceof ScriptedCloud) {
                     result.add((ScriptedCloud) cloud);
                 }