@@ -73,12 +73,12 @@ public GenericDefectDojoService(@NonNull ClientConfig clientConfig) {
73
73
74
74
@ Override
75
75
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 ());
78
78
79
79
final var url = createBaseUrl () + id ;
80
80
log .debug ("Requesting URL: {}" , url );
81
- ResponseEntity <T > response = restTemplate .exchange (
81
+ final ResponseEntity <T > response = restTemplate .exchange (
82
82
url ,
83
83
HttpMethod .GET ,
84
84
payload ,
@@ -90,12 +90,12 @@ public final T get(long id) {
90
90
91
91
@ Override
92
92
public final List <T > search (@ NonNull Map <String , Object > queryParams ) {
93
- List <T > objects = new LinkedList <>();
93
+ final List <T > objects = new LinkedList <>();
94
94
95
95
boolean hasNext ;
96
96
long page = 0 ;
97
97
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 ++);
99
99
objects .addAll (response .getResults ());
100
100
101
101
hasNext = response .getNext () != null ;
@@ -115,9 +115,8 @@ public final List<T> search() {
115
115
@ Override
116
116
@ SuppressWarnings ("unchecked" )
117
117
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 );
121
120
122
121
return objects .stream ()
123
122
.filter (object -> object != null && object .equalsQueryString (queryParams ))
@@ -126,7 +125,7 @@ public final Optional<T> searchUnique(@NonNull T searchObject) {
126
125
127
126
@ Override
128
127
public final Optional <T > searchUnique (@ NonNull Map <String , Object > queryParams ) {
129
- var found = search (queryParams );
128
+ final var found = search (queryParams );
130
129
131
130
return found .stream ()
132
131
.filter (object -> object .equalsQueryString (queryParams ))
@@ -135,27 +134,27 @@ public final Optional<T> searchUnique(@NonNull Map<String, Object> queryParams)
135
134
136
135
@ Override
137
136
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 ());
140
140
141
- ResponseEntity <T > response = restTemplate .exchange (createBaseUrl (), HttpMethod .POST , payload , getModelClass ());
142
141
return response .getBody ();
143
142
}
144
143
145
144
@ Override
146
145
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 ());
149
148
150
149
restTemplate .exchange (createBaseUrl () + id + "/" , HttpMethod .DELETE , payload , String .class );
151
150
}
152
151
153
152
@ Override
154
153
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 ());
157
157
158
- ResponseEntity <T > response = restTemplate .exchange (createBaseUrl () + id + "/" , HttpMethod .PUT , payload , getModelClass ());
159
158
return response .getBody ();
160
159
}
161
160
@@ -195,28 +194,27 @@ private HttpHeaders getDefectDojoAuthorizationHeaders() {
195
194
}
196
195
197
196
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 ();
200
199
converter .setObjectMapper (this .objectMapper );
201
- restTemplate .setMessageConverters (List .of (
200
+ template .setMessageConverters (List .of (
202
201
new FormHttpMessageConverter (),
203
202
new ResourceHttpMessageConverter (),
204
203
new StringHttpMessageConverter (),
205
204
converter
206
205
));
207
- return restTemplate ;
206
+ return template ;
208
207
}
209
208
210
209
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 ());
215
212
213
+ final var mutableQueryParams = new HashMap <>(queryParams );
216
214
mutableQueryParams .put ("limit" , String .valueOf (limit ));
217
215
mutableQueryParams .put ("offset" , String .valueOf (offset ));
218
216
219
- var multiValueMap = new LinkedMultiValueMap <String , String >();
217
+ final var multiValueMap = new LinkedMultiValueMap <String , String >();
220
218
for (var entry : mutableQueryParams .entrySet ()) {
221
219
multiValueMap .set (entry .getKey (), String .valueOf (entry .getValue ()));
222
220
}
0 commit comments