Polishing.

Original Pull Request: #3458

Author: christophstrobl

src/test/java/org/springframework/data/repository/aot/generate/AotRepositoryMethodBuilderUnitTests.java

@@ -66,8 +66,8 @@ void generatesMethodSkeletonBasedOnGenerationMetadata() throws NoSuchMethodExcep
 		when(methodGenerationContext.getTargetMethodMetadata()).thenReturn(methodMetadata);
 
 		AotRepositoryMethodBuilder builder = new AotRepositoryMethodBuilder(methodGenerationContext);
-		assertThat(builder.buildMethod().toString().replaceAll(System.lineSeparator(), " ")) //
-				.containsPattern("findByFirstname\\(.*@.*Param\\(\"hello\"\\).*String firstname\\)");
+		assertThat(builder.buildMethod().toString()) //
+			.containsSubsequence("findByFirstname(", "@", "Param(\"hello\")", "String firstname)");
 	}
 
 	@Test // GH-3279

src/test/java/org/springframework/data/repository/aot/generate/MethodMetadataUnitTests.java

@@ -22,17 +22,18 @@
 
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
-
 import org.springframework.data.core.TypeInformation;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.query.Param;
+import org.springframework.data.web.SortDefault;
 import org.springframework.javapoet.ParameterSpec;
 
 /**
  * Unit tests for {@link MethodMetadata}.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 class MethodMetadataUnitTests {
 
@@ -51,8 +52,13 @@ void addsAnnotations() throws NoSuchMethodException {
 
 		MethodMetadata metadata = methodMetadataFor("threeArgsMethod");
 
-		ParameterSpec spec = metadata.getMethodArguments().get("arg2");
-		assertThat(spec.annotations()).hasSize(1);
+		ParameterSpec arg1 = metadata.getMethodArguments().get("arg1");
+		assertThat(arg1.annotations()).extracting(annotationSpec -> annotationSpec.type().toString())
+				.containsExactly(SortDefault.class.getTypeName());
+
+		ParameterSpec arg2 = metadata.getMethodArguments().get("arg2");
+		assertThat(arg2.annotations()).extracting(annotationSpec -> annotationSpec.type().toString())
+				.containsExactly(SortDefault.class.getTypeName(), Param.class.getTypeName());
 	}
 
 	@Test // GH-3270
@@ -93,6 +99,6 @@ private interface DummyRepo {
 
 		String noArgsMethod();
 
-		String threeArgsMethod(Object arg0, Pageable arg1, @Param("foo") Object arg2);
+		String threeArgsMethod(Object arg0, @SortDefault Pageable arg1, @SortDefault @Param("foo") Object arg2);
 	}
 }