Consider EntityName in JpqlQueryBuilder.

Closes #4036

Author: mp911de

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

@@ -17,6 +17,8 @@
 
 import jakarta.persistence.Entity;
 
+import java.util.function.Function;
+
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -49,8 +51,13 @@ public Class<T> getJavaType() {
 
 	@Override
 	public String getEntityName() {
+		return getEntityNameOr(Class::getSimpleName);
+	}
+
+	String getEntityNameOr(Function<Class<?>, String> alternative) {
 
 		Entity entity = AnnotatedElementUtils.findMergedAnnotation(domainType, Entity.class);
-		return null != entity && StringUtils.hasText(entity.name()) ? entity.name() : domainType.getSimpleName();
+		return null != entity && StringUtils.hasText(entity.name()) ? entity.name() : alternative.apply(domainType);
 	}
+
 }

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

@@ -58,7 +58,8 @@ private JpqlQueryBuilder() {}
 	 * @return
 	 */
 	public static Entity entity(Class<?> from) {
-		return new Entity(from.getName(), from.getSimpleName(),
+		DefaultJpaEntityMetadata<?> entityMetadata = new DefaultJpaEntityMetadata<>(from);
+		return new Entity(from.getName(), entityMetadata.getEntityNameOr(Class::getName),
 				getAlias(from.getSimpleName(), Predicates.isTrue(), () -> "r"));
 	}
 
@@ -538,7 +539,8 @@ static PathAndOrigin path(Origin origin, String path) {
 		if (origin instanceof Entity entity) {
 
 			try {
-				PropertyPath from = PropertyPath.from(path, ClassUtils.forName(entity.entity, Entity.class.getClassLoader()));
+				PropertyPath from = PropertyPath.from(path,
+						ClassUtils.forName(entity.className, Entity.class.getClassLoader()));
 				return new PathAndOrigin(from, entity, false);
 			} catch (ClassNotFoundException e) {
 				throw new RuntimeException(e);
@@ -847,7 +849,7 @@ String render() {
 			StringBuilder where = new StringBuilder();
 			StringBuilder orderby = new StringBuilder();
 			StringBuilder result = new StringBuilder(
-					"SELECT %s FROM %s %s".formatted(selection.render(renderContext), entity.getEntity(), entity.getAlias()));
+					"SELECT %s FROM %s %s".formatted(selection.render(renderContext), entity.getName(), entity.getAlias()));
 
 			if (getWhere() != null) {
 				where.append(" WHERE ").append(getWhere().render(renderContext));
@@ -1024,28 +1026,24 @@ public interface Origin {
 	 */
 	public static final class Entity implements Origin {
 
+		private final String className;
 		private final String entity;
-		private final String simpleName;
 		private final String alias;
 
 		/**
-		 * @param entity fully-qualified entity name.
-		 * @param simpleName simple class name.
+		 * @param className fully-qualified entity name.
+		 * @param entity entity name (as in {@code @Entity(…)}).
 		 * @param alias alias to use.
 		 */
-		Entity(String entity, String simpleName, String alias) {
+		Entity(String className, String entity, String alias) {
+			this.className = className;
 			this.entity = entity;
-			this.simpleName = simpleName;
 			this.alias = alias;
 		}
 
-		public String getEntity() {
-			return entity;
-		}
-
 		@Override
 		public String getName() {
-			return simpleName;
+			return entity;
 		}
 
 		public String getAlias() {
@@ -1061,18 +1059,18 @@ public boolean equals(Object obj) {
 				return false;
 			}
 			var that = (Entity) obj;
-			return Objects.equals(this.entity, that.entity) && Objects.equals(this.simpleName, that.simpleName)
+			return Objects.equals(this.entity, that.entity) && Objects.equals(this.className, that.className)
 					&& Objects.equals(this.alias, that.alias);
 		}
 
 		@Override
 		public int hashCode() {
-			return Objects.hash(entity, simpleName, alias);
+			return Objects.hash(entity, className, alias);
 		}
 
 		@Override
 		public String toString() {
-			return "Entity[" + "entity=" + entity + ", " + "simpleName=" + simpleName + ", " + "alias=" + alias + ']';
+			return "Entity[" + "entity=" + entity + ", " + "className=" + className + ", " + "alias=" + alias + ']';
 		}
 
 	}

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

@@ -72,8 +72,16 @@ void entity() {
 		Entity entity = JpqlQueryBuilder.entity(Order.class);
 
 		assertThat(entity.getAlias()).isEqualTo("o");
-		assertThat(entity.getEntity()).isEqualTo(Order.class.getName());
-		assertThat(entity.getName()).isEqualTo(Order.class.getSimpleName());
+		assertThat(entity.getName()).isEqualTo(Order.class.getName());
+	}
+
+	@Test // GH-4032
+	void considersEntityName() {
+
+		Entity entity = JpqlQueryBuilder.entity(Product.class);
+
+		assertThat(entity.getAlias()).isEqualTo("p");
+		assertThat(entity.getName()).isEqualTo("my_product");
 	}
 
 	@Test // GH-3588
@@ -266,7 +274,7 @@ static class Person {
 		String name;
 	}
 
-	@jakarta.persistence.Entity
+	@jakarta.persistence.Entity(name = "my_product")
 	static class Product {
 
 		@Id Long id;