Polishing.

Use ReturnedType.isDtoProjection/isInterfaceProjection methods.

See #4088

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/QueriesFactory.java

@@ -154,8 +154,7 @@ private AotQueries buildStringQuery(ReturnedType returnedType, QueryEnhancerSele
 		StringAotQuery aotStringQuery = StringAotQuery.of(entityQuery);
 		String countQuery = query.getString("countQuery");
 
-		if (returnedType.isProjecting() && returnedType.hasInputProperties()
-				&& !returnedType.getReturnedType().isInterface()) {
+		if (returnedType.isDtoProjection() && returnedType.hasInputProperties()) {
 
 			QueryProvider rewritten = entityQuery.rewrite(new QueryEnhancer.QueryRewriteInformation() {
 				@Override
@@ -328,7 +327,7 @@ private AotQuery createCountQuery(PartTree partTree, ReturnedType returnedType,
 
 		if (returnedType.isProjecting()) {
 
-			if (returnedType.getReturnedType().isInterface()) {
+			if (returnedType.isInterfaceProjection()) {
 
 				if (query.hasConstructorExpressionOrDefaultProjection()) {
 					return result;

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

@@ -303,7 +303,7 @@ protected Query createCountQuery(JpaParametersParameterAccessor values) {
 			return null;
 		}
 
-		return returnedType.isProjecting() && returnedType.getReturnedType().isInterface()
+		return returnedType.isInterfaceProjection()
 				&& !getMetamodel().isJpaManaged(returnedType.getReturnedType()) //
 						? Tuple.class //
 						: null;
@@ -374,7 +374,7 @@ public TupleConverter(ReturnedType type, boolean nativeQuery) {
 
 			this.type = type;
 			this.tupleWrapper = nativeQuery ? TupleBackedMap::underscoreAware : UnaryOperator.identity();
-			this.dtoProjection = type.isProjecting() && !type.getReturnedType().isInterface()
+			this.dtoProjection = type.isDtoProjection()
 					&& type.needsCustomConstruction();
 
 			if (this.dtoProjection) {

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

@@ -46,7 +46,7 @@ class DtoProjectionTransformerDelegate {
 
 	public DtoProjectionTransformerDelegate(ReturnedType returnedType) {
 		this.returnedType = returnedType;
-		this.applyRewriting = Lazy.of(() -> returnedType.isProjecting() && !returnedType.getReturnedType().isInterface()
+		this.applyRewriting = Lazy.of(() -> returnedType.isDtoProjection()
 				&& returnedType.needsCustomConstruction());
 	}
 

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

@@ -165,7 +165,7 @@ JpqlQueryBuilder.Entity getEntity() {
 	}
 
 	public boolean useTupleQuery() {
-		return returnedType.needsCustomConstruction() && returnedType.getReturnedType().isInterface();
+		return returnedType.needsCustomConstruction() && returnedType.isInterfaceProjection();
 	}
 
 	/**

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

@@ -114,7 +114,7 @@ protected Query createJpaQuery(QueryProvider declaredQuery, Sort sort, @Nullable
 
 		if (returnedType.isProjecting()) {
 
-			if (returnedType.getReturnedType().isInterface()) {
+			if (returnedType.isInterfaceProjection()) {
 				return Tuple.class;
 			}
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByPredicate.java

@@ -25,6 +25,8 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.data.domain.KeysetScrollPosition;
 import org.springframework.data.domain.Page;
@@ -51,7 +53,6 @@
 import com.querydsl.core.types.dsl.PathBuilder;
 import com.querydsl.jpa.JPQLSerializer;
 import com.querydsl.jpa.impl.AbstractJPAQuery;
-import org.jspecify.annotations.Nullable;
 
 /**
  * Immutable implementation of {@link FetchableFluentQuery} based on a Querydsl {@link Predicate}. All methods that
@@ -231,7 +232,7 @@ private void applyQuerySettings(ReturnedType returnedType, int limit, AbstractJP
 		if (returnedType.needsCustomConstruction()) {
 
 			Collection<String> requiredSelection;
-			if (scrollPosition instanceof KeysetScrollPosition && returnedType.getReturnedType().isInterface()) {
+			if (scrollPosition instanceof KeysetScrollPosition && returnedType.isInterfaceProjection()) {
 				requiredSelection = KeysetScrollDelegate.getProjectionInputProperties(entityInformation, inputProperties, sort);
 			} else {
 				requiredSelection = inputProperties;
@@ -240,7 +241,7 @@ private void applyQuerySettings(ReturnedType returnedType, int limit, AbstractJP
 			PathBuilder<?> builder = new PathBuilder<>(entityPath.getType(), entityPath.getMetadata());
 			Expression<?>[] projection = requiredSelection.stream().map(builder::get).toArray(Expression[]::new);
 
-			if (returnedType.getReturnedType().isInterface()) {
+			if (returnedType.isInterfaceProjection()) {
 				query.select(new JakartaTuple(projection));
 			} else {
 				query.select(new DtoProjection(returnedType.getReturnedType(), projection));

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java

@@ -807,7 +807,7 @@ private <S extends T> TypedQuery<S> getQuery(ReturnedType returnedType, @Nullabl
 		CriteriaBuilder builder = entityManager.getCriteriaBuilder();
 		CriteriaQuery<S> query;
 
-		boolean interfaceProjection = returnedType.getReturnedType().isInterface();
+		boolean interfaceProjection = returnedType.isInterfaceProjection();
 
 		if (returnedType.needsCustomConstruction() && (inputProperties.isEmpty() || !interfaceProjection)) {
 			inputProperties = returnedType.getInputProperties();

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

@@ -73,7 +73,6 @@ void setUp() throws Exception {
 	}
 
 	@Test // DATAJPA-984
-	@SuppressWarnings("unchecked")
 	void returnsSingleTupleElementIfItMatchesExpectedType() {
 
 		doReturn(Collections.singletonList(element)).when(tuple).getElements();
@@ -85,7 +84,6 @@ void returnsSingleTupleElementIfItMatchesExpectedType() {
 	}
 
 	@Test // DATAJPA-1024
-	@SuppressWarnings("unchecked")
 	void returnsNullForSingleElementTupleWithNullValue() {
 
 		doReturn(Collections.singletonList(element)).when(tuple).getElements();
@@ -130,13 +128,15 @@ void dealsWithNullsInArguments() {
 		assertThat(result).isInstanceOf(WithPC.class);
 	}
 
-	@Test // GH-3076
+	@Test // GH-3076, GH-4088
 	void fallsBackToCompatibleConstructor() {
 
 		ReturnedType returnedType = spy(
 				ReturnedType.of(MultipleConstructors.class, DomainType.class, new SpelAwareProxyProjectionFactory()));
 		when(returnedType.isProjecting()).thenReturn(true);
+		when(returnedType.isDtoProjection()).thenReturn(true);
 		when(returnedType.getInputProperties()).thenReturn(Arrays.asList("one", "two", "three"));
+		when(returnedType.hasInputProperties()).thenReturn(true);
 
 		doReturn(List.of(element, element, element)).when(tuple).getElements();
 		when(tuple.get(eq(0))).thenReturn("one");
@@ -163,13 +163,15 @@ void fallsBackToCompatibleConstructor() {
 		assertThat(result.three).isEqualTo(97);
 	}
 
-	@Test // GH-3076
+	@Test // GH-3076, GH-4088
 	void acceptsConstructorWithCastableType() {
 
 		ReturnedType returnedType = spy(
 				ReturnedType.of(MultipleConstructors.class, DomainType.class, new SpelAwareProxyProjectionFactory()));
 		when(returnedType.isProjecting()).thenReturn(true);
+		when(returnedType.isDtoProjection()).thenReturn(true);
 		when(returnedType.getInputProperties()).thenReturn(Arrays.asList("one", "two", "three", "four"));
+		when(returnedType.hasInputProperties()).thenReturn(true);
 
 		doReturn(List.of(element, element, element, element)).when(tuple).getElements();
 		when(tuple.get(eq(0))).thenReturn("one");
@@ -185,13 +187,15 @@ void acceptsConstructorWithCastableType() {
 		assertThat(result.four).isEqualTo(2, offset(0.1d));
 	}
 
-	@Test // GH-3076
+	@Test // GH-3076, GH-4088
 	void failsForNonResolvableConstructor() {
 
 		ReturnedType returnedType = spy(
 				ReturnedType.of(MultipleConstructors.class, DomainType.class, new SpelAwareProxyProjectionFactory()));
 		when(returnedType.isProjecting()).thenReturn(true);
+		when(returnedType.isDtoProjection()).thenReturn(true);
 		when(returnedType.getInputProperties()).thenReturn(Arrays.asList("one", "two"));
+		when(returnedType.hasInputProperties()).thenReturn(true);
 
 		doReturn(List.of(element, element)).when(tuple).getElements();
 		when(tuple.get(eq(0))).thenReturn(1);