Skip to content

Proposal to fix #2531 adding explode modifier * to sort attribute #2945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Proposal to fix #2531 adding explode modifier * to sort attribute #2945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ec069b
2531 HateoasSortHandlerMethodArgumentResolver should append * to the …
Sep 28, 2023
8c76978
2531 HateoasSortHandlerMethodArgumentResolver should append * to the …
Sep 28, 2023
fb0b945
Upgrade to OpenWebBeans 4.0.
mp911de Sep 29, 2023
47c7923
2531 HateoasSortHandlerMethodArgumentResolver should append * to the …
Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,21 +207,6 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-se</artifactId>
<classifier>jakarta</classifier>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
<classifier>jakarta</classifier>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
<classifier>jakarta</classifier>
<scope>test</scope>
</dependency>

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
* @author Oliver Gierke
* @author Thomas Darimont
* @author Nick Williams
* @author Julien Béti
*/
public class HateoasSortHandlerMethodArgumentResolver extends SortHandlerMethodArgumentResolver
implements UriComponentsContributor {
Expand All @@ -58,7 +59,7 @@ public TemplateVariables getSortTemplateVariables(MethodParameter parameter, Uri

String description = String.format("pagination.%s.description", sortParameter);
TemplateVariable.VariableType type = append ? REQUEST_PARAM_CONTINUED : REQUEST_PARAM;
return new TemplateVariables(new TemplateVariable(sortParameter, type, description));
return new TemplateVariables(new TemplateVariable(sortParameter, type, description).composite());
}

@Override
Expand Down
11 changes: 6 additions & 5 deletions ...a/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
* Unit tests for {@link HateoasPageableHandlerMethodArgumentResolver}.
*
* @author Oliver Gierke
* @author Julien Béti
*/
class HateoasPageableHandlerMethodArgumentResolverUnitTests
extends PageableHandlerMethodArgumentResolverUnitTests {
Expand Down Expand Up @@ -69,10 +70,10 @@ void preventsPageSizeFromExceedingMayValueIfConfiguredOnWrite() throws Exception
@Test // DATACMNS-418
void appendsTemplateVariablesCorrectly() {

assertTemplateEnrichment("/foo", "{?page,size,sort}");
assertTemplateEnrichment("/foo?bar=1", "{&page,size,sort}");
assertTemplateEnrichment("/foo?page=1", "{&size,sort}");
assertTemplateEnrichment("/foo?page=1&size=10", "{&sort}");
assertTemplateEnrichment("/foo", "{?page,size,sort*}");
assertTemplateEnrichment("/foo?bar=1", "{&page,size,sort*}");
assertTemplateEnrichment("/foo?page=1", "{&size,sort*}");
assertTemplateEnrichment("/foo?page=1&size=10", "{&sort*}");
assertTemplateEnrichment("/foo?page=1&sort=foo,asc", "{&size}");
assertTemplateEnrichment("/foo?page=1&size=10&sort=foo,asc", "");
}
Expand All @@ -86,7 +87,7 @@ void returnsCustomizedTemplateVariables() {
resolver.setPageParameterName("foo");
var variables = resolver.getPaginationTemplateVariables(null, uriComponents).toString();

assertThat(variables).isEqualTo("{?foo,size,sort}");
assertThat(variables).isEqualTo("{?foo,size,sort*}");
}

@Test // DATACMNS-563
Expand Down
3 changes: 2 additions & 1 deletion .../java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
* Unit tests for {@link HateoasSortHandlerMethodArgumentResolver}
*
* @author Oliver Gierke
* @author Julien Béti
*/
class HateoasSortHandlerMethodArgumentResolverUnitTests extends SortHandlerMethodArgumentResolverUnitTests {

Expand All @@ -52,7 +53,7 @@ void returnCorrectTemplateVariables() {
var uriComponents = UriComponentsBuilder.fromPath("/").build();

var resolver = new HateoasSortHandlerMethodArgumentResolver();
assertThat(resolver.getSortTemplateVariables(null, uriComponents).toString()).isEqualTo("{?sort}");
assertThat(resolver.getSortTemplateVariables(null, uriComponents).toString()).isEqualTo("{?sort*}");
}

private void assertUriStringFor(Sort sort, String expected) throws Exception {
Expand Down