Add author annotation to HqlQueryRenderer and refactor subquery and set query detection logic

Signed-off-by: KNU-K <[email protected]>

Author: polyglot-k

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

@@ -32,6 +32,7 @@
 /**
  * An ANTLR {@link org.antlr.v4.runtime.tree.ParseTreeVisitor} that renders an HQL query without making any changes.
  *
+ * @author TaeHyun Kang(polyglot-k)
  * @author Greg Turnquist
  * @author Christoph Strobl
  * @author Oscar Fanchin
@@ -48,37 +49,42 @@ class HqlQueryRenderer extends HqlBaseVisitor<QueryTokenStream> {
 	 */
 	static boolean isSubquery(ParserRuleContext ctx) {
 
-		if (ctx instanceof HqlParser.SubqueryContext || ctx instanceof HqlParser.CteContext) {
-			return true;
-		} else if (ctx instanceof HqlParser.SelectStatementContext) {
-			return false;
-		} else if (ctx instanceof HqlParser.InsertStatementContext) {
-			return false;
-		} else if (ctx instanceof HqlParser.DeleteStatementContext) {
-			return false;
-		} else if (ctx instanceof HqlParser.UpdateStatementContext) {
-			return false;
-		} else {
-			return ctx.getParent() != null && isSubquery(ctx.getParent());
-		}
+        while (ctx != null) {
+            if (ctx instanceof HqlParser.SubqueryContext || ctx instanceof HqlParser.CteContext) {
+                return true;
+            }
+            if (ctx instanceof HqlParser.SelectStatementContext ||
+                ctx instanceof HqlParser.InsertStatementContext ||
+                ctx instanceof HqlParser.DeleteStatementContext ||
+                ctx instanceof HqlParser.UpdateStatementContext
+            ) {
+                return false;
+            }
+            ctx = ctx.getParent();
+        }
+        return false;
 	}
 
 	/**
 	 * Is this AST tree a {@literal set} query that has been added through {@literal UNION|INTERSECT|EXCEPT}?
 	 *
 	 * @return boolean
 	 */
-	static boolean isSetQuery(ParserRuleContext ctx) {
-
-		if (ctx instanceof HqlParser.OrderedQueryContext
-				&& ctx.getParent() instanceof HqlParser.QueryExpressionContext qec) {
-			if (qec.orderedQuery().indexOf(ctx) != 0) {
-				return true;
-			}
-		}
-
-		return ctx.getParent() != null && isSetQuery(ctx.getParent());
-	}
+    static boolean isSetQuery(ParserRuleContext ctx) {
+        while (ctx != null) {
+            ParserRuleContext parent = ctx.getParent();
+
+            if (ctx instanceof HqlParser.OrderedQueryContext
+                    && parent instanceof HqlParser.QueryExpressionContext qec) {
+                if (qec.orderedQuery().indexOf(ctx) != 0) {
+                    return true;
+                }
+            }
+
+            ctx = parent;
+        }
+        return false;
+    }
 
 	@Override
 	public QueryTokenStream visitStart(HqlParser.StartContext ctx) {