diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/FeaturesTest.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/FeaturesTest.java index 41bff208b..6a5b32798 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/FeaturesTest.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/FeaturesTest.java @@ -221,6 +221,17 @@ public class FeaturesTest extends HqlQueryBase{ // Java public static final constants eg.Color.TABBY } + @Test + public void testShortCuts(){ + Company c = new Company("c"); + Department d = new Department("d"); + Employee e = new Employee("e"); +// select(c.name, d.name, e.firstName, e.lastName).from(c.join().departments.as(d).join().employees.as(e)); + // join -> PathEntityRelations (foreign key fields) + // departments -> PathEntityRelations + // as(d) -> sets alias + } + @Test public void testSimpleAliasForNonEntityPaths(){ toString("cat.bodyWeight as catbodyWeight", cat.bodyWeight.as("catbodyWeight")); @@ -297,10 +308,6 @@ public class FeaturesTest extends HqlQueryBase{ visitor = new HqlSerializer(); } - public static final class BookmarkDTO{ - - } - public static final class _BookmarkDTO extends Constructor{ public _BookmarkDTO(){ super(BookmarkDTO.class); @@ -310,4 +317,8 @@ public class FeaturesTest extends HqlQueryBase{ } } + public static final class BookmarkDTO{ + + } + } diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/ThingLinkQueriesTest.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/ThingLinkQueriesTest.java index e227ccc2b..6ca4b0193 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/ThingLinkQueriesTest.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/ThingLinkQueriesTest.java @@ -34,6 +34,7 @@ public class ThingLinkQueriesTest extends HqlQueryBase{ } + @Test public void testQuery2(){ // "select g._keyword, count(g._keyword) from " // + Thing.class.getName() diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/AuditLog.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/AuditLog.java index 63067836a..999dbe231 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/AuditLog.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/AuditLog.java @@ -10,5 +10,5 @@ import javax.persistence.Entity; */ @Entity public class AuditLog { - protected Item item; + Item item; } diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Cat.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Cat.java index a87dbd562..c7f3552dd 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Cat.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Cat.java @@ -12,9 +12,9 @@ import javax.persistence.Entity; */ @Entity public class Cat { - protected Collection kittens; - protected Cat mate; - protected int bodyWeight; - protected String name; - protected boolean alive; + Collection kittens; + Cat mate; + int bodyWeight; + String name; + boolean alive; } diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Catalog.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Catalog.java index 9c360cc4f..c6415c7d0 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Catalog.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Catalog.java @@ -13,6 +13,6 @@ import javax.persistence.Entity; */ @Entity public class Catalog { - protected Collection prices; - protected Date effectiveDate; + Collection prices; + Date effectiveDate; } diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Company.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Company.java index 7a22f27d2..a188e6917 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Company.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Company.java @@ -1,5 +1,7 @@ package com.mysema.query.grammar.hql.domain; +import java.util.List; + import javax.persistence.Entity; @@ -11,6 +13,8 @@ import javax.persistence.Entity; */ @Entity public class Company { - protected long id; - protected String name; + long id; + String name; + List departments; + Employee ceo; } diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Customer.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Customer.java index e6dba5e02..e1dd576f3 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Customer.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Customer.java @@ -10,5 +10,5 @@ import javax.persistence.Entity; */ @Entity public class Customer { - protected Name name; + Name name; } diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Document.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Document.java index b69871fb0..8b4c3455e 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Document.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Document.java @@ -12,6 +12,6 @@ import javax.persistence.Entity; */ @Entity public class Document { - protected String name; - protected Date validTo; + String name; + Date validTo; } diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/EvilType.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/EvilType.java index da5b71073..01891c747 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/EvilType.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/EvilType.java @@ -10,6 +10,6 @@ import javax.persistence.Entity; */ @Entity public class EvilType { - protected EvilType isnull, isnotnull, asc, desc, get, getType, getMetadata; - protected EvilType toString, hashCode, getClass, notify, notifyAll, wait; + EvilType isnull, isnotnull, asc, desc, get, getType, getMetadata; + EvilType toString, hashCode, getClass, notify, notifyAll, wait; } diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Item.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Item.java index ba50a7efe..53bee8bfe 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Item.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Item.java @@ -10,6 +10,6 @@ import javax.persistence.Entity; */ @Entity public class Item { - protected long id; - protected Product product; + long id; + Product product; } diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Name.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Name.java index 01b611f97..6e452363e 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Name.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Name.java @@ -10,5 +10,5 @@ import javax.persistence.Entity; */ @Entity public class Name { - protected String firstName, lastName; + String firstName, lastName; } diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Order.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Order.java index 50d847701..c0729c698 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Order.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Order.java @@ -12,8 +12,8 @@ import javax.persistence.Entity; */ @Entity public class Order { - protected long id; - protected List items, lineItems; - protected boolean paid; - protected Customer customer; + long id; + List items, lineItems; + boolean paid; + Customer customer; } diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Price.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Price.java index e3467fa4d..0197fd35b 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Price.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Price.java @@ -10,6 +10,6 @@ import javax.persistence.Entity; */ @Entity public class Price { - protected long amount; - protected Product product; + long amount; + Product product; } diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/User.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/User.java index efbc4ab52..bb681fc45 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/User.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/User.java @@ -11,7 +11,7 @@ import javax.persistence.Entity; */ @Entity public class User { - protected Company company; - protected long id; - protected String userName, firstName, lastName; + Company company; + long id; + String userName, firstName, lastName; }