@@ -63,23 +63,7 @@ private RestTemplate createRestTemplate() {
63
63
final var template = new RestTemplate ();
64
64
65
65
if (shouldConfigureProxySettings ()) {
66
- // Configuring Proxy Authentication explicitly as it isn't done by default for spring rest templates :(
67
- final var credentials = new BasicCredentialsProvider ();
68
- credentials .setCredentials (
69
- new AuthScope (System .getProperty ("http.proxyHost" ), Integer .parseInt (System .getProperty ("http.proxyPort" ))),
70
- new UsernamePasswordCredentials (System .getProperty ("http.proxyUser" ), System .getProperty ("http.proxyPassword" ))
71
- );
72
-
73
- final var clientBuilder = HttpClientBuilder .create ();
74
-
75
- clientBuilder .useSystemProperties ();
76
- clientBuilder .setProxy (new HttpHost (System .getProperty ("http.proxyHost" ), Integer .parseInt (System .getProperty ("http.proxyPort" ))));
77
- clientBuilder .setDefaultCredentialsProvider (credentials );
78
- clientBuilder .setProxyAuthenticationStrategy (new ProxyAuthenticationStrategy ());
79
-
80
- final var factory = new HttpComponentsClientHttpRequestFactory ();
81
- factory .setHttpClient (clientBuilder .build ());
82
- template .setRequestFactory (factory );
66
+ template .setRequestFactory (createRequestFactoryWithProxyAuthConfig ());
83
67
}
84
68
85
69
return template ;
@@ -89,6 +73,26 @@ private static boolean shouldConfigureProxySettings() {
89
73
return System .getProperty ("http.proxyUser" ) != null && System .getProperty ("http.proxyPassword" ) != null ;
90
74
}
91
75
76
+ private static HttpComponentsClientHttpRequestFactory createRequestFactoryWithProxyAuthConfig () {
77
+ // Configuring Proxy Authentication explicitly as it isn't done by default for spring rest templates :(
78
+ final var credentials = new BasicCredentialsProvider ();
79
+ credentials .setCredentials (
80
+ new AuthScope (System .getProperty ("http.proxyHost" ), Integer .parseInt (System .getProperty ("http.proxyPort" ))),
81
+ new UsernamePasswordCredentials (System .getProperty ("http.proxyUser" ), System .getProperty ("http.proxyPassword" ))
82
+ );
83
+
84
+ final var clientBuilder = HttpClientBuilder .create ();
85
+
86
+ clientBuilder .useSystemProperties ();
87
+ clientBuilder .setProxy (new HttpHost (System .getProperty ("http.proxyHost" ), Integer .parseInt (System .getProperty ("http.proxyPort" ))));
88
+ clientBuilder .setDefaultCredentialsProvider (credentials );
89
+ clientBuilder .setProxyAuthenticationStrategy (new ProxyAuthenticationStrategy ());
90
+
91
+ final var factory = new HttpComponentsClientHttpRequestFactory ();
92
+ factory .setHttpClient (clientBuilder .build ());
93
+ return factory ;
94
+ }
95
+
92
96
/*
93
97
* Before version 1.5.4. testName (in DefectDojo _test_type_) must be defectDojoScanName, afterward, you can have something else.
94
98
*/
0 commit comments