From 09eea9e0b8c060fbbc361844fe4e70870d8cc250 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Mon, 18 May 2015 10:13:57 +0200 Subject: [PATCH] #85 - Simplified usage of RestTemplate in StarbucksClient. --- .../src/test/java/example/stores/StarbucksClient.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/rest/starbucks/src/test/java/example/stores/StarbucksClient.java b/rest/starbucks/src/test/java/example/stores/StarbucksClient.java index e8c885de..09586342 100644 --- a/rest/starbucks/src/test/java/example/stores/StarbucksClient.java +++ b/rest/starbucks/src/test/java/example/stores/StarbucksClient.java @@ -16,10 +16,8 @@ package example.stores; import static org.springframework.hateoas.MediaTypes.*; -import static org.springframework.http.HttpMethod.*; import java.net.URI; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.stream.StreamSupport; @@ -46,7 +44,6 @@ import org.springframework.hateoas.client.Traverson.TraversalBuilder; import org.springframework.hateoas.mvc.TypeReferences.PagedResourcesType; import org.springframework.hateoas.mvc.TypeReferences.ResourceType; import org.springframework.hateoas.mvc.TypeReferences.ResourcesType; -import org.springframework.http.HttpHeaders; import org.springframework.http.RequestEntity; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.web.client.RestOperations; @@ -112,19 +109,17 @@ public class StarbucksClient { @Test public void accessServiceUsingRestTemplate() { - HttpHeaders headers = new HttpHeaders(); - headers.setAccept(Arrays.asList(HAL_JSON)); - // Access root resource - RequestEntity request = new RequestEntity<>(headers, GET, URI.create(String.format(SERVICE_URI, port))); + URI uri = URI.create(String.format(SERVICE_URI, port)); + RequestEntity request = RequestEntity.get(uri).accept(HAL_JSON).build(); Resource rootLinks = restOperations.exchange(request, new ResourceType() {}).getBody(); Links links = new Links(rootLinks.getLinks()); // Follow stores link Link storesLink = links.getLink("stores").expand(); - request = new RequestEntity<>(headers, GET, URI.create(storesLink.getHref())); + request = RequestEntity.get(URI.create(storesLink.getHref())).accept(HAL_JSON).build(); Resources stores = restOperations.exchange(request, new ResourcesType() {}).getBody(); stores.getContent().forEach(store -> log.info("{} - {}", store.name, store.address));