Skip to content

Commit 29f1bd5

Browse files
committed
#36 Make the code identical to duplicated one
Signed-off-by: Sven Strittmatter <sven.strittmatter@iteratec.com>
1 parent c9dc6b3 commit 29f1bd5

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ private HttpHeaders getDefectDojoAuthorizationHeaders() {
7474
return new Foo(config).getDefectDojoAuthorizationHeaders();
7575
}
7676

77-
protected RestTemplate getRestTemplate() {
77+
protected RestTemplate setupRestTemplate() {
78+
RestTemplate restTemplate;
79+
7880
if (System.getProperty("http.proxyUser") != null && System.getProperty("http.proxyPassword") != null) {
7981
// Configuring Proxy Authentication explicitly as it isn't done by default for spring rest templates :(
8082
CredentialsProvider credsProvider = new BasicCredentialsProvider();
@@ -93,17 +95,19 @@ protected RestTemplate getRestTemplate() {
9395

9496
HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
9597
factory.setHttpClient(client);
96-
return new RestTemplate(factory);
98+
restTemplate = new RestTemplate(factory);
9799
} else {
98-
return new RestTemplate();
100+
restTemplate = new RestTemplate();
99101
}
102+
103+
return restTemplate;
100104
}
101105

102106
/**
103107
* Before version 1.5.4. testName (in DefectDojo _test_type_) must be defectDojoScanName, afterwards, you can have somethings else
104108
*/
105109
protected ImportScanResponse createFindings(ScanFile scanFile, String endpoint, long lead, String currentDate, ScanType scanType, long testType, MultiValueMap<String, Object> options) {
106-
var restTemplate = this.getRestTemplate();
110+
var restTemplate = this.setupRestTemplate();
107111
HttpHeaders headers = getDefectDojoAuthorizationHeaders();
108112
headers.setContentType(MediaType.MULTIPART_FORM_DATA);
109113
restTemplate.setMessageConverters(List.of(

0 commit comments

Comments
 (0)