Polishing.

Simplify AotQuery design, introduce isDerived() flag and NamedQuery (including isManaged flag) to improve encapsulation and simplify the flow.

See #4102

Author: mp911de

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

@@ -110,35 +110,23 @@ public Map<String, Object> serialize() {
 
 			Map<String, Object> serialized = new LinkedHashMap<>();
 
-			if (result() instanceof NamedAotQuery nq) {
-
-				serialized.put("name", nq.getName());
-				serialized.put("query", nq.getQueryString());
+			if (result() instanceof AotQuery.NamedQuery nq) {
+				serialized.put("name", nq.getQueryName());
 			}
 
 			if (result() instanceof StringAotQuery sq) {
 				serialized.put("query", sq.getQueryString());
 			}
 
-			if (result() instanceof StringAotQuery.NamedStringAotQuery nsq) {
-				serialized.put("name", nsq.getQueryName());
-			}
-
 			if (paging) {
 
-				if (count() instanceof NamedAotQuery nq) {
-
-					serialized.put("count-name", nq.getName());
-					serialized.put("count-query", nq.getQueryString());
+				if (count() instanceof AotQuery.NamedQuery nq) {
+					serialized.put("count-name", nq.getQueryName());
 				}
 
 				if (count() instanceof StringAotQuery sq) {
 					serialized.put("count-query", sq.getQueryString());
 				}
-
-				if (count() instanceof StringAotQuery.NamedStringAotQuery nsq) {
-					serialized.put("count-name", nsq.getQueryName());
-				}
 			}
 
 			return serialized;

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

@@ -67,30 +67,24 @@ public boolean isLimited() {
 	}
 
 	/**
-	 * @return whether the query a delete query.
+	 * @return whether the query is derived.
+	 * @since 4.0.1
 	 */
-	public boolean isDelete() {
+	public boolean isDerived() {
 		return false;
 	}
 
 	/**
-	 * @return whether the query is an exists query.
+	 * @return whether the query a delete query.
 	 */
-	public boolean isExists() {
+	public boolean isDelete() {
 		return false;
 	}
 
 	/**
-	 * @return {@literal true} if the query uses value expressions.
+	 * @return whether the query is an exists query.
 	 */
-	public boolean hasExpression() {
-
-		for (ParameterBinding parameterBinding : parameterBindings) {
-			if (parameterBinding.getOrigin().isExpression()) {
-				return true;
-			}
-		}
-
+	public boolean isExists() {
 		return false;
 	}
 
@@ -100,4 +94,24 @@ public boolean hasExpression() {
 	 */
 	public abstract boolean hasConstructorExpressionOrDefaultProjection();
 
+	/**
+	 * Extension to describe a named query.
+	 *
+	 * @since 4.0.1
+	 */
+	interface NamedQuery {
+
+		/**
+		 * @return the query name.
+		 */
+		String getQueryName();
+
+		/**
+		 * @return {@literal true} if the query is managed (e.g. defined in an {@code orm.xml} or via {@code @NamedQuery});
+		 *         {@literal false} otherwise
+		 */
+		boolean isManaged();
+
+	}
+
 }