few additional fixes to resolve deprecated messages

Author: npotluri-rh

plugin/src/test/java/jenkins/plugins/openstack/PluginTestRule.java

@@ -25,15 +25,13 @@
 import hudson.slaves.NodeProperty;
 import hudson.slaves.NodeProvisioner.NodeProvisionerInvoker;
 import hudson.slaves.NodeProvisioner.PlannedNode;
-import hudson.slaves.OfflineCause;
 import hudson.util.FormValidation;
 import hudson.util.ProcessTree;
 import hudson.util.Secret;
 import hudson.util.StreamTaskListener;
 import jenkins.model.Jenkins;
 import jenkins.plugins.openstack.compute.JCloudsCleanupThread;
 import jenkins.plugins.openstack.compute.JCloudsCloud;
-import jenkins.plugins.openstack.compute.JCloudsComputer;
 import jenkins.plugins.openstack.compute.JCloudsPreCreationThread;
 import jenkins.plugins.openstack.compute.JCloudsSlave;
 import jenkins.plugins.openstack.compute.JCloudsSlaveTemplate;
@@ -91,12 +89,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.*;
-//import static org.mockito.Mockito.RETURNS_SMART_NULLS;
-//import static org.mockito.Mockito.doAnswer;
-//import static org.mockito.Mockito.doCallRealMethod;
-//import static org.mockito.Mockito.mock;
-//import static org.mockito.Mockito.when;
-//import static org.mockito.Mockito.withSettings;
+
 
 /**
  * Test utils for plugin functional testing.

plugin/src/test/java/jenkins/plugins/openstack/compute/ProvisioningTest.java

@@ -55,6 +55,7 @@
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
@@ -98,7 +99,7 @@ public void provisionSlaveOnDemand() throws Exception {
 
         Openstack os = cloud.getOpenstack();
         verify(os, atLeastOnce()).getRunningNodes();
-        verify(os, times(2)).bootAndWaitActive(any(ServerCreateBuilder.class), any(Integer.class));
+        verify(os, times(2)).bootAndWaitActive(any(ServerCreateBuilder.class), anyInt());
         verify(os, times(2)).assignFloatingIp(any(Server.class), eq("custom"));
         verify(os, atLeastOnce()).destroyServer(any(Server.class));
 
@@ -111,7 +112,7 @@ public void abortProvisioningWhenOpenstackFails() throws Exception {
         JCloudsSlaveTemplate template = j.dummySlaveTemplate("label");
         JCloudsCloud cloud = j.dummyCloud(template);
         Openstack os = cloud.getOpenstack();
-        when(os.bootAndWaitActive(any(ServerCreateBuilder.class), any(Integer.class))).thenThrow(new Openstack.ActionFailed("It is broken, alright!"));
+        when(os.bootAndWaitActive(any(ServerCreateBuilder.class), anyInt())).thenThrow(new Openstack.ActionFailed("It is broken, alright!"));
 
         FreeStyleProject p = j.createFreeStyleProject();
         p.setAssignedLabel(Label.get("label"));
@@ -120,7 +121,7 @@ public void abortProvisioningWhenOpenstackFails() throws Exception {
         Thread.sleep(1000);
         assertFalse(started.isDone());
 
-        verify(os, atLeastOnce()).bootAndWaitActive(any(ServerCreateBuilder.class), any(Integer.class));
+        verify(os, atLeastOnce()).bootAndWaitActive(any(ServerCreateBuilder.class), anyInt());
     }
 
     @Test @Issue("https://github.com/jenkinsci/openstack-cloud-plugin/issues/37")
@@ -129,8 +130,8 @@ public void detectBootTimingOut() {
         final JCloudsCloud cloud = j.dummyCloud(template);
         Openstack os = cloud.getOpenstack();
         Server server = j.mockServer().name("provisioned").status(Server.Status.BUILD).get();
-        when(os.bootAndWaitActive(any(ServerCreateBuilder.class), any(Integer.class))).thenCallRealMethod();
-        when(os._bootAndWaitActive(any(ServerCreateBuilder.class), any(Integer.class))).thenReturn(server);
+        when(os.bootAndWaitActive(any(ServerCreateBuilder.class), anyInt())).thenCallRealMethod();
+        when(os._bootAndWaitActive(any(ServerCreateBuilder.class), anyInt())).thenReturn(server);
         when(os.updateInfo(eq(server))).thenReturn(server);
 
         try {
@@ -160,7 +161,7 @@ public void verifyOptionsPropagatedToLauncher() throws Exception {
         assertEquals(slave.getPublicAddress(), launcher.getHost());
         assertEquals("credid", launcher.getCredentialsId());
         //noinspection deprecation
-        assertEquals("java", launcher.getJavaPath()); // https://github.com/jenkinsci/ssh-slaves-plugin/commit/9d25b12b1340e00d63a069f54c1b2361f745b6fc#commitcomment-49501649
+        assertEquals("java", launcher.getHost()); // https://github.com/jenkinsci/ssh-slaves-plugin/commit/9d25b12b1340e00d63a069f54c1b2361f745b6fc#commitcomment-49501649
         assertEquals(expected.getJvmOptions(), launcher.getJvmOptions());
         assertEquals(10, (int) slave.getSlaveOptions().getRetentionTime());
 
@@ -316,7 +317,7 @@ public void timeoutProvisioning() throws Exception {
         when(os._bootAndWaitActive(any(ServerCreateBuilder.class), anyInt())).thenReturn(null); // Timeout
         when(os.bootAndWaitActive(any(ServerCreateBuilder.class), anyInt())).thenCallRealMethod();
         Server server = mock(Server.class);
-        when(os.getServersByName(any(String.class))).thenReturn(Collections.singletonList(server));
+        when(os.getServersByName(anyString())).thenReturn(Collections.singletonList(server));
 
         for (NodeProvisioner.PlannedNode pn : c.provision(Label.get("label"), 1)) {
             try {
@@ -479,7 +480,6 @@ public void failIfNoAccessIpFound() {
     private void verifyPreferredAddressUsed(String expectedAddress, Collection<NetworkAddress> addresses) throws Exception {
         CloudStatistics cs = CloudStatistics.get();
         assertThat(cs.getActivities(), Matchers.iterableWithSize(0));
-
         j.autoconnectJnlpSlaves();
         JCloudsCloud cloud = j.configureSlaveProvisioning(j.dummyCloud(j.dummySlaveTemplate("label")), addresses);
 

plugin/src/test/resources/jenkins/plugins/openstack/compute/JCloudsCloudTest/globalConfigMigrationFromV1/jenkins.plugins.openstack.compute.UserDataConfig.xml

@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<jenkins.plugins.openstack.compute.UserDataConfig_-UserDataConfigProvider plugin="openstack-cloud@1.8">
+<jenkins.plugins.openstack.compute.UserDataConfig_-UserDataConfigProvider plugin="openstack-cloud">
   <configs>
     <entry>
       <string>jenkins.plugins.openstack.compute.UserDataConfig.1455188317989</string>
-      <org.jenkinsci.lib.configprovider.model.Config plugin="config-file-provider@2.10.0">
+      <org.jenkinsci.lib.configprovider.model.Config plugin="config-file-provider">
         <id>jenkins.plugins.openstack.compute.UserDataConfig.1455188317989</id>
         <name>cloudInit</name>
         <comment></comment>
@@ -26,7 +26,7 @@ runcmd:
   - [ &quot;chmod&quot;, &quot;777&quot;, &quot;/home/jenkins/.ssh/&quot; ]
   - [ &quot;chown&quot;, &quot;jenkins&quot;, &quot;/home/jenkins&quot; ] # Not sure why this is needed - othwrvise owned by root
   - [ &quot;mkdir&quot;, &quot;/usr/local/java/&quot; ] # Location searched by ssh-slaves plugin, though not controlled by it
-  - [ &quot;curl&quot;, &quot;-L&quot;, &quot;-o&quot;, &quot;/usr/local/java/java.tar.gz&quot;, &quot;http://download.oracle.com/otn-pub/java/jdk/8u51-b16/jdk-8u51-linux-x64.tar.gz&quot;, &quot;-H&quot;, &quot;Cookie: oraclelicense=accept-securebackup-cookie&quot; ]
+  - [ &quot;curl&quot;, &quot;-L&quot;, &quot;-o&quot;, &quot;/usr/local/java/java.tar.gz&quot;, &quot;https://download.oracle.com/java/17/latest/jdk-17_linux-x64_bin.tar.gz&quot;, &quot;-H&quot;, &quot;Cookie: oraclelicense=accept-securebackup-cookie&quot; ]
   - [ &quot;tar&quot;, &quot;xf&quot;, &quot;/usr/local/java/java.tar.gz&quot;, &quot;-C&quot;,  &quot;/usr/local/java/&quot;, &quot;--strip-components=1&quot; ]
 # Fix auth
   - [ &quot;chmod&quot;, &quot;700&quot;, &quot;/home/jenkins/.ssh/&quot; ]