Skip to content

Commit 37948cc

Browse files
committed
#36 Simplify code
Use var and better names to unclutter the code. Signed-off-by: Sven Strittmatter <sven.strittmatter@iteratec.com>
1 parent 6dfde89 commit 37948cc

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

src/main/java/io/securecodebox/persistence/defectdojo/service/ImportScanService.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,21 @@ private HttpHeaders getDefectDojoAuthorizationHeaders() {
5858
protected RestTemplate createRestTemplate() {
5959
if (System.getProperty("http.proxyUser") != null && System.getProperty("http.proxyPassword") != null) {
6060
// Configuring Proxy Authentication explicitly as it isn't done by default for spring rest templates :(
61-
CredentialsProvider credsProvider = new BasicCredentialsProvider();
62-
credsProvider.setCredentials(
61+
final var credentials = new BasicCredentialsProvider();
62+
credentials.setCredentials(
6363
new AuthScope(System.getProperty("http.proxyHost"), Integer.parseInt(System.getProperty("http.proxyPort"))),
6464
new UsernamePasswordCredentials(System.getProperty("http.proxyUser"), System.getProperty("http.proxyPassword"))
6565
);
66-
HttpClientBuilder clientBuilder = HttpClientBuilder.create();
66+
67+
final var clientBuilder = HttpClientBuilder.create();
6768

6869
clientBuilder.useSystemProperties();
6970
clientBuilder.setProxy(new HttpHost(System.getProperty("http.proxyHost"), Integer.parseInt(System.getProperty("http.proxyPort"))));
70-
clientBuilder.setDefaultCredentialsProvider(credsProvider);
71+
clientBuilder.setDefaultCredentialsProvider(credentials);
7172
clientBuilder.setProxyAuthenticationStrategy(new ProxyAuthenticationStrategy());
7273

73-
CloseableHttpClient client = clientBuilder.build();
74-
75-
HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
76-
factory.setHttpClient(client);
74+
final var factory = new HttpComponentsClientHttpRequestFactory();
75+
factory.setHttpClient(clientBuilder.build());
7776
return new RestTemplate(factory);
7877
} else {
7978
return new RestTemplate();

0 commit comments

Comments
 (0)