diff --git a/querydsl-hibernate/pom.xml b/querydsl-hibernate/pom.xml index 95b36c3a4..a07f5f8f4 100644 --- a/querydsl-hibernate/pom.xml +++ b/querydsl-hibernate/pom.xml @@ -95,7 +95,7 @@ -AdtoClass=com.mysema.query.Domain1Dtos - com/mysema/query/grammar/hql/domain/*.java + com/mysema/query/grammar/hql/*.java diff --git a/querydsl-hibernate/src/main/java/com/mysema/query/hibernate/HqlQuery.java b/querydsl-hibernate/src/main/java/com/mysema/query/hibernate/HqlQuery.java index 726d806de..bf13d46e0 100644 --- a/querydsl-hibernate/src/main/java/com/mysema/query/hibernate/HqlQuery.java +++ b/querydsl-hibernate/src/main/java/com/mysema/query/hibernate/HqlQuery.java @@ -16,6 +16,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.mysema.query.grammar.HqlQueryBase; +import com.mysema.query.grammar.PathMetadata; import com.mysema.query.grammar.Types.ExprBoolean; import com.mysema.query.grammar.Types.PathEntity; import com.mysema.query.grammar.Types.PathNoEntitySimple; @@ -33,7 +34,7 @@ public class HqlQuery extends HqlQueryBase{ private Integer limit, offset; - private Session session; + private final Session session; public HqlQuery(Session session) { this.session = session; @@ -67,7 +68,8 @@ public class HqlQuery extends HqlQueryBase{ && !entry.getKey().equals("class") && !entry.getKey().equals("created") && !entry.getKey().equals("modified")){ - PathNoEntitySimple path = new PathNoEntitySimple(Object.class, entity, entry.getKey()); + PathMetadata md = PathMetadata.forProperty(entity, entry.getKey()); + PathNoEntitySimple path = new PathNoEntitySimple(Object.class, md); if (entry.getValue() != null){ conds.add(path.eq(entry.getValue())); }else{ 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 6b55d6cdc..5c4c758b0 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 @@ -10,14 +10,11 @@ import static com.mysema.query.grammar.Grammar.mult; import static com.mysema.query.grammar.Grammar.not; import static com.mysema.query.grammar.Grammar.sub; import static com.mysema.query.grammar.HqlGrammar.*; -import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import org.junit.Test; -import com.mysema.query.Domain1.Company; -import com.mysema.query.Domain1.Department; -import com.mysema.query.Domain1.Employee; import com.mysema.query.grammar.HqlGrammar; import com.mysema.query.grammar.HqlQueryBase; import com.mysema.query.grammar.HqlSerializer; @@ -113,8 +110,8 @@ public class FeaturesTest extends HqlQueryBase{ @Test public void testConstructors(){ - Constructor c = new Constructor(com.mysema.query.grammar.hql.domain.Cat.class, cat.name); - toString("new com.mysema.query.grammar.hql.domain.Cat(cat.name)", c); + Constructor c = new Constructor(com.mysema.query.grammar.hql.HqlDomain.Cat.class, cat.name); + toString("new "+com.mysema.query.grammar.hql.HqlDomain.Cat.class.getName()+"(cat.name)", c); toString("new "+getClass().getName()+"$BookmarkDTO()", new _BookmarkDTO()); toString("new "+getClass().getName()+"$BookmarkDTO(cat.name)", new _BookmarkDTO(cat.name)); } @@ -220,18 +217,6 @@ public class FeaturesTest extends HqlQueryBase{ } // "Simple" case, case ... when ... then ... else ... end, and "searched" case, case when ... then ... else ... end - - - @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(){ diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java index 4427141ef..c2dbb3923 100644 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java +++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java @@ -16,9 +16,9 @@ import antlr.collections.AST; import com.mysema.query.Domain1; import com.mysema.query.Domain1Dtos; import com.mysema.query.grammar.HqlQueryBase; -import com.mysema.query.grammar.hql.domain.Color; -import com.mysema.query.grammar.hql.domain.DomesticCat; -import com.mysema.query.grammar.hql.domain.Payment; +import com.mysema.query.grammar.hql.HqlDomain.Color; +import com.mysema.query.grammar.hql.HqlDomain.DomesticCat; +import com.mysema.query.grammar.hql.HqlDomain.Payment; @@ -41,7 +41,7 @@ public class HqlParserTest extends HqlQueryBase{ private Domain1.Calendar calendar = new Domain1.Calendar("calendar"); private Domain1.Cat cat = new Domain1.Cat("cat"); - private Domain1.Cat fatcat = new Domain1.Cat("fatcat"); +// private Domain1.Cat fatcat = new Domain1.Cat("fatcat"); private Domain1.Cat kittens = new Domain1.Cat("kittens"); private Domain1.Cat kitten = new Domain1.Cat("kitten"); private Domain1.Cat kit = new Domain1.Cat("kit"); diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Account.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Account.java deleted file mode 100644 index 7a185bd02..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Account.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Account provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Account { - Person owner; -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Animal.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Animal.java deleted file mode 100644 index ebdb69180..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Animal.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Animal provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Animal { - int bodyWeight, id, weight, toes; - String name; - Color color; - boolean alive; - java.util.Date birthdate; -} 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 deleted file mode 100644 index 999dbe231..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/AuditLog.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * AuditLog provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class AuditLog { - Item item; -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Bar.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Bar.java deleted file mode 100644 index 1838b42b1..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Bar.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Bar provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Bar { - java.util.Date date; -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Calendar.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Calendar.java deleted file mode 100644 index e5fbf6dd1..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Calendar.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import java.util.Map; - -import javax.persistence.Entity; - -/** - * Calendar provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Calendar { - Map holidays; -} 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 deleted file mode 100644 index 1c095830d..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Cat.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import java.util.Collection; - -import javax.persistence.Entity; - -/** - * Cat provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Cat extends Animal{ - Collection kittens; - Cat mate; - Color eyecolor; - int breed; -} 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 deleted file mode 100644 index c6415c7d0..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Catalog.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import java.util.Collection; -import java.util.Date; - -import javax.persistence.Entity; - -/** - * Catalog provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Catalog { - Collection prices; - Date effectiveDate; -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Color.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Color.java deleted file mode 100644 index 5540b0e47..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Color.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -/** - * Color provides - * - * @author tiwe - * @version $Id$ - */ -public enum Color { - BLACK, TABBY -} 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 deleted file mode 100644 index a188e6917..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Company.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import java.util.List; - -import javax.persistence.Entity; - - -/** - * Company provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Company { - 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 deleted file mode 100644 index e1dd576f3..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Customer.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Customer provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Customer { - Name name; -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Department.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Department.java deleted file mode 100644 index bf1052524..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Department.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import java.util.List; - -import javax.persistence.Entity; - -/** - * Department provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Department { - String name; - Company company; - List employees; -} 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 deleted file mode 100644 index 8b4c3455e..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Document.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import java.util.Date; - -import javax.persistence.Entity; - -/** - * Document provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Document { - String name; - Date validTo; -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/DomesticCat.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/DomesticCat.java deleted file mode 100644 index 4db7fe24f..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/DomesticCat.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * DomesticCat provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class DomesticCat extends Cat{ - -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Employee.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Employee.java deleted file mode 100644 index 2dcfbf566..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Employee.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Employee provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Employee { - String firstName, lastName; - Company company; -} 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 deleted file mode 100644 index 01891c747..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/EvilType.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * EvilType provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class EvilType { - 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/Family.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Family.java deleted file mode 100644 index 1c268f5ac..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Family.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import com.mysema.query.dto.DTO; - -/** - * Family provides - * - * @author tiwe - * @version $Id$ - */ -@DTO -public class Family { - public Family(Cat mother, Cat mate, Cat offspr){ - - } -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Foo.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Foo.java deleted file mode 100644 index baf776201..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Foo.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -import com.mysema.query.dto.DTO; - -/** - * Foo provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -@DTO -public class Foo { - java.util.Date startDate; - String bar; - public Foo(){} - public Foo(long l){} -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Formula.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Formula.java deleted file mode 100644 index 9b7510667..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Formula.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Formula provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Formula { - Parameter parameter; -} 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 deleted file mode 100644 index 53bee8bfe..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Item.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Item provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Item { - long id; - Product product; -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Location.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Location.java deleted file mode 100644 index 41d24c9e4..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Location.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Location provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Location { - String name; -} 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 deleted file mode 100644 index 6e452363e..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Name.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Name provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Name { - String firstName, lastName; -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Named.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Named.java deleted file mode 100644 index 9ba5fc41f..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Named.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Named provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Named { - String name; -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Nationality.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Nationality.java deleted file mode 100644 index e5f718b1e..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Nationality.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Nationality provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Nationality { - Calendar calendar; -} 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 deleted file mode 100644 index e00564c31..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Order.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import java.util.List; - -import javax.persistence.Entity; - -/** - * Order provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Order { - long id; - List items, lineItems; - List deliveredItemIndices; - boolean paid; - Customer customer; -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Parameter.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Parameter.java deleted file mode 100644 index 4d7936ad0..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Parameter.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Parameter provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Parameter { - -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Payment.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Payment.java deleted file mode 100644 index f55f990c9..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Payment.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Payment provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Payment extends Item{ - -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Person.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Person.java deleted file mode 100644 index 0aacdddf8..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Person.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Person provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Person { - PersonId id; - Nationality nationality; - java.util.Date birthDay; -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/PersonId.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/PersonId.java deleted file mode 100644 index f3d7870db..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/PersonId.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * PersonId provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class PersonId { - String country; - int medicareNumber; -} 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 deleted file mode 100644 index 0197fd35b..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Price.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Price provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Price { - long amount; - Product product; -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Product.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Product.java deleted file mode 100644 index 0077bc208..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Product.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - -/** - * Product provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Product { - String name; -} diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Store.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Store.java deleted file mode 100644 index d4173ce25..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/Store.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import java.util.List; - -import javax.persistence.Entity; - -/** - * Store provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class Store { - List customers; - Location location; -} 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 deleted file mode 100644 index bb681fc45..000000000 --- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/domain/User.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mysema.query.grammar.hql.domain; - -import javax.persistence.Entity; - - -/** - * User provides - * - * @author tiwe - * @version $Id$ - */ -@Entity -public class User { - Company company; - long id; - String userName, firstName, lastName; -}