Exclude DTO types without custom construction from DTO constructor rewriting.

We now verify that we can actually express a valid constructor expression before rewriting queries to use constructor expressions.

See #3929

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQuery.java

@@ -157,7 +157,7 @@ public Query doCreateQuery(JpaParametersParameterAccessor accessor) {
 	ReturnedType getReturnedType(ResultProcessor processor) {
 
 		ReturnedType returnedType = processor.getReturnedType();
-		Class<?> returnedJavaType = processor.getReturnedType().getReturnedType();
+		Class<?> returnedJavaType = returnedType.getReturnedType();
 
 		if (!returnedType.isProjecting() || returnedJavaType.isInterface() || query.isNative()) {
 			return returnedType;
@@ -169,7 +169,8 @@ ReturnedType getReturnedType(ResultProcessor processor) {
 			return returnedType;
 		}
 
-		if ((known != null && !known) || returnedJavaType.isArray() || getMetamodel().isJpaManaged(returnedJavaType)) {
+		if ((known != null && !known) || returnedJavaType.isArray() || getMetamodel().isJpaManaged(returnedJavaType)
+				|| !returnedType.needsCustomConstruction()) {
 			if (known == null) {
 				knownProjections.put(returnedJavaType, false);
 			}

spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/Country.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.domain.sample;
+
+/**
+ * @author Mark Paluch
+ */
+public class Country {
+
+	private final String code;
+
+	// workaround to avoid DTO projections as needsCustomConstruction is false.
+	private Country(Country other) {
+		this.code = other.code;
+	}
+
+	private Country(String code) {
+		this.code = code;
+	}
+
+	public static Country of(String code) {
+		return new Country(code);
+	}
+
+	public String getCode() {
+		return code;
+	}
+}

spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/CountryConverter.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.domain.sample;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter(autoApply = true)
+public class CountryConverter implements AttributeConverter<Country, String> {
+
+	@Override
+	public String convertToDatabaseColumn(Country attribute) {
+		return attribute.getCode();
+	}
+
+	@Override
+	public Country convertToEntityAttribute(String dbData) {
+		return Country.of(dbData);
+	}
+}

spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/Customer.java

@@ -15,17 +15,45 @@
  */
 package org.springframework.data.jpa.domain.sample;
 
+import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
 /**
  * @author Oliver Gierke
  * @author Patrice Blanchardie
+ * @author Mark Paluch
  */
 @Entity
 public class Customer {
 
-    @Id Long id;
+	@Id Long id;
 
-    String name;
+	String name;
+
+	@Convert(converter = CountryConverter.class) Country country;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Country getCountry() {
+		return country;
+	}
+
+	public void setCountry(Country country) {
+		this.country = country;
+	}
 }

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/CustomerRepositoryProjectionTests.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2008-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.List;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.sample.Country;
+import org.springframework.data.jpa.domain.sample.Customer;
+import org.springframework.data.jpa.repository.sample.CustomerRepository;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Integration test for executing projecting query methods.
+ *
+ * @author Mark Paluch
+ */
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(locations = "classpath:config/namespace-application-context-h2.xml")
+@Transactional
+class CustomerRepositoryProjectionTests {
+
+	@Autowired CustomerRepository repository;
+
+	@AfterEach
+	void clearUp() {
+		repository.deleteAll();
+	}
+
+	@Test
+	void returnsCountries() {
+
+		Customer customer = new Customer();
+		customer.setId(42L);
+		customer.setCountry(Country.of("DE"));
+		customer.setName("someone");
+
+		repository.saveAndFlush(customer);
+
+		List<Country> countries = repository.findCountries();
+
+		assertThat(countries).hasSize(1);
+	}
+
+}

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/RepositoryWithCompositeKeyTests.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.jpa.repository;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
 
 import jakarta.persistence.EntityManager;
 
@@ -25,6 +25,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -115,6 +116,24 @@ void shouldSupportSavingEntitiesWithCompositeKeyClassesWithEmbeddedIdsAndDerived
 		assertThat(persistedEmp.getDepartment().getName()).isEqualTo(dep.getName());
 	}
 
+	@Test // GH-3929
+	void shouldReturnIdentifiers() {
+
+		EmbeddedIdExampleDepartment dep = new EmbeddedIdExampleDepartment();
+		dep.setName("TestDepartment");
+		dep.setDepartmentId(-1L);
+
+		EmbeddedIdExampleEmployee emp = new EmbeddedIdExampleEmployee();
+		emp.setDepartment(dep);
+		emp.setEmployeePk(new EmbeddedIdExampleEmployeePK(1L, 2L));
+
+		emp = employeeRepositoryWithEmbeddedId.save(emp);
+
+		List<EmbeddedIdExampleEmployeePK> identifiers = employeeRepositoryWithEmbeddedId.findIdentifiers();
+
+		assertThat(identifiers).hasSize(1).contains(emp.getEmployeePk());
+	}
+
 	@Test // DATAJPA-472, DATAJPA-912
 	void shouldSupportFindAllWithPageableAndEntityWithIdClass() {
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java

@@ -46,6 +46,7 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.sample.Country;
 import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.provider.QueryExtractor;
 import org.springframework.data.jpa.repository.NativeQuery;
@@ -325,6 +326,17 @@ void jdbcStyleParametersOnlyAllowedInNativeQueries() throws Exception {
 		assertThatIllegalArgumentException().isThrownBy(() -> createJpaQuery(illegalMethod));
 	}
 
+	@Test // GH-3929
+	void doesNotRewriteQueryForDtoWithMultipleConstructors() throws Exception {
+
+		AbstractStringBasedJpaQuery jpaQuery = (AbstractStringBasedJpaQuery) createJpaQuery(
+				SampleRepository.class.getMethod("justCountries"));
+
+		String queryString = createQuery(jpaQuery);
+
+		assertThat(queryString).startsWith("select u.country from User u");
+	}
+
 	@Test // DATAJPA-1163
 	void resolvesExpressionInCountQuery() throws Exception {
 
@@ -408,6 +420,9 @@ interface SampleRepository extends Repository<User, Long> {
 		@Query("select r.name from User u LEFT JOIN FETCH u.roles r")
 		Collection<UnrelatedType> projectWithJoinPaths();
 
+		@Query("select u.country from User u")
+		Collection<Country> justCountries();
+
 		@Query(value = "select u from #{#entityName} u", countQuery = "select count(u.id) from #{#entityName} u")
 		List<User> findAllWithExpressionInCountQuery(Pageable pageable);
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/sample/CustomerRepository.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.sample;
+
+import java.util.List;
+
+import org.springframework.data.jpa.domain.sample.Country;
+import org.springframework.data.jpa.domain.sample.Customer;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+/**
+ * @author Mark Paluch
+ */
+public interface CustomerRepository extends JpaRepository<Customer, Integer> {
+
+	@Query("SELECT c.country FROM Customer c")
+	List<Country> findCountries();
+}

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/sample/EmployeeRepositoryWithEmbeddedId.java

@@ -21,6 +21,7 @@
 import org.springframework.data.jpa.domain.sample.EmbeddedIdExampleEmployee;
 import org.springframework.data.jpa.domain.sample.EmbeddedIdExampleEmployeePK;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 
 import com.querydsl.core.types.OrderSpecifier;
@@ -40,6 +41,9 @@ public interface EmployeeRepositoryWithEmbeddedId
 	@Override
 	List<EmbeddedIdExampleEmployee> findAll(Predicate predicate, OrderSpecifier<?>... orders);
 
+	@Query("select e.employeePk from EmbeddedIdExampleEmployee e")
+	List<EmbeddedIdExampleEmployeePK> findIdentifiers();
+
 	// DATAJPA-920
 	boolean existsByName(String name);
 }

spring-data-jpa/src/test/resources/META-INF/persistence.xml

@@ -23,6 +23,7 @@
 		<class>org.springframework.data.jpa.domain.sample.ConcreteType2</class>
 		<class>org.springframework.data.jpa.domain.sample.CustomAbstractPersistable</class>
 		<class>org.springframework.data.jpa.domain.sample.Customer</class>
+		<class>org.springframework.data.jpa.domain.sample.CountryConverter</class>
 		<class>org.springframework.data.jpa.domain.sample.EntityWithAssignedId</class>
 		<class>org.springframework.data.jpa.domain.sample.EmbeddedIdExampleEmployeePK</class>
 		<class>org.springframework.data.jpa.domain.sample.EmbeddedIdExampleEmployee</class>