[hibernate-commits] Hibernate SVN: r15858 - in core/branches/SQL_GEN_REDESIGN/src/main/java/org/hibernate/sql/ast: ordering and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2009-02-02 15:25:13 -0500 (Mon, 02 Feb 2009)
New Revision: 15858

Modified:
   core/branches/SQL_GEN_REDESIGN/src/main/java/org/hibernate/sql/ast/QuerySyntaxException.java
   core/branches/SQL_GEN_REDESIGN/src/main/java/org/hibernate/sql/ast/ordering/OrderByFragmentRenderer.java
   core/branches/SQL_GEN_REDESIGN/src/main/java/org/hibernate/sql/ast/ordering/OrderByFragmentTranslator.java
Log:
HHH-2407 : HQL translation rework (general cleanup)

Modified: core/branches/SQL_GEN_REDESIGN/src/main/java/org/hibernate/sql/ast/QuerySyntaxException.java
===================================================================
--- core/branches/SQL_GEN_REDESIGN/src/main/java/org/hibernate/sql/ast/QuerySyntaxException.java	2009-02-02 20:24:25 UTC (rev 15857)
+++ core/branches/SQL_GEN_REDESIGN/src/main/java/org/hibernate/sql/ast/QuerySyntaxException.java	2009-02-02 20:25:13 UTC (rev 15858)
@@ -29,7 +29,8 @@
 /**
  * Exception thrown when there is a syntax error in the HQL.
  *
- * @author josh
+ * @author Joshua Davis
+ * @author Steve Ebersole
  */
 public class QuerySyntaxException extends QueryException {
 	public QuerySyntaxException(String message) {
@@ -41,15 +42,19 @@
 		setQueryString( hql );
 	}
 
-	public static QuerySyntaxException convert(RecognitionException e) {
-		return convert( e, null );
+	public QuerySyntaxException(RecognitionException e) {
+		super( extractMessage( e ) );
 	}
 
-	public static QuerySyntaxException convert(RecognitionException e, String hql) {
+	public QuerySyntaxException(RecognitionException e, String query) {
+		this( e );
+		setQueryString( query );
+	}
+
+	public static String extractMessage(RecognitionException e) {
 		String positionInfo = e.getLine() > 0 && e.getColumn() > 0
 				? " near line " + e.getLine() + ", column " + e.getColumn()
 				: "";
-		return new QuerySyntaxException( e.getMessage() + positionInfo, hql );
+		return e.getMessage() + positionInfo;
 	}
-
 }
\ No newline at end of file

Modified: core/branches/SQL_GEN_REDESIGN/src/main/java/org/hibernate/sql/ast/ordering/OrderByFragmentRenderer.java
===================================================================
--- core/branches/SQL_GEN_REDESIGN/src/main/java/org/hibernate/sql/ast/ordering/OrderByFragmentRenderer.java	2009-02-02 20:24:25 UTC (rev 15857)
+++ core/branches/SQL_GEN_REDESIGN/src/main/java/org/hibernate/sql/ast/ordering/OrderByFragmentRenderer.java	2009-02-02 20:25:13 UTC (rev 15858)
@@ -41,6 +41,9 @@
 public class OrderByFragmentRenderer extends GeneratedOrderByFragmentRenderer {
 	private static final Logger log = LoggerFactory.getLogger( OrderByFragmentRenderer.class );
 
+	/**
+	 * {@inheritDoc}
+	 */
 	protected void out(AST ast) {
 		out( ( ( Node ) ast ).getRenderableText() );
 	}
@@ -50,30 +53,36 @@
 	private final ASTPrinter printer = new ASTPrinter( OrderByTemplateTokenTypes.class );
 	private int traceDepth = 0;
 
-	public void traceIn(String ruleName, AST tree) {
+	/**
+	 * {@inheritDoc}
+	 */
+	public final void traceIn(String ruleName, AST tree) {
 		if ( inputState.guessing > 0 ) {
 			return;
 		}
 		String prefix = StringHelper.repeat( '-', (traceDepth++ * 2) ) + "-> ";
 		String traceText = ruleName + " (" + buildTraceNodeName(tree) + ")";
-		trace( prefix + traceText );
+		traceExecution( prefix + traceText );
 	}
 
-	private String buildTraceNodeName(AST tree) {
+	protected String buildTraceNodeName(AST tree) {
 		return tree == null
 				? "???"
 				: tree.getText() + " [" + printer.getTokenTypeName( tree.getType() ) + "]";
 	}
 
-	public void traceOut(String ruleName, AST tree) {
+	/**
+	 * {@inheritDoc}
+	 */
+	public final void traceOut(String ruleName, AST tree) {
 		if ( inputState.guessing > 0 ) {
 			return;
 		}
 		String prefix = "<-" + StringHelper.repeat( '-', (--traceDepth * 2) ) + " ";
-		trace( prefix + ruleName );
+		traceExecution( prefix + ruleName );
 	}
 
-	private void trace(String msg) {
+	protected void traceExecution(String msg) {
 		log.trace( msg );
 	}
 }

Modified: core/branches/SQL_GEN_REDESIGN/src/main/java/org/hibernate/sql/ast/ordering/OrderByFragmentTranslator.java
===================================================================
--- core/branches/SQL_GEN_REDESIGN/src/main/java/org/hibernate/sql/ast/ordering/OrderByFragmentTranslator.java	2009-02-02 20:24:25 UTC (rev 15857)
+++ core/branches/SQL_GEN_REDESIGN/src/main/java/org/hibernate/sql/ast/ordering/OrderByFragmentTranslator.java	2009-02-02 20:25:13 UTC (rev 15858)
@@ -47,7 +47,7 @@
 	}
 
 	/**
-	 * The main contract, performing the transaction.
+	 * The main contract, performing the translation.
 	 *
 	 * @param fragment The <tt>order-by</tt> mapping fragment to be translated.
 	 *
@@ -71,7 +71,7 @@
 			log.trace( printer.showAsString( parser.getAST(), "--- {order-by fragment} ---" ) );
 		}
 
-		GeneratedOrderByFragmentRenderer renderer = new GeneratedOrderByFragmentRenderer();
+		OrderByFragmentRenderer renderer = new OrderByFragmentRenderer();
 		try {
 			renderer.orderByFragment( parser.getAST() );
 		}