From dd1d75dc56f604e7d9f34f696f282313813318f0 Mon Sep 17 00:00:00 2001 From: Lovro Pandzic Date: Thu, 13 Aug 2015 07:31:09 +0200 Subject: [PATCH 1/4] exposed varargs methods in JPQLQueryFactory --- .../java/com/querydsl/jpa/JPQLQueryFactory.java | 17 +++++++++++++++++ .../jpa/hibernate/HibernateQueryFactory.java | 11 +++++++++++ .../com/querydsl/jpa/impl/JPAQueryFactory.java | 11 +++++++++++ 3 files changed, 39 insertions(+) diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQueryFactory.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQueryFactory.java index 48857197a..cbba284da 100644 --- a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQueryFactory.java +++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQueryFactory.java @@ -93,6 +93,15 @@ public interface JPQLQueryFactory extends QueryFactory> { */ JPQLQuery selectFrom(EntityPath from); + /** + * Create a new JPQLQuery instance with the given source and projection + * + * @param from projection and source + * @param + * @return select(from).from(from) + */ + JPQLQuery selectFrom(EntityPath... from); + /** * Create a new Query with the given source * @@ -101,6 +110,14 @@ public interface JPQLQueryFactory extends QueryFactory> { */ JPQLQuery from(EntityPath from); + /** + * Create a new Query with the given source + * + * @param from from + * @return from(from) + */ + JPQLQuery from(EntityPath... from); + /** * Create a new UPDATE clause * diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java index eed3d48d7..f38bd82ac 100644 --- a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java +++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java @@ -15,6 +15,7 @@ package com.querydsl.jpa.hibernate; import javax.inject.Provider; +import com.querydsl.jpa.JPQLQuery; import org.hibernate.Session; import com.querydsl.core.Tuple; @@ -100,11 +101,21 @@ public class HibernateQueryFactory implements JPQLQueryFactory { return select(from).from(from); } + @Override + public JPQLQuery selectFrom(EntityPath... from) { + return select(from).from(from); + } + @Override public HibernateQuery from(EntityPath from) { return query().from(from); } + @Override + public HibernateQuery from(EntityPath... from) { + return query().from(from); + } + @Override public HibernateUpdateClause update(EntityPath path) { return new HibernateUpdateClause(session.get(), path, templates); diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java index dba5d3304..596f2a185 100644 --- a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java +++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java @@ -21,6 +21,7 @@ import com.querydsl.core.Tuple; import com.querydsl.core.types.EntityPath; import com.querydsl.core.types.Expression; import com.querydsl.core.types.dsl.Expressions; +import com.querydsl.jpa.JPQLQuery; import com.querydsl.jpa.JPQLQueryFactory; import com.querydsl.jpa.JPQLTemplates; @@ -111,11 +112,21 @@ public class JPAQueryFactory implements JPQLQueryFactory { return select(from).from(from); } + @Override + public JPQLQuery selectFrom(EntityPath... from) { + return select(from).from(from); + } + @Override public JPAQuery from(EntityPath from) { return query().from(from); } + @Override + public JPQLQuery from(EntityPath... from) { + return query().from(from); + } + @Override public JPAUpdateClause update(EntityPath path) { if (templates != null) { From 4d62556753d5636f1ece4ee6df70388f33ebe12a Mon Sep 17 00:00:00 2001 From: Lovro Pandzic Date: Sun, 16 Aug 2015 17:39:13 +0200 Subject: [PATCH 2/4] removed selectFrom methods with varargs from JPQLQueryFactory and implementations --- .../src/main/java/com/querydsl/jpa/JPQLQueryFactory.java | 9 --------- .../querydsl/jpa/hibernate/HibernateQueryFactory.java | 5 ----- .../main/java/com/querydsl/jpa/impl/JPAQueryFactory.java | 5 ----- 3 files changed, 19 deletions(-) diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQueryFactory.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQueryFactory.java index cbba284da..ca4d19500 100644 --- a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQueryFactory.java +++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQueryFactory.java @@ -93,15 +93,6 @@ public interface JPQLQueryFactory extends QueryFactory> { */ JPQLQuery selectFrom(EntityPath from); - /** - * Create a new JPQLQuery instance with the given source and projection - * - * @param from projection and source - * @param - * @return select(from).from(from) - */ - JPQLQuery selectFrom(EntityPath... from); - /** * Create a new Query with the given source * diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java index f38bd82ac..3c103148f 100644 --- a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java +++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java @@ -101,11 +101,6 @@ public class HibernateQueryFactory implements JPQLQueryFactory { return select(from).from(from); } - @Override - public JPQLQuery selectFrom(EntityPath... from) { - return select(from).from(from); - } - @Override public HibernateQuery from(EntityPath from) { return query().from(from); diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java index 596f2a185..38a80cbf6 100644 --- a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java +++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java @@ -112,11 +112,6 @@ public class JPAQueryFactory implements JPQLQueryFactory { return select(from).from(from); } - @Override - public JPQLQuery selectFrom(EntityPath... from) { - return select(from).from(from); - } - @Override public JPAQuery from(EntityPath from) { return query().from(from); From 11aaf656323560961cf1adac76ee9cd997fe176c Mon Sep 17 00:00:00 2001 From: Lovro Pandzic Date: Sun, 16 Aug 2015 17:40:52 +0200 Subject: [PATCH 3/4] specialized return type of from in JPAQueryFactory --- .../src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java index 38a80cbf6..1de0154d3 100644 --- a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java +++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java @@ -118,7 +118,7 @@ public class JPAQueryFactory implements JPQLQueryFactory { } @Override - public JPQLQuery from(EntityPath... from) { + public JPAQuery from(EntityPath... from) { return query().from(from); } From ed5150d2b2a05a1971959ff3668ae22519f2211d Mon Sep 17 00:00:00 2001 From: Lovro Pandzic Date: Sun, 16 Aug 2015 18:43:30 +0200 Subject: [PATCH 4/4] removed unused imports --- .../java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java | 1 - .../src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java | 1 - 2 files changed, 2 deletions(-) diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java index 3c103148f..afc4808c6 100644 --- a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java +++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java @@ -15,7 +15,6 @@ package com.querydsl.jpa.hibernate; import javax.inject.Provider; -import com.querydsl.jpa.JPQLQuery; import org.hibernate.Session; import com.querydsl.core.Tuple; diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java index 1de0154d3..a78f15786 100644 --- a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java +++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java @@ -21,7 +21,6 @@ import com.querydsl.core.Tuple; import com.querydsl.core.types.EntityPath; import com.querydsl.core.types.Expression; import com.querydsl.core.types.dsl.Expressions; -import com.querydsl.jpa.JPQLQuery; import com.querydsl.jpa.JPQLQueryFactory; import com.querydsl.jpa.JPQLTemplates;