diff --git a/querydsl-core/src/main/java/com/mysema/query/CascadingBoolean.java b/querydsl-core/src/main/java/com/mysema/query/CascadingBoolean.java index 255361a30..a1f5477da 100644 --- a/querydsl-core/src/main/java/com/mysema/query/CascadingBoolean.java +++ b/querydsl-core/src/main/java/com/mysema/query/CascadingBoolean.java @@ -9,8 +9,8 @@ import com.mysema.query.grammar.Grammar; import com.mysema.query.grammar.types.Expr; /** - * CascadingBoolean provides - * + * CascadingBoolean provides. + * * @author tiwe * @version $Id$ */ diff --git a/querydsl-core/src/main/java/com/mysema/query/JoinExpression.java b/querydsl-core/src/main/java/com/mysema/query/JoinExpression.java index e3c23533f..bd6b909c7 100644 --- a/querydsl-core/src/main/java/com/mysema/query/JoinExpression.java +++ b/querydsl-core/src/main/java/com/mysema/query/JoinExpression.java @@ -8,12 +8,10 @@ package com.mysema.query; import com.mysema.query.grammar.types.Expr; /** + * JoinExpression provides. * - * JoinExpression provides - * * @author tiwe * @version $Id$ - * */ public class JoinExpression { private Expr.Boolean condition; diff --git a/querydsl-core/src/main/java/com/mysema/query/JoinType.java b/querydsl-core/src/main/java/com/mysema/query/JoinType.java index 8f7adf6be..0d89497ba 100644 --- a/querydsl-core/src/main/java/com/mysema/query/JoinType.java +++ b/querydsl-core/src/main/java/com/mysema/query/JoinType.java @@ -6,12 +6,10 @@ package com.mysema.query; /** + * JoinType provides. * - * JoinType provides - * * @author tiwe * @version $Id$ - * */ public enum JoinType { DEFAULT, INNERJOIN, JOIN, LEFTJOIN, FULLJOIN 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 b0742a5a6..df7862ba0 100644 --- a/querydsl-core/src/main/java/com/mysema/query/Query.java +++ b/querydsl-core/src/main/java/com/mysema/query/Query.java @@ -11,8 +11,8 @@ import com.mysema.query.grammar.types.Expr; import static com.mysema.query.grammar.types.Expr.*; /** - * Query provides a the query interface of the fluent query DSL - * + * Query provides a the query interface of the fluent query DSL. + * * @author tiwe * @version $Id$ */ diff --git a/querydsl-core/src/main/java/com/mysema/query/QueryBase.java b/querydsl-core/src/main/java/com/mysema/query/QueryBase.java index 719c22cee..adf46a0d4 100644 --- a/querydsl-core/src/main/java/com/mysema/query/QueryBase.java +++ b/querydsl-core/src/main/java/com/mysema/query/QueryBase.java @@ -14,8 +14,8 @@ import com.mysema.query.grammar.types.Expr; import static com.mysema.query.grammar.types.Expr.*; /** - * QueryBase provides a basic implementation of the Query interface - * + * QueryBase provides a basic implementation of the Query interface. + * * @author tiwe * @version $Id$ */ @@ -103,6 +103,9 @@ public class QueryBase> implements Query { return metadata; } + /** + * The Class Metadata. + */ public class Metadata{ public List> getGroupBy() { return groupBy; diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/Grammar.java b/querydsl-core/src/main/java/com/mysema/query/grammar/Grammar.java index 300a6feb4..573dd86d0 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/Grammar.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/Grammar.java @@ -14,7 +14,7 @@ import com.mysema.query.grammar.types.CollectionType; import com.mysema.query.grammar.types.Expr; /** - * Grammar provides the factory methods for the fluent grammar + * Grammar provides the factory methods for the fluent grammar. * * @author tiwe * @version $Id$ diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/Ops.java b/querydsl-core/src/main/java/com/mysema/query/grammar/Ops.java index f21dc501a..404867f59 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/Ops.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/Ops.java @@ -6,13 +6,16 @@ package com.mysema.query.grammar; /** - * Ops provides the operators for the fluent query grammar - * + * Ops provides the operators for the fluent query grammar. + * * @author tiwe * @version $Id$ */ public interface Ops { + /** + * The Class Op. + */ public static class Op{} // general diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/Order.java b/querydsl-core/src/main/java/com/mysema/query/grammar/Order.java index ccd20b71d..5b300a386 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/Order.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/Order.java @@ -6,12 +6,10 @@ package com.mysema.query.grammar; /** + * Order provides. * - * Order provides - * * @author tiwe * @version $Id$ - * */ public enum Order { ASC, DESC diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/OrderSpecifier.java b/querydsl-core/src/main/java/com/mysema/query/grammar/OrderSpecifier.java index f7622ba22..fd5a05e02 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/OrderSpecifier.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/OrderSpecifier.java @@ -9,13 +9,11 @@ import com.mysema.query.grammar.types.Expr; /** + * OrderSpecifier provides. * - * OrderSpecifier provides - * + * @param * * @author tiwe * @version $Id$ - * - * @param */ public class OrderSpecifier> { public Order order; diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Alias.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Alias.java index 3780e71be..8845ad007 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Alias.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Alias.java @@ -6,8 +6,8 @@ package com.mysema.query.grammar.types; /** - * Alias provides - * + * Alias provides. + * * @author tiwe * @version $Id$ */ @@ -15,6 +15,9 @@ public interface Alias { Expr getFrom(); + /** + * The Class Entity. + */ public static class Entity extends Expr.Entity implements ToPath{ private final Expr from; private final Path to; @@ -27,6 +30,9 @@ public interface Alias { public Path getTo() {return to;} } + /** + * The Class EntityCollection. + */ public static class EntityCollection extends Expr.Entity implements ToPath{ private final Expr from; private final Path to; @@ -39,6 +45,9 @@ public interface Alias { public Path getTo() {return to;} } + /** + * The Class Simple. + */ public static class Simple extends Expr.Simple implements Alias{ private final Expr from; private final java.lang.String to; @@ -54,6 +63,9 @@ public interface Alias { public java.lang.String getTo() {return to;} } + /** + * The Interface ToPath. + */ public interface ToPath extends Alias{ Path getTo(); } diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/CollectionType.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/CollectionType.java index 3547db116..ee7c91ace 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/CollectionType.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/CollectionType.java @@ -6,8 +6,8 @@ package com.mysema.query.grammar.types; /** - * CollectionType provides - * + * CollectionType provides. + * * @author tiwe * @version $Id$ */ diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Expr.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Expr.java index 4c9080af8..0c65a02aa 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Expr.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Expr.java @@ -8,8 +8,8 @@ package com.mysema.query.grammar.types; import com.mysema.query.grammar.OrderSpecifier; /** - * Expr provides - * + * Expr provides. + * * @author tiwe * @version $Id$ */ @@ -23,12 +23,18 @@ public abstract class Expr { public Boolean ne(D right){return IntGrammar.ne(this, right);} public Boolean ne(Expr right){return IntGrammar.ne(this, right);} + /** + * The Class Boolean. + */ public static abstract class Boolean extends Literal{ public Boolean() {super(java.lang.Boolean.class);} public Boolean and(Boolean right) {return IntGrammar.and(this, right);} public Boolean or(Boolean right) {return IntGrammar.or(this, right);} } + /** + * The Class Comparable. + */ public static abstract class Comparable> extends Literal{ public Comparable(Class type) {super(type);} public Boolean after(D right) {return IntGrammar.after(this,right);} @@ -55,6 +61,9 @@ public abstract class Expr { public Boolean notIn(CollectionType arg) {return IntGrammar.notIn(this, arg);} } + /** + * The Class Constant. + */ public static class Constant extends Expr{ private final D constant; @SuppressWarnings("unchecked") @@ -74,23 +83,38 @@ public abstract class Expr { // -, // + + /** + * The Class Entity. + */ public static abstract class Entity extends Expr{ public Entity(Class type) {super(type);} } + /** + * The Class Simple. + */ public static abstract class Simple extends Expr{ public Simple(Class type) {super(type);} public Expr as(java.lang.String to){return IntGrammar.as(this, to);} } + /** + * The Class Embeddable. + */ public static abstract class Embeddable extends Simple{ public Embeddable(Class type) {super(type);} } + /** + * The Class Literal. + */ public static abstract class Literal extends Simple{ public Literal(Class type) {super(type);} } + /** + * The Class String. + */ public static abstract class String extends Comparable{ public String() {super(java.lang.String.class);} public String concat(Expr str) {return IntGrammar.concat(this, str);} diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Factory.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Factory.java index c83ee3579..f198a165a 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Factory.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Factory.java @@ -8,8 +8,8 @@ package com.mysema.query.grammar.types; import com.mysema.query.grammar.Ops.Op; /** - * Factory provides - * + * Factory provides. + * * @author tiwe * @version $Id$ */ diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Operation.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Operation.java index b76313a23..5a9324ca0 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Operation.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Operation.java @@ -10,8 +10,8 @@ import com.mysema.query.grammar.Ops.Op; /** - * Operation provides - * + * Operation provides. + * * @author tiwe * @version $Id$ */ @@ -20,6 +20,9 @@ public interface Operation { Expr[] getArgs(); Op getOperator(); + /** + * The Class Boolean. + */ public static class Boolean extends Expr.Boolean implements Operation{ private final Expr[] args; private final Op op; @@ -31,6 +34,9 @@ public interface Operation { public Op getOperator() {return op;} } + /** + * The Class Comparable. + */ public static class Comparable> extends Expr.Comparable implements Operation { private final Expr[] args; private final Op op; @@ -43,12 +49,18 @@ public interface Operation { public Op getOperator() {return op;} } + /** + * The Class Number. + */ public static class Number> extends Comparable{ public Number(Op op, Expr[] args) { super(op, args); } } + /** + * The Class String. + */ public static class String extends Expr.String implements Operation{ private final Expr[] args; private final Op op; diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Path.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Path.java index c991e4cc8..3669c20fd 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Path.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Path.java @@ -13,8 +13,8 @@ import static com.mysema.query.grammar.types.PathMetadata.forVariable; /** - * Path provides - * + * Path provides. + * * @author tiwe * @version $Id$ */ @@ -24,6 +24,9 @@ public interface Path { Expr.Boolean isnotnull(); Expr.Boolean isnull(); + /** + * The Class Boolean. + */ public static class Boolean extends Expr.Boolean implements Path{ private final PathMetadata metadata; public Boolean(PathMetadata metadata) { @@ -34,11 +37,17 @@ public interface Path { public Expr.Boolean isnull() {return IntGrammar.isnull(this);} } + /** + * The Interface Collection. + */ public interface Collection extends Path>, CollectionType{ Class getElementType(); Expr.Comparable size(); } + /** + * The Class Comparable. + */ public static class Comparable> extends Expr.Comparable implements Path{ private final PathMetadata metadata; public Comparable(Class type, PathMetadata metadata) { @@ -50,6 +59,9 @@ public interface Path { public Expr.Boolean isnull() {return IntGrammar.isnull(this);} } + /** + * The Class ComponentCollection. + */ public static class ComponentCollection extends Expr.Simple> implements Collection{ private final PathMetadata metadata; protected final Class type; @@ -67,6 +79,9 @@ public interface Path { } } + /** + * The Class ComponentList. + */ public static class ComponentList extends ComponentCollection implements List{ public ComponentList(Class type, PathMetadata metadata) { super(type, metadata); @@ -79,6 +94,9 @@ public interface Path { } } + /** + * The Class ComponentMap. + */ public static class ComponentMap extends Expr.Simple> implements Map{ private final Class keyType; private final PathMetadata metadata; @@ -102,6 +120,9 @@ public interface Path { public Expr.Boolean isnull() {return IntGrammar.isnull(this);} } + /** + * The Class Entity. + */ public static class Entity extends Expr.Entity implements Path{ private final PathMetadata metadata; public Entity(Class type, java.lang.String localName) { @@ -149,6 +170,9 @@ public interface Path { public Expr.Boolean typeOf(Class type) {return IntGrammar.typeOf(this, type);} } + /** + * The Class EntityCollection. + */ public static class EntityCollection extends Expr.Entity> implements Collection{ private final PathMetadata metadata; protected final Class type; @@ -168,6 +192,9 @@ public interface Path { } } + /** + * The Class EntityList. + */ public static class EntityList extends EntityCollection implements List{ public EntityList(Class type, PathMetadata metadata) { super(type, metadata); @@ -180,6 +207,9 @@ public interface Path { } } + /** + * The Class EntityMap. + */ public static class EntityMap extends Expr.Entity> implements Map{ private final Class keyType; private final PathMetadata metadata; @@ -203,11 +233,17 @@ public interface Path { public Expr.Boolean isnull() {return IntGrammar.isnull(this);} } + /** + * The Interface List. + */ public interface List extends Collection{ Expr get(Expr index); Expr get(int index); } + /** + * The Interface Map. + */ public interface Map extends Path>{ Expr get(Expr key); Expr get(K key); @@ -215,11 +251,17 @@ public interface Path { Class getValueType(); } + /** + * The Class RenamableEntity. + */ public static class RenamableEntity extends Entity{ protected RenamableEntity(Class type, PathMetadata metadata) {super(type, metadata);} public Alias.Entity as(Path.Entity to) {return IntGrammar.as(this, to);} } + /** + * The Class Simple. + */ public static class Simple extends Expr.Simple implements Path{ private final PathMetadata metadata; public Simple(Class type, PathMetadata metadata) { @@ -231,6 +273,9 @@ public interface Path { public Expr.Boolean isnull() {return IntGrammar.isnull(this);} } + /** + * The Class String. + */ public static class String extends Expr.String implements Path{ private final PathMetadata metadata; public String(PathMetadata metadata) { diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/PathMetadata.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/PathMetadata.java index 4f07258a9..b60ce86ac 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/PathMetadata.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/PathMetadata.java @@ -8,12 +8,10 @@ package com.mysema.query.grammar.types; import com.mysema.query.grammar.Ops; /** - * - * PathMetadata provides metadata for Path expressions + * PathMetadata provides metadata for Path expressions. * * @author tiwe * @version $Id$ - * */ public final class PathMetadata { private final Expr expression; @@ -74,6 +72,9 @@ public final class PathMetadata { return pathType; } + /** + * The Class PathType. + */ public static class PathType extends Ops.Op> {} // bookmark.tags.size diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Visitor.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Visitor.java index fd8ec7454..b10ca9906 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Visitor.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Visitor.java @@ -13,7 +13,7 @@ import org.apache.commons.collections15.Transformer; import org.apache.commons.collections15.map.LazyMap; /** - * Visitor provides a dispatching Visitor for Expr instances + * Visitor provides a dispatching Visitor for Expr instances. * * @author tiwe * @version $Id$ diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/VisitorAdapter.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/VisitorAdapter.java index 055b738e5..1234fbe1d 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/VisitorAdapter.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/VisitorAdapter.java @@ -9,7 +9,7 @@ package com.mysema.query.grammar.types; /** * VisitorAdapter provides a base implementation where invocations are - * dispatched to supertypes when available and visible + * dispatched to supertypes when available and visible. * * @author tiwe * @version $Id$ @@ -24,10 +24,6 @@ public abstract class VisitorAdapter> extends Visito protected void visit(Alias.EntityCollection expr) { visit((Alias.ToPath) expr); } -// @Override -// protected void visit(Alias.Literal expr) { -// visit((Alias.Simple) expr); -// } @Override protected void visit(Operation.Boolean expr) { visit((Operation) expr); diff --git a/querydsl-core/src/test/java/com/mysema/query/grammar/VisitorTest.java b/querydsl-core/src/test/java/com/mysema/query/grammar/VisitorTest.java index 4ed28c1f6..f47b0b503 100644 --- a/querydsl-core/src/test/java/com/mysema/query/grammar/VisitorTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/grammar/VisitorTest.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2008 Mysema Ltd. + * All rights reserved. + * + */ package com.mysema.query.grammar; import java.util.ArrayList; @@ -14,8 +19,8 @@ import com.mysema.query.grammar.types.Visitor; /** - * VisitorTest provides - * + * VisitorTest provides. + * * @author tiwe * @version $Id$ */ diff --git a/querydsl-core/src/test/java/com/mysema/query/grammar/types/TypesTest.java b/querydsl-core/src/test/java/com/mysema/query/grammar/types/TypesTest.java index 5a797c000..ca808d64e 100644 --- a/querydsl-core/src/test/java/com/mysema/query/grammar/types/TypesTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/grammar/types/TypesTest.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2008 Mysema Ltd. + * All rights reserved. + * + */ package com.mysema.query.grammar.types; import static org.junit.Assert.*; @@ -6,8 +11,8 @@ import org.junit.Test; /** - * TypesTest provides - * + * TypesTest provides. + * * @author tiwe * @version $Id$ */