Skip to content

Simplify private class ResteasyClientBuilder #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Puffy1215 merged 2 commits into from
Apr 30, 2025
Merged

Simplify private class ResteasyClientBuilder #79

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ceeb2f
- Renamed private class ResteasyClientBuilder to HttpCredsResteasyCli…
Puffy1215 Apr 24, 2025
1bd76f3
Merge branch 'master' into removeHttpEngine
Puffy1215 Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions src/main/java/com/gitee/jenkins/gitee/api/impl/ResteasyGiteeClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,8 @@
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.DefaultHttpClient;
import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder.HostnameVerificationPolicy;
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine;
import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;
import org.jboss.resteasy.client.jaxrs.internal.proxy.ProxyBuilderImpl;
import org.jboss.resteasy.core.providerfactory.ResteasyProviderFactoryImpl;
Expand Down Expand Up @@ -93,7 +90,7 @@
}

private GiteeClient buildClient(String url, String apiToken, ProxyConfiguration httpProxyConfig, boolean ignoreCertificateErrors, int connectionTimeout, int readTimeout) {
ResteasyClientBuilder builder = new ResteasyClientBuilder();
HttpCredsResteasyClientBuilderImpl builder = new HttpCredsResteasyClientBuilderImpl();

Check warning on line 93 in src/main/java/com/gitee/jenkins/gitee/api/impl/ResteasyGiteeClientBuilder.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line 

Line 93 is not covered by tests

if (ignoreCertificateErrors) {
builder.hostnameVerification(HostnameVerificationPolicy.ANY);
Expand Down Expand Up @@ -233,27 +230,18 @@
}
}

private static class ResteasyClientBuilder extends ResteasyClientBuilderImpl {
private static class HttpCredsResteasyClientBuilderImpl extends ResteasyClientBuilderImpl {
private CredentialsProvider proxyCredentials;


@SuppressWarnings("UnusedReturnValue")
ResteasyClientBuilder defaultProxy(String hostname, int port, final String scheme, String username, String password) {
HttpCredsResteasyClientBuilderImpl defaultProxy(String hostname, int port, final String scheme, String username, String password) {
super.defaultProxy(hostname, port, scheme);
if (username != null && password != null) {
proxyCredentials = new BasicCredentialsProvider();
proxyCredentials.setCredentials(new AuthScope(hostname, port), new UsernamePasswordCredentials(username, password));
}
return this;
}

@SuppressWarnings("deprecation")
@Override
public ClientHttpEngine getHttpEngine() {
ApacheHttpClient43Engine httpEngine = (ApacheHttpClient43Engine) super.getHttpEngine();
if (proxyCredentials != null) {
((DefaultHttpClient) httpEngine.getHttpClient()).setCredentialsProvider(proxyCredentials);
}
return httpEngine;
}
}
}