From 9c69da77e01af7eb212f414bc71266f457a707f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Fri, 3 Apr 2009 08:45:57 +0000 Subject: [PATCH] made query variable instance specific --- .../main/java/com/mysema/query/JoinType.java | 19 +++++--- .../{ExprFactory.java => PathFactory.java} | 6 +-- .../java/com/mysema/query/QueryAdapter.java | 3 +- ...xprFactory.java => SimplePathFactory.java} | 6 +-- ...actory.java => AliasAwarePathFactory.java} | 6 +-- .../query/grammar/GrammarWithAlias.java | 44 +++++++++---------- 6 files changed, 41 insertions(+), 43 deletions(-) rename querydsl-core/src/main/java/com/mysema/query/{ExprFactory.java => PathFactory.java} (78%) rename querydsl-core/src/main/java/com/mysema/query/{SimpleExprFactory.java => SimplePathFactory.java} (93%) rename querydsl-core/src/main/java/com/mysema/query/alias/{AliasAwareExprFactory.java => AliasAwarePathFactory.java} (92%) 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 a52051539..f4ebb8d79 100644 --- a/querydsl-core/src/main/java/com/mysema/query/JoinType.java +++ b/querydsl-core/src/main/java/com/mysema/query/JoinType.java @@ -14,13 +14,18 @@ package com.mysema.query; public enum JoinType { DEFAULT, INNERJOIN { - public String toString(){ return "INNER JOIN"; } - }, - JOIN, - LEFTJOIN { - public String toString(){ return "LEFT JOIN"; } - }, + public String toString() { + return "INNER JOIN"; + } + }, + JOIN, LEFTJOIN { + public String toString() { + return "LEFT JOIN"; + } + }, FULLJOIN { - public String toString(){ return "FULL JOIN"; } + public String toString() { + return "FULL JOIN"; + } } } \ No newline at end of file diff --git a/querydsl-core/src/main/java/com/mysema/query/ExprFactory.java b/querydsl-core/src/main/java/com/mysema/query/PathFactory.java similarity index 78% rename from querydsl-core/src/main/java/com/mysema/query/ExprFactory.java rename to querydsl-core/src/main/java/com/mysema/query/PathFactory.java index 7d8e0ed64..ea901d575 100644 --- a/querydsl-core/src/main/java/com/mysema/query/ExprFactory.java +++ b/querydsl-core/src/main/java/com/mysema/query/PathFactory.java @@ -10,10 +10,6 @@ import java.util.List; import java.util.Map; import com.mysema.query.grammar.types.Expr; -import com.mysema.query.grammar.types.Expr.EBoolean; -import com.mysema.query.grammar.types.Expr.EComparable; -import com.mysema.query.grammar.types.Expr.ENumber; -import com.mysema.query.grammar.types.Expr.EString; import com.mysema.query.grammar.types.Path.*; /** @@ -22,7 +18,7 @@ import com.mysema.query.grammar.types.Path.*; * @author tiwe * @version $Id$ */ -public interface ExprFactory { +public interface PathFactory { Expr createAny(D arg); diff --git a/querydsl-core/src/main/java/com/mysema/query/QueryAdapter.java b/querydsl-core/src/main/java/com/mysema/query/QueryAdapter.java index 300aa4c52..a34956d5a 100644 --- a/querydsl-core/src/main/java/com/mysema/query/QueryAdapter.java +++ b/querydsl-core/src/main/java/com/mysema/query/QueryAdapter.java @@ -14,7 +14,8 @@ import com.mysema.query.util.Assert; public class QueryAdapter> implements Query{ private Query query; - + + @SuppressWarnings("unchecked") private SubType _this = (SubType)this; public QueryAdapter(){} diff --git a/querydsl-core/src/main/java/com/mysema/query/SimpleExprFactory.java b/querydsl-core/src/main/java/com/mysema/query/SimplePathFactory.java similarity index 93% rename from querydsl-core/src/main/java/com/mysema/query/SimpleExprFactory.java rename to querydsl-core/src/main/java/com/mysema/query/SimplePathFactory.java index 61c99560f..9f8b70801 100644 --- a/querydsl-core/src/main/java/com/mysema/query/SimpleExprFactory.java +++ b/querydsl-core/src/main/java/com/mysema/query/SimplePathFactory.java @@ -17,10 +17,6 @@ import org.apache.commons.lang.StringUtils; import com.mysema.query.grammar.types.Expr; import com.mysema.query.grammar.types.PathMetadata; -import com.mysema.query.grammar.types.Expr.EBoolean; -import com.mysema.query.grammar.types.Expr.EComparable; -import com.mysema.query.grammar.types.Expr.ENumber; -import com.mysema.query.grammar.types.Expr.EString; import com.mysema.query.grammar.types.Path.*; /** @@ -29,7 +25,7 @@ import com.mysema.query.grammar.types.Path.*; * @author tiwe * @version $Id$ */ -public class SimpleExprFactory implements ExprFactory { +public class SimplePathFactory implements PathFactory { private final PString str = new PString(PathMetadata.forVariable("str")); diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/AliasAwareExprFactory.java b/querydsl-core/src/main/java/com/mysema/query/alias/AliasAwarePathFactory.java similarity index 92% rename from querydsl-core/src/main/java/com/mysema/query/alias/AliasAwareExprFactory.java rename to querydsl-core/src/main/java/com/mysema/query/alias/AliasAwarePathFactory.java index 9e6b96ded..8f204b4fd 100644 --- a/querydsl-core/src/main/java/com/mysema/query/alias/AliasAwareExprFactory.java +++ b/querydsl-core/src/main/java/com/mysema/query/alias/AliasAwarePathFactory.java @@ -9,7 +9,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import com.mysema.query.SimpleExprFactory; +import com.mysema.query.SimplePathFactory; import com.mysema.query.grammar.types.Expr; import com.mysema.query.grammar.types.Path.*; @@ -19,11 +19,11 @@ import com.mysema.query.grammar.types.Path.*; * @author tiwe * @version $Id$ */ -public class AliasAwareExprFactory extends SimpleExprFactory{ +public class AliasAwarePathFactory extends SimplePathFactory{ private final AliasFactory aliasFactory; - public AliasAwareExprFactory(AliasFactory aliasFactory){ + public AliasAwarePathFactory(AliasFactory aliasFactory){ this.aliasFactory = aliasFactory; } diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/GrammarWithAlias.java b/querydsl-core/src/main/java/com/mysema/query/grammar/GrammarWithAlias.java index 834212a55..adf7f805a 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/GrammarWithAlias.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/GrammarWithAlias.java @@ -11,8 +11,8 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import com.mysema.query.ExprFactory; -import com.mysema.query.alias.AliasAwareExprFactory; +import com.mysema.query.PathFactory; +import com.mysema.query.alias.AliasAwarePathFactory; import com.mysema.query.alias.AliasFactory; import com.mysema.query.alias.SimpleAliasFactory; import com.mysema.query.grammar.types.Expr; @@ -29,7 +29,7 @@ public class GrammarWithAlias extends Grammar{ private static final AliasFactory aliasFactory = new SimpleAliasFactory(); - private static final ExprFactory exprFactory = new AliasAwareExprFactory(aliasFactory); + private static final PathFactory pathFactory = new AliasAwarePathFactory(aliasFactory); private static final PSimple it = new PSimple(Object.class,PathMetadata.forVariable("it")); @@ -46,79 +46,79 @@ public class GrammarWithAlias extends Grammar{ } public static PBoolean $(Boolean arg){ - return exprFactory.createBoolean(arg); + return pathFactory.createBoolean(arg); } public static > PComparable $(D arg){ - return exprFactory.createComparable(arg); + return pathFactory.createComparable(arg); } public static PNumber $(BigDecimal arg){ - return exprFactory.createNumber(arg); + return pathFactory.createNumber(arg); } public static PNumber $(BigInteger arg){ - return exprFactory.createNumber(arg); + return pathFactory.createNumber(arg); } public static PNumber $(Byte arg){ - return exprFactory.createNumber(arg); + return pathFactory.createNumber(arg); } public static PNumber $(Double arg){ - return exprFactory.createNumber(arg); + return pathFactory.createNumber(arg); } public static PNumber $(Float arg){ - return exprFactory.createNumber(arg); + return pathFactory.createNumber(arg); } public static PNumber $(Integer arg){ - return exprFactory.createNumber(arg); + return pathFactory.createNumber(arg); } public static PNumber $(Long arg){ - return exprFactory.createNumber(arg); + return pathFactory.createNumber(arg); } public static PNumber $(Short arg){ - return exprFactory.createNumber(arg); + return pathFactory.createNumber(arg); } public static PString $(String arg){ - return exprFactory.createString(arg); + return pathFactory.createString(arg); } public static PBooleanArray $(Boolean[] args){ - return exprFactory.createBooleanArray(args); + return pathFactory.createBooleanArray(args); } public static > PComparableArray $(D[] args){ - return exprFactory.createComparableArray(args); + return pathFactory.createComparableArray(args); } public static PStringArray $(String[] args){ - return exprFactory.createStringArray(args); + return pathFactory.createStringArray(args); } public static PEntityCollection $(Collection args){ - return exprFactory.createEntityCollection(args); + return pathFactory.createEntityCollection(args); } public static PEntityMap $(Map args){ - return exprFactory.createEntityMap(args); + return pathFactory.createEntityMap(args); } public static PEntityList $(List args){ - return exprFactory.createEntityList(args); + return pathFactory.createEntityList(args); } public static PEntity $(D arg){ - return exprFactory.createEntity(arg); + return pathFactory.createEntity(arg); } public static Expr getAny(D arg){ - return exprFactory.createAny(arg); + return pathFactory.createAny(arg); } @SuppressWarnings("unchecked")