diff --git a/documentation/src/main/docbook/devguide/en-US/appendix-Configuration_Properties.xml b/documentation/src/main/docbook/devguide/en-US/appendix-Configuration_Properties.xml index a0985f450f..fd0888a4eb 100644 --- a/documentation/src/main/docbook/devguide/en-US/appendix-Configuration_Properties.xml +++ b/documentation/src/main/docbook/devguide/en-US/appendix-Configuration_Properties.xml @@ -287,8 +287,8 @@ factory_class - org.hibernate.hql.ast.ASTQueryTranslatorFactory or - org.hibernate.hql.classic.ClassicQueryTranslatorFactory + org.hibernate.hql.internal.ast.ASTQueryTranslatorFactory or + org.hibernate.hql.internal.classic.ClassicQueryTranslatorFactory Chooses the HQL parser implementation. diff --git a/documentation/src/main/docbook/manual/en-US/content/configuration.xml b/documentation/src/main/docbook/manual/en-US/content/configuration.xml index 55fd460ecd..30d2c6289e 100644 --- a/documentation/src/main/docbook/manual/en-US/content/configuration.xml +++ b/documentation/src/main/docbook/manual/en-US/content/configuration.xml @@ -869,9 +869,9 @@ hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect Chooses the HQL parser implementation. e.g. - org.hibernate.hql.ast.ASTQueryTranslatorFactory + org.hibernate.hql.internal.ast.ASTQueryTranslatorFactory or - org.hibernate.hql.classic.ClassicQueryTranslatorFactory + org.hibernate.hql.internal.classic.ClassicQueryTranslatorFactory @@ -1291,7 +1291,7 @@ hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect - org.hibernate.hql.ast.AST + org.hibernate.hql.internal.ast.AST Log HQL and SQL ASTs during query parsing diff --git a/etc/hibernate.properties b/etc/hibernate.properties index 098787d587..668ea03a45 100644 --- a/etc/hibernate.properties +++ b/etc/hibernate.properties @@ -9,7 +9,7 @@ hibernate.query.substitutions yes 'Y', no 'N' ## select the classic query parser -#hibernate.query.factory_class org.hibernate.hql.classic.ClassicQueryTranslatorFactory +#hibernate.query.factory_class org.hibernate.hql.internal.classic.ClassicQueryTranslatorFactory diff --git a/hibernate-core/src/main/antlr/hql-sql.g b/hibernate-core/src/main/antlr/hql-sql.g index 01a64e4849..f830f7ba1c 100644 --- a/hibernate-core/src/main/antlr/hql-sql.g +++ b/hibernate-core/src/main/antlr/hql-sql.g @@ -1,6 +1,6 @@ header { -package org.hibernate.hql.antlr; +package org.hibernate.hql.internal.antlr; import org.hibernate.internal.CoreMessageLogger; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/main/antlr/hql.g b/hibernate-core/src/main/antlr/hql.g index 5fe8917b39..f6ed120684 100644 --- a/hibernate-core/src/main/antlr/hql.g +++ b/hibernate-core/src/main/antlr/hql.g @@ -1,11 +1,9 @@ header { -// $Id: hql.g 10163 2006-07-26 15:07:50Z steve.ebersole@jboss.com $ +package org.hibernate.hql.internal.antlr; -package org.hibernate.hql.antlr; - -import org.hibernate.hql.ast.*; -import org.hibernate.hql.ast.util.*; +import org.hibernate.hql.internal.ast.*; +import org.hibernate.hql.internal.ast.util.*; } /** diff --git a/hibernate-core/src/main/antlr/sql-gen.g b/hibernate-core/src/main/antlr/sql-gen.g index 8def60e6b5..d60561e449 100644 --- a/hibernate-core/src/main/antlr/sql-gen.g +++ b/hibernate-core/src/main/antlr/sql-gen.g @@ -1,8 +1,6 @@ header { -// $Id: sql-gen.g 10001 2006-06-08 21:08:04Z steve.ebersole@jboss.com $ -package org.hibernate.hql.antlr; - +package org.hibernate.hql.internal.antlr; } /** * SQL Generator Tree Parser, providing SQL rendering of SQL ASTs produced by the previous phase, HqlSqlWalker. All diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Settings.java b/hibernate-core/src/main/java/org/hibernate/cfg/Settings.java index dc5664e8da..0a6a11d993 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/Settings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/Settings.java @@ -29,7 +29,7 @@ import org.hibernate.EntityMode; import org.hibernate.MultiTenancyStrategy; import org.hibernate.cache.spi.QueryCacheFactory; import org.hibernate.cache.spi.RegionFactory; -import org.hibernate.hql.QueryTranslatorFactory; +import org.hibernate.hql.spi.QueryTranslatorFactory; import org.hibernate.service.jta.platform.spi.JtaPlatform; import org.hibernate.tuple.entity.EntityTuplizerFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java b/hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java index 1240b36824..7b88455ecb 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java @@ -40,7 +40,7 @@ import org.hibernate.cache.internal.bridge.RegionFactoryCacheProviderBridge; import org.hibernate.engine.jdbc.spi.ExtractedDatabaseMetaData; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.transaction.spi.TransactionFactory; -import org.hibernate.hql.QueryTranslatorFactory; +import org.hibernate.hql.spi.QueryTranslatorFactory; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.config.ConfigurationHelper; @@ -358,7 +358,7 @@ public class SettingsFactory implements Serializable { protected QueryTranslatorFactory createQueryTranslatorFactory(Properties properties, ServiceRegistry serviceRegistry) { String className = ConfigurationHelper.getString( - Environment.QUERY_TRANSLATOR, properties, "org.hibernate.hql.ast.ASTQueryTranslatorFactory" + Environment.QUERY_TRANSLATOR, properties, "org.hibernate.hql.internal.ast.ASTQueryTranslatorFactory" ); LOG.debugf( "Query translator: %s", className ); try { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java index fbd1a1616e..26ab241489 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java @@ -39,14 +39,14 @@ import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.RowSelection; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.hql.internal.QuerySplitter; +import org.hibernate.hql.spi.ParameterTranslations; +import org.hibernate.hql.spi.QueryTranslator; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.QueryException; import org.hibernate.ScrollableResults; import org.hibernate.event.spi.EventSource; -import org.hibernate.hql.FilterTranslator; -import org.hibernate.hql.ParameterTranslations; -import org.hibernate.hql.QuerySplitter; -import org.hibernate.hql.QueryTranslator; +import org.hibernate.hql.spi.FilterTranslator; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.EmptyIterator; import org.hibernate.internal.util.collections.IdentitySet; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterParser.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterParser.java index 2a87fcf6bb..b970591afe 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterParser.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterParser.java @@ -24,7 +24,7 @@ */ package org.hibernate.engine.query.spi; import org.hibernate.QueryException; -import org.hibernate.hql.classic.ParserHelper; +import org.hibernate.hql.internal.classic.ParserHelper; import org.hibernate.internal.util.StringHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java index 93fe188ad2..876d43d21f 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java @@ -38,7 +38,7 @@ import org.hibernate.LockOptions; import org.hibernate.QueryException; import org.hibernate.ScrollMode; import org.hibernate.dialect.Dialect; -import org.hibernate.hql.classic.ParserHelper; +import org.hibernate.hql.internal.classic.ParserHelper; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.FilterImpl; import org.hibernate.internal.util.collections.ArrayHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/CollectionProperties.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/CollectionProperties.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/CollectionProperties.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/CollectionProperties.java index 5506e93078..b47fffcc43 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/CollectionProperties.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/CollectionProperties.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql; +package org.hibernate.hql.internal; import java.util.HashMap; import java.util.Map; import org.hibernate.persister.collection.CollectionPropertyNames; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/CollectionSubqueryFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/CollectionSubqueryFactory.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/CollectionSubqueryFactory.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/CollectionSubqueryFactory.java index f2646cd306..337d8d6c92 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/CollectionSubqueryFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/CollectionSubqueryFactory.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql; +package org.hibernate.hql.internal; import java.util.Map; import org.hibernate.MappingException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/HolderInstantiator.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/HolderInstantiator.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/HolderInstantiator.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/HolderInstantiator.java index ce65e3997a..06e419e454 100755 --- a/hibernate-core/src/main/java/org/hibernate/hql/HolderInstantiator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/HolderInstantiator.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql; +package org.hibernate.hql.internal; import java.lang.reflect.Constructor; import org.hibernate.transform.AliasToBeanConstructorResultTransformer; import org.hibernate.transform.ResultTransformer; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/NameGenerator.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/NameGenerator.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/NameGenerator.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/NameGenerator.java index 78bd153bb9..532ea2caa2 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/NameGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/NameGenerator.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql; +package org.hibernate.hql.internal; import org.hibernate.MappingException; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/QueryExecutionRequestException.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/QueryExecutionRequestException.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/hql/QueryExecutionRequestException.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/QueryExecutionRequestException.java index dc7503b544..f29a1650f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/QueryExecutionRequestException.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/QueryExecutionRequestException.java @@ -1,38 +1,38 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ -package org.hibernate.hql; -import org.hibernate.QueryException; - -/** - * Expecting to execute an illegal operation regarding the query type - * - * @author Emmanuel Bernard - */ -public class QueryExecutionRequestException extends QueryException { - - public QueryExecutionRequestException(String message, String queryString) { - super( message, queryString ); - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + * + */ +package org.hibernate.hql.internal; +import org.hibernate.QueryException; + +/** + * Expecting to execute an illegal operation regarding the query type + * + * @author Emmanuel Bernard + */ +public class QueryExecutionRequestException extends QueryException { + + public QueryExecutionRequestException(String message, String queryString) { + super( message, queryString ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/hql/QuerySplitter.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/QuerySplitter.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/QuerySplitter.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/QuerySplitter.java index ad46f43bed..fa35676060 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/QuerySplitter.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/QuerySplitter.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql; +package org.hibernate.hql.internal; import java.util.ArrayList; import java.util.HashSet; @@ -31,7 +31,7 @@ import java.util.Set; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.MappingException; -import org.hibernate.hql.classic.ParserHelper; +import org.hibernate.hql.internal.classic.ParserHelper; import org.hibernate.internal.util.StringHelper; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/antlr/package.html b/hibernate-core/src/main/java/org/hibernate/hql/internal/antlr/package.html similarity index 100% rename from hibernate-core/src/main/java/org/hibernate/hql/antlr/package.html rename to hibernate-core/src/main/java/org/hibernate/hql/internal/antlr/package.html diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ASTQueryTranslatorFactory.java similarity index 89% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ASTQueryTranslatorFactory.java index dc7ac0a031..de111472a8 100755 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ASTQueryTranslatorFactory.java @@ -22,14 +22,14 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import java.util.Map; import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.hql.spi.QueryTranslator; +import org.hibernate.hql.spi.QueryTranslatorFactory; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.hql.FilterTranslator; -import org.hibernate.hql.QueryTranslator; -import org.hibernate.hql.QueryTranslatorFactory; +import org.hibernate.hql.spi.FilterTranslator; import org.jboss.logging.Logger; @@ -49,7 +49,7 @@ public class ASTQueryTranslatorFactory implements QueryTranslatorFactory { } /** - * @see QueryTranslatorFactory#createQueryTranslator + * @see org.hibernate.hql.spi.QueryTranslatorFactory#createQueryTranslator */ public QueryTranslator createQueryTranslator( String queryIdentifier, diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/DetailedSemanticException.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/DetailedSemanticException.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/DetailedSemanticException.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/DetailedSemanticException.java index 9362fe0a1b..ab6e89f261 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/DetailedSemanticException.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/DetailedSemanticException.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import java.io.PrintStream; import java.io.PrintWriter; import antlr.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ErrorCounter.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ErrorCounter.java index fd4ac0b3f4..fb880f8647 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ErrorCounter.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorReporter.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ErrorReporter.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorReporter.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ErrorReporter.java index 31a898f380..6856c217ba 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorReporter.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ErrorReporter.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import antlr.RecognitionException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlASTFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlASTFactory.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/HqlASTFactory.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlASTFactory.java index 59ba88fa73..55d78d2b4a 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlASTFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlASTFactory.java @@ -22,8 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; -import org.hibernate.hql.ast.tree.Node; +package org.hibernate.hql.internal.ast; +import org.hibernate.hql.internal.ast.tree.Node; import antlr.ASTFactory; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlLexer.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlLexer.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/HqlLexer.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlLexer.java index d5d932a0b8..fb7bb0c3c2 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlLexer.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlLexer.java @@ -22,11 +22,11 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import java.io.InputStream; import java.io.Reader; import org.hibernate.QueryException; -import org.hibernate.hql.antlr.HqlBaseLexer; +import org.hibernate.hql.internal.antlr.HqlBaseLexer; import antlr.Token; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlParser.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/HqlParser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlParser.java index d338027218..ff3e8e7525 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlParser.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import java.io.PrintStream; import java.io.PrintWriter; @@ -30,10 +30,10 @@ import java.io.StringReader; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.QueryException; -import org.hibernate.hql.antlr.HqlBaseParser; -import org.hibernate.hql.antlr.HqlTokenTypes; -import org.hibernate.hql.ast.util.ASTPrinter; -import org.hibernate.hql.ast.util.ASTUtil; +import org.hibernate.hql.internal.antlr.HqlBaseParser; +import org.hibernate.hql.internal.antlr.HqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ASTPrinter; +import org.hibernate.hql.internal.ast.util.ASTUtil; import org.hibernate.internal.util.StringHelper; import org.jboss.logging.Logger; @@ -59,7 +59,7 @@ public final class HqlParser extends HqlBaseParser { private ASTPrinter printer = getASTPrinter(); private static ASTPrinter getASTPrinter() { - return new ASTPrinter( org.hibernate.hql.antlr.HqlTokenTypes.class ); + return new ASTPrinter( org.hibernate.hql.internal.antlr.HqlTokenTypes.class ); } public static HqlParser getInstance(String hql) { diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java index 7fff90f719..31a07adeb7 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import java.io.Serializable; import java.util.ArrayList; @@ -37,48 +37,48 @@ import java.util.Map; import java.util.Set; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.hql.spi.QueryTranslator; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.QueryException; import org.hibernate.engine.internal.JoinSequence; import org.hibernate.engine.internal.ParameterBinder; -import org.hibernate.hql.QueryTranslator; -import org.hibernate.hql.antlr.HqlSqlBaseWalker; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.antlr.HqlTokenTypes; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.tree.AggregateNode; -import org.hibernate.hql.ast.tree.AssignmentSpecification; -import org.hibernate.hql.ast.tree.CollectionFunction; -import org.hibernate.hql.ast.tree.ConstructorNode; -import org.hibernate.hql.ast.tree.DeleteStatement; -import org.hibernate.hql.ast.tree.DotNode; -import org.hibernate.hql.ast.tree.FromClause; -import org.hibernate.hql.ast.tree.FromElement; -import org.hibernate.hql.ast.tree.FromElementFactory; -import org.hibernate.hql.ast.tree.FromReferenceNode; -import org.hibernate.hql.ast.tree.IdentNode; -import org.hibernate.hql.ast.tree.IndexNode; -import org.hibernate.hql.ast.tree.InsertStatement; -import org.hibernate.hql.ast.tree.IntoClause; -import org.hibernate.hql.ast.tree.MethodNode; -import org.hibernate.hql.ast.tree.OperatorNode; -import org.hibernate.hql.ast.tree.ParameterContainer; -import org.hibernate.hql.ast.tree.ParameterNode; -import org.hibernate.hql.ast.tree.QueryNode; -import org.hibernate.hql.ast.tree.ResolvableNode; -import org.hibernate.hql.ast.tree.RestrictableStatement; -import org.hibernate.hql.ast.tree.ResultVariableRefNode; -import org.hibernate.hql.ast.tree.SelectClause; -import org.hibernate.hql.ast.tree.SelectExpression; -import org.hibernate.hql.ast.tree.UpdateStatement; -import org.hibernate.hql.ast.util.ASTPrinter; -import org.hibernate.hql.ast.util.ASTUtil; -import org.hibernate.hql.ast.util.AliasGenerator; -import org.hibernate.hql.ast.util.JoinProcessor; -import org.hibernate.hql.ast.util.LiteralProcessor; -import org.hibernate.hql.ast.util.NodeTraverser; -import org.hibernate.hql.ast.util.SessionFactoryHelper; -import org.hibernate.hql.ast.util.SyntheticAndFactory; +import org.hibernate.hql.internal.antlr.HqlSqlBaseWalker; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.antlr.HqlTokenTypes; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.tree.AggregateNode; +import org.hibernate.hql.internal.ast.tree.AssignmentSpecification; +import org.hibernate.hql.internal.ast.tree.CollectionFunction; +import org.hibernate.hql.internal.ast.tree.ConstructorNode; +import org.hibernate.hql.internal.ast.tree.DeleteStatement; +import org.hibernate.hql.internal.ast.tree.DotNode; +import org.hibernate.hql.internal.ast.tree.FromClause; +import org.hibernate.hql.internal.ast.tree.FromElement; +import org.hibernate.hql.internal.ast.tree.FromElementFactory; +import org.hibernate.hql.internal.ast.tree.FromReferenceNode; +import org.hibernate.hql.internal.ast.tree.IdentNode; +import org.hibernate.hql.internal.ast.tree.IndexNode; +import org.hibernate.hql.internal.ast.tree.InsertStatement; +import org.hibernate.hql.internal.ast.tree.IntoClause; +import org.hibernate.hql.internal.ast.tree.MethodNode; +import org.hibernate.hql.internal.ast.tree.OperatorNode; +import org.hibernate.hql.internal.ast.tree.ParameterContainer; +import org.hibernate.hql.internal.ast.tree.ParameterNode; +import org.hibernate.hql.internal.ast.tree.QueryNode; +import org.hibernate.hql.internal.ast.tree.ResolvableNode; +import org.hibernate.hql.internal.ast.tree.RestrictableStatement; +import org.hibernate.hql.internal.ast.tree.ResultVariableRefNode; +import org.hibernate.hql.internal.ast.tree.SelectClause; +import org.hibernate.hql.internal.ast.tree.SelectExpression; +import org.hibernate.hql.internal.ast.tree.UpdateStatement; +import org.hibernate.hql.internal.ast.util.ASTPrinter; +import org.hibernate.hql.internal.ast.util.ASTUtil; +import org.hibernate.hql.internal.ast.util.AliasGenerator; +import org.hibernate.hql.internal.ast.util.JoinProcessor; +import org.hibernate.hql.internal.ast.util.LiteralProcessor; +import org.hibernate.hql.internal.ast.util.NodeTraverser; +import org.hibernate.hql.internal.ast.util.SessionFactoryHelper; +import org.hibernate.hql.internal.ast.util.SyntheticAndFactory; import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.PostInsertIdentifierGenerator; import org.hibernate.id.SequenceGenerator; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlToken.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlToken.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/HqlToken.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlToken.java index d0675396f9..0fb1483c95 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlToken.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlToken.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidPathException.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/InvalidPathException.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidPathException.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/InvalidPathException.java index 669a92a812..7eaf731378 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidPathException.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/InvalidPathException.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import antlr.SemanticException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidWithClauseException.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/InvalidWithClauseException.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidWithClauseException.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/InvalidWithClauseException.java index ba5f4a50d7..bb407afa44 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidWithClauseException.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/InvalidWithClauseException.java @@ -1,41 +1,41 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ -package org.hibernate.hql.ast; - - -/** - * {@inheritDoc} - * - * @author Steve Ebersole - */ -public class InvalidWithClauseException extends QuerySyntaxException { - public InvalidWithClauseException(String message) { - super( message ); - } - - public InvalidWithClauseException(String message, String queryString) { - super( message, queryString ); - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + * + */ +package org.hibernate.hql.internal.ast; + + +/** + * {@inheritDoc} + * + * @author Steve Ebersole + */ +public class InvalidWithClauseException extends QuerySyntaxException { + public InvalidWithClauseException(String message) { + super( message ); + } + + public InvalidWithClauseException(String message, String queryString) { + super( message, queryString ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/ParameterTranslationsImpl.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ParameterTranslationsImpl.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/ParameterTranslationsImpl.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ParameterTranslationsImpl.java index 552740a399..b7967d10bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/ParameterTranslationsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ParameterTranslationsImpl.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import java.io.Serializable; import java.util.ArrayList; @@ -31,7 +31,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import org.hibernate.hql.ParameterTranslations; +import org.hibernate.hql.spi.ParameterTranslations; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.param.NamedParameterSpecification; import org.hibernate.param.ParameterSpecification; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/ParseErrorHandler.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ParseErrorHandler.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/ParseErrorHandler.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ParseErrorHandler.java index 9583aa37df..016755da62 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/ParseErrorHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ParseErrorHandler.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import org.hibernate.QueryException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/QuerySyntaxException.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/QuerySyntaxException.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/QuerySyntaxException.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/QuerySyntaxException.java index 7f01204d48..7b103c3393 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/QuerySyntaxException.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/QuerySyntaxException.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import org.hibernate.QueryException; import antlr.RecognitionException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/QueryTranslatorImpl.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/QueryTranslatorImpl.java index de43b6e5dd..bc64eedf17 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/QueryTranslatorImpl.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import java.util.ArrayList; import java.util.HashMap; @@ -40,30 +40,30 @@ import org.hibernate.HibernateException; import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.RowSelection; import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.hql.internal.QueryExecutionRequestException; +import org.hibernate.hql.spi.ParameterTranslations; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.ScrollableResults; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.event.spi.EventSource; -import org.hibernate.hql.FilterTranslator; -import org.hibernate.hql.ParameterTranslations; -import org.hibernate.hql.QueryExecutionRequestException; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.antlr.HqlTokenTypes; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.exec.BasicExecutor; -import org.hibernate.hql.ast.exec.MultiTableDeleteExecutor; -import org.hibernate.hql.ast.exec.MultiTableUpdateExecutor; -import org.hibernate.hql.ast.exec.StatementExecutor; -import org.hibernate.hql.ast.tree.AggregatedSelectExpression; -import org.hibernate.hql.ast.tree.FromElement; -import org.hibernate.hql.ast.tree.InsertStatement; -import org.hibernate.hql.ast.tree.QueryNode; -import org.hibernate.hql.ast.tree.Statement; -import org.hibernate.hql.ast.util.ASTPrinter; -import org.hibernate.hql.ast.util.ASTUtil; -import org.hibernate.hql.ast.util.NodeTraverser; +import org.hibernate.hql.spi.FilterTranslator; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.antlr.HqlTokenTypes; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.exec.BasicExecutor; +import org.hibernate.hql.internal.ast.exec.MultiTableDeleteExecutor; +import org.hibernate.hql.internal.ast.exec.MultiTableUpdateExecutor; +import org.hibernate.hql.internal.ast.exec.StatementExecutor; +import org.hibernate.hql.internal.ast.tree.AggregatedSelectExpression; +import org.hibernate.hql.internal.ast.tree.FromElement; +import org.hibernate.hql.internal.ast.tree.InsertStatement; +import org.hibernate.hql.internal.ast.tree.QueryNode; +import org.hibernate.hql.internal.ast.tree.Statement; +import org.hibernate.hql.internal.ast.util.ASTPrinter; +import org.hibernate.hql.internal.ast.util.ASTUtil; +import org.hibernate.hql.internal.ast.util.NodeTraverser; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.collections.IdentitySet; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/SqlASTFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/SqlASTFactory.java similarity index 70% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/SqlASTFactory.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/SqlASTFactory.java index 0bdd7ab930..54a28d4128 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/SqlASTFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/SqlASTFactory.java @@ -22,50 +22,50 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import java.lang.reflect.Constructor; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.ast.tree.AggregateNode; -import org.hibernate.hql.ast.tree.BetweenOperatorNode; -import org.hibernate.hql.ast.tree.BinaryArithmeticOperatorNode; -import org.hibernate.hql.ast.tree.BinaryLogicOperatorNode; -import org.hibernate.hql.ast.tree.BooleanLiteralNode; -import org.hibernate.hql.ast.tree.Case2Node; -import org.hibernate.hql.ast.tree.CaseNode; -import org.hibernate.hql.ast.tree.CollectionFunction; -import org.hibernate.hql.ast.tree.ConstructorNode; -import org.hibernate.hql.ast.tree.CountNode; -import org.hibernate.hql.ast.tree.DeleteStatement; -import org.hibernate.hql.ast.tree.DotNode; -import org.hibernate.hql.ast.tree.FromClause; -import org.hibernate.hql.ast.tree.FromElement; -import org.hibernate.hql.ast.tree.IdentNode; -import org.hibernate.hql.ast.tree.ImpliedFromElement; -import org.hibernate.hql.ast.tree.InLogicOperatorNode; -import org.hibernate.hql.ast.tree.IndexNode; -import org.hibernate.hql.ast.tree.InitializeableNode; -import org.hibernate.hql.ast.tree.InsertStatement; -import org.hibernate.hql.ast.tree.IntoClause; -import org.hibernate.hql.ast.tree.IsNotNullLogicOperatorNode; -import org.hibernate.hql.ast.tree.IsNullLogicOperatorNode; -import org.hibernate.hql.ast.tree.JavaConstantNode; -import org.hibernate.hql.ast.tree.LiteralNode; -import org.hibernate.hql.ast.tree.MapEntryNode; -import org.hibernate.hql.ast.tree.MapKeyNode; -import org.hibernate.hql.ast.tree.MapValueNode; -import org.hibernate.hql.ast.tree.MethodNode; -import org.hibernate.hql.ast.tree.OrderByClause; -import org.hibernate.hql.ast.tree.ParameterNode; -import org.hibernate.hql.ast.tree.QueryNode; -import org.hibernate.hql.ast.tree.ResultVariableRefNode; -import org.hibernate.hql.ast.tree.SelectClause; -import org.hibernate.hql.ast.tree.SelectExpressionImpl; -import org.hibernate.hql.ast.tree.SessionFactoryAwareNode; -import org.hibernate.hql.ast.tree.SqlFragment; -import org.hibernate.hql.ast.tree.SqlNode; -import org.hibernate.hql.ast.tree.UnaryArithmeticNode; -import org.hibernate.hql.ast.tree.UnaryLogicOperatorNode; -import org.hibernate.hql.ast.tree.UpdateStatement; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.ast.tree.AggregateNode; +import org.hibernate.hql.internal.ast.tree.BetweenOperatorNode; +import org.hibernate.hql.internal.ast.tree.BinaryArithmeticOperatorNode; +import org.hibernate.hql.internal.ast.tree.BinaryLogicOperatorNode; +import org.hibernate.hql.internal.ast.tree.BooleanLiteralNode; +import org.hibernate.hql.internal.ast.tree.Case2Node; +import org.hibernate.hql.internal.ast.tree.CaseNode; +import org.hibernate.hql.internal.ast.tree.CollectionFunction; +import org.hibernate.hql.internal.ast.tree.ConstructorNode; +import org.hibernate.hql.internal.ast.tree.CountNode; +import org.hibernate.hql.internal.ast.tree.DeleteStatement; +import org.hibernate.hql.internal.ast.tree.DotNode; +import org.hibernate.hql.internal.ast.tree.FromClause; +import org.hibernate.hql.internal.ast.tree.FromElement; +import org.hibernate.hql.internal.ast.tree.IdentNode; +import org.hibernate.hql.internal.ast.tree.ImpliedFromElement; +import org.hibernate.hql.internal.ast.tree.InLogicOperatorNode; +import org.hibernate.hql.internal.ast.tree.IndexNode; +import org.hibernate.hql.internal.ast.tree.InitializeableNode; +import org.hibernate.hql.internal.ast.tree.InsertStatement; +import org.hibernate.hql.internal.ast.tree.IntoClause; +import org.hibernate.hql.internal.ast.tree.IsNotNullLogicOperatorNode; +import org.hibernate.hql.internal.ast.tree.IsNullLogicOperatorNode; +import org.hibernate.hql.internal.ast.tree.JavaConstantNode; +import org.hibernate.hql.internal.ast.tree.LiteralNode; +import org.hibernate.hql.internal.ast.tree.MapEntryNode; +import org.hibernate.hql.internal.ast.tree.MapKeyNode; +import org.hibernate.hql.internal.ast.tree.MapValueNode; +import org.hibernate.hql.internal.ast.tree.MethodNode; +import org.hibernate.hql.internal.ast.tree.OrderByClause; +import org.hibernate.hql.internal.ast.tree.ParameterNode; +import org.hibernate.hql.internal.ast.tree.QueryNode; +import org.hibernate.hql.internal.ast.tree.ResultVariableRefNode; +import org.hibernate.hql.internal.ast.tree.SelectClause; +import org.hibernate.hql.internal.ast.tree.SelectExpressionImpl; +import org.hibernate.hql.internal.ast.tree.SessionFactoryAwareNode; +import org.hibernate.hql.internal.ast.tree.SqlFragment; +import org.hibernate.hql.internal.ast.tree.SqlNode; +import org.hibernate.hql.internal.ast.tree.UnaryArithmeticNode; +import org.hibernate.hql.internal.ast.tree.UnaryLogicOperatorNode; +import org.hibernate.hql.internal.ast.tree.UpdateStatement; import antlr.ASTFactory; import antlr.Token; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/SqlGenerator.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/SqlGenerator.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/SqlGenerator.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/SqlGenerator.java index c2e7fed50f..214509e90b 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/SqlGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/SqlGenerator.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import java.util.ArrayList; import java.util.Arrays; @@ -33,14 +33,14 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.QueryException; import org.hibernate.dialect.function.SQLFunction; -import org.hibernate.hql.antlr.SqlGeneratorBase; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.tree.FromElement; -import org.hibernate.hql.ast.tree.FunctionNode; -import org.hibernate.hql.ast.tree.Node; -import org.hibernate.hql.ast.tree.ParameterContainer; -import org.hibernate.hql.ast.tree.ParameterNode; -import org.hibernate.hql.ast.util.ASTPrinter; +import org.hibernate.hql.internal.antlr.SqlGeneratorBase; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.tree.FromElement; +import org.hibernate.hql.internal.ast.tree.FunctionNode; +import org.hibernate.hql.internal.ast.tree.Node; +import org.hibernate.hql.internal.ast.tree.ParameterContainer; +import org.hibernate.hql.internal.ast.tree.ParameterNode; +import org.hibernate.hql.internal.ast.util.ASTPrinter; import org.hibernate.internal.util.StringHelper; import org.hibernate.param.ParameterSpecification; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/TypeDiscriminatorMetadata.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/TypeDiscriminatorMetadata.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/TypeDiscriminatorMetadata.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/TypeDiscriminatorMetadata.java index 3226a181da..6d8f78db16 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/TypeDiscriminatorMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/TypeDiscriminatorMetadata.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast; +package org.hibernate.hql.internal.ast; import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/AbstractStatementExecutor.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/AbstractStatementExecutor.java index 5b22a1bdb3..a3d8cdfcbe 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/AbstractStatementExecutor.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.exec; +package org.hibernate.hql.internal.ast.exec; import java.sql.Connection; import java.sql.PreparedStatement; @@ -37,8 +37,8 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.event.spi.EventSource; -import org.hibernate.hql.ast.HqlSqlWalker; -import org.hibernate.hql.ast.SqlGenerator; +import org.hibernate.hql.internal.ast.HqlSqlWalker; +import org.hibernate.hql.internal.ast.SqlGenerator; import org.hibernate.internal.util.StringHelper; import org.hibernate.jdbc.AbstractWork; import org.hibernate.persister.entity.Queryable; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/BasicExecutor.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/BasicExecutor.java index be0ea1a9f3..f8ad986d4c 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/BasicExecutor.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.exec; +package org.hibernate.hql.internal.ast.exec; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Iterator; @@ -31,9 +31,9 @@ import org.hibernate.HibernateException; import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.RowSelection; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.hql.ast.HqlSqlWalker; -import org.hibernate.hql.ast.QuerySyntaxException; -import org.hibernate.hql.ast.SqlGenerator; +import org.hibernate.hql.internal.ast.HqlSqlWalker; +import org.hibernate.hql.internal.ast.QuerySyntaxException; +import org.hibernate.hql.internal.ast.SqlGenerator; import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.entity.Queryable; import antlr.RecognitionException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/MultiTableDeleteExecutor.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/MultiTableDeleteExecutor.java index 8fd1043de6..294b30163e 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/MultiTableDeleteExecutor.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.exec; +package org.hibernate.hql.internal.ast.exec; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -31,9 +31,9 @@ import org.hibernate.HibernateException; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.engine.spi.QueryParameters; -import org.hibernate.hql.ast.HqlSqlWalker; -import org.hibernate.hql.ast.tree.DeleteStatement; -import org.hibernate.hql.ast.tree.FromElement; +import org.hibernate.hql.internal.ast.HqlSqlWalker; +import org.hibernate.hql.internal.ast.tree.DeleteStatement; +import org.hibernate.hql.internal.ast.tree.FromElement; import org.hibernate.internal.util.StringHelper; import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.entity.Queryable; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/MultiTableUpdateExecutor.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/MultiTableUpdateExecutor.java index 79088ed153..c44434c079 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/MultiTableUpdateExecutor.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.exec; +package org.hibernate.hql.internal.ast.exec; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -33,10 +33,10 @@ import org.hibernate.HibernateException; import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.hql.ast.HqlSqlWalker; -import org.hibernate.hql.ast.tree.AssignmentSpecification; -import org.hibernate.hql.ast.tree.FromElement; -import org.hibernate.hql.ast.tree.UpdateStatement; +import org.hibernate.hql.internal.ast.HqlSqlWalker; +import org.hibernate.hql.internal.ast.tree.AssignmentSpecification; +import org.hibernate.hql.internal.ast.tree.FromElement; +import org.hibernate.hql.internal.ast.tree.UpdateStatement; import org.hibernate.internal.util.StringHelper; import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.entity.Queryable; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/StatementExecutor.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/StatementExecutor.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/exec/StatementExecutor.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/StatementExecutor.java index d5b8b5c634..e7b27bd6a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/StatementExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/StatementExecutor.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.exec; +package org.hibernate.hql.internal.ast.exec; import org.hibernate.HibernateException; import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/package.html b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/package.html similarity index 100% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/package.html rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/package.html diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractMapComponentNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractMapComponentNode.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractMapComponentNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractMapComponentNode.java index 2b7a3ef476..ff993c0794 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractMapComponentNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractMapComponentNode.java @@ -19,11 +19,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.Map; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.ast.util.ColumnHelper; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ColumnHelper; import org.hibernate.internal.util.StringHelper; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.type.CollectionType; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractNullnessCheckNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractNullnessCheckNode.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractNullnessCheckNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractNullnessCheckNode.java index 03b171bc5d..c9b4e42f30 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractNullnessCheckNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractNullnessCheckNode.java @@ -22,11 +22,11 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; import org.hibernate.internal.util.StringHelper; import org.hibernate.type.Type; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractRestrictableStatement.java similarity index 89% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractRestrictableStatement.java index a23eabadaf..e90cb6de6b 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractRestrictableStatement.java @@ -22,10 +22,10 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.ast.util.ASTUtil; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ASTUtil; import antlr.collections.AST; /** @@ -44,7 +44,7 @@ public abstract class AbstractRestrictableStatement extends AbstractStatement im protected abstract CoreMessageLogger getLog(); /** - * @see org.hibernate.hql.ast.tree.RestrictableStatement#getFromClause + * @see org.hibernate.hql.internal.ast.tree.RestrictableStatement#getFromClause */ public final FromClause getFromClause() { if ( fromClause == null ) { @@ -62,7 +62,7 @@ public abstract class AbstractRestrictableStatement extends AbstractStatement im } /** - * @see org.hibernate.hql.ast.tree.RestrictableStatement#getWhereClause + * @see org.hibernate.hql.internal.ast.tree.RestrictableStatement#getWhereClause */ public final AST getWhereClause() { if ( whereClause == null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractSelectExpression.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractSelectExpression.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractSelectExpression.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractSelectExpression.java index 440e399a4a..ae32b8d35b 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractSelectExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractSelectExpression.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.type.Type; import antlr.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractStatement.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractStatement.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractStatement.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractStatement.java index fd66f31212..abadefe6da 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractStatement.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.Iterator; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregateNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AggregateNode.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregateNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AggregateNode.java index 0fc0e60828..5473fc4bff 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregateNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AggregateNode.java @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.dialect.function.SQLFunction; import org.hibernate.dialect.function.StandardSQLFunction; -import org.hibernate.hql.ast.util.ColumnHelper; +import org.hibernate.hql.internal.ast.util.ColumnHelper; import org.hibernate.type.Type; import org.jboss.logging.Logger; import antlr.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregatedSelectExpression.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AggregatedSelectExpression.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregatedSelectExpression.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AggregatedSelectExpression.java index c43ca11474..cd3af226f4 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregatedSelectExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AggregatedSelectExpression.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AssignmentSpecification.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AssignmentSpecification.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AssignmentSpecification.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AssignmentSpecification.java index f77a39bc62..b73705fb74 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AssignmentSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AssignmentSpecification.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; @@ -30,9 +30,9 @@ import java.util.List; import java.util.Set; import org.hibernate.QueryException; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.ast.SqlGenerator; -import org.hibernate.hql.ast.util.ASTUtil; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.ast.SqlGenerator; +import org.hibernate.hql.internal.ast.util.ASTUtil; import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.entity.Queryable; import org.hibernate.persister.entity.UnionSubclassEntityPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BetweenOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BetweenOperatorNode.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BetweenOperatorNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BetweenOperatorNode.java index b6c9f65553..e6a4bc65d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BetweenOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BetweenOperatorNode.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import antlr.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryArithmeticOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BinaryArithmeticOperatorNode.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryArithmeticOperatorNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BinaryArithmeticOperatorNode.java index 5cfcc15446..e5127a4b1c 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryArithmeticOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BinaryArithmeticOperatorNode.java @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import antlr.SemanticException; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.ast.util.ColumnHelper; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ColumnHelper; import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BinaryLogicOperatorNode.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BinaryLogicOperatorNode.java index 303407dd61..152eedfb80 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BinaryLogicOperatorNode.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import antlr.SemanticException; import antlr.collections.AST; @@ -29,7 +29,7 @@ import antlr.collections.AST; import org.hibernate.HibernateException; import org.hibernate.TypeMismatchException; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; import org.hibernate.internal.util.StringHelper; import org.hibernate.param.ParameterSpecification; import org.hibernate.type.OneToOneType; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BinaryOperatorNode.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryOperatorNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BinaryOperatorNode.java index 662a379d3c..dc47b1bc5b 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BinaryOperatorNode.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BooleanLiteralNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BooleanLiteralNode.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BooleanLiteralNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BooleanLiteralNode.java index 43b733d251..abf8caf7e5 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BooleanLiteralNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BooleanLiteralNode.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.QueryException; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Case2Node.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Case2Node.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Case2Node.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Case2Node.java index 619bc76699..825cf22cfb 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Case2Node.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Case2Node.java @@ -22,8 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; -import org.hibernate.hql.ast.util.ColumnHelper; +package org.hibernate.hql.internal.ast.tree; +import org.hibernate.hql.internal.ast.util.ColumnHelper; import org.hibernate.type.Type; import antlr.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CaseNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/CaseNode.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CaseNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/CaseNode.java index 74c3920c89..260a4822c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CaseNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/CaseNode.java @@ -22,8 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; -import org.hibernate.hql.ast.util.ColumnHelper; +package org.hibernate.hql.internal.ast.tree; +import org.hibernate.hql.internal.ast.util.ColumnHelper; import org.hibernate.type.Type; import antlr.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CollectionFunction.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/CollectionFunction.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CollectionFunction.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/CollectionFunction.java index f2e2298d77..8c06782653 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CollectionFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/CollectionFunction.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import antlr.SemanticException; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ComponentJoin.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ComponentJoin.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ComponentJoin.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ComponentJoin.java index 33ecf66b08..a639507c79 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ComponentJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ComponentJoin.java @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.QueryException; -import org.hibernate.hql.NameGenerator; +import org.hibernate.hql.internal.NameGenerator; import org.hibernate.internal.util.StringHelper; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.PropertyMapping; @@ -94,7 +94,7 @@ public class ComponentJoin extends FromElement { // used to "resolve" the IdentNode when our alias is encountered *by itself* in the query; so // here we use the component // NOTE : ^^ is true *except for* when encountered by itself in the SELECT clause. That gets - // routed through org.hibernate.hql.ast.tree.ComponentJoin.ComponentFromElementType.renderScalarIdentifierSelect() + // routed through org.hibernate.hql.internal.ast.tree.ComponentJoin.ComponentFromElementType.renderScalarIdentifierSelect() // which we also override to account for return columns; } diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ConstructorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ConstructorNode.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ConstructorNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ConstructorNode.java index c8f5f302ec..a277b31ddd 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ConstructorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ConstructorNode.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.lang.reflect.Constructor; import java.util.Arrays; @@ -33,7 +33,7 @@ import antlr.collections.AST; import org.hibernate.PropertyNotFoundException; import org.hibernate.QueryException; -import org.hibernate.hql.ast.DetailedSemanticException; +import org.hibernate.hql.internal.ast.DetailedSemanticException; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.StringHelper; import org.hibernate.transform.AliasToBeanConstructorResultTransformer; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CountNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/CountNode.java similarity index 93% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CountNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/CountNode.java index ece1a2a3ce..f416d2c459 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CountNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/CountNode.java @@ -22,8 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; -import org.hibernate.hql.ast.util.ColumnHelper; +package org.hibernate.hql.internal.ast.tree; +import org.hibernate.hql.internal.ast.util.ColumnHelper; import org.hibernate.type.Type; import antlr.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/DeleteStatement.java similarity index 85% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/DeleteStatement.java index 9cf021b8ab..b7e0a06283 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/DeleteStatement.java @@ -22,10 +22,10 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; import org.jboss.logging.Logger; @@ -39,14 +39,14 @@ public class DeleteStatement extends AbstractRestrictableStatement { private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, DeleteStatement.class.getName()); /** - * @see org.hibernate.hql.ast.tree.Statement#getStatementType() + * @see org.hibernate.hql.internal.ast.tree.Statement#getStatementType() */ public int getStatementType() { return HqlSqlTokenTypes.DELETE; } /** - * @see org.hibernate.hql.ast.tree.Statement#needsExecutor() + * @see org.hibernate.hql.internal.ast.tree.Statement#needsExecutor() */ public boolean needsExecutor() { return true; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DisplayableNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/DisplayableNode.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DisplayableNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/DisplayableNode.java index 6a7558898d..09a4b0f18d 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DisplayableNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/DisplayableNode.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/DotNode.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/DotNode.java index d0b8049deb..5a965ccfd7 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/DotNode.java @@ -22,15 +22,15 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.engine.internal.JoinSequence; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.QueryException; -import org.hibernate.hql.CollectionProperties; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.util.ASTUtil; -import org.hibernate.hql.ast.util.ColumnHelper; +import org.hibernate.hql.internal.CollectionProperties; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ASTUtil; +import org.hibernate.hql.internal.ast.util.ColumnHelper; import org.hibernate.internal.util.StringHelper; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ExpectedTypeAwareNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ExpectedTypeAwareNode.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ExpectedTypeAwareNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ExpectedTypeAwareNode.java index f6d749a3bc..1c0df9eb90 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ExpectedTypeAwareNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ExpectedTypeAwareNode.java @@ -1,37 +1,37 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ -package org.hibernate.hql.ast.tree; -import org.hibernate.type.Type; - -/** - * Interface for nodes which wish to be made aware of any determined "expected - * type" based on the context within they appear in the query. - * - * @author Steve Ebersole - */ -public interface ExpectedTypeAwareNode { - public void setExpectedType(Type expectedType); - public Type getExpectedType(); -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + * + */ +package org.hibernate.hql.internal.ast.tree; +import org.hibernate.type.Type; + +/** + * Interface for nodes which wish to be made aware of any determined "expected + * type" based on the context within they appear in the query. + * + * @author Steve Ebersole + */ +public interface ExpectedTypeAwareNode { + public void setExpectedType(Type expectedType); + public Type getExpectedType(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromClause.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromClause.java index ab28190c74..6df0eda8c7 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromClause.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -32,9 +32,9 @@ import java.util.Map; import java.util.Set; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.ast.util.ASTIterator; -import org.hibernate.hql.ast.util.ASTUtil; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ASTIterator; +import org.hibernate.hql.internal.ast.util.ASTUtil; import org.jboss.logging.Logger; import antlr.SemanticException; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElement.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElement.java index 43e86f7ddd..dd590e7fac 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElement.java @@ -22,21 +22,21 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import org.hibernate.engine.internal.JoinSequence; +import org.hibernate.hql.spi.QueryTranslator; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.QueryException; -import org.hibernate.hql.CollectionProperties; -import org.hibernate.hql.QueryTranslator; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.TypeDiscriminatorMetadata; -import org.hibernate.hql.ast.util.ASTUtil; +import org.hibernate.hql.internal.CollectionProperties; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.TypeDiscriminatorMetadata; +import org.hibernate.hql.internal.ast.util.ASTUtil; import org.hibernate.internal.util.StringHelper; import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.collection.QueryableCollection; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElementFactory.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElementFactory.java index 8b457aec5c..c486a38db8 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElementFactory.java @@ -22,15 +22,15 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.engine.internal.JoinSequence; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.util.ASTUtil; -import org.hibernate.hql.ast.util.AliasGenerator; -import org.hibernate.hql.ast.util.PathHelper; -import org.hibernate.hql.ast.util.SessionFactoryHelper; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ASTUtil; +import org.hibernate.hql.internal.ast.util.AliasGenerator; +import org.hibernate.hql.internal.ast.util.PathHelper; +import org.hibernate.hql.internal.ast.util.SessionFactoryHelper; import org.hibernate.internal.util.StringHelper; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElementType.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElementType.java index 33ccff60e7..e2f1d6989a 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElementType.java @@ -22,19 +22,19 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.List; import java.util.Map; import org.hibernate.engine.internal.JoinSequence; +import org.hibernate.hql.internal.CollectionProperties; +import org.hibernate.hql.internal.CollectionSubqueryFactory; +import org.hibernate.hql.internal.NameGenerator; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.MappingException; import org.hibernate.QueryException; -import org.hibernate.hql.CollectionProperties; -import org.hibernate.hql.CollectionSubqueryFactory; -import org.hibernate.hql.NameGenerator; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.collection.CollectionPropertyMapping; @@ -338,7 +338,7 @@ class FromElementType { Map enabledFilters = fromElement.getWalker().getEnabledFilters(); String subquery = CollectionSubqueryFactory.createCollectionSubquery( joinSequence.copy().setUseThetaStyle( true ), - enabledFilters, + enabledFilters, propertyMapping.toColumns( tableAlias, path ) ); LOG.debugf("toColumns(%s,%s) : subquery = %s", tableAlias, path, subquery); diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromReferenceNode.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromReferenceNode.java index fc1a2c7de8..ef0ef02167 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromReferenceNode.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.internal.CoreMessageLogger; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FunctionNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FunctionNode.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FunctionNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FunctionNode.java index 8821a7ee13..4807bd43e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FunctionNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FunctionNode.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.dialect.function.SQLFunction; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/HqlSqlWalkerNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/HqlSqlWalkerNode.java similarity index 88% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/HqlSqlWalkerNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/HqlSqlWalkerNode.java index 1472fcc4f2..5f3fba4f11 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/HqlSqlWalkerNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/HqlSqlWalkerNode.java @@ -22,10 +22,10 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; -import org.hibernate.hql.ast.HqlSqlWalker; -import org.hibernate.hql.ast.util.AliasGenerator; -import org.hibernate.hql.ast.util.SessionFactoryHelper; +package org.hibernate.hql.internal.ast.tree; +import org.hibernate.hql.internal.ast.HqlSqlWalker; +import org.hibernate.hql.internal.ast.util.AliasGenerator; +import org.hibernate.hql.internal.ast.util.SessionFactoryHelper; import antlr.ASTFactory; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IdentNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IdentNode.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IdentNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IdentNode.java index 25569e15ac..fe75e4d726 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IdentNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IdentNode.java @@ -22,13 +22,13 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.List; import org.hibernate.QueryException; import org.hibernate.dialect.function.SQLFunction; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.util.ColumnHelper; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ColumnHelper; import org.hibernate.internal.util.StringHelper; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.Queryable; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ImpliedFromElement.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ImpliedFromElement.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ImpliedFromElement.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ImpliedFromElement.java index 5b3255f166..050ec3392a 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ImpliedFromElement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ImpliedFromElement.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InLogicOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/InLogicOperatorNode.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InLogicOperatorNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/InLogicOperatorNode.java index 13a35893a3..d887490d96 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InLogicOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/InLogicOperatorNode.java @@ -22,12 +22,12 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.ArrayList; import java.util.List; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.antlr.HqlTokenTypes; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.antlr.HqlTokenTypes; import org.hibernate.param.ParameterSpecification; import org.hibernate.type.Type; import antlr.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IndexNode.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IndexNode.java index 3b43693fd8..6e30eb88ef 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IndexNode.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Iterator; @@ -33,8 +33,8 @@ import org.hibernate.internal.CoreMessageLogger; import org.hibernate.QueryException; import org.hibernate.engine.internal.JoinSequence; import org.hibernate.engine.spi.QueryParameters; -import org.hibernate.hql.ast.SqlGenerator; -import org.hibernate.hql.ast.util.SessionFactoryHelper; +import org.hibernate.hql.internal.ast.SqlGenerator; +import org.hibernate.hql.internal.ast.util.SessionFactoryHelper; import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.type.CollectionType; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InitializeableNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/InitializeableNode.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InitializeableNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/InitializeableNode.java index c10604e5ba..9bc01d1667 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InitializeableNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/InitializeableNode.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InsertStatement.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/InsertStatement.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InsertStatement.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/InsertStatement.java index 7c89c581f4..5ed90ac2fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InsertStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/InsertStatement.java @@ -22,9 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.QueryException; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; /** * Defines a top-level AST node representing an HQL "insert select" statement. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IntoClause.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IntoClause.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IntoClause.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IntoClause.java index 227fa298de..6219d124c7 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IntoClause.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IntoClause.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.sql.Types; import java.util.ArrayList; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNotNullLogicOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IsNotNullLogicOperatorNode.java similarity index 93% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNotNullLogicOperatorNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IsNotNullLogicOperatorNode.java index eaa1e021a1..5f9e8aeae6 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNotNullLogicOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IsNotNullLogicOperatorNode.java @@ -22,8 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; +package org.hibernate.hql.internal.ast.tree; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; /** * IsNotNullLogicOperatorNode implementation diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNullLogicOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IsNullLogicOperatorNode.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNullLogicOperatorNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IsNullLogicOperatorNode.java index fa85713754..55e94d5fb1 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNullLogicOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IsNullLogicOperatorNode.java @@ -22,8 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; +package org.hibernate.hql.internal.ast.tree; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; /** * Represents a 'is null' check. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/JavaConstantNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/JavaConstantNode.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/JavaConstantNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/JavaConstantNode.java index 9f0944b8b4..82fb6ba00a 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/JavaConstantNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/JavaConstantNode.java @@ -22,12 +22,12 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.QueryException; import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.hql.QueryTranslator; +import org.hibernate.hql.spi.QueryTranslator; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.StringHelper; import org.hibernate.type.LiteralType; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/LiteralNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/LiteralNode.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/LiteralNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/LiteralNode.java index 3f04744cfd..6ad942b7c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/LiteralNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/LiteralNode.java @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import antlr.SemanticException; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.ast.util.ColumnHelper; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ColumnHelper; import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapEntryNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapEntryNode.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapEntryNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapEntryNode.java index 046b333d28..737e6ff9ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapEntryNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapEntryNode.java @@ -19,14 +19,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.hql.NameGenerator; +import org.hibernate.hql.internal.NameGenerator; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.Queryable; import org.hibernate.sql.AliasGenerator; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapKeyNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapKeyNode.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapKeyNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapKeyNode.java index 547540813b..966af6d391 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapKeyNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapKeyNode.java @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapValueNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapValueNode.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapValueNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapValueNode.java index 280a1d7478..d674137504 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapValueNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapValueNode.java @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MethodNode.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MethodNode.java index 2a4a41fc34..1142161ca9 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MethodNode.java @@ -22,16 +22,16 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.Arrays; +import org.hibernate.hql.internal.CollectionProperties; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.dialect.function.SQLFunction; -import org.hibernate.hql.CollectionProperties; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.TypeDiscriminatorMetadata; -import org.hibernate.hql.ast.util.ASTUtil; -import org.hibernate.hql.ast.util.ColumnHelper; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.TypeDiscriminatorMetadata; +import org.hibernate.hql.internal.ast.util.ASTUtil; +import org.hibernate.hql.internal.ast.util.ColumnHelper; import org.hibernate.persister.collection.CollectionPropertyNames; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Node.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Node.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Node.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Node.java index b60ce9fa0c..ac9768e09b 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Node.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Node.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/OperatorNode.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OperatorNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/OperatorNode.java index 8cae87f43a..6ac5bef6bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/OperatorNode.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.type.Type; import antlr.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OrderByClause.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/OrderByClause.java similarity index 90% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OrderByClause.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/OrderByClause.java index 9265e0de5a..3dcd1e8dab 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OrderByClause.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/OrderByClause.java @@ -22,9 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.ast.util.ASTUtil; +package org.hibernate.hql.internal.ast.tree; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ASTUtil; import antlr.collections.AST; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterContainer.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ParameterContainer.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterContainer.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ParameterContainer.java index 397e45fb3e..f75443b470 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ParameterContainer.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.param.ParameterSpecification; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ParameterNode.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ParameterNode.java index fa4123647a..d18cd03de0 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ParameterNode.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.param.ParameterSpecification; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/PathNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/PathNode.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/PathNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/PathNode.java index 38400d3a6d..b77d1202dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/PathNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/PathNode.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/QueryNode.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/QueryNode.java index 514ca04d0d..7ec6b8d80d 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/QueryNode.java @@ -22,12 +22,12 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.util.ASTUtil; -import org.hibernate.hql.ast.util.ColumnHelper; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ASTUtil; +import org.hibernate.hql.internal.ast.util.ColumnHelper; import org.hibernate.type.Type; import org.jboss.logging.Logger; import antlr.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResolvableNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ResolvableNode.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResolvableNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ResolvableNode.java index 12d9d28b14..51f59ac4c1 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResolvableNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ResolvableNode.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import antlr.SemanticException; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/RestrictableStatement.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/RestrictableStatement.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/RestrictableStatement.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/RestrictableStatement.java index e7e0c8e876..2724d222e0 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/RestrictableStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/RestrictableStatement.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import antlr.collections.AST; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResultVariableRefNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ResultVariableRefNode.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResultVariableRefNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ResultVariableRefNode.java index 047f6485f2..ccee13196e 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResultVariableRefNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ResultVariableRefNode.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectClause.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectClause.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectClause.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectClause.java index 9d710b4512..33591a9694 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectClause.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectClause.java @@ -22,15 +22,15 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import org.hibernate.QueryException; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.util.ASTAppender; -import org.hibernate.hql.ast.util.ASTIterator; -import org.hibernate.hql.ast.util.ASTPrinter; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ASTAppender; +import org.hibernate.hql.internal.ast.util.ASTIterator; +import org.hibernate.hql.internal.ast.util.ASTPrinter; import org.hibernate.type.Type; import antlr.SemanticException; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpression.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectExpression.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpression.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectExpression.java index 0bb0cbf1bd..187b8f2c0b 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectExpression.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.type.Type; import antlr.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionImpl.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectExpressionImpl.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionImpl.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectExpressionImpl.java index 612fbb792a..8e26d3fcc5 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectExpressionImpl.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import antlr.SemanticException; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionList.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectExpressionList.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionList.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectExpressionList.java index d7079cabf7..0a164b4cc0 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionList.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectExpressionList.java @@ -22,10 +22,10 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.ArrayList; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.util.ASTPrinter; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ASTPrinter; import antlr.collections.AST; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SessionFactoryAwareNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SessionFactoryAwareNode.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SessionFactoryAwareNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SessionFactoryAwareNode.java index b2d47a577b..1e6c8c1c2e 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SessionFactoryAwareNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SessionFactoryAwareNode.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.engine.spi.SessionFactoryImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlFragment.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SqlFragment.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlFragment.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SqlFragment.java index 60474f68f1..1143753c2c 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlFragment.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SqlFragment.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import java.util.ArrayList; import java.util.List; import org.hibernate.param.ParameterSpecification; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SqlNode.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SqlNode.java index a2a3a0a78c..02caed801d 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SqlNode.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Statement.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Statement.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Statement.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Statement.java index fa60622d71..eff6950e10 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Statement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Statement.java @@ -22,8 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; -import org.hibernate.hql.ast.HqlSqlWalker; +package org.hibernate.hql.internal.ast.tree; +import org.hibernate.hql.internal.ast.HqlSqlWalker; /** * Common interface modeling the different HQL statements (i.e., INSERT, UPDATE, DELETE, SELECT). diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryArithmeticNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UnaryArithmeticNode.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryArithmeticNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UnaryArithmeticNode.java index 3458e11dd8..b564de1441 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryArithmeticNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UnaryArithmeticNode.java @@ -24,8 +24,8 @@ */ //$Id: UnaryArithmeticNode.java 8407 2005-10-14 17:23:18Z steveebersole $ -package org.hibernate.hql.ast.tree; -import org.hibernate.hql.ast.util.ColumnHelper; +package org.hibernate.hql.internal.ast.tree; +import org.hibernate.hql.internal.ast.util.ColumnHelper; import org.hibernate.type.Type; import antlr.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryLogicOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UnaryLogicOperatorNode.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryLogicOperatorNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UnaryLogicOperatorNode.java index 0240795cd4..7e7a3bebc0 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryLogicOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UnaryLogicOperatorNode.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UnaryOperatorNode.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryOperatorNode.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UnaryOperatorNode.java index 74f309b4f1..30b53d3788 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UnaryOperatorNode.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UpdateStatement.java similarity index 84% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UpdateStatement.java index a226034ffd..38a142ee9a 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UpdateStatement.java @@ -22,11 +22,11 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; +package org.hibernate.hql.internal.ast.tree; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.util.ASTUtil; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.util.ASTUtil; import org.jboss.logging.Logger; import antlr.collections.AST; @@ -41,14 +41,14 @@ public class UpdateStatement extends AbstractRestrictableStatement { private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, UpdateStatement.class.getName()); /** - * @see org.hibernate.hql.ast.tree.Statement#getStatementType() + * @see org.hibernate.hql.internal.ast.tree.Statement#getStatementType() */ public int getStatementType() { return SqlTokenTypes.UPDATE; } /** - * @see org.hibernate.hql.ast.tree.Statement#needsExecutor() + * @see org.hibernate.hql.internal.ast.tree.Statement#needsExecutor() */ public boolean needsExecutor() { return true; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTAppender.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTAppender.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTAppender.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTAppender.java index c4933480fd..83cdf48b19 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTAppender.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTAppender.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.util; +package org.hibernate.hql.internal.ast.util; import antlr.ASTFactory; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTIterator.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTIterator.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTIterator.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTIterator.java index b42fb4f5b4..c948071faa 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTIterator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTIterator.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.util; +package org.hibernate.hql.internal.ast.util; import java.util.Iterator; import java.util.LinkedList; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTParentsFirstIterator.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTParentsFirstIterator.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTParentsFirstIterator.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTParentsFirstIterator.java index 5f70e033dd..84ed792dd2 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTParentsFirstIterator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTParentsFirstIterator.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.util; +package org.hibernate.hql.internal.ast.util; import java.util.Iterator; import java.util.LinkedList; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTPrinter.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTPrinter.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTPrinter.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTPrinter.java index 5531aa7021..2daaa190ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTPrinter.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTPrinter.java @@ -22,14 +22,14 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.util; +package org.hibernate.hql.internal.ast.util; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Map; -import org.hibernate.hql.ast.tree.DisplayableNode; +import org.hibernate.hql.internal.ast.tree.DisplayableNode; import org.hibernate.internal.util.StringHelper; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTUtil.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTUtil.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTUtil.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTUtil.java index 2b9c5ea384..97d3f6e191 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTUtil.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTUtil.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.util; +package org.hibernate.hql.internal.ast.util; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/AliasGenerator.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/AliasGenerator.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/util/AliasGenerator.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/AliasGenerator.java index 8d41eeed0a..a49ba89bc9 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/AliasGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/AliasGenerator.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.util; +package org.hibernate.hql.internal.ast.util; import org.hibernate.internal.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ColumnHelper.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ColumnHelper.java similarity index 91% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/util/ColumnHelper.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ColumnHelper.java index 42ffe9c426..2be142c92a 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ColumnHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ColumnHelper.java @@ -22,10 +22,10 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.util; -import org.hibernate.hql.NameGenerator; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.tree.HqlSqlWalkerNode; +package org.hibernate.hql.internal.ast.util; +import org.hibernate.hql.internal.NameGenerator; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.tree.HqlSqlWalkerNode; import antlr.ASTFactory; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/JoinProcessor.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/JoinProcessor.java index 77f6b8f4d1..7d5c7842aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/JoinProcessor.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.util; +package org.hibernate.hql.internal.ast.util; import java.util.ArrayList; import java.util.Collection; @@ -35,14 +35,14 @@ import org.hibernate.engine.internal.JoinSequence; import org.hibernate.engine.spi.LoadQueryInfluencers; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.dialect.Dialect; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.HqlSqlWalker; -import org.hibernate.hql.ast.tree.DotNode; -import org.hibernate.hql.ast.tree.FromClause; -import org.hibernate.hql.ast.tree.FromElement; -import org.hibernate.hql.ast.tree.ParameterContainer; -import org.hibernate.hql.ast.tree.QueryNode; -import org.hibernate.hql.classic.ParserHelper; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.HqlSqlWalker; +import org.hibernate.hql.internal.ast.tree.DotNode; +import org.hibernate.hql.internal.ast.tree.FromClause; +import org.hibernate.hql.internal.ast.tree.FromElement; +import org.hibernate.hql.internal.ast.tree.ParameterContainer; +import org.hibernate.hql.internal.ast.tree.QueryNode; +import org.hibernate.hql.internal.classic.ParserHelper; import org.hibernate.internal.FilterImpl; import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.collections.ArrayHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/LiteralProcessor.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/LiteralProcessor.java index bd0dc76f1c..b2d8165cb2 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/LiteralProcessor.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.util; +package org.hibernate.hql.internal.ast.util; import java.math.BigDecimal; import java.math.BigInteger; @@ -32,14 +32,14 @@ import org.hibernate.internal.CoreMessageLogger; import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.dialect.Dialect; -import org.hibernate.hql.QueryTranslator; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.antlr.SqlTokenTypes; -import org.hibernate.hql.ast.HqlSqlWalker; -import org.hibernate.hql.ast.InvalidPathException; -import org.hibernate.hql.ast.tree.DotNode; -import org.hibernate.hql.ast.tree.FromClause; -import org.hibernate.hql.ast.tree.IdentNode; +import org.hibernate.hql.spi.QueryTranslator; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.antlr.SqlTokenTypes; +import org.hibernate.hql.internal.ast.HqlSqlWalker; +import org.hibernate.hql.internal.ast.InvalidPathException; +import org.hibernate.hql.internal.ast.tree.DotNode; +import org.hibernate.hql.internal.ast.tree.FromClause; +import org.hibernate.hql.internal.ast.tree.IdentNode; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.persister.entity.Queryable; import org.hibernate.sql.InFragment; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/NodeTraverser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/NodeTraverser.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/util/NodeTraverser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/NodeTraverser.java index 217bbda144..08d17205b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/NodeTraverser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/NodeTraverser.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.util; +package org.hibernate.hql.internal.ast.util; import java.util.Stack; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/PathHelper.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/PathHelper.java index 7bd9276be6..0d2e566607 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/PathHelper.java @@ -22,10 +22,10 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.util; +package org.hibernate.hql.internal.ast.util; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; import org.hibernate.internal.util.StringHelper; import org.jboss.logging.Logger; import antlr.ASTFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/SessionFactoryHelper.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/SessionFactoryHelper.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/util/SessionFactoryHelper.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/SessionFactoryHelper.java index 0dfa001efb..c378f42941 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/SessionFactoryHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/SessionFactoryHelper.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.util; +package org.hibernate.hql.internal.ast.util; import java.util.HashMap; import java.util.Map; import org.hibernate.MappingException; @@ -30,10 +30,10 @@ import org.hibernate.QueryException; import org.hibernate.dialect.function.SQLFunction; import org.hibernate.engine.internal.JoinSequence; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.hql.NameGenerator; -import org.hibernate.hql.ast.DetailedSemanticException; -import org.hibernate.hql.ast.QuerySyntaxException; -import org.hibernate.hql.ast.tree.SqlNode; +import org.hibernate.hql.internal.NameGenerator; +import org.hibernate.hql.internal.ast.DetailedSemanticException; +import org.hibernate.hql.internal.ast.QuerySyntaxException; +import org.hibernate.hql.internal.ast.tree.SqlNode; import org.hibernate.persister.collection.CollectionPropertyMapping; import org.hibernate.persister.collection.CollectionPropertyNames; import org.hibernate.persister.collection.QueryableCollection; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/SyntheticAndFactory.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/SyntheticAndFactory.java index 4a82ef96b8..96ed0dcd14 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/SyntheticAndFactory.java @@ -22,18 +22,18 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.util; +package org.hibernate.hql.internal.ast.util; import java.util.Map; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.ast.HqlSqlWalker; -import org.hibernate.hql.ast.tree.FromElement; -import org.hibernate.hql.ast.tree.Node; -import org.hibernate.hql.ast.tree.QueryNode; -import org.hibernate.hql.ast.tree.RestrictableStatement; -import org.hibernate.hql.ast.tree.SqlFragment; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.ast.HqlSqlWalker; +import org.hibernate.hql.internal.ast.tree.FromElement; +import org.hibernate.hql.internal.ast.tree.Node; +import org.hibernate.hql.internal.ast.tree.QueryNode; +import org.hibernate.hql.internal.ast.tree.RestrictableStatement; +import org.hibernate.hql.internal.ast.tree.SqlFragment; import org.hibernate.internal.util.StringHelper; import org.hibernate.param.CollectionFilterKeyParameterSpecification; import org.hibernate.persister.entity.Queryable; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/ClassicQueryTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/ClassicQueryTranslatorFactory.java similarity index 87% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/ClassicQueryTranslatorFactory.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/ClassicQueryTranslatorFactory.java index 8cd3d7a651..efa18c6231 100755 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/ClassicQueryTranslatorFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/ClassicQueryTranslatorFactory.java @@ -22,12 +22,12 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import java.util.Map; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.hql.FilterTranslator; -import org.hibernate.hql.QueryTranslator; -import org.hibernate.hql.QueryTranslatorFactory; +import org.hibernate.hql.spi.FilterTranslator; +import org.hibernate.hql.spi.QueryTranslator; +import org.hibernate.hql.spi.QueryTranslatorFactory; /** * Generates translators which uses the older hand-written parser to perform @@ -49,7 +49,7 @@ public class ClassicQueryTranslatorFactory implements QueryTranslatorFactory { } /** - * @see QueryTranslatorFactory#createFilterTranslator + * @see org.hibernate.hql.spi.QueryTranslatorFactory#createFilterTranslator */ public FilterTranslator createFilterTranslator( String queryIdentifier, diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/ClauseParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/ClauseParser.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/ClauseParser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/ClauseParser.java index 5876e633cf..21fbaee392 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/ClauseParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/ClauseParser.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/FromParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/FromParser.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/FromParser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/FromParser.java index 20690e7fde..d224a11556 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/FromParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/FromParser.java @@ -22,11 +22,11 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import java.util.HashMap; import java.util.Map; import org.hibernate.QueryException; -import org.hibernate.hql.QueryTranslator; +import org.hibernate.hql.spi.QueryTranslator; import org.hibernate.persister.entity.Queryable; import org.hibernate.sql.JoinFragment; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/FromPathExpressionParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/FromPathExpressionParser.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/FromPathExpressionParser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/FromPathExpressionParser.java index 10039c5a6f..c71fb72fed 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/FromPathExpressionParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/FromPathExpressionParser.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import org.hibernate.QueryException; import org.hibernate.persister.collection.CollectionPropertyNames; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/GroupByParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/GroupByParser.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/GroupByParser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/GroupByParser.java index 0b57ac6662..b67c6ba1c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/GroupByParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/GroupByParser.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import org.hibernate.QueryException; import org.hibernate.internal.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/HavingParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/HavingParser.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/HavingParser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/HavingParser.java index 1719943f89..5b93fd8520 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/HavingParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/HavingParser.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/OrderByParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/OrderByParser.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/OrderByParser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/OrderByParser.java index 021c9fb826..347f83f0a6 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/OrderByParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/OrderByParser.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import org.hibernate.QueryException; import org.hibernate.internal.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/Parser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/Parser.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/Parser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/Parser.java index e096366a29..0643d17a3b 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/Parser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/Parser.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import org.hibernate.QueryException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/ParserHelper.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/ParserHelper.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/ParserHelper.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/ParserHelper.java index 62bade6a19..df8ac48e25 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/ParserHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/ParserHelper.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import java.util.StringTokenizer; import org.hibernate.QueryException; import org.hibernate.internal.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/PathExpressionParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/PathExpressionParser.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/PathExpressionParser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/PathExpressionParser.java index 92b210f9b2..d941857e14 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/PathExpressionParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/PathExpressionParser.java @@ -22,13 +22,13 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import java.util.LinkedList; import java.util.Map; import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.engine.internal.JoinSequence; -import org.hibernate.hql.CollectionSubqueryFactory; +import org.hibernate.hql.internal.CollectionSubqueryFactory; import org.hibernate.persister.collection.CollectionPropertyMapping; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/PreprocessingParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/PreprocessingParser.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/PreprocessingParser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/PreprocessingParser.java index 1334107a08..c873c21430 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/PreprocessingParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/PreprocessingParser.java @@ -22,13 +22,13 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import java.util.HashSet; import java.util.Map; import java.util.Set; import org.hibernate.QueryException; -import org.hibernate.hql.CollectionProperties; +import org.hibernate.hql.internal.CollectionProperties; import org.hibernate.internal.util.StringHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java index 0cfa051267..797e0b3273 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import java.io.Serializable; import java.lang.reflect.Constructor; @@ -42,6 +42,9 @@ import org.hibernate.HibernateException; import org.hibernate.engine.internal.JoinSequence; import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.hql.internal.HolderInstantiator; +import org.hibernate.hql.internal.NameGenerator; +import org.hibernate.hql.spi.FilterTranslator; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.LockMode; import org.hibernate.LockOptions; @@ -51,10 +54,7 @@ import org.hibernate.ScrollableResults; import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.event.spi.EventSource; -import org.hibernate.hql.FilterTranslator; -import org.hibernate.hql.HolderInstantiator; -import org.hibernate.hql.NameGenerator; -import org.hibernate.hql.ParameterTranslations; +import org.hibernate.hql.spi.ParameterTranslations; import org.hibernate.internal.IteratorImpl; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.StringHelper; @@ -145,7 +145,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator * @param queryIdentifier A unique identifier for the query of which this * translation is part; typically this is the original, user-supplied query string. * @param queryString The "preprocessed" query string; at the very least - * already processed by {@link org.hibernate.hql.QuerySplitter}. + * already processed by {@link org.hibernate.hql.internal.QuerySplitter}. * @param enabledFilters Any enabled filters. * @param factory The session factory. */ @@ -1163,7 +1163,9 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator public ScrollableResults scroll(final QueryParameters queryParameters, final SessionImplementor session) throws HibernateException { - HolderInstantiator hi = HolderInstantiator.createClassicHolderInstantiator(holderConstructor, queryParameters.getResultTransformer()); + HolderInstantiator hi = HolderInstantiator.createClassicHolderInstantiator( + holderConstructor, queryParameters.getResultTransformer() + ); return scroll( queryParameters, returnTypes, hi, session ); } diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/SelectParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/SelectParser.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/SelectParser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/SelectParser.java index fa1cf3f9ab..f5819addc7 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/SelectParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/SelectParser.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import java.util.HashSet; import java.util.LinkedList; @@ -30,7 +30,7 @@ import java.util.Set; import org.hibernate.QueryException; import org.hibernate.dialect.function.SQLFunction; -import org.hibernate.hql.QuerySplitter; +import org.hibernate.hql.internal.QuerySplitter; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/SelectPathExpressionParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/SelectPathExpressionParser.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/SelectPathExpressionParser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/SelectPathExpressionParser.java index f180c63004..b098c35ce5 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/SelectPathExpressionParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/SelectPathExpressionParser.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import org.hibernate.QueryException; public class SelectPathExpressionParser extends PathExpressionParser { diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/WhereParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/WhereParser.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/WhereParser.java rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/WhereParser.java index 740c151f04..4df667c735 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/WhereParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/WhereParser.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.classic; +package org.hibernate.hql.internal.classic; import java.util.HashMap; import java.util.HashSet; @@ -33,7 +33,7 @@ import java.util.StringTokenizer; import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.engine.internal.JoinSequence; -import org.hibernate.hql.QueryTranslator; +import org.hibernate.hql.spi.QueryTranslator; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.StringHelper; import org.hibernate.persister.collection.CollectionPropertyNames; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/package.html b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/package.html similarity index 100% rename from hibernate-core/src/main/java/org/hibernate/hql/classic/package.html rename to hibernate-core/src/main/java/org/hibernate/hql/internal/classic/package.html diff --git a/hibernate-core/src/main/java/org/hibernate/hql/FilterTranslator.java b/hibernate-core/src/main/java/org/hibernate/hql/spi/FilterTranslator.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/FilterTranslator.java rename to hibernate-core/src/main/java/org/hibernate/hql/spi/FilterTranslator.java index af6caca86a..effe00b4ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/FilterTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/spi/FilterTranslator.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql; +package org.hibernate.hql.spi; import java.util.Map; import org.hibernate.MappingException; import org.hibernate.QueryException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ParameterTranslations.java b/hibernate-core/src/main/java/org/hibernate/hql/spi/ParameterTranslations.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/ParameterTranslations.java rename to hibernate-core/src/main/java/org/hibernate/hql/spi/ParameterTranslations.java index 43a5fc8a48..aaa51f7e91 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ParameterTranslations.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/spi/ParameterTranslations.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql; +package org.hibernate.hql.spi; import java.util.Set; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/QueryTranslator.java b/hibernate-core/src/main/java/org/hibernate/hql/spi/QueryTranslator.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/hql/QueryTranslator.java rename to hibernate-core/src/main/java/org/hibernate/hql/spi/QueryTranslator.java index 11efcfea82..0c81ccebf2 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/QueryTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/spi/QueryTranslator.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.hql; +package org.hibernate.hql.spi; import java.util.Iterator; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/QueryTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/spi/QueryTranslatorFactory.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/hql/QueryTranslatorFactory.java rename to hibernate-core/src/main/java/org/hibernate/hql/spi/QueryTranslatorFactory.java index acc9928aef..a0adc7f7ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/QueryTranslatorFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/spi/QueryTranslatorFactory.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql; +package org.hibernate.hql.spi; import java.util.Map; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractQueryImpl.java index 1b84b73ffa..9383abe322 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractQueryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractQueryImpl.java @@ -54,7 +54,7 @@ import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.RowSelection; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.spi.TypedValue; -import org.hibernate.hql.classic.ParserHelper; +import org.hibernate.hql.internal.classic.ParserHelper; import org.hibernate.internal.util.MarkerObject; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java index c9b012b591..cff7db8d43 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java @@ -42,7 +42,7 @@ import org.hibernate.MappingException; import org.hibernate.ScrollableResults; import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.hql.HolderInstantiator; +import org.hibernate.hql.internal.HolderInstantiator; import org.hibernate.loader.Loader; import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java index c5112aaccb..d8df991965 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java @@ -29,7 +29,7 @@ import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.hql.HolderInstantiator; +import org.hibernate.hql.internal.HolderInstantiator; import org.hibernate.loader.Loader; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/IteratorImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/IteratorImpl.java index c4e9935c2c..f10a7a6a4b 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/IteratorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/IteratorImpl.java @@ -31,7 +31,7 @@ import org.hibernate.HibernateException; import org.hibernate.JDBCException; import org.hibernate.engine.HibernateIterator; import org.hibernate.event.spi.EventSource; -import org.hibernate.hql.HolderInstantiator; +import org.hibernate.hql.internal.HolderInstantiator; import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java index 48fddf6623..a4db2bec06 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java @@ -30,7 +30,7 @@ import org.hibernate.MappingException; import org.hibernate.ScrollableResults; import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.hql.HolderInstantiator; +import org.hibernate.hql.internal.HolderInstantiator; import org.hibernate.loader.Loader; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java index 1baa86829b..bb78df3c5c 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java @@ -156,7 +156,7 @@ import org.hibernate.type.TypeResolver; * * @see org.hibernate.service.jdbc.connections.spi.ConnectionProvider * @see org.hibernate.Session - * @see org.hibernate.hql.QueryTranslator + * @see org.hibernate.hql.spi.QueryTranslator * @see org.hibernate.persister.entity.EntityPersister * @see org.hibernate.persister.collection.CollectionPersister * @author Gavin King diff --git a/hibernate-core/src/main/java/org/hibernate/loader/Loader.java b/hibernate-core/src/main/java/org/hibernate/loader/Loader.java index 0ee02a3e9c..7f3cd4c1ef 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/Loader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/Loader.java @@ -52,6 +52,7 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.spi.SubselectFetch; import org.hibernate.event.spi.EventSource; import org.hibernate.event.spi.PreLoadEvent; +import org.hibernate.hql.internal.HolderInstantiator; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.LockMode; import org.hibernate.LockOptions; @@ -68,7 +69,6 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.TypedValue; import org.hibernate.engine.jdbc.ColumnNameCache; import org.hibernate.event.spi.PostLoadEvent; -import org.hibernate.hql.HolderInstantiator; import org.hibernate.internal.FetchingScrollableResultsImpl; import org.hibernate.internal.ScrollableResultsImpl; import org.hibernate.internal.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java index 92296d1899..b4bf2a0f5b 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java @@ -48,7 +48,7 @@ import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.RowSelection; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.TypedValue; -import org.hibernate.hql.ast.util.SessionFactoryHelper; +import org.hibernate.hql.internal.ast.util.SessionFactoryHelper; import org.hibernate.internal.CriteriaImpl; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.persister.entity.Loadable; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/criteria/ScalarCollectionCriteriaInfoProvider.java b/hibernate-core/src/main/java/org/hibernate/loader/criteria/ScalarCollectionCriteriaInfoProvider.java index ca1c88a327..b132312b17 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/criteria/ScalarCollectionCriteriaInfoProvider.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/criteria/ScalarCollectionCriteriaInfoProvider.java @@ -26,10 +26,9 @@ package org.hibernate.loader.criteria; import java.io.Serializable; -import org.hibernate.hql.ast.util.SessionFactoryHelper; +import org.hibernate.hql.internal.ast.util.SessionFactoryHelper; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.PropertyMapping; -import org.hibernate.type.ComponentType; import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java index 9ea03bd8a5..6331c1a154 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java @@ -41,7 +41,7 @@ import org.hibernate.ScrollableResults; import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.hql.HolderInstantiator; +import org.hibernate.hql.internal.HolderInstantiator; import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.loader.CollectionAliases; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java index be234e260d..e699c26ff0 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java @@ -42,12 +42,12 @@ import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.event.spi.EventSource; -import org.hibernate.hql.HolderInstantiator; -import org.hibernate.hql.ast.QueryTranslatorImpl; -import org.hibernate.hql.ast.tree.AggregatedSelectExpression; -import org.hibernate.hql.ast.tree.FromElement; -import org.hibernate.hql.ast.tree.QueryNode; -import org.hibernate.hql.ast.tree.SelectClause; +import org.hibernate.hql.internal.HolderInstantiator; +import org.hibernate.hql.internal.ast.QueryTranslatorImpl; +import org.hibernate.hql.internal.ast.tree.AggregatedSelectExpression; +import org.hibernate.hql.internal.ast.tree.FromElement; +import org.hibernate.hql.internal.ast.tree.QueryNode; +import org.hibernate.hql.internal.ast.tree.SelectClause; import org.hibernate.internal.IteratorImpl; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.loader.BasicLoader; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/OrderByFragmentRenderer.java b/hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/OrderByFragmentRenderer.java index 6c0cb2c530..ab5497468b 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/OrderByFragmentRenderer.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/OrderByFragmentRenderer.java @@ -24,7 +24,7 @@ */ package org.hibernate.sql.ordering.antlr; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.hql.ast.util.ASTPrinter; +import org.hibernate.hql.internal.ast.util.ASTPrinter; import org.hibernate.internal.util.StringHelper; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/OrderByFragmentTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/OrderByFragmentTranslator.java index a4b1a35223..cd267b4258 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/OrderByFragmentTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/OrderByFragmentTranslator.java @@ -26,7 +26,7 @@ package org.hibernate.sql.ordering.antlr; import java.io.StringReader; import org.hibernate.HibernateException; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.hql.ast.util.ASTPrinter; +import org.hibernate.hql.internal.ast.util.ASTPrinter; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java b/hibernate-core/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java index 9fd05e0177..328a4f9fa3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java @@ -28,12 +28,12 @@ import java.io.PrintWriter; import antlr.ASTFactory; import antlr.collections.AST; -import org.hibernate.hql.antlr.HqlTokenTypes; -import org.hibernate.hql.ast.HqlParser; -import org.hibernate.hql.ast.util.ASTIterator; -import org.hibernate.hql.ast.util.ASTParentsFirstIterator; -import org.hibernate.hql.ast.util.ASTPrinter; -import org.hibernate.hql.ast.util.ASTUtil; +import org.hibernate.hql.internal.antlr.HqlTokenTypes; +import org.hibernate.hql.internal.ast.HqlParser; +import org.hibernate.hql.internal.ast.util.ASTIterator; +import org.hibernate.hql.internal.ast.util.ASTParentsFirstIterator; +import org.hibernate.hql.internal.ast.util.ASTPrinter; +import org.hibernate.hql.internal.ast.util.ASTUtil; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/ast/ASTUtilTest.java b/hibernate-core/src/test/java/org/hibernate/test/ast/ASTUtilTest.java index 52efcf2549..3feb970f25 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/ast/ASTUtilTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/ast/ASTUtilTest.java @@ -26,7 +26,7 @@ package org.hibernate.test.ast; import antlr.ASTFactory; import antlr.collections.AST; -import org.hibernate.hql.ast.util.ASTUtil; +import org.hibernate.hql.internal.ast.util.ASTUtil; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingOrderByTest.java index 3d0ae5a8de..c69f96add0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingOrderByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingOrderByTest.java @@ -32,10 +32,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.hql.ast.ASTQueryTranslatorFactory; +import org.hibernate.hql.internal.ast.ASTQueryTranslatorFactory; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import org.hibernate.testing.FailureExpected; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java index 2432bd9931..a10813e79b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java @@ -58,7 +58,7 @@ import org.hibernate.dialect.Sybase11Dialect; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.SybaseAnywhereDialect; import org.hibernate.dialect.SybaseDialect; -import org.hibernate.hql.ast.ASTQueryTranslatorFactory; +import org.hibernate.hql.internal.ast.ASTQueryTranslatorFactory; import org.hibernate.internal.util.StringHelper; import org.hibernate.persister.entity.DiscriminatorType; import org.hibernate.stat.QueryStatistics; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java index 8475783715..40ff05216c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java @@ -32,7 +32,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.hql.ast.HqlSqlWalker; +import org.hibernate.hql.internal.ast.HqlSqlWalker; import org.hibernate.id.IdentifierGenerator; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/ClassicTranslatorTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ClassicTranslatorTest.java index 1f588d82f9..8106a7e28d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/ClassicTranslatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/ClassicTranslatorTest.java @@ -26,7 +26,7 @@ package org.hibernate.test.hql; import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.hql.classic.ClassicQueryTranslatorFactory; +import org.hibernate.hql.internal.classic.ClassicQueryTranslatorFactory; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java index 045d8cb005..3c95ad1862 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java @@ -28,10 +28,10 @@ import org.hibernate.cfg.Configuration; import org.hibernate.dialect.function.ClassicAvgFunction; import org.hibernate.dialect.function.ClassicCountFunction; import org.hibernate.dialect.function.ClassicSumFunction; -import org.hibernate.hql.QueryTranslator; -import org.hibernate.hql.QueryTranslatorFactory; -import org.hibernate.hql.ast.QueryTranslatorImpl; -import org.hibernate.hql.classic.ClassicQueryTranslatorFactory; +import org.hibernate.hql.spi.QueryTranslator; +import org.hibernate.hql.spi.QueryTranslatorFactory; +import org.hibernate.hql.internal.ast.QueryTranslatorImpl; +import org.hibernate.hql.internal.classic.ClassicQueryTranslatorFactory; import org.hibernate.type.BigDecimalType; import org.hibernate.type.BigIntegerType; import org.hibernate.type.DoubleType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java index 3f72640ab7..452a834fac 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java @@ -31,11 +31,11 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Projections; import org.hibernate.exception.SQLGrammarException; -import org.hibernate.hql.QueryTranslator; -import org.hibernate.hql.QueryTranslatorFactory; -import org.hibernate.hql.ast.QueryTranslatorImpl; -import org.hibernate.hql.ast.tree.SelectClause; -import org.hibernate.hql.classic.ClassicQueryTranslatorFactory; +import org.hibernate.hql.spi.QueryTranslator; +import org.hibernate.hql.spi.QueryTranslatorFactory; +import org.hibernate.hql.internal.ast.QueryTranslatorImpl; +import org.hibernate.hql.internal.ast.tree.SelectClause; +import org.hibernate.hql.internal.classic.ClassicQueryTranslatorFactory; import org.hibernate.type.BigDecimalType; import org.hibernate.type.BigIntegerType; import org.hibernate.type.DoubleType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/EJBQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/EJBQLTest.java index 4002123ec7..08e35446ac 100755 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/EJBQLTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/EJBQLTest.java @@ -31,13 +31,13 @@ import antlr.RecognitionException; import antlr.TokenStreamException; import antlr.collections.AST; -import org.hibernate.hql.QueryTranslator; -import org.hibernate.hql.QueryTranslatorFactory; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.hql.ast.ASTQueryTranslatorFactory; -import org.hibernate.hql.ast.HqlParser; -import org.hibernate.hql.ast.QueryTranslatorImpl; -import org.hibernate.hql.ast.util.ASTUtil; +import org.hibernate.hql.spi.QueryTranslator; +import org.hibernate.hql.spi.QueryTranslatorFactory; +import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.internal.ast.ASTQueryTranslatorFactory; +import org.hibernate.hql.internal.ast.HqlParser; +import org.hibernate.hql.internal.ast.QueryTranslatorImpl; +import org.hibernate.hql.internal.ast.util.ASTUtil; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/HQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/HQLTest.java index e4186b7702..6bd285ca3a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/HQLTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/HQLTest.java @@ -50,21 +50,21 @@ import org.hibernate.dialect.function.SQLFunction; import org.hibernate.engine.query.spi.HQLQueryPlan; import org.hibernate.engine.query.spi.ReturnMetadata; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.hql.QueryTranslator; -import org.hibernate.hql.QueryTranslatorFactory; -import org.hibernate.hql.antlr.HqlTokenTypes; -import org.hibernate.hql.ast.ASTQueryTranslatorFactory; -import org.hibernate.hql.ast.DetailedSemanticException; -import org.hibernate.hql.ast.QuerySyntaxException; -import org.hibernate.hql.ast.QueryTranslatorImpl; -import org.hibernate.hql.ast.SqlGenerator; -import org.hibernate.hql.ast.tree.ConstructorNode; -import org.hibernate.hql.ast.tree.DotNode; -import org.hibernate.hql.ast.tree.FromReferenceNode; -import org.hibernate.hql.ast.tree.IndexNode; -import org.hibernate.hql.ast.tree.QueryNode; -import org.hibernate.hql.ast.tree.SelectClause; -import org.hibernate.hql.ast.util.ASTUtil; +import org.hibernate.hql.spi.QueryTranslator; +import org.hibernate.hql.spi.QueryTranslatorFactory; +import org.hibernate.hql.internal.antlr.HqlTokenTypes; +import org.hibernate.hql.internal.ast.ASTQueryTranslatorFactory; +import org.hibernate.hql.internal.ast.DetailedSemanticException; +import org.hibernate.hql.internal.ast.QuerySyntaxException; +import org.hibernate.hql.internal.ast.QueryTranslatorImpl; +import org.hibernate.hql.internal.ast.SqlGenerator; +import org.hibernate.hql.internal.ast.tree.ConstructorNode; +import org.hibernate.hql.internal.ast.tree.DotNode; +import org.hibernate.hql.internal.ast.tree.FromReferenceNode; +import org.hibernate.hql.internal.ast.tree.IndexNode; +import org.hibernate.hql.internal.ast.tree.QueryNode; +import org.hibernate.hql.internal.ast.tree.SelectClause; +import org.hibernate.hql.internal.ast.util.ASTUtil; import org.hibernate.type.CalendarDateType; import org.hibernate.type.DoubleType; import org.hibernate.type.StringType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/HqlParserTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/HqlParserTest.java index 0a1b5137d3..ff18f0ce16 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/HqlParserTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/HqlParserTest.java @@ -5,10 +5,10 @@ import java.io.PrintStream; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.hibernate.hql.ast.HqlParser; -import org.hibernate.hql.ast.tree.Node; -import org.hibernate.hql.ast.util.ASTIterator; -import org.hibernate.hql.ast.util.ASTPrinter; +import org.hibernate.hql.internal.ast.HqlParser; +import org.hibernate.hql.internal.ast.tree.Node; +import org.hibernate.hql.internal.ast.util.ASTIterator; +import org.hibernate.hql.internal.ast.util.ASTPrinter; import antlr.RecognitionException; import antlr.TokenStreamException; import antlr.collections.AST; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java b/hibernate-core/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java index 1143fba08a..c982844abe 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java @@ -34,12 +34,12 @@ import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.engine.query.spi.HQLQueryPlan; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.hql.QueryTranslator; -import org.hibernate.hql.QueryTranslatorFactory; -import org.hibernate.hql.ast.ASTQueryTranslatorFactory; -import org.hibernate.hql.ast.QueryTranslatorImpl; -import org.hibernate.hql.ast.util.ASTPrinter; -import org.hibernate.hql.classic.ClassicQueryTranslatorFactory; +import org.hibernate.hql.spi.QueryTranslator; +import org.hibernate.hql.spi.QueryTranslatorFactory; +import org.hibernate.hql.internal.ast.ASTQueryTranslatorFactory; +import org.hibernate.hql.internal.ast.QueryTranslatorImpl; +import org.hibernate.hql.internal.ast.util.ASTPrinter; +import org.hibernate.hql.internal.classic.ClassicQueryTranslatorFactory; import org.hibernate.internal.util.StringHelper; import org.hibernate.type.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/WithClauseTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/WithClauseTest.java index f080467b69..74f97973f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/WithClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/WithClauseTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.hql.ast.InvalidWithClauseException; +import org.hibernate.hql.internal.ast.InvalidWithClauseException; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java index 77123cc672..fd7b34b2e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java @@ -29,7 +29,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.DefaultNamingStrategy; import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; -import org.hibernate.hql.classic.ClassicQueryTranslatorFactory; +import org.hibernate.hql.internal.classic.ClassicQueryTranslatorFactory; import org.hibernate.internal.util.StringHelper; import org.hibernate.type.Type; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java index d14bd4488b..88df1b9b3e 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java @@ -50,7 +50,7 @@ import org.hibernate.ejb.internal.EntityManagerMessageLogger; import org.hibernate.ejb.util.CacheModeHelper; import org.hibernate.ejb.util.ConfigurationHelper; import org.hibernate.ejb.util.LockModeTypeHelper; -import org.hibernate.hql.QueryExecutionRequestException; +import org.hibernate.hql.internal.QueryExecutionRequestException; import org.jboss.logging.Logger; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java index e1427304f9..074aff71d2 100755 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java @@ -53,7 +53,7 @@ import org.hibernate.ejb.util.LockModeTypeHelper; import org.hibernate.engine.query.spi.NamedParameterDescriptor; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.query.spi.OrdinalParameterDescriptor; -import org.hibernate.hql.QueryExecutionRequestException; +import org.hibernate.hql.internal.QueryExecutionRequestException; import org.hibernate.internal.AbstractQueryImpl; import org.jboss.logging.Logger;