Skip to content

Commit aaef43b

Browse files
author
Eugen
committed
Merge pull request eugenp#246 from zinch84/rest_template_tutorial
[RestTemplate] Rename local RestTemplate instance so as not to shadow…
2 parents 08dd4e8 + 1014588 commit aaef43b

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

spring-security-rest-full/src/test/java/org/baeldung/client/RestTemplateLiveTest.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ public void givenFooService_whenPostForObject_thenCreatedObjectIsReturned() {
102102

103103
@Test
104104
public void givenFooService_whenPostFor2Objects_thenNewObjectIsCreatedEachTime() {
105-
ClientHttpRequestFactory requestFactory = getClientHttpRequestFactory();
106-
RestTemplate restTemplate = new RestTemplate(requestFactory);
107-
108105
HttpEntity<Foo> request = new HttpEntity<>(new Foo("bar"));
109106
Foo firstInstance = restTemplate.postForObject(fooResourceUrl, request, Foo.class);
110107
Foo secondInstance = restTemplate.postForObject(fooResourceUrl, request, Foo.class);
@@ -129,12 +126,12 @@ public void givenResource_whenCallOptionsForAllow_thenReceiveValueOfAllowHeader(
129126

130127
@Test
131128
public void givenRestService_whenPostResource_thenResourceIsCreated() {
132-
RestTemplate restTemplate = new RestTemplate();
129+
RestTemplate template = new RestTemplate();
133130

134131
HttpHeaders headers = prepareBasicAuthHeaders();
135132
HttpEntity<Foo> request = new HttpEntity<>(new Foo("bar"), headers);
136133

137-
ResponseEntity<Foo> response = restTemplate.exchange(fooResourceUrl, HttpMethod.POST, request, Foo.class);
134+
ResponseEntity<Foo> response = template.exchange(fooResourceUrl, HttpMethod.POST, request, Foo.class);
138135
assertThat(response.getStatusCode(), is(HttpStatus.CREATED));
139136
Foo foo = response.getBody();
140137
assertThat(foo, notNullValue());
@@ -143,22 +140,22 @@ public void givenRestService_whenPostResource_thenResourceIsCreated() {
143140

144141
@Test
145142
public void givenResource_whenPutExistingEntity_thenItIsUpdated() {
146-
RestTemplate restTemplate = new RestTemplate();
143+
RestTemplate template = new RestTemplate();
147144
HttpHeaders headers = prepareBasicAuthHeaders();
148145
HttpEntity<Foo> request = new HttpEntity<>(new Foo("bar"), headers);
149146

150147
//Create entity
151-
ResponseEntity<Foo> response = restTemplate.exchange(fooResourceUrl, HttpMethod.POST, request, Foo.class);
148+
ResponseEntity<Foo> response = template.exchange(fooResourceUrl, HttpMethod.POST, request, Foo.class);
152149
assertThat(response.getStatusCode(), is(HttpStatus.CREATED));
153150

154151
//Update entity
155152
Foo updatedInstance = new Foo("newName");
156153
updatedInstance.setId(response.getBody().getId());
157154
String resourceUrl = fooResourceUrl + '/' + response.getBody().getId();
158-
restTemplate.execute(resourceUrl, HttpMethod.PUT, requestCallback(updatedInstance), clientHttpResponse -> null);
155+
template.execute(resourceUrl, HttpMethod.PUT, requestCallback(updatedInstance), clientHttpResponse -> null);
159156

160157
//Check that entity was updated
161-
response = restTemplate.exchange(resourceUrl, HttpMethod.GET, new HttpEntity<>(headers), Foo.class);
158+
response = template.exchange(resourceUrl, HttpMethod.GET, new HttpEntity<>(headers), Foo.class);
162159
Foo foo = response.getBody();
163160
assertThat(foo.getName(), is(updatedInstance.getName()));
164161
}

0 commit comments

Comments
 (0)