From bb1a66f71c03355477845cb232a2a62b7d9a715c Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Wed, 25 Jun 2025 13:07:15 +0200 Subject: [PATCH 1/2] =?UTF-8?q?HttpTransport=20=E2=89=A0=20TransportHttp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java index 5f4ca8c214..2b0ac2263c 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java @@ -125,7 +125,6 @@ import org.eclipse.jgit.submodule.SubmoduleWalk; import org.eclipse.jgit.transport.CredentialsProvider; import org.eclipse.jgit.transport.FetchConnection; -import org.eclipse.jgit.transport.HttpTransport; import org.eclipse.jgit.transport.PushResult; import org.eclipse.jgit.transport.RefSpec; import org.eclipse.jgit.transport.RemoteConfig; @@ -993,7 +992,7 @@ private TransportConfigCallback getTransportConfigCallback() { if (transport instanceof SshTransport sshTransport) { sshTransport.setSshSessionFactory(buildSshdSessionFactory(this.hostKeyVerifierFactory)); } - if (transport instanceof HttpTransport) { + if (transport instanceof TransportHttp) { ((TransportHttp) transport) .setHttpConnectionFactory(new PreemptiveAuthHttpClientConnectionFactory(getProvider())); } @@ -1004,7 +1003,7 @@ private void decorateTransport(Transport tn) { if (tn instanceof SshTransport transport) { transport.setSshSessionFactory(buildSshdSessionFactory(getHostKeyFactory())); } - if (tn instanceof HttpTransport) { + if (tn instanceof TransportHttp) { ((TransportHttp) tn).setHttpConnectionFactory(new PreemptiveAuthHttpClientConnectionFactory(getProvider())); } } From 0a55f4d5bf5c464e5966d7be84230172f015eea9 Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Fri, 27 Jun 2025 09:08:33 +0200 Subject: [PATCH 2/2] instanceof pattern matching --- .../org/jenkinsci/plugins/gitclient/JGitAPIImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java index 2b0ac2263c..34a8b41ae5 100644 --- a/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java +++ b/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java @@ -992,9 +992,8 @@ private TransportConfigCallback getTransportConfigCallback() { if (transport instanceof SshTransport sshTransport) { sshTransport.setSshSessionFactory(buildSshdSessionFactory(this.hostKeyVerifierFactory)); } - if (transport instanceof TransportHttp) { - ((TransportHttp) transport) - .setHttpConnectionFactory(new PreemptiveAuthHttpClientConnectionFactory(getProvider())); + if (transport instanceof TransportHttp transportHttp) { + transportHttp.setHttpConnectionFactory(new PreemptiveAuthHttpClientConnectionFactory(getProvider())); } }; } @@ -1003,8 +1002,8 @@ private void decorateTransport(Transport tn) { if (tn instanceof SshTransport transport) { transport.setSshSessionFactory(buildSshdSessionFactory(getHostKeyFactory())); } - if (tn instanceof TransportHttp) { - ((TransportHttp) tn).setHttpConnectionFactory(new PreemptiveAuthHttpClientConnectionFactory(getProvider())); + if (tn instanceof TransportHttp transportHttp) { + transportHttp.setHttpConnectionFactory(new PreemptiveAuthHttpClientConnectionFactory(getProvider())); } }