Fix for DATAREST-69. Tweaked how RepositoryEntityLinks gets its default baseUri if none is set in the configuration.

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

@@ -23,7 +23,7 @@ import org.springframework.data.rest.repository.json.Jackson2DatatypeHelper;
 import org.springframework.data.rest.repository.json.PersistentEntityJackson2Module;
 import org.springframework.data.rest.repository.json.PersistentEntityToJsonSchemaConverter;
 import org.springframework.data.rest.repository.support.DomainObjectMerger;
-import org.springframework.data.rest.repository.support.RepositoryEntityLinks;
+import org.springframework.data.rest.webmvc.support.RepositoryEntityLinks;
 import org.springframework.data.rest.webmvc.BaseUriMethodArgumentResolver;
 import org.springframework.data.rest.webmvc.PagingAndSortingMethodArgumentResolver;
 import org.springframework.data.rest.webmvc.PersistentEntityResourceHandlerMethodArgumentResolver;

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

@@ -0,0 +1,130 @@
+package org.springframework.data.rest.webmvc.support;
+
+import static org.springframework.data.rest.core.util.UriUtils.*;
+import static org.springframework.data.rest.repository.support.ResourceMappingUtils.*;
+
+import java.net.URI;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentProperty;
+import org.springframework.data.repository.core.RepositoryInformation;
+import org.springframework.data.repository.support.Repositories;
+import org.springframework.data.rest.config.RepositoryRestConfiguration;
+import org.springframework.data.rest.config.ResourceMapping;
+import org.springframework.data.rest.webmvc.RepositoryController;
+import org.springframework.hateoas.Identifiable;
+import org.springframework.hateoas.Link;
+import org.springframework.hateoas.LinkBuilder;
+import org.springframework.hateoas.core.AbstractEntityLinks;
+import org.springframework.hateoas.mvc.ControllerLinkBuilder;
+import org.springframework.web.util.UriComponentsBuilder;
+
+/**
+ * @author Jon Brisbin
+ */
+public class RepositoryEntityLinks extends AbstractEntityLinks {
+
+	private final Repositories                repositories;
+	private final RepositoryRestConfiguration config;
+
+	@Autowired
+	public RepositoryEntityLinks(Repositories repositories,
+	                             RepositoryRestConfiguration config) {
+		this.repositories = repositories;
+		this.config = config;
+	}
+
+	@Override public boolean supports(Class<?> delimiter) {
+		PersistentEntity persistentEntity = repositories.getPersistentEntity(delimiter);
+		return (null != persistentEntity);
+	}
+
+	@Override public LinkBuilder linkFor(Class<?> type) {
+		RepositoryInformation repoInfo = repositories.getRepositoryInformationFor(type);
+		if(null == repoInfo) {
+			throw new IllegalArgumentException(type + " is not managed by any repository.");
+		}
+		PersistentEntity persistentEntity = repositories.getPersistentEntity(type);
+		if(null == persistentEntity) {
+			throw new IllegalArgumentException(type + " is not managed by any repository.");
+		}
+		return new PersistentEntityLinkBuilder(config.getBaseUri(), repoInfo, persistentEntity);
+	}
+
+	@Override public LinkBuilder linkFor(Class<?> type, Object... parameters) {
+		return linkFor(type);
+	}
+
+	@Override public Link linkToCollectionResource(Class<?> type) {
+		RepositoryInformation repoInfo = repositories.getRepositoryInformationFor(type);
+		if(null == repoInfo) {
+			throw new IllegalArgumentException(type + " is not managed by any repository.");
+		}
+		ResourceMapping mapping = getResourceMapping(config, repoInfo);
+		return linkFor(type).withRel(mapping.getRel());
+	}
+
+	@Override public Link linkToSingleResource(Class<?> type, Object id) {
+		RepositoryInformation repoInfo = repositories.getRepositoryInformationFor(type);
+		if(null == repoInfo) {
+			throw new IllegalArgumentException(type + " is not managed by any repository.");
+		}
+		ResourceMapping repoMapping = getResourceMapping(config, repoInfo);
+		PersistentEntity persistentEntity = repositories.getPersistentEntity(type);
+		ResourceMapping entityMapping = getResourceMapping(config, persistentEntity);
+		return linkFor(type).slash(id).withRel(repoMapping.getRel() + "." + entityMapping.getRel());
+	}
+
+	private class PersistentEntityLinkBuilder implements LinkBuilder {
+		private final UriComponentsBuilder builder;
+		private final ResourceMapping      repoMapping;
+		private final ResourceMapping      entityMapping;
+
+		private PersistentEntityLinkBuilder(URI baseUri,
+		                                    RepositoryInformation repoInfo,
+		                                    PersistentEntity persistentEntity) {
+			this.repoMapping = getResourceMapping(config, repoInfo);
+			this.entityMapping = getResourceMapping(config, persistentEntity);
+			if(null == baseUri) {
+				URI u = ControllerLinkBuilder.linkTo(RepositoryController.class).toUri();
+				if(u.toString().endsWith("/")) {
+					String s = u.toString();
+					baseUri = URI.create(s.substring(0, s.lastIndexOf('/')));
+				} else {
+					baseUri = u;
+				}
+			}
+			this.builder = UriComponentsBuilder.fromUri(buildUri(baseUri, repoMapping.getPath()));
+		}
+
+		@Override public LinkBuilder slash(Object object) {
+			String path = String.format("%s", object);
+			if(object instanceof PersistentProperty) {
+				String propName = ((PersistentProperty)object).getName();
+				if(entityMapping.hasResourceMappingFor(propName)) {
+					path = entityMapping.getResourceMappingFor(propName).getPath();
+				}
+			}
+			builder.pathSegment(path);
+			return this;
+		}
+
+		@Override public LinkBuilder slash(Identifiable<?> identifiable) {
+			return slash(identifiable.getId());
+		}
+
+		@Override public URI toUri() {
+			return builder.build().toUri();
+		}
+
+		@Override public Link withRel(String rel) {
+			return new Link(builder.build().toUriString(), rel);
+		}
+
+		@Override public Link withSelfRel() {
+			return withRel("self");
+		}
+	}
+
+}