From 60296f3fe100f8906acf55eb171f70a5c013cd2c Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Thu, 26 Feb 2026 13:02:17 +0100 Subject: [PATCH] Polishing. Original Pull Request: #3458 --- .../AotRepositoryMethodBuilderUnitTests.java | 4 ++-- .../aot/generate/MethodMetadataUnitTests.java | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/springframework/data/repository/aot/generate/AotRepositoryMethodBuilderUnitTests.java b/src/test/java/org/springframework/data/repository/aot/generate/AotRepositoryMethodBuilderUnitTests.java index 0fdfaa6f3..181118cde 100644 --- a/src/test/java/org/springframework/data/repository/aot/generate/AotRepositoryMethodBuilderUnitTests.java +++ b/src/test/java/org/springframework/data/repository/aot/generate/AotRepositoryMethodBuilderUnitTests.java @@ -66,8 +66,8 @@ class AotRepositoryMethodBuilderUnitTests { 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 diff --git a/src/test/java/org/springframework/data/repository/aot/generate/MethodMetadataUnitTests.java b/src/test/java/org/springframework/data/repository/aot/generate/MethodMetadataUnitTests.java index aa726d396..98dd81383 100644 --- a/src/test/java/org/springframework/data/repository/aot/generate/MethodMetadataUnitTests.java +++ b/src/test/java/org/springframework/data/repository/aot/generate/MethodMetadataUnitTests.java @@ -22,17 +22,18 @@ import java.lang.reflect.Method; 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 @@ class MethodMetadataUnitTests { 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 @@ class MethodMetadataUnitTests { String noArgsMethod(); - String threeArgsMethod(Object arg0, Pageable arg1, @Param("foo") Object arg2); + String threeArgsMethod(Object arg0, @SortDefault Pageable arg1, @SortDefault @Param("foo") Object arg2); } }