From bbcab404bd2d57d2f12ffee02dfe055d3a143fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Thu, 23 Sep 2010 13:48:46 +0000 Subject: [PATCH] updated javadocs --- .../java/com/mysema/query/BooleanBuilder.java | 2 +- .../java/com/mysema/query/FilteredClause.java | 4 +- .../main/java/com/mysema/query/JoinFlag.java | 2 +- .../src/main/java/com/mysema/query/Query.java | 2 +- .../main/java/com/mysema/query/QueryFlag.java | 41 ++++++++++++++++++- .../java/com/mysema/query/QueryModifiers.java | 22 ---------- .../{QuerydslConfig.java => Config.java} | 3 +- .../query/annotations/QueryDelegate.java | 1 - ...{QuerydslVariables.java => Variables.java} | 3 +- .../query/codegen/SimpleSerializerConfig.java | 4 +- .../com/mysema/query/dml/DeleteClause.java | 2 +- .../com/mysema/query/dml/InsertClause.java | 2 +- .../com/mysema/query/types/ConstantImpl.java | 10 ++++- .../com/mysema/query/types/EntityPath.java | 2 + .../com/mysema/query/types/Expression.java | 2 +- .../mysema/query/types/ExpressionBase.java | 2 + .../mysema/query/types/ExpressionUtils.java | 2 + .../mysema/query/types/ExtractorVisitor.java | 2 + .../com/mysema/query/types/JavaTemplates.java | 2 +- .../query/types/{path => }/NullExpr.java | 4 +- .../com/mysema/query/types/OperationImpl.java | 2 + .../java/com/mysema/query/types/Operator.java | 2 + .../mysema/query/types/ParamExpression.java | 4 ++ .../java/com/mysema/query/types/PathImpl.java | 3 +- .../query/types/PathMetadataFactory.java | 2 + .../com/mysema/query/types/Predicate.java | 4 ++ .../query/types/PredicateOperation.java | 2 + .../com/mysema/query/types/SubQueryImpl.java | 2 +- .../query/types/TemplateExpressionImpl.java | 1 - .../expr/ArrayConstructorExpression.java | 2 +- .../query/types/expr/CaseForEqBuilder.java | 2 - .../types/expr/ComparableExpression.java | 2 +- .../query/types/expr/EnumExpression.java | 2 + .../query/types/expr/SimpleExpression.java | 3 +- .../query/types/expr/TimeOperation.java | 2 +- .../com/mysema/query/types/path/DatePath.java | 2 + .../mysema/query/types/path/DateTimePath.java | 2 + .../query/types/path/EntityPathBase.java | 2 + .../mysema/query/types/path/PathBuilder.java | 2 +- .../com/mysema/query/types/path/TimePath.java | 2 + .../query/types/query/BooleanSubQuery.java | 2 +- .../query/types/query/ComparableSubQuery.java | 2 +- .../query/types/query/DateSubQuery.java | 2 +- .../query/types/query/DateTimeSubQuery.java | 2 +- .../query/types/query/NumberSubQuery.java | 2 +- .../query/types/query/ObjectSubQuery.java | 2 +- .../query/types/query/StringSubQuery.java | 2 +- .../query/types/query/TimeSubQuery.java | 2 +- .../query/types/template/DateTemplate.java | 2 + .../types/template/DateTimeTemplate.java | 2 + .../query/types/template/TimeTemplate.java | 2 + .../template/TemplateExpressionTest.java | 13 +----- .../query/jdo/dml/JDOQLUpdateClause.java | 2 +- .../com/mysema/query/jpa/JPQLCommonQuery.java | 2 +- .../com/mysema/query/jpa/JPQLGrammar.java | 2 +- .../java/com/mysema/query/jpa/JPQLQuery.java | 2 +- .../com/mysema/query/jpa/JPQLQueryBase.java | 2 +- .../com/mysema/query/jpa/JPQLQueryMixin.java | 2 +- .../com/mysema/query/jpa/JPQLSerializer.java | 2 +- .../com/mysema/query/jpa/JPQLSubQuery.java | 2 +- .../com/mysema/query/jpa/JPQLTemplates.java | 2 +- .../jpa/hibernate/AbstractHibernateQuery.java | 2 +- .../query/jpa/hibernate/HibernateQuery.java | 2 +- .../jpa/hibernate/HibernateUpdateClause.java | 2 +- .../query/jpa/hibernate/package-info.java | 2 +- .../query/jpa/impl/AbstractJPAQuery.java | 2 +- .../com/mysema/query/jpa/impl/JPAQuery.java | 2 +- .../query/jpa/impl/JPAUpdateClause.java | 2 +- .../mysema/query/jpa/domain/package-info.java | 4 +- .../mysema/query/sql/dml/SQLInsertClause.java | 2 +- .../mysema/query/sql/dml/SQLMergeClause.java | 2 +- .../mysema/query/sql/dml/SQLUpdateClause.java | 2 +- 72 files changed, 140 insertions(+), 96 deletions(-) rename querydsl-core/src/main/java/com/mysema/query/annotations/{QuerydslConfig.java => Config.java} (94%) rename querydsl-core/src/main/java/com/mysema/query/annotations/{QuerydslVariables.java => Variables.java} (92%) rename querydsl-core/src/main/java/com/mysema/query/types/{path => }/NullExpr.java (83%) diff --git a/querydsl-core/src/main/java/com/mysema/query/BooleanBuilder.java b/querydsl-core/src/main/java/com/mysema/query/BooleanBuilder.java index df50b4256..679f6e3b2 100644 --- a/querydsl-core/src/main/java/com/mysema/query/BooleanBuilder.java +++ b/querydsl-core/src/main/java/com/mysema/query/BooleanBuilder.java @@ -22,7 +22,7 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.BooleanExpression; /** - * BooleanBuilder is a cascading builder for {@link BooleanExpression} expressions. + * BooleanBuilder is a cascading builder for {@link Predicate} expressions. * * @author tiwe */ diff --git a/querydsl-core/src/main/java/com/mysema/query/FilteredClause.java b/querydsl-core/src/main/java/com/mysema/query/FilteredClause.java index eee7a9a7b..f5bda11b4 100644 --- a/querydsl-core/src/main/java/com/mysema/query/FilteredClause.java +++ b/querydsl-core/src/main/java/com/mysema/query/FilteredClause.java @@ -8,7 +8,7 @@ package com.mysema.query; import com.mysema.query.types.Predicate; /** - * Parent interface for clauses with a filter + * Parent interface for clauses with a filter condition * * @author tiwe * @@ -17,7 +17,7 @@ import com.mysema.query.types.Predicate; public interface FilteredClause> { /** - * Defines the filter constraints + * Adds the given filter conditions * * @param o * @return diff --git a/querydsl-core/src/main/java/com/mysema/query/JoinFlag.java b/querydsl-core/src/main/java/com/mysema/query/JoinFlag.java index 76e4afd0d..c440b7cdc 100644 --- a/querydsl-core/src/main/java/com/mysema/query/JoinFlag.java +++ b/querydsl-core/src/main/java/com/mysema/query/JoinFlag.java @@ -13,7 +13,7 @@ import com.mysema.query.types.Expression; import com.mysema.query.types.TemplateExpressionImpl; /** - * JoinFlag defines a join related flag using an Expr instance + * JoinFlag defines a join related flag using an Expression instance * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/Query.java b/querydsl-core/src/main/java/com/mysema/query/Query.java index f73324ff8..c9d19e635 100644 --- a/querydsl-core/src/main/java/com/mysema/query/Query.java +++ b/querydsl-core/src/main/java/com/mysema/query/Query.java @@ -13,7 +13,7 @@ import com.mysema.query.types.ParamExpression; import com.mysema.query.types.Predicate; /** - * Query provides a query interface of the fluent query DSL. + * Query defines the main query interface of the fluent query language. * *

Note that the from method has been left out, since there are implementation * specific variants of it.

diff --git a/querydsl-core/src/main/java/com/mysema/query/QueryFlag.java b/querydsl-core/src/main/java/com/mysema/query/QueryFlag.java index 88f42fb0e..885918f6d 100644 --- a/querydsl-core/src/main/java/com/mysema/query/QueryFlag.java +++ b/querydsl-core/src/main/java/com/mysema/query/QueryFlag.java @@ -14,7 +14,7 @@ import com.mysema.query.types.Expression; import com.mysema.query.types.TemplateExpressionImpl; /** - * Defines a positioned flag in a query for customization of query serialization + * Defines a positioned flag in a Query for customization of query serialization * * @author tiwe * @@ -26,30 +26,69 @@ public class QueryFlag implements Serializable{ public enum Position { + /** + * Start of the query + */ START, + /** + * Override for the first element (e.g SELECT, INSERT) + */ START_OVERRIDE, + /** + * After the first element (after select) + */ AFTER_SELECT, + /** + * After the projection (after select ...) + */ AFTER_PROJECTION, + /** + * Before the filter conditions (where) + */ BEFORE_FILTERS, + /** + * After the filter conditions (where) + */ AFTER_FILTERS, + /** + * Before group by + */ BEFORE_GROUP_BY, + /** + * After group by + */ AFTER_GROUP_BY, + /** + * Before having + */ BEFORE_HAVING, + /** + * After having + */ AFTER_HAVING, + /** + * Before order (by) + */ BEFORE_ORDER, + /** + * After order (by) + */ AFTER_ORDER, + /** + * After all other tokens + */ END } diff --git a/querydsl-core/src/main/java/com/mysema/query/QueryModifiers.java b/querydsl-core/src/main/java/com/mysema/query/QueryModifiers.java index 18dd0e1c3..b14a8f468 100644 --- a/querydsl-core/src/main/java/com/mysema/query/QueryModifiers.java +++ b/querydsl-core/src/main/java/com/mysema/query/QueryModifiers.java @@ -36,20 +36,11 @@ public final class QueryModifiers implements Serializable{ @Nullable private final Long limit, offset; - /** - * Instantiates a new query modifiers. - */ public QueryModifiers() { limit = null; offset = null; } - /** - * Instantiates a new query modifiers. - * - * @param limit the limit - * @param offset the offset - */ public QueryModifiers(@Nullable Long limit, @Nullable Long offset) { this.limit = limit; if (limit != null && limit <= 0) { @@ -61,29 +52,16 @@ public final class QueryModifiers implements Serializable{ } } - /** - * @param modifiers - */ public QueryModifiers(QueryModifiers modifiers) { this.limit = modifiers.getLimit(); this.offset = modifiers.getOffset(); } - /** - * Gets the limit. - * - * @return the limit - */ @Nullable public Long getLimit() { return limit; } - /** - * Gets the offset. - * - * @return the offset - */ @Nullable public Long getOffset() { return offset; diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QuerydslConfig.java b/querydsl-core/src/main/java/com/mysema/query/annotations/Config.java similarity index 94% rename from querydsl-core/src/main/java/com/mysema/query/annotations/QuerydslConfig.java rename to querydsl-core/src/main/java/com/mysema/query/annotations/Config.java index b3591d3ef..78d120673 100644 --- a/querydsl-core/src/main/java/com/mysema/query/annotations/QuerydslConfig.java +++ b/querydsl-core/src/main/java/com/mysema/query/annotations/Config.java @@ -22,8 +22,7 @@ import java.lang.annotation.Target; @Documented @Target({PACKAGE,TYPE}) @Retention(RUNTIME) -// TODO : rename to Config -public @interface QuerydslConfig { +public @interface Config { /** * Created entity field initialization accessors diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryDelegate.java b/querydsl-core/src/main/java/com/mysema/query/annotations/QueryDelegate.java index 5012218c8..e8b63c09c 100644 --- a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryDelegate.java +++ b/querydsl-core/src/main/java/com/mysema/query/annotations/QueryDelegate.java @@ -21,7 +21,6 @@ import java.lang.annotation.Target; @Documented @Target({METHOD}) @Retention(RUNTIME) -// TODO : rename to Delegate public @interface QueryDelegate { /** diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QuerydslVariables.java b/querydsl-core/src/main/java/com/mysema/query/annotations/Variables.java similarity index 92% rename from querydsl-core/src/main/java/com/mysema/query/annotations/QuerydslVariables.java rename to querydsl-core/src/main/java/com/mysema/query/annotations/Variables.java index b353f1b4c..56427af74 100644 --- a/querydsl-core/src/main/java/com/mysema/query/annotations/QuerydslVariables.java +++ b/querydsl-core/src/main/java/com/mysema/query/annotations/Variables.java @@ -22,8 +22,7 @@ import java.lang.annotation.Target; @Documented @Target({PACKAGE}) @Retention(RUNTIME) -// TODO : rename to Variables -public @interface QuerydslVariables { +public @interface Variables { /** * Simple name of the variables class diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/SimpleSerializerConfig.java b/querydsl-core/src/main/java/com/mysema/query/codegen/SimpleSerializerConfig.java index 60ce3ec42..8db9d15ae 100644 --- a/querydsl-core/src/main/java/com/mysema/query/codegen/SimpleSerializerConfig.java +++ b/querydsl-core/src/main/java/com/mysema/query/codegen/SimpleSerializerConfig.java @@ -7,7 +7,7 @@ package com.mysema.query.codegen; import net.jcip.annotations.Immutable; -import com.mysema.query.annotations.QuerydslConfig; +import com.mysema.query.annotations.Config; /** * SimpleSerializerConfig is the default implementation of the SerializerConfig interface @@ -20,7 +20,7 @@ public final class SimpleSerializerConfig implements SerializerConfig{ public static final SerializerConfig DEFAULT = new SimpleSerializerConfig(false, false, false, true); - public static SerializerConfig getConfig(QuerydslConfig annotation){ + public static SerializerConfig getConfig(Config annotation){ return new SimpleSerializerConfig( annotation.entityAccessors(), annotation.listAccessors(), diff --git a/querydsl-core/src/main/java/com/mysema/query/dml/DeleteClause.java b/querydsl-core/src/main/java/com/mysema/query/dml/DeleteClause.java index d5ebe6832..d0b9a5953 100644 --- a/querydsl-core/src/main/java/com/mysema/query/dml/DeleteClause.java +++ b/querydsl-core/src/main/java/com/mysema/query/dml/DeleteClause.java @@ -9,7 +9,7 @@ import com.mysema.query.FilteredClause; /** - * DeleteClause defines a generic extensible interface for Delete clauses + * DeleteClause defines a generic interface for Delete clauses * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/dml/InsertClause.java b/querydsl-core/src/main/java/com/mysema/query/dml/InsertClause.java index 06d5ab2bd..cd18417ed 100644 --- a/querydsl-core/src/main/java/com/mysema/query/dml/InsertClause.java +++ b/querydsl-core/src/main/java/com/mysema/query/dml/InsertClause.java @@ -9,7 +9,7 @@ import com.mysema.query.types.Path; import com.mysema.query.types.SubQueryExpression; /** - * InsertClause defines a generic extensible interface for Insert clauses + * InsertClause defines a generic interface for Insert clauses * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ConstantImpl.java b/querydsl-core/src/main/java/com/mysema/query/types/ConstantImpl.java index d88c93859..70df14741 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/ConstantImpl.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/ConstantImpl.java @@ -14,6 +14,8 @@ import java.util.Map; import com.mysema.commons.lang.Assert; /** + * ConstantImpl is the default implementation of the Constant interface + * * @author tiwe */ @SuppressWarnings("unchecked") @@ -33,9 +35,9 @@ public class ConstantImpl extends ExpressionBase implements Constant { private static final Map> STRINGS; - public static final Constant FALSE = new ConstantImpl(Boolean.FALSE); + private static final Constant FALSE = new ConstantImpl(Boolean.FALSE); - public static final Constant TRUE = new ConstantImpl(Boolean.TRUE); + private static final Constant TRUE = new ConstantImpl(Boolean.TRUE); static{ List strs = new ArrayList(Arrays.asList("", ".", ".*", "%")); @@ -56,6 +58,10 @@ public class ConstantImpl extends ExpressionBase implements Constant { } } + public static Constant create(boolean b){ + return b ? TRUE : FALSE; + } + public static Constant create(byte i){ if (i >= 0 && i < CACHE_SIZE){ return BYTES[i]; diff --git a/querydsl-core/src/main/java/com/mysema/query/types/EntityPath.java b/querydsl-core/src/main/java/com/mysema/query/types/EntityPath.java index 6e45e61c2..8210bc469 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/EntityPath.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/EntityPath.java @@ -6,6 +6,8 @@ package com.mysema.query.types; /** + * EntityPath is the common interface for entity path expressions + * * @author tiwe * * @param diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Expression.java b/querydsl-core/src/main/java/com/mysema/query/types/Expression.java index c757e7438..b6bd0594d 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/Expression.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/Expression.java @@ -10,7 +10,7 @@ import java.io.Serializable; import javax.annotation.Nullable; /** - * Expr represents a general typed expression in a Query instance. The generic type parameter + * Expression defines a general typed expression in a Query instance. The generic type parameter * is a reference to the type the expression is bound to. * * @author tiwe diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionBase.java b/querydsl-core/src/main/java/com/mysema/query/types/ExpressionBase.java index c01b80f09..c8a415f95 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionBase.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/ExpressionBase.java @@ -8,6 +8,8 @@ package com.mysema.query.types; import javax.annotation.Nullable; /** + * ExpressionBase is the base class for Expression implementations + * * @author tiwe * * @param diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java b/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java index b4a36a485..adeeea834 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java @@ -11,6 +11,8 @@ import javax.annotation.Nullable; /** + * Utilities for constructing common operation instances + * * @author tiwe * */ diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ExtractorVisitor.java b/querydsl-core/src/main/java/com/mysema/query/types/ExtractorVisitor.java index 72c64321f..661fc9007 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/ExtractorVisitor.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/ExtractorVisitor.java @@ -7,6 +7,8 @@ package com.mysema.query.types; /** + * ExtractorVisitor is a Visitor implementation for Expression extraction + * * @author tiwe * */ diff --git a/querydsl-core/src/main/java/com/mysema/query/types/JavaTemplates.java b/querydsl-core/src/main/java/com/mysema/query/types/JavaTemplates.java index 59c29cb4b..3488976f3 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/JavaTemplates.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/JavaTemplates.java @@ -9,7 +9,7 @@ import java.lang.reflect.Field; /** - * JavaTemplates extends Template to provide Java syntax compliant serialization + * JavaTemplates extends Templates to provide Java syntax compliant serialization * of Querydsl expressions * * @author tiwe diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/NullExpr.java b/querydsl-core/src/main/java/com/mysema/query/types/NullExpr.java similarity index 83% rename from querydsl-core/src/main/java/com/mysema/query/types/path/NullExpr.java rename to querydsl-core/src/main/java/com/mysema/query/types/NullExpr.java index ed08b51ea..c1ccd9b1a 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/path/NullExpr.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/NullExpr.java @@ -3,12 +3,10 @@ * All rights reserved. * */ -package com.mysema.query.types.path; +package com.mysema.query.types; import java.util.Collections; -import com.mysema.query.types.Expression; -import com.mysema.query.types.TemplateFactory; import com.mysema.query.types.template.SimpleTemplate; /** diff --git a/querydsl-core/src/main/java/com/mysema/query/types/OperationImpl.java b/querydsl-core/src/main/java/com/mysema/query/types/OperationImpl.java index 172d51e46..486381866 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/OperationImpl.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/OperationImpl.java @@ -11,6 +11,8 @@ import java.util.List; /** + * OperationImpl is the default implementation of the Operation interface + * * @author tiwe * * @param diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Operator.java b/querydsl-core/src/main/java/com/mysema/query/types/Operator.java index 9455b0d87..b617fd153 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/Operator.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/Operator.java @@ -18,6 +18,8 @@ import java.util.List; public interface Operator extends Serializable{ /** + * Get the unique id for this Operator + * * @return */ String getId(); diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ParamExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/ParamExpression.java index d5566bf74..dcc811bea 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/ParamExpression.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/ParamExpression.java @@ -6,6 +6,8 @@ package com.mysema.query.types; /** + * ParamExpression defines named and unnamed parameters in queries + * * @author tiwe * * @param @@ -13,6 +15,8 @@ package com.mysema.query.types; public interface ParamExpression extends Expression{ /** + * Get the name of the parameter + * * @return */ String getName(); diff --git a/querydsl-core/src/main/java/com/mysema/query/types/PathImpl.java b/querydsl-core/src/main/java/com/mysema/query/types/PathImpl.java index d365088ce..29f6a37a8 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/PathImpl.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/PathImpl.java @@ -12,8 +12,7 @@ import javax.annotation.Nullable; import com.mysema.util.ReflectionUtils; /** - * PathImpl defines a default implementation of the Path interface which can be used - * as a component and target in actual Path implementations + * PathImpl defines a default implementation of the Path interface * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/PathMetadataFactory.java b/querydsl-core/src/main/java/com/mysema/query/types/PathMetadataFactory.java index 70b8a4503..1e7250d1e 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/PathMetadataFactory.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/PathMetadataFactory.java @@ -10,6 +10,8 @@ import javax.annotation.Nonnegative; import com.mysema.commons.lang.Assert; /** + * PathMetadataFactory is a factory class for Path construction + * * @author tiwe * */ diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Predicate.java b/querydsl-core/src/main/java/com/mysema/query/types/Predicate.java index d0d20ebd9..f33e06a55 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/Predicate.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/Predicate.java @@ -6,12 +6,16 @@ package com.mysema.query.types; /** + * Predicate is the common interface for Boolean typed expressions + * * @author tiwe * */ public interface Predicate extends Expression{ /** + * Get the negation of the expression + * * @return */ Predicate not(); diff --git a/querydsl-core/src/main/java/com/mysema/query/types/PredicateOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/PredicateOperation.java index f90316689..e4d7fed26 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/PredicateOperation.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/PredicateOperation.java @@ -6,6 +6,8 @@ package com.mysema.query.types; /** + * PredicateOperation provides a Boolean typed Operation implemenentation + * * @author tiwe * */ diff --git a/querydsl-core/src/main/java/com/mysema/query/types/SubQueryImpl.java b/querydsl-core/src/main/java/com/mysema/query/types/SubQueryImpl.java index 00559c055..cc5c0e537 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/SubQueryImpl.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/SubQueryImpl.java @@ -10,7 +10,7 @@ import javax.annotation.Nullable; import com.mysema.query.QueryMetadata; /** - * Mixin implementation of the SubQuery interface + * SubQueryImpl is the default implementation of the SubQuery interface * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/TemplateExpressionImpl.java b/querydsl-core/src/main/java/com/mysema/query/types/TemplateExpressionImpl.java index b62e54648..9de2d9fc6 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/TemplateExpressionImpl.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/TemplateExpressionImpl.java @@ -8,7 +8,6 @@ package com.mysema.query.types; import java.util.Arrays; import java.util.List; - /** * Default implementation of the TemplateExpression interface * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/ArrayConstructorExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/ArrayConstructorExpression.java index d6e19e644..ee7f6c477 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/expr/ArrayConstructorExpression.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/ArrayConstructorExpression.java @@ -15,7 +15,7 @@ import com.mysema.query.types.FactoryExpression; import com.mysema.query.types.Visitor; /** - * ArrayConstructorExpression extends {@link ConstructorExpression} to represent array initializers + * ArrayConstructorExpression extends {@link SimpleExpression} to represent array initializers * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseForEqBuilder.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseForEqBuilder.java index 759093573..ae9d41d18 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseForEqBuilder.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseForEqBuilder.java @@ -85,7 +85,6 @@ public final class CaseForEqBuilder { } public > Cases> then(T then){ -// return then(NumberConstant.create(then)); return thenNumber(new ConstantImpl(then)); } @@ -110,7 +109,6 @@ public final class CaseForEqBuilder { } public Cases then(String then){ -// return then(StringConstant.create(then)); return thenString(ConstantImpl.create(then)); } diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/ComparableExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/ComparableExpression.java index 484f779b8..b633f2a3d 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/expr/ComparableExpression.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/ComparableExpression.java @@ -13,7 +13,7 @@ import com.mysema.query.types.Path; import com.mysema.query.types.PathImpl; /** - * ComparableExpression extends EComparableBase to provide comparison methods. + * ComparableExpression extends ComparableExpressionBase to provide comparison methods. * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/EnumExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/EnumExpression.java index a59c58746..fe158d339 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/expr/EnumExpression.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/EnumExpression.java @@ -11,6 +11,8 @@ import com.mysema.query.types.Path; import com.mysema.query.types.PathImpl; /** + * EnumExpression represents Enum typed expressions + * * @author tiwe * * @param diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/SimpleExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/SimpleExpression.java index e2c4bad21..a397f0f6e 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/expr/SimpleExpression.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/SimpleExpression.java @@ -20,8 +20,7 @@ import com.mysema.query.types.Path; import com.mysema.query.types.PathImpl; /** - * ESimple is the base class for Expr implementations. It provides default implementations - * for most of the abstract methods in {@link Expression} + * SimpleExpression is the base class for Expression implementations. * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/TimeOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/TimeOperation.java index f630ff63d..d6af54cd0 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/expr/TimeOperation.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/TimeOperation.java @@ -15,7 +15,7 @@ import com.mysema.query.types.Operator; import com.mysema.query.types.Visitor; /** - * TimeOperation represents Time functions + * TimeOperation represents Time operations * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/DatePath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/DatePath.java index 779503d07..db9826070 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/path/DatePath.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/path/DatePath.java @@ -15,6 +15,8 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.DateExpression; /** + * DatePath presents Date paths + * * @author tiwe * * @param diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/DateTimePath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/DateTimePath.java index 7a301e4ae..605b84ad0 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/path/DateTimePath.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/path/DateTimePath.java @@ -15,6 +15,8 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.DateTimeExpression; /** + * DateTimePath presents DateTime typed paths + * * @author tiwe * * @param diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/EntityPathBase.java b/querydsl-core/src/main/java/com/mysema/query/types/path/EntityPathBase.java index a524b36cd..b1db0e730 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/path/EntityPathBase.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/path/EntityPathBase.java @@ -11,6 +11,8 @@ import com.mysema.query.types.EntityPath; import com.mysema.query.types.PathMetadata; /** + * EntityPathBase provides a base class for EntityPath implementations + * * @author tiwe * * @param diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/PathBuilder.java b/querydsl-core/src/main/java/com/mysema/query/types/path/PathBuilder.java index 6debd3b51..328fb50c2 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/path/PathBuilder.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/path/PathBuilder.java @@ -14,7 +14,7 @@ import com.mysema.query.types.PathMetadataFactory; import com.mysema.query.types.expr.SimpleExpression; /** - * PathBuilder is an extension to PEntity for dynamic path construction + * PathBuilder is an extension to EntityPathBase for dynamic path construction * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/TimePath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/TimePath.java index 6d0f4fc16..4dd4cf54d 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/path/TimePath.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/path/TimePath.java @@ -15,6 +15,8 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.TimeExpression; /** + * TimePath represented Time paths + * * @author tiwe * * @param diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/BooleanSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/BooleanSubQuery.java index 5a2781ab3..0475050e0 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/query/BooleanSubQuery.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/query/BooleanSubQuery.java @@ -13,7 +13,7 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.BooleanExpression; /** - * Single result subquery + * Boolean typed single result subquery * * @author tiwe */ diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/ComparableSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/ComparableSubQuery.java index e6dc5578a..3d1326495 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/query/ComparableSubQuery.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/query/ComparableSubQuery.java @@ -13,7 +13,7 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.ComparableExpression; /** - * Single result subquery + * Comparable typed single result subquery * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/DateSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/DateSubQuery.java index c5eb147fe..92f6507b9 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/query/DateSubQuery.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/query/DateSubQuery.java @@ -13,7 +13,7 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.DateExpression; /** - * Single result subquery + * Date typed single result subquery * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/DateTimeSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/DateTimeSubQuery.java index 26759ad12..3d7b74e95 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/query/DateTimeSubQuery.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/query/DateTimeSubQuery.java @@ -13,7 +13,7 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.DateTimeExpression; /** - * Single result subquery + * DateTime typed single result subquery * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/NumberSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/NumberSubQuery.java index 1169b5bda..7350727e4 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/query/NumberSubQuery.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/query/NumberSubQuery.java @@ -13,7 +13,7 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.NumberExpression; /** - * Single result subquery + * Number typed single result subquery * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/ObjectSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/ObjectSubQuery.java index e750ec007..58e83af88 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/query/ObjectSubQuery.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/query/ObjectSubQuery.java @@ -13,7 +13,7 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.SimpleExpression; /** - * Single result subquery + * Object typed single result subquery * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/StringSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/StringSubQuery.java index fc69a1410..5fc777a1f 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/query/StringSubQuery.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/query/StringSubQuery.java @@ -13,7 +13,7 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.StringExpression; /** - * Single result subquery + * String typed single result subquery * * @author tiwe */ diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/TimeSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/TimeSubQuery.java index 866d845da..8bca0aa5a 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/query/TimeSubQuery.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/query/TimeSubQuery.java @@ -13,7 +13,7 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.TimeExpression; /** - * Single result subquery + * Time typed single result subquery * * @author tiwe * diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/DateTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/template/DateTemplate.java index 601e72c8c..e5927b60a 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/template/DateTemplate.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/template/DateTemplate.java @@ -17,6 +17,8 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.DateExpression; /** + * DateTemplate defines custom date expressions + * * @author tiwe * * @param diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/DateTimeTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/template/DateTimeTemplate.java index 2c6e66c44..971d1832b 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/template/DateTimeTemplate.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/template/DateTimeTemplate.java @@ -17,6 +17,8 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.DateTimeExpression; /** + * DateTimeTemplate defines custom dateTime expressions + * * @author tiwe * * @param diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/TimeTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/template/TimeTemplate.java index 8edb59768..75c749299 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/template/TimeTemplate.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/template/TimeTemplate.java @@ -17,6 +17,8 @@ import com.mysema.query.types.Visitor; import com.mysema.query.types.expr.TimeExpression; /** + * TimeTemplate defines custom time expressions + * * @author tiwe * * @param diff --git a/querydsl-core/src/test/java/com/mysema/query/types/template/TemplateExpressionTest.java b/querydsl-core/src/test/java/com/mysema/query/types/template/TemplateExpressionTest.java index 5ae64bfb9..5bbe3fd1c 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/template/TemplateExpressionTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/types/template/TemplateExpressionTest.java @@ -16,7 +16,6 @@ import java.util.List; import org.junit.Test; -import com.mysema.query.types.Constant; import com.mysema.query.types.ConstantImpl; import com.mysema.query.types.Expression; import com.mysema.query.types.JavaTemplates; @@ -26,14 +25,6 @@ import com.mysema.query.types.TemplateFactory; import com.mysema.query.types.Templates; import com.mysema.query.types.ToStringVisitor; import com.mysema.query.types.path.StringPath; -import com.mysema.query.types.template.BooleanTemplate; -import com.mysema.query.types.template.ComparableTemplate; -import com.mysema.query.types.template.DateTemplate; -import com.mysema.query.types.template.DateTimeTemplate; -import com.mysema.query.types.template.NumberTemplate; -import com.mysema.query.types.template.SimpleTemplate; -import com.mysema.query.types.template.StringTemplate; -import com.mysema.query.types.template.TimeTemplate; public class TemplateExpressionTest { @@ -71,7 +62,7 @@ public class TemplateExpressionTest { @Test public void factoryMethods(){ String template = ""; - Constant arg = ConstantImpl.TRUE; + Expression arg = ConstantImpl.create(true); BooleanTemplate.create(template, arg); ComparableTemplate.create(String.class, template, arg); @@ -86,7 +77,7 @@ public class TemplateExpressionTest { @Test public void factoryMethods2(){ Template template = TemplateFactory.DEFAULT.create(""); - Constant arg = ConstantImpl.TRUE; + Expression arg = ConstantImpl.create(true); BooleanTemplate.create(template, arg); ComparableTemplate.create(String.class, template, arg); diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOQLUpdateClause.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOQLUpdateClause.java index 227d70c48..0be63ee37 100644 --- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOQLUpdateClause.java +++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOQLUpdateClause.java @@ -12,9 +12,9 @@ import com.mysema.query.QueryMetadata; import com.mysema.query.dml.UpdateClause; import com.mysema.query.types.Expression; import com.mysema.query.types.ExpressionUtils; +import com.mysema.query.types.NullExpr; import com.mysema.query.types.Path; import com.mysema.query.types.Predicate; -import com.mysema.query.types.path.NullExpr; /** * UpdateClause implementation for JDO diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLCommonQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLCommonQuery.java index 047594328..b24043987 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLCommonQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLCommonQuery.java @@ -9,7 +9,7 @@ import com.mysema.query.types.expr.BooleanExpression; import com.mysema.query.types.path.MapPath; /** - * HQLCommonQuery is a common interface for HQLQuery and HQLSubQuery + * JPQLCommonQuery is a common interface for HQLQuery and HQLSubQuery * * @author tiwe * diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLGrammar.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLGrammar.java index 91bde4fad..6cb3a81e9 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLGrammar.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLGrammar.java @@ -15,7 +15,7 @@ import com.mysema.query.types.expr.NumberOperation; import com.mysema.query.types.expr.SimpleOperation; /** - * HQLGrammar provides factory methods for HQL specific operations + * JPQLGrammar provides factory methods for JPQL specific operations * elements. * * @author tiwe diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQuery.java index 6d67cfd96..5178569e4 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQuery.java @@ -8,7 +8,7 @@ package com.mysema.query.jpa; import com.mysema.query.Projectable; /** - * Query interface for HQL queries + * Query interface for JPQL queries * * @author tiwe * diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryBase.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryBase.java index 4be1a1648..a24658b5e 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryBase.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryBase.java @@ -16,7 +16,7 @@ import com.mysema.query.types.expr.BooleanExpression; import com.mysema.query.types.path.MapPath; /** - * HQLQueryBase is a base Query class for HQL + * JPQLQueryBase is a base Query class for JPQL queries * * @author tiwe * @version $Id$ diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java index a1aeb7c33..6fe51fb19 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java @@ -14,7 +14,7 @@ import com.mysema.query.support.QueryMixin; import com.mysema.query.types.expr.BooleanExpression; /** - * HQLQueryMixin extends QueryMixin to support JPQL join construction + * JPQLQueryMixin extends QueryMixin to support JPQL join construction * * @author tiwe * diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java index b72d6131a..0875ce71f 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java @@ -27,7 +27,7 @@ import com.mysema.query.types.expr.SimpleOperation; import com.mysema.util.MathUtils; /** - * HQLSerializer serializes Querydsl expressions into HQL syntax. + * JPQLSerializer serializes Querydsl expressions into JPQL syntax. * * @author tiwe * @version $Id$ diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSubQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSubQuery.java index dbd923165..dca80841c 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSubQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSubQuery.java @@ -8,7 +8,7 @@ package com.mysema.query.jpa; import com.mysema.query.QueryMetadata; /** - * HQLSubQuery is a subquery class for JPQL + * JPQLSubQuery is a subquery class for JPQL * * @author tiwe * diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLTemplates.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLTemplates.java index e71e486fe..57a2974d9 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLTemplates.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLTemplates.java @@ -13,7 +13,7 @@ import com.mysema.query.types.PathType; import com.mysema.query.types.Templates; /** - * JPQLTemplates extends Templates to provide operator patterns for HQL + * JPQLTemplates extends Templates to provide operator patterns for JPQL * serialization * * @author tiwe diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/AbstractHibernateQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/AbstractHibernateQuery.java index 67d5be2e3..8cfcb7227 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/AbstractHibernateQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/AbstractHibernateQuery.java @@ -35,7 +35,7 @@ import com.mysema.query.types.Path; import com.mysema.query.types.expr.ConstructorExpression; /** - * Abstract base class for Hibernate API based implementations of the HQLQuery interface + * Abstract base class for Hibernate API based implementations of the JPQL interface * * @author tiwe * diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java index 7faee5061..af6e17aa4 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java @@ -15,7 +15,7 @@ import com.mysema.query.jpa.HQLTemplates; import com.mysema.query.jpa.JPQLTemplates; /** - * HibernateQuery is the default implementation of the HQLQuery interface for Hibernate + * HibernateQuery is the default implementation of the JPQLQuery interface for Hibernate * * @author tiwe * diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java index 0951b772e..a575294a7 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java @@ -22,9 +22,9 @@ import com.mysema.query.jpa.JPQLTemplates; import com.mysema.query.types.EntityPath; import com.mysema.query.types.Expression; import com.mysema.query.types.ExpressionUtils; +import com.mysema.query.types.NullExpr; import com.mysema.query.types.Path; import com.mysema.query.types.Predicate; -import com.mysema.query.types.path.NullExpr; /** * UpdateClause implementation for Hibernate diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/package-info.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/package-info.java index 40fa5b08b..320e56ed7 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/package-info.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/package-info.java @@ -5,7 +5,7 @@ */ /** - * HQL for Hibernate + * JPQL for Hibernate */ @DefaultAnnotation( { Nonnull.class }) package com.mysema.query.jpa.hibernate; diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java index 5ae1d6dd6..eda010c78 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java @@ -27,7 +27,7 @@ import com.mysema.query.jpa.JPQLTemplates; import com.mysema.query.types.Expression; /** - * Abstract base class for JPA API based implementations of the HQLQuery interface + * Abstract base class for JPA API based implementations of the JPQLQuery interface * * @author tiwe * diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java index 72279b8ff..a4948ab79 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java @@ -14,7 +14,7 @@ import com.mysema.query.jpa.HQLTemplates; import com.mysema.query.jpa.JPQLTemplates; /** - * JPAQuery is the default implementation of the HQLQuery interface for JPA + * JPAQuery is the default implementation of the JPQLQuery interface for JPA * * @author tiwe * diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java index 47def158a..d2b38e9fc 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java @@ -21,9 +21,9 @@ import com.mysema.query.jpa.JPQLTemplates; import com.mysema.query.types.EntityPath; import com.mysema.query.types.Expression; import com.mysema.query.types.ExpressionUtils; +import com.mysema.query.types.NullExpr; import com.mysema.query.types.Path; import com.mysema.query.types.Predicate; -import com.mysema.query.types.path.NullExpr; /** * UpdateClause implementation for JPA diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/package-info.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/package-info.java index df6a7fa97..5da208231 100644 --- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/package-info.java +++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/package-info.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -@QuerydslConfig(listAccessors=true, mapAccessors=true) +@Config(listAccessors=true, mapAccessors=true) package com.mysema.query.jpa.domain; -import com.mysema.query.annotations.QuerydslConfig; +import com.mysema.query.annotations.Config; diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java index 53f91c989..08dbd8279 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java @@ -35,10 +35,10 @@ import com.mysema.query.sql.SQLSerializer; import com.mysema.query.sql.SQLTemplates; import com.mysema.query.types.ConstantImpl; import com.mysema.query.types.Expression; +import com.mysema.query.types.NullExpr; import com.mysema.query.types.Path; import com.mysema.query.types.SubQueryExpression; import com.mysema.query.types.expr.Param; -import com.mysema.query.types.path.NullExpr; import com.mysema.util.ResultSetAdapter; /** diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java index 8facd9c2c..bd678496f 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java @@ -34,10 +34,10 @@ import com.mysema.query.sql.SQLTemplates; import com.mysema.query.types.ConstantImpl; import com.mysema.query.types.Expression; import com.mysema.query.types.ExpressionUtils; +import com.mysema.query.types.NullExpr; import com.mysema.query.types.Path; import com.mysema.query.types.SubQueryExpression; import com.mysema.query.types.expr.Param; -import com.mysema.query.types.path.NullExpr; /** * SQLMergeClause defines an MERGE INTO clause diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateClause.java index 1964e98f6..8d40266ad 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateClause.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateClause.java @@ -30,10 +30,10 @@ import com.mysema.query.sql.Configuration; import com.mysema.query.sql.RelationalPath; import com.mysema.query.sql.SQLSerializer; import com.mysema.query.sql.SQLTemplates; +import com.mysema.query.types.NullExpr; import com.mysema.query.types.Path; import com.mysema.query.types.Predicate; import com.mysema.query.types.expr.Param; -import com.mysema.query.types.path.NullExpr; /** * SQLUpdateClause defines a UPDATE clause