DATAREST-1205 - Upgrade to Spring HATEOAS 1.0

Author: gregturn

spring-data-rest-core/pom.xml

@@ -18,6 +18,7 @@
 	<properties>
 		<springplugin>1.2.0.RELEASE</springplugin>
 		<evoinflector>1.2.2</evoinflector>
+		<spring-hateoas>1.0.0.BUILD-SNAPSHOT</spring-hateoas>
 		<java-module-name>spring.data.rest.core</java-module-name>
 	</properties>
 

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/AbstractRepositoryRestController.java

@@ -63,7 +63,7 @@ protected Link resourceLink(RootResourceInformation resourceLink, Resource resou
 
 		ResourceMetadata repoMapping = resourceLink.getResourceMetadata();
 
-		Link selfLink = resource.getLink("self");
+		Link selfLink = resource.getRequiredLink(Link.REL_SELF);
 		String rel = repoMapping.getItemResourceRel();
 
 		return new Link(selfLink.getHref(), rel);

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceController.java

@@ -134,11 +134,11 @@ public ResponseEntity<ResourceSupport> followPropertyReference(final RootResourc
 			} else {
 
 				PersistentEntityResource resource = assembler.toResource(it);
-				headers.set("Content-Location", resource.getId().getHref());
+				headers.set("Content-Location", resource.getRequiredLink(Link.REL_SELF).getHref());
 				return resource;
 			}
 
-		}).orElseThrow(() -> new ResourceNotFoundException());
+		}).orElseThrow(ResourceNotFoundException::new);
 
 		return ControllerUtils.toResponseEntity(HttpStatus.OK, headers, //
 				doWithReferencedProperty(repoRequest, id, property, handler, HttpMethod.GET));
@@ -187,7 +187,7 @@ public ResponseEntity<ResourceSupport> followPropertyReference(RootResourceInfor
 					if (propertyId.equals(accessor1.getIdentifier().toString())) {
 
 						PersistentEntityResource resource1 = assembler.toResource(obj);
-						headers.set("Content-Location", resource1.getId().getHref());
+						headers.set("Content-Location", resource1.getRequiredLink(Link.REL_SELF).getHref());
 						return resource1;
 					}
 				}
@@ -200,18 +200,18 @@ public ResponseEntity<ResourceSupport> followPropertyReference(RootResourceInfor
 					if (propertyId.equals(accessor2.getIdentifier().toString())) {
 
 						PersistentEntityResource resource2 = assembler.toResource(entry.getValue());
-						headers.set("Content-Location", resource2.getId().getHref());
+						headers.set("Content-Location", resource2.getRequiredLink(Link.REL_SELF).getHref());
 						return resource2;
 					}
 				}
 
 			} else {
-				return new Resource<Object>(prop.propertyValue);
+				return new Resource<>(prop.propertyValue);
 			}
 
 			throw new ResourceNotFoundException();
 
-		}).orElseThrow(() -> new ResourceNotFoundException());
+		}).orElseThrow(ResourceNotFoundException::new);
 
 		return ControllerUtils.toResponseEntity(HttpStatus.OK, headers, //
 				doWithReferencedProperty(repoRequest, id, property, handler, HttpMethod.GET));
@@ -254,7 +254,7 @@ public ResponseEntity<ResourceSupport> followPropertyReferenceCompact(RootResour
 				Map<Object, Resource<?>> map = (Map<Object, Resource<?>>) content;
 
 				for (Entry<Object, Resource<?>> entry : map.entrySet()) {
-					Link l = new Link(entry.getValue().getLink("self").getHref(), entry.getKey().toString());
+					Link l = new Link(entry.getValue().getRequiredLink(Link.REL_SELF).getHref(), entry.getKey().toString());
 					links.add(l);
 				}
 			}

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositorySearchController.java

@@ -344,23 +344,20 @@ private Optional<Object> executeQueryMethod(final RepositoryInvoker invoker,
 		List<TypeInformation<?>> parameterTypeInformations = ClassTypeInformation.from(method.getDeclaringClass())
 				.getParameterTypes(method);
 
-		for (Entry<String, List<Object>> entry : parameters.entrySet()) {
+		parameters.entrySet().forEach(entry ->
 
-			MethodParameter parameter = methodParameters.getParameter(entry.getKey());
+			methodParameters.getParameter(entry.getKey()).ifPresent(parameter -> {
 
-			if (parameter == null) {
-				continue;
-			}
-
-			int parameterIndex = parameterList.indexOf(parameter);
-			TypeInformation<?> domainType = parameterTypeInformations.get(parameterIndex).getActualType();
+				int parameterIndex = parameterList.indexOf(parameter);
+				TypeInformation<?> domainType = parameterTypeInformations.get(parameterIndex).getActualType();
 
-			ResourceMetadata metadata = mappings.getMetadataFor(domainType.getType());
+				ResourceMetadata metadata = mappings.getMetadataFor(domainType.getType());
 
-			if (metadata != null && metadata.isExported()) {
-				result.put(parameter.getParameterName(), prepareUris(entry.getValue()));
+				if (metadata != null && metadata.isExported()) {
+					result.put(parameter.getParameterName(), prepareUris(entry.getValue()));
+				}
 			}
-		}
+		));
 
 		return invoker.invokeQueryMethod(method, result, pageable.getPageable(), sort);
 	}

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java

@@ -131,6 +131,7 @@
 import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType;
 import org.springframework.hateoas.core.EvoInflectorRelProvider;
 import org.springframework.hateoas.hal.CurieProvider;
+import org.springframework.hateoas.hal.HalConfiguration;
 import org.springframework.hateoas.hal.Jackson2HalModule;
 import org.springframework.hateoas.hal.Jackson2HalModule.HalHandlerInstantiator;
 import org.springframework.hateoas.mvc.ResourceProcessorInvoker;
@@ -533,7 +534,7 @@ public ObjectMapper halObjectMapper() {
 		RelProvider defaultedRelProvider = this.relProvider != null ? this.relProvider : new EvoInflectorRelProvider();
 
 		HalHandlerInstantiator instantiator = new HalHandlerInstantiator(defaultedRelProvider, curieProvider,
-				resourceDescriptionMessageSourceAccessor(), applicationContext.getAutowireCapableBeanFactory());
+				resourceDescriptionMessageSourceAccessor(), true, new HalConfiguration());
 
 		ObjectMapper mapper = basicObjectMapper();
 		mapper.registerModule(persistentEntityJackson2Module());

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/mapping/LinkCollector.java

@@ -141,7 +141,7 @@ private Links addSelfLinkIfNecessary(Object object, List<Link> existing) {
 	private Link createSelfLink(Object object, Links existing) {
 
 		if (existing.hasLink(Link.REL_SELF)) {
-			return existing.getLink(Link.REL_SELF);
+			return existing.getLink(Link.REL_SELF).get();
 		}
 
 		return links.createSelfLinkFor(object).withSelfRel();