Skip to content

Commit aaf04ea

Browse files
committed
#121 Make Vars Final
Signed-off-by: Sven Strittmatter <[email protected]>
1 parent 43df372 commit aaf04ea

File tree

1 file changed

+24
-26
lines changed

1 file changed

+24
-26
lines changed

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

+24-26
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ public GenericDefectDojoService(@NonNull ClientConfig clientConfig) {
7373

7474
@Override
7575
public final T get(long id) {
76-
var restTemplate = this.getRestTemplate();
77-
HttpEntity<String> payload = new HttpEntity<>(getDefectDojoAuthorizationHeaders());
76+
final var restTemplate = this.getRestTemplate();
77+
final HttpEntity<String> payload = new HttpEntity<>(getDefectDojoAuthorizationHeaders());
7878

7979
final var url = createBaseUrl() + id;
8080
log.debug("Requesting URL: {}", url);
81-
ResponseEntity<T> response = restTemplate.exchange(
81+
final ResponseEntity<T> response = restTemplate.exchange(
8282
url,
8383
HttpMethod.GET,
8484
payload,
@@ -90,12 +90,12 @@ public final T get(long id) {
9090

9191
@Override
9292
public final List<T> search(@NonNull Map<String, Object> queryParams) {
93-
List<T> objects = new LinkedList<>();
93+
final List<T> objects = new LinkedList<>();
9494

9595
boolean hasNext;
9696
long page = 0;
9797
do {
98-
var response = internalSearch(queryParams, DEFECT_DOJO_OBJET_LIMIT, DEFECT_DOJO_OBJET_LIMIT * page++);
98+
final var response = internalSearch(queryParams, DEFECT_DOJO_OBJET_LIMIT, DEFECT_DOJO_OBJET_LIMIT * page++);
9999
objects.addAll(response.getResults());
100100

101101
hasNext = response.getNext() != null;
@@ -115,9 +115,8 @@ public final List<T> search() {
115115
@Override
116116
@SuppressWarnings("unchecked")
117117
public final Optional<T> searchUnique(@NonNull T searchObject) {
118-
Map<String, Object> queryParams = searchStringMapper.convertValue(searchObject, Map.class);
119-
120-
var objects = search(queryParams);
118+
final Map<String, Object> queryParams = searchStringMapper.convertValue(searchObject, Map.class);
119+
final var objects = search(queryParams);
121120

122121
return objects.stream()
123122
.filter(object -> object != null && object.equalsQueryString(queryParams))
@@ -126,7 +125,7 @@ public final Optional<T> searchUnique(@NonNull T searchObject) {
126125

127126
@Override
128127
public final Optional<T> searchUnique(@NonNull Map<String, Object> queryParams) {
129-
var found = search(queryParams);
128+
final var found = search(queryParams);
130129

131130
return found.stream()
132131
.filter(object -> object.equalsQueryString(queryParams))
@@ -135,27 +134,27 @@ public final Optional<T> searchUnique(@NonNull Map<String, Object> queryParams)
135134

136135
@Override
137136
public final T create(@NonNull T object) {
138-
var restTemplate = this.getRestTemplate();
139-
HttpEntity<T> payload = new HttpEntity<>(object, getDefectDojoAuthorizationHeaders());
137+
final var restTemplate = this.getRestTemplate();
138+
final HttpEntity<T> payload = new HttpEntity<>(object, getDefectDojoAuthorizationHeaders());
139+
final ResponseEntity<T> response = restTemplate.exchange(createBaseUrl(), HttpMethod.POST, payload, getModelClass());
140140

141-
ResponseEntity<T> response = restTemplate.exchange(createBaseUrl(), HttpMethod.POST, payload, getModelClass());
142141
return response.getBody();
143142
}
144143

145144
@Override
146145
public final void delete(long id) {
147-
var restTemplate = this.getRestTemplate();
148-
HttpEntity<String> payload = new HttpEntity<>(getDefectDojoAuthorizationHeaders());
146+
final var restTemplate = this.getRestTemplate();
147+
final HttpEntity<String> payload = new HttpEntity<>(getDefectDojoAuthorizationHeaders());
149148

150149
restTemplate.exchange(createBaseUrl() + id + "/", HttpMethod.DELETE, payload, String.class);
151150
}
152151

153152
@Override
154153
public final T update(@NonNull T object, long id) {
155-
var restTemplate = this.getRestTemplate();
156-
HttpEntity<T> payload = new HttpEntity<>(object, getDefectDojoAuthorizationHeaders());
154+
final var restTemplate = this.getRestTemplate();
155+
final HttpEntity<T> payload = new HttpEntity<>(object, getDefectDojoAuthorizationHeaders());
156+
final ResponseEntity<T> response = restTemplate.exchange(createBaseUrl() + id + "/", HttpMethod.PUT, payload, getModelClass());
157157

158-
ResponseEntity<T> response = restTemplate.exchange(createBaseUrl() + id + "/", HttpMethod.PUT, payload, getModelClass());
159158
return response.getBody();
160159
}
161160

@@ -195,28 +194,27 @@ private HttpHeaders getDefectDojoAuthorizationHeaders() {
195194
}
196195

197196
private RestTemplate setupRestTemplate() {
198-
RestTemplate restTemplate = new Foo(new ProxyConfigFactory().create()).createRestTemplate();
199-
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
197+
final RestTemplate template = new Foo(new ProxyConfigFactory().create()).createRestTemplate();
198+
final MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
200199
converter.setObjectMapper(this.objectMapper);
201-
restTemplate.setMessageConverters(List.of(
200+
template.setMessageConverters(List.of(
202201
new FormHttpMessageConverter(),
203202
new ResourceHttpMessageConverter(),
204203
new StringHttpMessageConverter(),
205204
converter
206205
));
207-
return restTemplate;
206+
return template;
208207
}
209208

210209
protected PaginatedResult<T> internalSearch(Map<String, Object> queryParams, long limit, long offset) {
211-
var restTemplate = this.getRestTemplate();
212-
HttpEntity<String> payload = new HttpEntity<>(getDefectDojoAuthorizationHeaders());
213-
214-
var mutableQueryParams = new HashMap<>(queryParams);
210+
final var restTemplate = this.getRestTemplate();
211+
final HttpEntity<String> payload = new HttpEntity<>(getDefectDojoAuthorizationHeaders());
215212

213+
final var mutableQueryParams = new HashMap<>(queryParams);
216214
mutableQueryParams.put("limit", String.valueOf(limit));
217215
mutableQueryParams.put("offset", String.valueOf(offset));
218216

219-
var multiValueMap = new LinkedMultiValueMap<String, String>();
217+
final var multiValueMap = new LinkedMultiValueMap<String, String>();
220218
for (var entry : mutableQueryParams.entrySet()) {
221219
multiValueMap.set(entry.getKey(), String.valueOf(entry.getValue()));
222220
}

0 commit comments

Comments
 (0)