From b81b1a4e4561ed3831728334c006abc34f4da148 Mon Sep 17 00:00:00 2001 From: Greg Turnquist Date: Mon, 6 Nov 2017 15:52:17 -0600 Subject: [PATCH] #340 - Polishing. Used IDE to migrate several Java 6 constructors to Java 8. --- ...Jackson2PagedResourcesIntegrationTest.java | 2 +- .../Jackson2ResourceIntegrationTest.java | 2 +- .../PagedResourcesMarshallingTest.java | 8 +- .../hateoas/PagedResourcesUnitTest.java | 2 +- .../hateoas/ResourceIntegrationTest.java | 2 +- .../hateoas/ResourceUnitTest.java | 14 ++-- .../hateoas/ResourcesUnitTest.java | 18 ++--- .../hateoas/UriTemplateUnitTest.java | 6 +- .../hateoas/VndErrorsMarshallingTest.java | 6 +- .../hateoas/client/HopUnitTest.java | 4 +- .../hateoas/client/Server.java | 6 +- .../hateoas/client/TraversonTest.java | 14 ++-- ...nableHypermediaSupportIntegrationTest.java | 4 +- ...trollerEntityLinksFactoryBeanUnitTest.java | 2 +- .../core/DelegatingEntityLinksUnitTest.java | 2 +- .../hal/DefaultCurieProviderUnitTest.java | 2 +- .../hal/Jackson2HalIntegrationTest.java | 70 ++++++++--------- .../HalFormsValidationIntegrationTest.java | 10 +-- .../forms/HalFormsWebMvcIntegrationTest.java | 14 ++-- .../Jackson2HalFormsIntegrationTest.java | 76 +++++++++---------- .../ControllerLinkBuilderFactoryUnitTest.java | 6 +- .../mvc/ControllerLinkBuilderUnitTest.java | 2 +- .../mvc/DummyInvocationUtilsUnitTest.java | 4 +- .../HeaderLinksResponseEntityUnitTest.java | 6 +- ...ndlerMethodReturnValueHandlerUnitTest.java | 65 ++++++++-------- 25 files changed, 166 insertions(+), 181 deletions(-) diff --git a/src/test/java/org/springframework/hateoas/Jackson2PagedResourcesIntegrationTest.java b/src/test/java/org/springframework/hateoas/Jackson2PagedResourcesIntegrationTest.java index 20c9d702..0b0f33c4 100755 --- a/src/test/java/org/springframework/hateoas/Jackson2PagedResourcesIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/Jackson2PagedResourcesIntegrationTest.java @@ -66,7 +66,7 @@ public class Jackson2PagedResourcesIntegrationTest { user.lastname = "Matthews"; PageMetadata metadata = new PagedResources.PageMetadata(1, 0, 2); - PagedResources resources = new PagedResources(Collections.singleton(user), metadata); + PagedResources resources = new PagedResources<>(Collections.singleton(user), metadata); Method method = Sample.class.getMethod("someMethod"); StringWriter writer = new StringWriter(); diff --git a/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java b/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java index e98a789c..6d229854 100755 --- a/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java @@ -27,7 +27,7 @@ public class Jackson2ResourceIntegrationTest extends AbstractJackson2Marshalling person.firstname = "Dave"; person.lastname = "Matthews"; - Resource resource = new Resource(person); + Resource resource = new Resource<>(person); resource.add(new Link("localhost")); assertThat(write(resource)).isEqualTo(REFERENCE); diff --git a/src/test/java/org/springframework/hateoas/PagedResourcesMarshallingTest.java b/src/test/java/org/springframework/hateoas/PagedResourcesMarshallingTest.java index 45d35a90..9afa2a61 100755 --- a/src/test/java/org/springframework/hateoas/PagedResourcesMarshallingTest.java +++ b/src/test/java/org/springframework/hateoas/PagedResourcesMarshallingTest.java @@ -57,7 +57,7 @@ public class PagedResourcesMarshallingTest { marshaller = context.createMarshaller(); unmarshaller = context.createUnmarshaller(); - pagedResources = new PagedResources(new ArrayList(), null); + pagedResources = new PagedResources<>(new ArrayList<>(), null); } /** @@ -73,14 +73,10 @@ public class PagedResourcesMarshallingTest { private static String readFile(org.springframework.core.io.Resource resource) throws IOException { - FileInputStream stream = new FileInputStream(resource.getFile()); - - try { + try (FileInputStream stream = new FileInputStream(resource.getFile())) { FileChannel fc = stream.getChannel(); MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size()); return Charset.defaultCharset().decode(bb).toString(); - } finally { - stream.close(); } } } diff --git a/src/test/java/org/springframework/hateoas/PagedResourcesUnitTest.java b/src/test/java/org/springframework/hateoas/PagedResourcesUnitTest.java index fbba0d11..87ce1825 100755 --- a/src/test/java/org/springframework/hateoas/PagedResourcesUnitTest.java +++ b/src/test/java/org/springframework/hateoas/PagedResourcesUnitTest.java @@ -36,7 +36,7 @@ public class PagedResourcesUnitTest { @Before public void setUp() { - resources = new PagedResources(Collections.emptyList(), metadata); + resources = new PagedResources<>(Collections.emptyList(), metadata); } @Test diff --git a/src/test/java/org/springframework/hateoas/ResourceIntegrationTest.java b/src/test/java/org/springframework/hateoas/ResourceIntegrationTest.java index 38287563..9493506c 100755 --- a/src/test/java/org/springframework/hateoas/ResourceIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/ResourceIntegrationTest.java @@ -47,7 +47,7 @@ public class ResourceIntegrationTest extends AbstractJackson2MarshallingIntegrat person.firstname = "Dave"; person.lastname = "Matthews"; - Resource resource = new Resource(person); + Resource resource = new Resource<>(person); resource.add(new Link("localhost")); assertThat(write(resource)).isEqualTo(REFERENCE); diff --git a/src/test/java/org/springframework/hateoas/ResourceUnitTest.java b/src/test/java/org/springframework/hateoas/ResourceUnitTest.java index 38380d41..beddea3b 100755 --- a/src/test/java/org/springframework/hateoas/ResourceUnitTest.java +++ b/src/test/java/org/springframework/hateoas/ResourceUnitTest.java @@ -31,15 +31,15 @@ public class ResourceUnitTest { @Test public void equalsForSelfReference() { - Resource resource = new Resource("foo"); + Resource resource = new Resource<>("foo"); assertThat(resource).isEqualTo(resource); } @Test public void equalsWithEqualContent() { - Resource left = new Resource("foo"); - Resource right = new Resource("foo"); + Resource left = new Resource<>("foo"); + Resource right = new Resource<>("foo"); assertThat(left).isEqualTo(right); assertThat(right).isEqualTo(left); @@ -48,8 +48,8 @@ public class ResourceUnitTest { @Test public void notEqualForDifferentContent() { - Resource left = new Resource("foo"); - Resource right = new Resource("bar"); + Resource left = new Resource<>("foo"); + Resource right = new Resource<>("bar"); assertThat(left).isNotEqualTo(right); assertThat(right).isNotEqualTo(left); @@ -58,8 +58,8 @@ public class ResourceUnitTest { @Test public void notEqualForDifferentLinks() { - Resource left = new Resource("foo"); - Resource right = new Resource("foo"); + Resource left = new Resource<>("foo"); + Resource right = new Resource<>("foo"); right.add(new Link("localhost")); assertThat(left).isNotEqualTo(right); diff --git a/src/test/java/org/springframework/hateoas/ResourcesUnitTest.java b/src/test/java/org/springframework/hateoas/ResourcesUnitTest.java index ef142429..267c5497 100755 --- a/src/test/java/org/springframework/hateoas/ResourcesUnitTest.java +++ b/src/test/java/org/springframework/hateoas/ResourcesUnitTest.java @@ -29,21 +29,21 @@ import org.junit.Test; */ public class ResourcesUnitTest { - Set> foo = Collections.singleton(new Resource("foo")); - Set> bar = Collections.singleton(new Resource("bar")); + Set> foo = Collections.singleton(new Resource<>("foo")); + Set> bar = Collections.singleton(new Resource<>("bar")); @Test public void equalsForSelfReference() { - Resources> resource = new Resources>(foo); + Resources> resource = new Resources<>(foo); assertThat(resource).isEqualTo(resource); } @Test public void equalsWithEqualContent() { - Resources> left = new Resources>(foo); - Resources> right = new Resources>(foo); + Resources> left = new Resources<>(foo); + Resources> right = new Resources<>(foo); assertThat(left).isEqualTo(right); assertThat(right).isEqualTo(left); @@ -52,8 +52,8 @@ public class ResourcesUnitTest { @Test public void notEqualForDifferentContent() { - Resources> left = new Resources>(foo); - Resources> right = new Resources>(bar); + Resources> left = new Resources<>(foo); + Resources> right = new Resources<>(bar); assertThat(left).isNotEqualTo(right); assertThat(right).isNotEqualTo(left); @@ -62,8 +62,8 @@ public class ResourcesUnitTest { @Test public void notEqualForDifferentLinks() { - Resources> left = new Resources>(foo); - Resources> right = new Resources>(bar); + Resources> left = new Resources<>(foo); + Resources> right = new Resources<>(bar); right.add(new Link("localhost")); assertThat(left).isNotEqualTo(right); diff --git a/src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java b/src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java index 2863559e..068112d4 100755 --- a/src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java +++ b/src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java @@ -133,7 +133,7 @@ public class UriTemplateUnitTest { @Test public void expandsMultipleRequestParameters() { - Map parameters = new HashMap(); + Map parameters = new HashMap<>(); parameters.put("bar", "myBar"); parameters.put("fooBar", "myFooBar"); @@ -150,7 +150,7 @@ public class UriTemplateUnitTest { public void rejectsMissingRequiredPathVariable() { UriTemplate template = new UriTemplate("/foo/{bar}"); - template.expand(Collections. emptyMap()); + template.expand(Collections.emptyMap()); } /** @@ -200,7 +200,7 @@ public class UriTemplateUnitTest { UriTemplate source = new UriTemplate("/{foo}/bar{?page}"); List toAdd = Arrays.asList(new TemplateVariable("bar", VariableType.REQUEST_PARAM)); - List expected = new ArrayList(); + List expected = new ArrayList<>(); expected.addAll(source.getVariables()); expected.addAll(toAdd); diff --git a/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java b/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java index 2f0a8697..1d828f7c 100755 --- a/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java +++ b/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java @@ -122,14 +122,10 @@ public class VndErrorsMarshallingTest { private static String readFile(org.springframework.core.io.Resource resource) throws IOException { - FileInputStream stream = new FileInputStream(resource.getFile()); - - try { + try (FileInputStream stream = new FileInputStream(resource.getFile())) { FileChannel fc = stream.getChannel(); MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size()); return Charset.defaultCharset().decode(bb).toString(); - } finally { - stream.close(); } } } diff --git a/src/test/java/org/springframework/hateoas/client/HopUnitTest.java b/src/test/java/org/springframework/hateoas/client/HopUnitTest.java index fef5548d..43504ad3 100755 --- a/src/test/java/org/springframework/hateoas/client/HopUnitTest.java +++ b/src/test/java/org/springframework/hateoas/client/HopUnitTest.java @@ -75,7 +75,7 @@ public class HopUnitTest { Hop hop = Hop.rel("rel").withParameter("key", "value").withParameters(Collections.singletonMap("foo", "bar")); assertThat(hop.getParameters()).hasSize(1) // - .containsEntry("foo", (Object) "bar"); + .containsEntry("foo", "bar"); } /** @@ -99,7 +99,7 @@ public class HopUnitTest { Hop hop = Hop.rel("rel").withParameter("key", "value"); - Map result = hop.getMergedParameters(Collections.singletonMap("key", (Object) "global")); + Map result = hop.getMergedParameters(Collections.singletonMap("key", "global")); assertThat(result).hasSize(1) // .containsEntry("key", "value"); diff --git a/src/test/java/org/springframework/hateoas/client/Server.java b/src/test/java/org/springframework/hateoas/client/Server.java index 1f5aae16..daaa4fa2 100644 --- a/src/test/java/org/springframework/hateoas/client/Server.java +++ b/src/test/java/org/springframework/hateoas/client/Server.java @@ -52,7 +52,7 @@ public class Server implements Closeable { private final ObjectMapper mapper; private final RelProvider relProvider; - private final MultiValueMap baseResources = new LinkedMultiValueMap(); + private final MultiValueMap baseResources = new LinkedMultiValueMap<>(); private final ResourceLoader resourceLoader = new DefaultResourceLoader(); public Server() { @@ -187,13 +187,13 @@ public class Server implements Closeable { public void finishMocking() { - Resources resources = new Resources(Collections. emptyList()); + Resources resources = new Resources<>(Collections.emptyList()); for (Link link : baseResources.keySet()) { resources.add(link); - Resources nested = new Resources(Collections. emptyList()); + Resources nested = new Resources<>(Collections.emptyList()); nested.add(baseResources.get(link)); register(link.getHref(), nested); diff --git a/src/test/java/org/springframework/hateoas/client/TraversonTest.java b/src/test/java/org/springframework/hateoas/client/TraversonTest.java index 281b22ab..9d272687 100755 --- a/src/test/java/org/springframework/hateoas/client/TraversonTest.java +++ b/src/test/java/org/springframework/hateoas/client/TraversonTest.java @@ -91,7 +91,7 @@ public class TraversonTest { */ @Test(expected = IllegalArgumentException.class) public void rejectsEmptyMediaTypes() { - new Traverson(baseUri, new MediaType[0]); + new Traverson(baseUri); } /** @@ -187,7 +187,7 @@ public class TraversonTest { CountingInterceptor interceptor = new CountingInterceptor(); RestTemplate restTemplate = new RestTemplate(); - restTemplate.setInterceptors(Arrays. asList(interceptor)); + restTemplate.setInterceptors(Arrays.asList(interceptor)); this.traverson = new Traverson(baseUri, MediaTypes.HAL_JSON); this.traverson.setRestOperations(restTemplate); @@ -266,7 +266,7 @@ public class TraversonTest { public void returnsDefaultMessageConverters() { List> converters = Traverson - .getDefaultMessageConverters(Collections. emptyList()); + .getDefaultMessageConverters(Collections.emptyList()); assertThat(converters).hasSize(1); assertThat(converters.get(0)).isInstanceOf(StringHttpMessageConverter.class); @@ -346,7 +346,7 @@ public class TraversonTest { this.traverson = new Traverson(URI.create(server.rootResource() + "/springagram"), MediaTypes.HAL_JSON); - Map params = new HashMap(); + Map params = new HashMap<>(); params.put("projection", "thisShouldGetOverwrittenByLocalHop"); ParameterizedTypeReference> resourceParameterizedTypeReference = new ParameterizedTypeReference>() {}; @@ -382,11 +382,11 @@ public class TraversonTest { private void setUpActors() { - Resource actor = new Resource(new Actor("Keanu Reaves")); + Resource actor = new Resource<>(new Actor("Keanu Reaves")); String actorUri = server.mockResourceFor(actor); Movie movie = new Movie("The Matrix"); - Resource resource = new Resource(movie); + Resource resource = new Resource<>(movie); resource.add(new Link(actorUri, "actor")); server.mockResourceFor(resource); @@ -403,7 +403,7 @@ public class TraversonTest { this.intercepted++; return execution.execute(request, body); } - }; + } static class GitHubLinkDiscoverer extends JsonPathLinkDiscoverer { diff --git a/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java b/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java index dca47c50..714a4d85 100755 --- a/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java @@ -144,9 +144,7 @@ public class EnableHypermediaSupportIntegrationTest { .getField(processor, "messageConverters"); assertThat(converters.get(0)).isInstanceOfSatisfying(TypeConstrainedMappingJackson2HttpMessageConverter.class, - it -> { - assertThat(it.getSupportedMediaTypes()).contains(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8); - }); + it -> assertThat(it.getSupportedMediaTypes()).contains(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8)); } } diff --git a/src/test/java/org/springframework/hateoas/core/ControllerEntityLinksFactoryBeanUnitTest.java b/src/test/java/org/springframework/hateoas/core/ControllerEntityLinksFactoryBeanUnitTest.java index a6cc25a9..c01fb285 100755 --- a/src/test/java/org/springframework/hateoas/core/ControllerEntityLinksFactoryBeanUnitTest.java +++ b/src/test/java/org/springframework/hateoas/core/ControllerEntityLinksFactoryBeanUnitTest.java @@ -40,7 +40,7 @@ public class ControllerEntityLinksFactoryBeanUnitTest { ControllerEntityLinksFactoryBean builder = new ControllerEntityLinksFactoryBean(); assertThatExceptionOfType(IllegalStateException.class) // - .isThrownBy(() -> builder.afterPropertiesSet()) // + .isThrownBy(builder::afterPropertiesSet) // .withMessageContaining("Annotation"); } diff --git a/src/test/java/org/springframework/hateoas/core/DelegatingEntityLinksUnitTest.java b/src/test/java/org/springframework/hateoas/core/DelegatingEntityLinksUnitTest.java index 27e8a676..c2695911 100755 --- a/src/test/java/org/springframework/hateoas/core/DelegatingEntityLinksUnitTest.java +++ b/src/test/java/org/springframework/hateoas/core/DelegatingEntityLinksUnitTest.java @@ -55,7 +55,7 @@ public class DelegatingEntityLinksUnitTest extends TestUtils { @Test public void throwsExceptionForUnsupportedClass() { - EntityLinks links = new DelegatingEntityLinks(SimplePluginRegistry., EntityLinks> create()); + EntityLinks links = new DelegatingEntityLinks(SimplePluginRegistry.create()); assertThatExceptionOfType(IllegalArgumentException.class) // .isThrownBy(() -> links.linkFor(String.class)) // diff --git a/src/test/java/org/springframework/hateoas/hal/DefaultCurieProviderUnitTest.java b/src/test/java/org/springframework/hateoas/hal/DefaultCurieProviderUnitTest.java index e97883ab..5d915507 100755 --- a/src/test/java/org/springframework/hateoas/hal/DefaultCurieProviderUnitTest.java +++ b/src/test/java/org/springframework/hateoas/hal/DefaultCurieProviderUnitTest.java @@ -170,7 +170,7 @@ public class DefaultCurieProviderUnitTest { private static Map getCuries() { - Map curies = new HashMap(2); + Map curies = new HashMap<>(2); curies.put("foo", new UriTemplate("/foo/{rel}")); curies.put("bar", new UriTemplate("/bar/{rel}")); diff --git a/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java b/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java index da01bc9c..b4c9222c 100755 --- a/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java @@ -160,11 +160,11 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg @Test public void rendersSimpleResourcesAsEmbedded() throws Exception { - List content = new ArrayList(); + List content = new ArrayList<>(); content.add("first"); content.add("second"); - Resources resources = new Resources(content); + Resources resources = new Resources<>(content); resources.add(new Link("localhost")); assertThat(write(resources)).isEqualTo(SIMPLE_EMBEDDED_RESOURCE_REFERENCE); @@ -173,11 +173,11 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg @Test public void deserializesSimpleResourcesAsEmbedded() throws Exception { - List content = new ArrayList(); + List content = new ArrayList<>(); content.add("first"); content.add("second"); - Resources expected = new Resources(content); + Resources expected = new Resources<>(content); expected.add(new Link("localhost")); Resources result = mapper.readValue(SIMPLE_EMBEDDED_RESOURCE_REFERENCE, @@ -190,10 +190,10 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg @Test public void rendersSingleResourceResourcesAsEmbedded() throws Exception { - List> content = new ArrayList>(); - content.add(new Resource(new SimplePojo("test1", 1), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimplePojo("test1", 1), new Link("localhost"))); - Resources> resources = new Resources>(content); + Resources> resources = new Resources<>(content); resources.add(new Link("localhost")); assertThat(write(resources)).isEqualTo(SINGLE_EMBEDDED_RESOURCE_REFERENCE); @@ -202,10 +202,10 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg @Test public void deserializesSingleResourceResourcesAsEmbedded() throws Exception { - List> content = new ArrayList>(); - content.add(new Resource(new SimplePojo("test1", 1), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimplePojo("test1", 1), new Link("localhost"))); - Resources> expected = new Resources>(content); + Resources> expected = new Resources<>(content); expected.add(new Link("localhost")); Resources> result = mapper.readValue(SINGLE_EMBEDDED_RESOURCE_REFERENCE, @@ -244,10 +244,10 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg @Test public void serializesAnnotatedResourceResourcesAsEmbedded() throws Exception { - List> content = new ArrayList>(); - content.add(new Resource(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); - Resources> resources = new Resources>(content); + Resources> resources = new Resources<>(content); resources.add(new Link("localhost")); assertThat(write(resources)).isEqualTo(ANNOTATED_EMBEDDED_RESOURCE_REFERENCE); @@ -259,10 +259,10 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg @Test public void deserializesAnnotatedResourceResourcesAsEmbedded() throws Exception { - List> content = new ArrayList>(); - content.add(new Resource(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); - Resources> expected = new Resources>(content); + Resources> expected = new Resources<>(content); expected.add(new Link("localhost")); Resources> result = mapper.readValue(ANNOTATED_EMBEDDED_RESOURCE_REFERENCE, @@ -319,8 +319,8 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg @Test public void rendersCuriesCorrectly() throws Exception { - Resources resources = new Resources(Collections.emptySet(), new Link("foo"), - new Link("bar", "myrel")); + Resources resources = new Resources<>(Collections.emptySet(), new Link("foo"), + new Link("bar", "myrel")); assertThat(getCuriedObjectMapper().writeValueAsString(resources)).isEqualTo(CURIED_DOCUMENT); } @@ -331,7 +331,7 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg @Test public void doesNotRenderCuriesIfNoLinkIsPresent() throws Exception { - Resources resources = new Resources(Collections.emptySet()); + Resources resources = new Resources<>(Collections.emptySet()); assertThat(getCuriedObjectMapper().writeValueAsString(resources)).isEqualTo(EMPTY_DOCUMENT); } @@ -341,7 +341,7 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg @Test public void doesNotRenderCuriesIfNoCurieLinkIsPresent() throws Exception { - Resources resources = new Resources(Collections.emptySet()); + Resources resources = new Resources<>(Collections.emptySet()); resources.add(new Link("foo")); assertThat(getCuriedObjectMapper().writeValueAsString(resources)).isEqualTo(SINGLE_NON_CURIE_LINK); @@ -365,7 +365,7 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg @Test public void rendersMultipleCuries() throws Exception { - Resources resources = new Resources(Collections.emptySet()); + Resources resources = new Resources<>(Collections.emptySet()); resources.add(new Link("foo", "myrel")); CurieProvider provider = new DefaultCurieProvider("default", new UriTemplate("/doc{?rel}")) { @@ -386,10 +386,10 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg EmbeddedWrappers wrappers = new EmbeddedWrappers(false); - List values = new ArrayList(); + List values = new ArrayList<>(); values.add(wrappers.emptyCollectionOf(SimpleAnnotatedPojo.class)); - Resources resources = new Resources(values); + Resources resources = new Resources<>(values); assertThat(write(resources)).isEqualTo("{\"_embedded\":{\"pojos\":[]}}"); } @@ -439,29 +439,29 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg private static Resources> setupAnnotatedPagedResources() { - List> content = new ArrayList>(); - content.add(new Resource(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); - content.add(new Resource(new SimpleAnnotatedPojo("test2", 2), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); + content.add(new Resource<>(new SimpleAnnotatedPojo("test2", 2), new Link("localhost"))); - return new PagedResources>(content, new PageMetadata(2, 0, 4), PAGINATION_LINKS); + return new PagedResources<>(content, new PageMetadata(2, 0, 4), PAGINATION_LINKS); } private static Resources> setupAnnotatedResources() { - List> content = new ArrayList>(); - content.add(new Resource(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); - content.add(new Resource(new SimpleAnnotatedPojo("test2", 2), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); + content.add(new Resource<>(new SimpleAnnotatedPojo("test2", 2), new Link("localhost"))); - return new Resources>(content); + return new Resources<>(content); } private static Resources> setupResources() { - List> content = new ArrayList>(); - content.add(new Resource(new SimplePojo("test1", 1), new Link("localhost"))); - content.add(new Resource(new SimplePojo("test2", 2), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimplePojo("test1", 1), new Link("localhost"))); + content.add(new Resource<>(new SimplePojo("test2", 2), new Link("localhost"))); - return new Resources>(content); + return new Resources<>(content); } private static ObjectMapper getCuriedObjectMapper() { diff --git a/src/test/java/org/springframework/hateoas/hal/forms/HalFormsValidationIntegrationTest.java b/src/test/java/org/springframework/hateoas/hal/forms/HalFormsValidationIntegrationTest.java index 07e0895b..11670a02 100644 --- a/src/test/java/org/springframework/hateoas/hal/forms/HalFormsValidationIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/hal/forms/HalFormsValidationIntegrationTest.java @@ -109,7 +109,7 @@ public class HalFormsValidationIntegrationTest { @RestController static class BadController { - private final static Map EMPLOYEES = new TreeMap(); + private final static Map EMPLOYEES = new TreeMap<>(); static { EMPLOYEES.put(0, new Employee("Frodo Baggins", "ring bearer")); @@ -120,7 +120,7 @@ public class HalFormsValidationIntegrationTest { public Resources> all() { // Create a list of Resource's to return - List> employees = new ArrayList>(); + List> employees = new ArrayList<>(); // Fetch each Resource using the controller's findOne method. for (int i = 0; i < EMPLOYEES.size(); i++) { @@ -132,7 +132,7 @@ public class HalFormsValidationIntegrationTest { .andAffordance(afford(methodOn(BadController.class).updateEmployee(null, 0))); // Return the collection of employee resources along with the composite affordance - return new Resources>(employees, selfLink); + return new Resources<>(employees, selfLink); } @GetMapping("/employees/{id}") @@ -146,8 +146,8 @@ public class HalFormsValidationIntegrationTest { .andAffordance(afford(methodOn(BadController.class).newEmployee(null))); // Return the affordance + a link back to the entire collection resource. - return new Resource(EMPLOYEES.get(id), findOneLink.andAffordances(employeesLink.getAffordances()), - employeesLink); + return new Resource<>(EMPLOYEES.get(id), findOneLink.andAffordances(employeesLink.getAffordances()), + employeesLink); } @PostMapping("/employees") diff --git a/src/test/java/org/springframework/hateoas/hal/forms/HalFormsWebMvcIntegrationTest.java b/src/test/java/org/springframework/hateoas/hal/forms/HalFormsWebMvcIntegrationTest.java index 54bffdf7..d0ee5c7c 100644 --- a/src/test/java/org/springframework/hateoas/hal/forms/HalFormsWebMvcIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/hal/forms/HalFormsWebMvcIntegrationTest.java @@ -127,7 +127,7 @@ public class HalFormsWebMvcIntegrationTest { @RestController static class EmployeeController { - private final static Map EMPLOYEES = new TreeMap(); + private final static Map EMPLOYEES = new TreeMap<>(); static { EMPLOYEES.put(0, new Employee("Frodo Baggins", "ring bearer")); @@ -138,7 +138,7 @@ public class HalFormsWebMvcIntegrationTest { public Resources> all() { // Create a list of Resource's to return - List> employees = new ArrayList>(); + List> employees = new ArrayList<>(); // Fetch each Resource using the controller's findOne method. for (int i = 0; i < EMPLOYEES.size(); i++) { @@ -150,7 +150,7 @@ public class HalFormsWebMvcIntegrationTest { .andAffordance(afford(methodOn(EmployeeController.class).newEmployee(null))); // Return the collection of employee resources along with the composite affordance - return new Resources>(employees, selfLink); + return new Resources<>(employees, selfLink); } @GetMapping("/employees/{id}") @@ -163,10 +163,10 @@ public class HalFormsWebMvcIntegrationTest { Link employeesLink = linkTo(methodOn(EmployeeController.class).all()).withRel("employees"); // Return the affordance + a link back to the entire collection resource. - return new Resource(EMPLOYEES.get(id), - findOneLink.andAffordance(afford(methodOn(EmployeeController.class).updateEmployee(null, id))) // - .andAffordance(afford(methodOn(EmployeeController.class).partiallyUpdateEmployee(null, id))), - employeesLink); + return new Resource<>(EMPLOYEES.get(id), + findOneLink.andAffordance(afford(methodOn(EmployeeController.class).updateEmployee(null, id))) // + .andAffordance(afford(methodOn(EmployeeController.class).partiallyUpdateEmployee(null, id))), + employeesLink); } @PostMapping("/employees") diff --git a/src/test/java/org/springframework/hateoas/hal/forms/Jackson2HalFormsIntegrationTest.java b/src/test/java/org/springframework/hateoas/hal/forms/Jackson2HalFormsIntegrationTest.java index dd6b9fce..6cd2e024 100644 --- a/src/test/java/org/springframework/hateoas/hal/forms/Jackson2HalFormsIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/hal/forms/Jackson2HalFormsIntegrationTest.java @@ -116,7 +116,7 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling @Test public void rendersResource() throws Exception { - Resource resource = new Resource(new SimplePojo("test1", 1), new Link("localhost")); + Resource resource = new Resource<>(new SimplePojo("test1", 1), new Link("localhost")); assertThat(write(resource), is(MappingUtils.read(new ClassPathResource("simple-resource-unwrapped.json", getClass())))); @@ -125,7 +125,7 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling @Test public void deserializesResource() throws IOException { - Resource expected = new Resource(new SimplePojo("test1", 1), new Link("localhost")); + Resource expected = new Resource<>(new SimplePojo("test1", 1), new Link("localhost")); Resource result = mapper.readValue( MappingUtils.read(new ClassPathResource("simple-resource-unwrapped.json", getClass())), @@ -137,11 +137,11 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling @Test public void rendersSimpleResourcesAsEmbedded() throws Exception { - List content = new ArrayList(); + List content = new ArrayList<>(); content.add("first"); content.add("second"); - Resources resources = new Resources(content); + Resources resources = new Resources<>(content); resources.add(new Link("localhost")); assertThat(write(resources), @@ -151,11 +151,11 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling @Test public void deserializesSimpleResourcesAsEmbedded() throws Exception { - List content = new ArrayList(); + List content = new ArrayList<>(); content.add("first"); content.add("second"); - Resources expected = new Resources(content); + Resources expected = new Resources<>(content); expected.add(new Link("localhost")); Resources result = mapper.readValue( @@ -169,10 +169,10 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling @Test public void rendersSingleResourceResourcesAsEmbedded() throws Exception { - List> content = new ArrayList>(); - content.add(new Resource(new SimplePojo("test1", 1), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimplePojo("test1", 1), new Link("localhost"))); - Resources> resources = new Resources>(content); + Resources> resources = new Resources<>(content); resources.add(new Link("localhost")); assertThat(write(resources), @@ -182,10 +182,10 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling @Test public void deserializesSingleResourceResourcesAsEmbedded() throws Exception { - List> content = new ArrayList>(); - content.add(new Resource(new SimplePojo("test1", 1), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimplePojo("test1", 1), new Link("localhost"))); - Resources> expected = new Resources>(content); + Resources> expected = new Resources<>(content); expected.add(new Link("localhost")); Resources> result = mapper.readValue( @@ -223,10 +223,10 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling @Test public void serializesAnnotatedResourceResourcesAsEmbedded() throws Exception { - List> content = new ArrayList>(); - content.add(new Resource(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); - Resources> resources = new Resources>(content); + Resources> resources = new Resources<>(content); resources.add(new Link("localhost")); assertThat(write(resources), @@ -236,10 +236,10 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling @Test public void deserializesAnnotatedResourceResourcesAsEmbedded() throws Exception { - List> content = new ArrayList>(); - content.add(new Resource(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); - Resources> expected = new Resources>(content); + Resources> expected = new Resources<>(content); expected.add(new Link("localhost")); Resources> result = mapper.readValue( @@ -286,8 +286,8 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling @Test public void rendersCuriesCorrectly() throws Exception { - Resources resources = new Resources(Collections.emptySet(), new Link("foo"), - new Link("bar", "myrel")); + Resources resources = new Resources<>(Collections.emptySet(), new Link("foo"), + new Link("bar", "myrel")); assertThat(getCuriedObjectMapper().writeValueAsString(resources), is(MappingUtils.read(new ClassPathResource("curied-document.json", getClass())))); @@ -296,7 +296,7 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling @Test public void doesNotRenderCuriesIfNoLinkIsPresent() throws Exception { - Resources resources = new Resources(Collections.emptySet()); + Resources resources = new Resources<>(Collections.emptySet()); assertThat(getCuriedObjectMapper().writeValueAsString(resources), is(MappingUtils.read(new ClassPathResource("empty-document.json", getClass())))); } @@ -304,7 +304,7 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling @Test public void doesNotRenderCuriesIfNoCurieLinkIsPresent() throws Exception { - Resources resources = new Resources(Collections.emptySet()); + Resources resources = new Resources<>(Collections.emptySet()); resources.add(new Link("foo")); assertThat(getCuriedObjectMapper().writeValueAsString(resources), @@ -323,7 +323,7 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling @Test public void rendersMultipleCuries() throws Exception { - Resources resources = new Resources(Collections.emptySet()); + Resources resources = new Resources<>(Collections.emptySet()); resources.add(new Link("foo", "myrel")); CurieProvider provider = new DefaultCurieProvider("default", new UriTemplate("/doc{?rel}")) { @@ -342,10 +342,10 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling EmbeddedWrappers wrappers = new EmbeddedWrappers(false); - List values = new ArrayList(); + List values = new ArrayList<>(); values.add(wrappers.emptyCollectionOf(SimpleAnnotatedPojo.class)); - Resources resources = new Resources(values); + Resources resources = new Resources<>(values); assertThat(write(resources), is(MappingUtils.read(new ClassPathResource("empty-embedded-pojos.json", getClass())))); } @@ -378,30 +378,30 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling private static Resources> setupResources() { - List> content = new ArrayList>(); - content.add(new Resource(new SimplePojo("test1", 1), new Link("localhost"))); - content.add(new Resource(new SimplePojo("test2", 2), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimplePojo("test1", 1), new Link("localhost"))); + content.add(new Resource<>(new SimplePojo("test2", 2), new Link("localhost"))); - return new Resources>(content); + return new Resources<>(content); } private static Resources> setupAnnotatedResources() { - List> content = new ArrayList>(); - content.add(new Resource(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); - content.add(new Resource(new SimpleAnnotatedPojo("test2", 2), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); + content.add(new Resource<>(new SimpleAnnotatedPojo("test2", 2), new Link("localhost"))); - return new Resources>(content); + return new Resources<>(content); } private static Resources> setupAnnotatedPagedResources() { - List> content = new ArrayList>(); - content.add(new Resource(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); - content.add(new Resource(new SimpleAnnotatedPojo("test2", 2), new Link("localhost"))); + List> content = new ArrayList<>(); + content.add(new Resource<>(new SimpleAnnotatedPojo("test1", 1), new Link("localhost"))); + content.add(new Resource<>(new SimpleAnnotatedPojo("test2", 2), new Link("localhost"))); - return new PagedResources>(content, new PagedResources.PageMetadata(2, 0, 4), - PAGINATION_LINKS); + return new PagedResources<>(content, new PagedResources.PageMetadata(2, 0, 4), + PAGINATION_LINKS); } private static ObjectMapper getCuriedObjectMapper() { diff --git a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactoryUnitTest.java b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactoryUnitTest.java index 2332572f..b86c8368 100755 --- a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactoryUnitTest.java +++ b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactoryUnitTest.java @@ -131,7 +131,7 @@ public class ControllerLinkBuilderFactoryUnitTest extends TestUtils { @Test public void createsLinkToControllerMethodWithMapRequestParam() { - Map queryParams = new LinkedHashMap(); + Map queryParams = new LinkedHashMap<>(); queryParams.put("firstKey", "firstValue"); queryParams.put("secondKey", "secondValue"); @@ -148,7 +148,7 @@ public class ControllerLinkBuilderFactoryUnitTest extends TestUtils { @Test public void createsLinkToControllerMethodWithMultiValueMapRequestParam() { - MultiValueMap queryParams = new LinkedMultiValueMap(); + MultiValueMap queryParams = new LinkedMultiValueMap<>(); queryParams.put("key1", Arrays.asList("value1a", "value1b")); queryParams.put("key2", Arrays.asList("value2a", "value2b")); @@ -173,7 +173,7 @@ public class ControllerLinkBuilderFactoryUnitTest extends TestUtils { assertThat(link.getHref()).endsWith("/people/17/addresses"); } - static interface SampleController { + interface SampleController { @RequestMapping("/sample/{id}") HttpEntity sampleMethod(@PathVariable("id") Long id, SpecialType parameter); diff --git a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java index f7e237e7..25e31619 100755 --- a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java +++ b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java @@ -561,7 +561,7 @@ public class ControllerLinkBuilderUnitTest extends TestUtils { @Test public void considersEmptyOptionalMethodParameterOptional() { - Link link = linkTo(methodOn(ControllerWithMethods.class).methodWithJdk8Optional(Optional. empty())) + Link link = linkTo(methodOn(ControllerWithMethods.class).methodWithJdk8Optional(Optional.empty())) .withSelfRel(); assertThat(link.isTemplated()).isTrue(); diff --git a/src/test/java/org/springframework/hateoas/mvc/DummyInvocationUtilsUnitTest.java b/src/test/java/org/springframework/hateoas/mvc/DummyInvocationUtilsUnitTest.java index 446f05b7..e222dcfd 100755 --- a/src/test/java/org/springframework/hateoas/mvc/DummyInvocationUtilsUnitTest.java +++ b/src/test/java/org/springframework/hateoas/mvc/DummyInvocationUtilsUnitTest.java @@ -53,12 +53,12 @@ public class DummyInvocationUtilsUnitTest extends TestUtils { @RequestMapping("/{id}/foo") HttpEntity someMethod(@PathVariable("id") Long id) { - return new ResponseEntity(HttpStatus.OK); + return new ResponseEntity<>(HttpStatus.OK); } @RequestMapping("/{otherName}/bar") HttpEntity someOtherMethod(@PathVariable(name = "otherName") Long id) { - return new ResponseEntity(HttpStatus.OK); + return new ResponseEntity<>(HttpStatus.OK); } } } diff --git a/src/test/java/org/springframework/hateoas/mvc/HeaderLinksResponseEntityUnitTest.java b/src/test/java/org/springframework/hateoas/mvc/HeaderLinksResponseEntityUnitTest.java index edd16a5e..017e4f34 100755 --- a/src/test/java/org/springframework/hateoas/mvc/HeaderLinksResponseEntityUnitTest.java +++ b/src/test/java/org/springframework/hateoas/mvc/HeaderLinksResponseEntityUnitTest.java @@ -36,8 +36,8 @@ public class HeaderLinksResponseEntityUnitTest { static final Object CONTENT = new Object(); static final Link LINK = new Link("href", "rel"); - Resource resource = new Resource(CONTENT, LINK); - ResponseEntity> entity = new ResponseEntity>(resource, HttpStatus.OK); + Resource resource = new Resource<>(CONTENT, LINK); + ResponseEntity> entity = new ResponseEntity<>(resource, HttpStatus.OK); @Test public void movesRootResourceLinksToHeader() { @@ -58,7 +58,7 @@ public class HeaderLinksResponseEntityUnitTest { @Test public void defaultStatusCodeToOkForHttpEntities() { - HttpEntity> entity = new HttpEntity>(resource); + HttpEntity> entity = new HttpEntity<>(resource); ResponseEntity> wrappedEntity = HeaderLinksResponseEntity.wrap(entity); assertThat(wrappedEntity.getStatusCode()).isEqualTo(HttpStatus.OK); diff --git a/src/test/java/org/springframework/hateoas/mvc/ResourceProcessorHandlerMethodReturnValueHandlerUnitTest.java b/src/test/java/org/springframework/hateoas/mvc/ResourceProcessorHandlerMethodReturnValueHandlerUnitTest.java index 50759000..9d07000e 100644 --- a/src/test/java/org/springframework/hateoas/mvc/ResourceProcessorHandlerMethodReturnValueHandlerUnitTest.java +++ b/src/test/java/org/springframework/hateoas/mvc/ResourceProcessorHandlerMethodReturnValueHandlerUnitTest.java @@ -60,39 +60,34 @@ import org.springframework.web.method.support.HandlerMethodReturnValueHandler; @RunWith(MockitoJUnitRunner.class) public class ResourceProcessorHandlerMethodReturnValueHandlerUnitTest { - static final Resource FOO = new Resource("foo"); - static final Resources> FOOS = new Resources>(Collections.singletonList(FOO)); - static final PagedResources> FOO_PAGE = new PagedResources>( - Collections.singleton(FOO), new PageMetadata(1, 0, 10)); + static final Resource FOO = new Resource<>("foo"); + static final Resources> FOOS = new Resources<>(Collections.singletonList(FOO)); + static final PagedResources> FOO_PAGE = new PagedResources<>( + Collections.singleton(FOO), new PageMetadata(1, 0, 10)); static final StringResource FOO_RES = new StringResource("foo"); - static final HttpEntity> FOO_ENTITY = new HttpEntity>(FOO); - static final ResponseEntity> FOO_RESP_ENTITY = new ResponseEntity>(FOO, - HttpStatus.OK); - static final HttpEntity FOO_RES_ENTITY = new HttpEntity(FOO_RES); - static final Resource BAR = new Resource("bar"); - static final Resources> BARS = new Resources>(Collections.singletonList(BAR)); + static final HttpEntity> FOO_ENTITY = new HttpEntity<>(FOO); + static final ResponseEntity> FOO_RESP_ENTITY = new ResponseEntity<>(FOO, + HttpStatus.OK); + static final HttpEntity FOO_RES_ENTITY = new HttpEntity<>(FOO_RES); + static final Resource BAR = new Resource<>("bar"); + static final Resources> BARS = new Resources<>(Collections.singletonList(BAR)); static final StringResource BAR_RES = new StringResource("bar"); - static final HttpEntity> BAR_ENTITY = new HttpEntity>(BAR); - static final ResponseEntity> BAR_RESP_ENTITY = new ResponseEntity>(BAR, - HttpStatus.OK); - static final HttpEntity BAR_RES_ENTITY = new HttpEntity(BAR_RES); - static final Resource LONG_10 = new Resource(10L); - static final Resource LONG_20 = new Resource(20L); + static final HttpEntity> BAR_ENTITY = new HttpEntity<>(BAR); + static final ResponseEntity> BAR_RESP_ENTITY = new ResponseEntity<>(BAR, + HttpStatus.OK); + static final HttpEntity BAR_RES_ENTITY = new HttpEntity<>(BAR_RES); + static final Resource LONG_10 = new Resource<>(10L); + static final Resource LONG_20 = new Resource<>(20L); static final LongResource LONG_10_RES = new LongResource(10L); static final LongResource LONG_20_RES = new LongResource(20L); - static final HttpEntity> LONG_10_ENTITY = new HttpEntity>(LONG_10); - static final HttpEntity LONG_10_RES_ENTITY = new HttpEntity(LONG_10_RES); - static final HttpEntity> LONG_20_ENTITY = new HttpEntity>(LONG_20); - static final HttpEntity LONG_20_RES_ENTITY = new HttpEntity(LONG_20_RES); - static final Map METHOD_PARAMS = new HashMap(); + static final HttpEntity> LONG_10_ENTITY = new HttpEntity<>(LONG_10); + static final HttpEntity LONG_10_RES_ENTITY = new HttpEntity<>(LONG_10_RES); + static final HttpEntity> LONG_20_ENTITY = new HttpEntity<>(LONG_20); + static final HttpEntity LONG_20_RES_ENTITY = new HttpEntity<>(LONG_20_RES); + static final Map METHOD_PARAMS = new HashMap<>(); static { - doWithMethods(Controller.class, new MethodCallback() { - @Override - public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException { - METHOD_PARAMS.put(method.getName(), new MethodParameter(method, -1)); - } - }); + doWithMethods(Controller.class, method -> METHOD_PARAMS.put(method.getName(), new MethodParameter(method, -1))); } @Mock HandlerMethodReturnValueHandler delegate; @@ -100,7 +95,7 @@ public class ResourceProcessorHandlerMethodReturnValueHandlerUnitTest { @Before public void setUp() { - resourceProcessors = new ArrayList>(); + resourceProcessors = new ArrayList<>(); } /** @@ -252,12 +247,12 @@ public class ResourceProcessorHandlerMethodReturnValueHandlerUnitTest { */ @Test public void usesHeaderLinksResponseEntityIfConfigured() throws Exception { - usesHeaderLinksResponseEntityIfConfigured(it -> ResponseEntity.ok(it)); + usesHeaderLinksResponseEntityIfConfigured(ResponseEntity::ok); } private void usesHeaderLinksResponseEntityIfConfigured(Function mapper) throws Exception { - Resource resource = new Resource("foo", new Link("href", "rel")); + Resource resource = new Resource<>("foo", new Link("href", "rel")); MethodParameter parameter = METHOD_PARAMS.get("resource"); ResourceProcessorHandlerMethodReturnValueHandler handler = new ResourceProcessorHandlerMethodReturnValueHandler( @@ -287,8 +282,8 @@ public class ResourceProcessorHandlerMethodReturnValueHandlerUnitTest { public void doesNotInvokeAProcessorForASpecializedType() throws Exception { EmbeddedWrappers wrappers = new EmbeddedWrappers(false); - Resources value = new Resources( - Collections. singleton(wrappers.emptyCollectionOf(Object.class))); + Resources value = new Resources<>( + Collections.singleton(wrappers.emptyCollectionOf(Object.class))); ResourcesProcessorWrapper wrapper = new ResourcesProcessorWrapper(new SpecialResourcesProcessor()); ResolvableType type = ResolvableType.forMethodReturnType(Controller.class.getMethod("resourcesOfObject")); @@ -392,7 +387,7 @@ public class ResourceProcessorHandlerMethodReturnValueHandlerUnitTest { } } - static interface Controller { + interface Controller { Resources> resources(); @@ -439,13 +434,13 @@ public class ResourceProcessorHandlerMethodReturnValueHandlerUnitTest { } } - static class PagedStringResources extends PagedResources> {}; + static class PagedStringResources extends PagedResources> {} static class Sample { } - static interface SampleProjection { + interface SampleProjection { }