Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREST-519 - RepositoryEntityLinks now adds existing Pageable and Sort.

Browse Source
This commit is contained in:
Oliver Gierke
2015-04-14 22:02:37 +02:00
parent 28e0ef76d1
commit bc04809bcf
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,14 +286,17 @@ public class RepositoryEntityLinks extends AbstractEntityLinks {
return null;
}
LinkBuilder builder = linkFor(type).slash(mappings.getSearchResourceMappings(type).getPath());
LinkBuilder builder = linkFor(type).//
slash(mappings.getSearchResourceMappings(type).getPath()).//
slash(mapping.getPath());
UriComponents uriComponents = prepareUri(builder.toString(), mapping, pageable, sort);
TemplateVariables variables = getParameterVariables(mapping).//
concat(getTemplateVariables(uriComponents, mapping, pageable, sort)).//
concat(getProjectionVariable(mapping.getReturnedDomainType()));
return new Link(new UriTemplate(builder.slash(mapping.getPath()).toString(), variables), mapping.getRel());
return new Link(new UriTemplate(uriComponents.toString(), variables), mapping.getRel());
}
/**

12
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/support/RepositoryEntityLinksIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,6 +31,8 @@ import org.springframework.data.rest.webmvc.jpa.Person;
import org.springframework.hateoas.Link;
import org.springframework.hateoas.Links;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.web.util.UriComponents;
import org.springframework.web.util.UriComponentsBuilder;
/**
* Integration tests for {@link RepositoryEntityLinks}.
@@ -127,6 +129,7 @@ public class RepositoryEntityLinksIntegrationTests extends AbstractControllerInt
/**
* @see DATAREST-467
* @see DATAREST-519
*/
@Test
public void prepopulatesPaginationInformationForSearchResourceLink() {
@@ -137,6 +140,9 @@ public class RepositoryEntityLinksIntegrationTests extends AbstractControllerInt
assertThat(link.isTemplated(), is(true));
assertThat(link.getVariableNames(), hasItem("firstname"));
assertThat(link.getVariableNames(), not(hasItems("page", "size")));
UriComponents components = UriComponentsBuilder.fromUriString(link.getHref()).build();
assertThat(components.getQueryParams(), allOf(hasKey("page"), hasKey("size")));
}
/**
@@ -153,6 +159,7 @@ public class RepositoryEntityLinksIntegrationTests extends AbstractControllerInt
/**
* @see DATAREST-467
* @see DATAREST-519
*/
@Test
public void prepopulatesSortInformationForSearchResourceLink() {
@@ -163,5 +170,8 @@ public class RepositoryEntityLinksIntegrationTests extends AbstractControllerInt
assertThat(link.isTemplated(), is(true));
assertThat(link.getVariableNames(), hasItem("lastname"));
assertThat(link.getVariableNames(), not(hasItems("sort")));
UriComponents components = UriComponentsBuilder.fromUriString(link.getHref()).build();
assertThat(components.getQueryParams(), hasKey("sort"));
}
}