Polishing.

Revert changes targeting primitive and array types explicitly to extract minimal inversive change switching getPackage().getName() to getPackageName().

Original Pull Request: #3284

Author: christophstrobl

src/main/java/org/springframework/data/util/QTypeContributor.java

@@ -22,6 +22,7 @@
 import org.springframework.aot.hint.TypeReference;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * @author Christoph Strobl
@@ -41,10 +42,6 @@ public static void contributeEntityPath(Class<?> type, GenerationContext context
 				return;
 			}
 
-			if (type.isPrimitive() || type.isArray()) {
-				return;
-			}
-
 			String queryClassName = getQueryClassName(type);
 			if (ClassUtils.isPresent(queryClassName, classLoader)) {
 
@@ -84,7 +81,10 @@ private static Class<?> getEntityPathType(@Nullable ClassLoader classLoader) thr
 	private static String getQueryClassName(Class<?> domainClass) {
 
 		String simpleClassName = ClassUtils.getShortName(domainClass);
-		String pkgName = domainClass.getPackage().getName();
+		String pkgName = domainClass.getPackageName();
+		if (!StringUtils.hasText(pkgName)) {
+			return String.format("Q%s%s", getClassBase(simpleClassName), domainClass.getSimpleName());
+		}
 
 		return String.format("%s.Q%s%s", pkgName, getClassBase(simpleClassName), domainClass.getSimpleName());
 	}

src/test/java/QTypeInDefaultPackage.java

@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * Dummy type looking like a QueryDSL Generated one but its not - does not extend the
+ * {@link com.querydsl.core.types.dsl.EntityPathBase})
+ * 
+ * @author Christoph Strobl
+ */
+public class QTypeInDefaultPackage {}

src/test/java/org/springframework/data/util/QTypeContributorUnitTests.java

@@ -15,7 +15,12 @@
  */
 package org.springframework.data.util;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatNoException;
+
+import java.net.URLClassLoader;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.aot.generate.ClassNameGenerator;
@@ -26,14 +31,14 @@
 import org.springframework.data.aot.sample.ConfigWithQuerydslPredicateExecutor.Person;
 import org.springframework.data.aot.sample.QConfigWithQuerydslPredicateExecutor_Person;
 import org.springframework.data.classloadersupport.HidingClassLoader;
-import org.springframework.data.querydsl.User;
 import org.springframework.javapoet.ClassName;
 
 import com.querydsl.core.types.EntityPath;
 
 /**
  * Unit tests for {@link QTypeContributor}.
  *
+ * @author Christoph Strobl
  * @author ckdgus08
  */
 class QTypeContributorUnitTests {
@@ -75,58 +80,52 @@ void doesNotAddQTypeHintIfQuerydslNotPresent() {
 				RuntimeHintsPredicates.reflection().onType(QConfigWithQuerydslPredicateExecutor_Person.class).negate());
 	}
 
-	@Test // DATAMONGO-4958
-	void doesNotAddQTypeHintForArrayType() {
+	@Test // GH-3284
+	void doesNotFailForArrayType() {
 
 		GenerationContext generationContext = new DefaultGenerationContext(
 				new ClassNameGenerator(ClassName.get(this.getClass())), new InMemoryGeneratedFiles());
 
-		QTypeContributor.contributeEntityPath(Person[].class, generationContext, HidingClassLoader.hideTypes());
-
-		assertThat(generationContext.getRuntimeHints()).matches(
-				RuntimeHintsPredicates.reflection().onType(QConfigWithQuerydslPredicateExecutor_Person.class).negate());
-		assertThat(generationContext.getRuntimeHints()).matches(
-				RuntimeHintsPredicates.reflection().onType(QConfigWithQuerydslPredicateExecutor_Person[].class).negate());
+		assertThatNoException().isThrownBy(
+				() -> QTypeContributor.contributeEntityPath(Person[].class, generationContext, HidingClassLoader.hideTypes()));
 	}
 
-	@Test // DATAMONGO-4958
-	void addsQTypeHintForQUserType() {
+	@Test // GH-3284
+	void doesNotFailForPrimitiveType() {
 
 		GenerationContext generationContext = new DefaultGenerationContext(
 				new ClassNameGenerator(ClassName.get(this.getClass())), new InMemoryGeneratedFiles());
 
-		QTypeContributor.contributeEntityPath(User.class, generationContext, getClass().getClassLoader());
-
-		var qUserHintCount = generationContext.getRuntimeHints().reflection().typeHints()
-				.filter(hint -> hint.getType().getName().equals("org.springframework.data.querydsl.QUser"))
-				.count();
-		assertThat(qUserHintCount).isEqualTo(1);
+		assertThatNoException().isThrownBy(
+				() -> QTypeContributor.contributeEntityPath(int.class, generationContext, getClass().getClassLoader()));
 	}
 
-	@Test // DATAMONGO-4958
-	void doesNotAddQTypeHintForQUserArrayType() {
+	@Test // GH-3284
+	void doesNotFailForTypeInDefaultPackage() throws Exception {
 
 		GenerationContext generationContext = new DefaultGenerationContext(
 				new ClassNameGenerator(ClassName.get(this.getClass())), new InMemoryGeneratedFiles());
-		var classLoader = getClass().getClassLoader();
 
-		QTypeContributor.contributeEntityPath(User[].class, generationContext, classLoader);
+		class CapturingClassLoader extends ClassLoader {
 
-		assertThat(generationContext.getRuntimeHints().reflection().typeHints()).isEmpty();
-		var qUserHintCount = generationContext.getRuntimeHints().reflection().typeHints()
-				.filter(hint -> hint.getType().getName().equals("org.springframework.data.querydsl.QUser"))
-				.count();
-		assertThat(qUserHintCount).isEqualTo(0);
-	}
+			final Set<String> lookups = new HashSet<>(10);
 
-	@Test // DATAMONGO-4958
-	void doesNotAddQTypeHintForPrimitiveType() {
+			CapturingClassLoader() {
+				super(URLClassLoader.getSystemClassLoader());
+			}
 
-		GenerationContext generationContext = new DefaultGenerationContext(
-				new ClassNameGenerator(ClassName.get(this.getClass())), new InMemoryGeneratedFiles());
+			@Override
+			public Class<?> loadClass(String name) throws ClassNotFoundException {
+				lookups.add(name);
+				return super.loadClass(name);
+			}
+		}
 
-		QTypeContributor.contributeEntityPath(int.class, generationContext, getClass().getClassLoader());
+		CapturingClassLoader classLoaderToUse = new CapturingClassLoader();
 
-		assertThat(generationContext.getRuntimeHints().reflection().typeHints()).isEmpty();
+		var typeInDefaultPackage = Class.forName("TypeInDefaultPackage");
+		assertThatNoException().isThrownBy(
+				() -> QTypeContributor.contributeEntityPath(typeInDefaultPackage, generationContext, classLoaderToUse));
+		assertThat(classLoaderToUse.lookups).contains("QTypeInDefaultPackage");
 	}
 }