From c78a0e86cab1acf965f6dbaed66f4b79661979a1 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Thu, 15 May 2025 11:41:41 +0200 Subject: [PATCH] Update nullable contract and add issue references. Original Pull Request: #4970 --- .../aot/MongoAotRepositoryFragmentSupport.java | 2 +- .../aot/MongoRepositoryContributorTests.java | 10 +++++----- .../aot/MongoRepositoryContributorUnitTests.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoAotRepositoryFragmentSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoAotRepositoryFragmentSupport.java index 8e9439e7f..178ce4bda 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoAotRepositoryFragmentSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoAotRepositoryFragmentSupport.java @@ -103,7 +103,7 @@ public class MongoAotRepositoryFragmentSupport { return list; } - protected Object convertSimpleRawResult(Class targetType, Document rawResult) { + protected @Nullable Object convertSimpleRawResult(Class targetType, Document rawResult) { return extractSimpleTypeResult(rawResult, targetType, mongoConverter); } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorTests.java index 1c9796ead..a2840ec26 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorTests.java @@ -275,7 +275,7 @@ class MongoRepositoryContributorTests { assertThat(slice.getContent()).extracting(User::getUsername).containsExactly("han", "kylo"); } - @Test + @Test // GH-4970 void testDerivedQueryReturningStream() { List results = fragment.streamByLastnameStartingWith("S", Sort.by("username"), Limit.of(2)).toList(); @@ -284,7 +284,7 @@ class MongoRepositoryContributorTests { assertThat(results).extracting(User::getUsername).containsExactly("han", "kylo"); } - @Test + @Test // GH-4970 void testDerivedQueryReturningWindowByOffset() { Window window1 = fragment.findTop2WindowByLastnameStartingWithOrderByUsername("S", ScrollPosition.offset()); @@ -295,7 +295,7 @@ class MongoRepositoryContributorTests { assertThat(window2).extracting(User::getUsername).containsExactly("luke", "vader"); } - @Test + @Test // GH-4970 void testDerivedQueryReturningWindowByKeyset() { Window window1 = fragment.findTop2WindowByLastnameStartingWithOrderByUsername("S", ScrollPosition.keyset()); @@ -474,7 +474,7 @@ class MongoRepositoryContributorTests { assertThat(users).extracting(UserProjection::getUsername).containsExactly("han", "kylo"); } - @Test + @Test // GH-4970 void testDerivedFinderReturningPageOfDynamicProjections() { Page users = fragment.findUserProjectionByLastnameStartingWith("S", @@ -559,7 +559,7 @@ class MongoRepositoryContributorTests { new UserAggregate("Solo", List.of("Han", "Ben"))); } - @Test + @Test // GH-4970 void testAggregationStreamWithProjectedResultsWrappedInAggregationResults() { List allLastnames = fragment.streamGroupByLastnameAndAsAggregationResults("first_name").toList(); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java index e53b3ae67..bc70b4ded 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java @@ -65,7 +65,7 @@ class MongoRepositoryContributorUnitTests { @Autowired TestGenerationContext generationContext; - @Test + @Test // GH-4970 void shouldConsiderMetaAnnotation() throws IOException { InputStreamSource aotFragment = generationContext.getGeneratedFiles().getGeneratedFile(GeneratedFiles.Kind.SOURCE,