AOT query creation for IgnoreCase generates invalid code block.

Fix AOT jdbc repository integration test setup that generated code for a different repository.

Closes: #2155

Author: christophstrobl

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/aot/JdbcCodeBlocks.java

@@ -65,6 +65,7 @@
  * Common code blocks for JDBC AOT Fragment generation.
  *
  * @author Mark Paluch
+ * @author Christoph Strobl
  * @since 4.0
  */
 class JdbcCodeBlocks {
@@ -368,7 +369,7 @@ private void appendCriteria(CriteriaDefinition current, Builder builder) {
 			}
 
 			if (current.isIgnoreCase()) {
-				builder.addStatement(".ignoreCase(true)");
+				builder.add(".ignoreCase(true)");
 			}
 		}
 

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/aot/PlaceholderAccessor.java

@@ -16,6 +16,7 @@
 package org.springframework.data.jdbc.repository.aot;
 
 import java.sql.JDBCType;
+import java.util.Collection;
 
 import org.jspecify.annotations.Nullable;
 
@@ -37,6 +38,7 @@
  * Utility to access placeholders in AOT processing.
  *
  * @author Mark Paluch
+ * @author Christoph Strobl
  * @since 4.0
  */
 class PlaceholderAccessor {
@@ -79,6 +81,10 @@ public static CapturingJdbcValue unwrap(@Nullable Object value) {
 			return cp;
 		}
 
+		if(value instanceof Collection<?> c && c.iterator().hasNext()) {
+			return unwrap(c.iterator().next());
+		}
+
 		throw new IllegalArgumentException("Cannot unwrap value: '%s' to CapturingJdbcValue".formatted(value));
 	}
 

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/AotJdbcRepositoryIntegrationTests.java

@@ -40,6 +40,7 @@
  * Integration test for {@link DummyEntityRepository} using JavaConfig with mounted AOT-generated repository methods.
  *
  * @author Mark Paluch
+ * @author Christoph Strobl
  */
 @IntegrationTest
 @EnabledOnDatabase(DatabaseType.H2)
@@ -59,7 +60,7 @@ TestClass testClass() {
 
 		@Bean
 		static AotFragmentTestConfigurationSupport aot() {
-			return new AotFragmentTestConfigurationSupport(UserRepository.class, JdbcH2Dialect.INSTANCE, AotConfig.class,
+			return new AotFragmentTestConfigurationSupport(DummyEntityRepository.class, JdbcH2Dialect.INSTANCE, AotConfig.class,
 					false);
 		}
 

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java

@@ -102,6 +102,7 @@
  * @author Christopher Klein
  * @author Mikhail Polivakha
  * @author Paul Jones
+ * @author Christoph Strobl
  */
 @IntegrationTest
 public class JdbcRepositoryIntegrationTests {
@@ -575,6 +576,15 @@ public void selectWithLimitShouldReturnCorrectResult() {
 		assertThat(repository.findByNameContains("a", Limit.unlimited())).hasSize(3);
 	}
 
+	@Test // GH-2155
+	public void selectContainingIgnoreCase() {
+
+		repository.saveAll(Arrays.asList(new DummyEntity("1a1"), new DummyEntity("1B1"), new DummyEntity("1c1")));
+
+		Optional<DummyEntity> result = repository.findByNameContainingIgnoreCase("b");
+		assertThat(result).map(DummyEntity::getName).contains("1B1");
+	}
+
 	@Test // GH-774
 	public void sliceByNameShouldReturnCorrectResult() {
 
@@ -1567,6 +1577,8 @@ public interface DummyEntityRepository
 
 		List<DummyEntity> findByNameContains(String name, Limit limit);
 
+		Optional<DummyEntity> findByNameContainingIgnoreCase(String partialName);
+
 		Page<DummyProjection> findPageProjectionByName(String name, Pageable pageable);
 
 		Slice<DummyEntity> findSliceByNameContains(String name, Pageable pageable);

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/aot/AotFragmentTestConfigurationSupport.java

@@ -65,6 +65,7 @@
  * invocations to the backing AOT fragment. Note that {@code repositoryInterface} is not a repository proxy.
  *
  * @author Mark Paluch
+ * @author Christoph Strobl
  */
 public class AotFragmentTestConfigurationSupport implements BeanFactoryPostProcessor {
 
@@ -105,7 +106,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 		jdbcRepositoryContributor.contribute(generationContext);
 
 		AbstractBeanDefinition aotGeneratedRepository = BeanDefinitionBuilder
-				.genericBeanDefinition(repositoryInterface.getName() + "Impl__AotRepository")
+				.genericBeanDefinition(repositoryInterface.getPackageName() + "." + repositoryInterface.getSimpleName() + "Impl__AotRepository")
 				.addConstructorArgValue(new RuntimeBeanReference(JdbcAggregateOperations.class))
 				.addConstructorArgValue(new RuntimeBeanReference(RowMapperFactory.class))
 				.addConstructorArgValue(