spring-projects#2168 No TemplateVariable generated for null Pageable

Author: reda-alaoui

pom.xml

@@ -21,6 +21,7 @@
 		<xmlbeam>1.4.23</xmlbeam>
 		<java-module-name>spring.data.commons</java-module-name>
 
+		<spring-hateoas>1.1.0.0.cosium</spring-hateoas>
 	</properties>
 
 	<dependencies>
@@ -222,7 +223,7 @@
 			<version>${vavr}</version>
 			<optional>true</optional>
 		</dependency>
-		
+
 		<!-- Eclipse Collections -->
 
 		<dependency>

src/main/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolver.java

@@ -40,6 +40,7 @@
  * @since 1.6
  * @author Oliver Gierke
  * @author Nick Williams
+ * @author Réda Housni Alaoui
  */
 @SuppressWarnings("null")
 public class HateoasPageableHandlerMethodArgumentResolver extends PageableHandlerMethodArgumentResolver
@@ -129,6 +130,11 @@ public void enhance(UriComponentsBuilder builder, @Nullable MethodParameter para
 		this.sortResolver.enhance(builder, parameter, pageable.getSort());
 	}
 
+	@Override
+	public TemplateVariables enhance(TemplateVariables templateVariables, UriComponents uriComponents, MethodParameter parameter) {
+		return templateVariables.concat(getPaginationTemplateVariables(parameter, uriComponents));
+	}
+
 	private static HateoasSortHandlerMethodArgumentResolver getDefaultedSortResolver(
 			@Nullable HateoasSortHandlerMethodArgumentResolver sortResolver) {
 		return sortResolver == null ? DEFAULT_SORT_RESOLVER : sortResolver;

src/main/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolver.java

@@ -36,6 +36,7 @@
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Nick Williams
+ * @author Réda Housni Alaoui
  */
 public class HateoasSortHandlerMethodArgumentResolver extends SortHandlerMethodArgumentResolver
 		implements UriComponentsContributor {
@@ -82,4 +83,9 @@ public void enhance(UriComponentsBuilder builder, @Nullable MethodParameter para
 			builder.queryParam(sortParameter, expression);
 		}
 	}
+
+	@Override
+	public TemplateVariables enhance(TemplateVariables templateVariables, UriComponents uriComponents, MethodParameter parameter) {
+		return templateVariables.concat(getSortTemplateVariables(parameter, uriComponents));
+	}
 }

src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java

@@ -23,6 +23,7 @@
 import org.springframework.core.MethodParameter;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.hateoas.TemplateVariables;
 import org.springframework.hateoas.server.mvc.UriComponentsContributor;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.util.UriComponents;
@@ -32,6 +33,7 @@
  * Unit tests for {@link HateoasPageableHandlerMethodArgumentResolver}.
  *
  * @author Oliver Gierke
+ * @author Réda Housni Alaoui
  */
 class HateoasPageableHandlerMethodArgumentResolverUnitTests
 		extends PageableHandlerMethodArgumentResolverUnitTests {
@@ -119,6 +121,18 @@ void enhancesUnpaged() {
 		assertThat(builder).isEqualTo(builder);
 	}
 
+	@Test // DATACMNS-1752
+	void enhanceTemplateVariables() {
+
+		UriComponents uriComponents = UriComponentsBuilder.fromPath("/foo").build();
+
+		HateoasPageableHandlerMethodArgumentResolver resolver = getResolver();
+		resolver.setPageParameterName("foo");
+		String variables = resolver.enhance(TemplateVariables.NONE, uriComponents, null).toString();
+
+		assertThat(variables).isEqualTo("{?foo,size,sort}");
+	}
+
 	@Override
 	protected HateoasPageableHandlerMethodArgumentResolver getResolver() {
 

src/test/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java

@@ -23,13 +23,15 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.core.MethodParameter;
 import org.springframework.data.domain.Sort;
+import org.springframework.hateoas.TemplateVariables;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
 
 /**
  * Unit tests for {@link HateoasSortHandlerMethodArgumentResolver}
  *
  * @author Oliver Gierke
+ * @author Réda Housni Alaoui
  */
 class HateoasSortHandlerMethodArgumentResolverUnitTests extends SortHandlerMethodArgumentResolverUnitTests {
 
@@ -57,6 +59,15 @@ void returnCorrectTemplateVariables() {
 		assertThat(resolver.getSortTemplateVariables(null, uriComponents).toString()).isEqualTo("{?sort}");
 	}
 
+	@Test // DATACMNS-1752
+	void enhanceTemplateVariables(){
+
+		UriComponents uriComponents = UriComponentsBuilder.fromPath("/").build();
+
+		HateoasSortHandlerMethodArgumentResolver resolver = new HateoasSortHandlerMethodArgumentResolver();
+		assertThat(resolver.enhance(TemplateVariables.NONE, uriComponents, null).toString()).isEqualTo("{?sort}");
+	}
+
 	private void assertUriStringFor(Sort sort, String expected) throws Exception {
 		assertUriStringFor(sort, expected, "/");
 	}