[chore] Remove deps on SSH credentials implementations

jenkinsci · Aug 5, 2024 · 6e48666 · 6e48666
1 parent a2ddfba
commit 6e48666
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/test/java/org/jenkinsci/plugins/trileadapi/TrileadSSHPasswordAuthenticatorTest.java b/src/test/java/org/jenkinsci/plugins/trileadapi/TrileadSSHPasswordAuthenticatorTest.java
@@ -26,7 +26,6 @@
 import com.cloudbees.jenkins.plugins.sshcredentials.SSHAuthenticator;
 import com.cloudbees.jenkins.plugins.sshcredentials.SSHAuthenticatorFactory;
 import com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPassword;
-import com.cloudbees.jenkins.plugins.sshcredentials.impl.TrileadSSHPasswordAuthenticator;
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
 import com.trilead.ssh2.Connection;
@@ -83,8 +82,8 @@ public void tearDown() {
     public void dontTestKeyboardInteractive() throws Exception {
         connection = new Connection("localhost");
         connection.connect(new NoVerifier());
-        com.cloudbees.jenkins.plugins.sshcredentials.impl.TrileadSSHPasswordAuthenticator instance =
-                new com.cloudbees.jenkins.plugins.sshcredentials.impl.TrileadSSHPasswordAuthenticator(connection, new BasicSSHUserPassword(CredentialsScope.SYSTEM,
+        TrileadSSHPasswordAuthenticator instance =
+                new TrileadSSHPasswordAuthenticator(connection, new BasicSSHUserPassword(CredentialsScope.SYSTEM,
                         null, "....",  // <---- put your username here
                         "....",  // <---- put your password here
                         null));
@@ -105,7 +104,7 @@ public void testPassword() throws Exception {
         int port = (Integer)invoke(sshd, "getPort", null, null);
         connection = new Connection("localhost", port);
         connection.connect(new NoVerifier());
-        com.cloudbees.jenkins.plugins.sshcredentials.impl.TrileadSSHPasswordAuthenticator instance =
+        TrileadSSHPasswordAuthenticator instance =
                 new TrileadSSHPasswordAuthenticator(connection, user);
         assertThat(instance.getAuthenticationMode(), is(SSHAuthenticator.Mode.AFTER_CONNECT));
         assertThat(instance.canAuthenticate(), is(true));

diff --git a/src/test/java/org/jenkinsci/plugins/trileadapi/TrileadSSHPublicKeyAuthenticatorTest.java b/src/test/java/org/jenkinsci/plugins/trileadapi/TrileadSSHPublicKeyAuthenticatorTest.java
@@ -25,7 +25,6 @@
 
 import com.cloudbees.jenkins.plugins.sshcredentials.SSHAuthenticator;
 import com.cloudbees.jenkins.plugins.sshcredentials.SSHUserPrivateKey;
-import com.cloudbees.jenkins.plugins.sshcredentials.impl.TrileadSSHPublicKeyAuthenticator;
 import com.cloudbees.plugins.credentials.CredentialsDescriptor;
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
@@ -148,7 +147,7 @@ public void testAuthenticate() throws Exception {
             int port = (Integer)invoke(sshd, "getPort", null, null);
             connection = new Connection("localhost", port);
             connection.connect((hostname, port1, serverHostKeyAlgorithm, serverHostKey) -> true);
-            com.cloudbees.jenkins.plugins.sshcredentials.impl.TrileadSSHPublicKeyAuthenticator instance =
+            TrileadSSHPublicKeyAuthenticator instance =
                     new TrileadSSHPublicKeyAuthenticator(connection, user);
             assertThat(instance.getAuthenticationMode(), is(SSHAuthenticator.Mode.AFTER_CONNECT));
             assertThat(instance.canAuthenticate(), is(true));