DATAREST-1205 - Use Affordances API

* Leverage the Affordances API while making other media types work.

pom.xml

@@ -35,8 +35,10 @@
 <springdata.solr>4.1.0.BUILD-SNAPSHOT</springdata.solr>
 <springdata.cassandra>2.2.0.BUILD-SNAPSHOT</springdata.cassandra>
 <springdata.keyvalue>2.2.0.BUILD-SNAPSHOT</springdata.keyvalue>
-<spring-hateoas>0.25.0.RELEASE</spring-hateoas>
+<springplugin>2.0.0.BUILD-SNAPSHOT</springplugin>
+<spring-hateoas>1.0.0.BUILD-SNAPSHOT</spring-hateoas>
 
+<evoinflector>1.2.2</evoinflector>
 <hibernate.version>4.3.10.Final</hibernate.version>
 <jsonpath>1.1.0</jsonpath>
 <bundlor.enabled>false</bundlor.enabled>

spring-data-rest-core/pom.xml

@@ -16,8 +16,6 @@
 </parent>
 
 <properties>
-<springplugin>1.2.0.RELEASE</springplugin>
-<evoinflector>1.2.2</evoinflector>
 <java-module-name>spring.data.rest.core</java-module-name>
 <project.root>${basedir}/..</project.root>
 </properties>

spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/SearchResourceMappings.java

@@ -24,6 +24,7 @@
 import java.util.Set;
 
 import org.springframework.data.rest.core.Path;
+import org.springframework.hateoas.IanaLinkRelation;
 import org.springframework.util.Assert;
 
 /**
@@ -37,7 +38,6 @@ public class SearchResourceMappings implements Iterable<MethodResourceMapping>,
 + "%s are mapped to %s! Tweak configuration to get to unambiguous paths!";
 
 private static final Path PATH = new Path("/search");
-private static final String REL = "search";
 
 private final Map<Path, MethodResourceMapping> mappings;
 
@@ -155,7 +155,7 @@ public Path getPath() {
  */
 @Override
 public String getRel() {
-return REL;
+return IanaLinkRelation.SEARCH.value();
 }
 
 /*

spring-data-rest-core/src/main/java/org/springframework/data/rest/core/util/Java8PluginRegistry.java

@@ -46,7 +46,7 @@ public static <T extends Plugin<S>, S> Java8PluginRegistry<T, S> empty() {
 }
 
 public Optional<T> getPluginFor(S delimiter) {
-return Optional.ofNullable(registry.getPluginFor(delimiter));
+return registry.getPluginFor(delimiter);
 }
 
 public T getPluginOrDefaultFor(S delimiter, T fallback) {

spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/AbstractWebIntegrationTests.java

@@ -21,11 +21,10 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
-import net.minidev.json.JSONArray;
-
 import java.util.Collections;
 import java.util.Map;
 
+import net.minidev.json.JSONArray;
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/CommonWebTests.java

@@ -29,6 +29,7 @@
 
 import org.junit.Test;
 import org.springframework.data.rest.webmvc.RestMediaTypes;
+import org.springframework.hateoas.IanaLinkRelation;
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.Links;
 import org.springframework.hateoas.MediaTypes;
@@ -79,7 +80,7 @@ public void exposesSchemasForResourcesExposed() throws Exception {
 // Resource
 client.follow(link).andExpect(status().is2xxSuccessful());
 
-Link profileLink = client.discoverUnique(link, "profile");
+Link profileLink = client.discoverUnique(link, IanaLinkRelation.PROFILE.value());
 
 // Default metadata
 client.follow(profileLink).andExpect(status().is2xxSuccessful());
@@ -117,7 +118,7 @@ public void exposesSearchesForRootResources() throws Exception {
 
 Link link = client.assertHasLinkWithRel(rel, response);
 String rootResourceRepresentation = client.request(link).getContentAsString();
-Link searchLink = client.getDiscoverer(response).findLinkWithRel("search", rootResourceRepresentation);
+Link searchLink = client.getDiscoverer(response).findLinkWithRel(IanaLinkRelation.SEARCH.value(), rootResourceRepresentation);
 
 if (searchLink != null) {
 client.follow(searchLink).//
@@ -183,17 +184,15 @@ public void accessLinkedResources() throws Exception {
 @Test // DATAREST-230
 public void exposesDescriptionAsAlpsDocuments() throws Exception {
 
-MediaType ALPS_MEDIA_TYPE = MediaType.valueOf("application/alps+json");
-
 MockHttpServletResponse response = client.request("/");
-Link profileLink = client.assertHasLinkWithRel("profile", response);
+Link profileLink = client.assertHasLinkWithRel(IanaLinkRelation.PROFILE.value(), response);
 
 mvc.perform(//
 get(profileLink.expand().getHref()).//
-accept(ALPS_MEDIA_TYPE))
+accept(RestMediaTypes.ALPS_JSON))
 .//
 andExpect(status().isOk()).//
-andExpect(content().contentTypeCompatibleWith(ALPS_MEDIA_TYPE));
+andExpect(content().contentTypeCompatibleWith(RestMediaTypes.ALPS_JSON));
 }
 
 @Test // DATAREST-448
@@ -216,8 +215,8 @@ public void collectionResourcesExposeLinksAsHeadersForHeadRequest() throws Excep
 
 Links links = Links.valueOf(response.getHeader("Link"));
 
-assertThat(links.hasLink(Link.REL_SELF)).isTrue();
-assertThat(links.hasLink("profile")).isTrue();
+assertThat(links.hasLink(IanaLinkRelation.SELF.value())).isTrue();
+assertThat(links.hasLink(IanaLinkRelation.PROFILE.value())).isTrue();
 }
 }
 

spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/ResourceTester.java

@@ -83,7 +83,7 @@ public Link assertHasLinkEndingWith(String rel, String hrefEnd) {
 
 private final Link assertHasLinkMatching(String rel, Matcher<String> hrefMatcher) {
 
-Link link = resource.getLink(rel);
+Link link = resource.getRequiredLink(rel);
 assertThat("Expected link with rel '" + rel + "' but didn't find it in " + resource.getLinks(), link,
 is(notNullValue()));
 

spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml

@@ -47,6 +47,19 @@
 <scope>test</scope>
 </dependency>
 
+<dependency>
+<groupId>org.springframework</groupId>
+<artifactId>spring-web</artifactId>
+<version>${spring}</version>
+</dependency>
+
+<dependency>
+<groupId>org.springframework.hateoas</groupId>
+<artifactId>spring-hateoas</artifactId>
+<version>${spring-hateoas}</version>
+<scope>test</scope>
+</dependency>
+
 <!-- Jackson Hibernate -->
 
 <dependency>