From 19238ab45dff8901fc49b9dc2735bc413696f8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Fri, 22 Feb 2008 19:47:13 +0000 Subject: [PATCH] changed 'as' from DomainType method status to function --- etc/Domain.java | 90 +++++++++---------- .../com/mysema/query/grammar/Grammar.java | 8 +- .../java/com/mysema/query/grammar/Types.java | 6 +- .../java/com/mysema/query/test/QueryTest.java | 6 +- .../com/mysema/query/test/domain/Domain.java | 90 +++++++++---------- .../mysema/query/test/domain/Instances.java | 52 +++++------ 6 files changed, 128 insertions(+), 124 deletions(-) diff --git a/etc/Domain.java b/etc/Domain.java index fc4606d34..01b66a8ed 100644 --- a/etc/Domain.java +++ b/etc/Domain.java @@ -2,90 +2,90 @@ package com.mysema.query.test.domain; public class Domain { - public static class qAuditLog extends com.mysema.query.grammar.Types.DomainType{ - private qItem item; - qAuditLog(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qAuditLog(String path) {super(path);} - public qItem item() { - if (item == null) item = new qItem(this,"item"); + public static class _AuditLog extends com.mysema.query.grammar.Types.DomainType{ + private _Item item; + _AuditLog(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _AuditLog(String path) {super(path);} + public _Item item() { + if (item == null) item = new _Item(this,"item"); return item; } } - public static class qCat extends com.mysema.query.grammar.Types.DomainType{ + public static class _Cat extends com.mysema.query.grammar.Types.DomainType{ public final com.mysema.query.grammar.Types.BooleanProperty alive = _boolean("alive"); public final com.mysema.query.grammar.Types.Reference bodyWeight = _prop("bodyWeight",Integer.class); - private qCat kittens; - private qCat mate; + private _Cat kittens; + private _Cat mate; public final com.mysema.query.grammar.Types.Reference name = _prop("name",String.class); - qCat(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qCat(String path) {super(path);} - public final qCat kittens(){ - if (kittens == null) kittens = new qCat(this,"kittens"); + _Cat(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Cat(String path) {super(path);} + public final _Cat kittens(){ + if (kittens == null) kittens = new _Cat(this,"kittens"); return kittens; } - public final qCat mate(){ - if (mate == null) mate = new qCat(this,"mate"); + public final _Cat mate(){ + if (mate == null) mate = new _Cat(this,"mate"); return mate; } } - public static class qCompany extends com.mysema.query.grammar.Types.DomainType{ + public static class _Company extends com.mysema.query.grammar.Types.DomainType{ public final com.mysema.query.grammar.Types.Reference id = _prop("id",Long.class); public final com.mysema.query.grammar.Types.Reference name = _prop("name",String.class); - qCompany(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qCompany(String path) {super(path);} + _Company(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Company(String path) {super(path);} } - public static class qCustomer extends com.mysema.query.grammar.Types.DomainType{ - private qName name; - qCustomer(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qCustomer(String path) {super(path);} - public final qName name(){ - if (name == null) name = new qName(this, "name"); + public static class _Customer extends com.mysema.query.grammar.Types.DomainType{ + private _Name name; + _Customer(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Customer(String path) {super(path);} + public final _Name name(){ + if (name == null) name = new _Name(this, "name"); return name; } } - public static class qDocument extends com.mysema.query.grammar.Types.DomainType{ + public static class _Document extends com.mysema.query.grammar.Types.DomainType{ public final com.mysema.query.grammar.Types.Reference name = _prop("name",String.class); public final com.mysema.query.grammar.Types.Reference validTo = _prop("validTo",java.util.Date.class); - qDocument(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qDocument(String path){super(path);} + _Document(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Document(String path){super(path);} } - public static class qDomesticCat extends qCat{ - qDomesticCat(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qDomesticCat(String path) {super(path);} + public static class _DomesticCat extends _Cat{ + _DomesticCat(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _DomesticCat(String path) {super(path);} } - public static class qItem extends com.mysema.query.grammar.Types.DomainType{ + public static class _Item extends com.mysema.query.grammar.Types.DomainType{ public com.mysema.query.grammar.Types.Reference id = _prop("id",String.class); - qItem(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qItem(String path){super(path);} + _Item(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Item(String path){super(path);} } - public static class qName extends com.mysema.query.grammar.Types.DomainType{ + public static class _Name extends com.mysema.query.grammar.Types.DomainType{ public final com.mysema.query.grammar.Types.Reference firstName = _prop("firstName",String.class); - qName(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qName(String path){super(path);} + _Name(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Name(String path){super(path);} } - public static class qPayment extends qItem{ - qPayment(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qPayment(String path){super(path);} + public static class _Payment extends _Item{ + _Payment(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Payment(String path){super(path);} } - public static class qUser extends com.mysema.query.grammar.Types.DomainType{ - private qCompany company; + public static class _User extends com.mysema.query.grammar.Types.DomainType{ + private _Company company; public final com.mysema.query.grammar.Types.Reference firstName = _prop("firstName",String.class); public final com.mysema.query.grammar.Types.Reference id = _prop("id",Long.class); public final com.mysema.query.grammar.Types.Reference lastName = _prop("lastName",String.class); public final com.mysema.query.grammar.Types.Reference userName = _prop("userName",String.class); - qUser(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qUser(String path) {super(path);} - public final qCompany company(){ - if (company == null) company = new qCompany(this,"company"); + _User(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _User(String path) {super(path);} + public final _Company company(){ + if (company == null) company = new _Company(this,"company"); return company; } } diff --git a/src/main/java/com/mysema/query/grammar/Grammar.java b/src/main/java/com/mysema/query/grammar/Grammar.java index ceaaccf2a..2532ffc31 100644 --- a/src/main/java/com/mysema/query/grammar/Grammar.java +++ b/src/main/java/com/mysema/query/grammar/Grammar.java @@ -90,15 +90,19 @@ public class Grammar { // NOTE : basically same as gt return _binOp(DateOp.AFTER, left, _const(right)); } - + public static > BooleanExpr after(Expr left, Expr right){ // NOTE : signature is for Comparables to support other than Java's date types // NOTE : basically same as gt return _binOp(DateOp.AFTER, left, right); } - + public static BooleanExpr and(BooleanExpr left, BooleanExpr right){ return _binOp(BoOp.AND, left, right); + } + + public static EntityExpr as(DomainType from, DomainType to){ + return new Alias(from, to); } public static > OrderSpecifier asc(Expr target){ diff --git a/src/main/java/com/mysema/query/grammar/Types.java b/src/main/java/com/mysema/query/grammar/Types.java index fd2da9ef7..467e0198c 100644 --- a/src/main/java/com/mysema/query/grammar/Types.java +++ b/src/main/java/com/mysema/query/grammar/Types.java @@ -91,9 +91,9 @@ public class Types { super(type+"."+path); } protected DomainType(String path) {super(path);} - public EntityExpr as(DomainType to){ - return new Alias(this, to); - } +// public EntityExpr as(DomainType to){ +// return new Alias(this, to); +// } protected BooleanProperty _boolean(String path){ return new BooleanProperty(this+"."+path); } diff --git a/src/test/java/com/mysema/query/test/QueryTest.java b/src/test/java/com/mysema/query/test/QueryTest.java index 53d1c079b..69961d868 100644 --- a/src/test/java/com/mysema/query/test/QueryTest.java +++ b/src/test/java/com/mysema/query/test/QueryTest.java @@ -38,7 +38,7 @@ public class QueryTest extends QueryBase{ select(lower(cat.name)).from(cat).where(eq(substr(cat.name,0,2),"Mi")); select(upper(cat.name)).from(cat); select(concat(lower(cat.name),cat.mate().name)).from(cat); - cat.as(kitten); + as(cat,kitten); // cat.as(company); // not allowed // asc(cust.name()); // not allowed asc(cust.name().firstName); @@ -68,7 +68,7 @@ public class QueryTest extends QueryBase{ public void testCat1(){ // from Cat as cat left join cat.kittens as kitten // with kitten.bodyWeight > 10.0 - from(cat).leftJoin(cat.kittens().as(kitten)) + from(cat).leftJoin(as(cat.kittens(),kitten)) .with(gt(kitten.bodyWeight,10)); } @@ -77,7 +77,7 @@ public class QueryTest extends QueryBase{ // from Cat as cat inner join fetch cat.mate // left join fetch cat.kittens child left join fetch child.kittens from(cat).innerJoin(cat.mate()) - .leftJoin(cat.kittens().as(child)).leftJoin(child.kittens()); + .leftJoin(as(cat.kittens(),child)).leftJoin(child.kittens()); } @Test diff --git a/src/test/java/com/mysema/query/test/domain/Domain.java b/src/test/java/com/mysema/query/test/domain/Domain.java index fc4606d34..01b66a8ed 100644 --- a/src/test/java/com/mysema/query/test/domain/Domain.java +++ b/src/test/java/com/mysema/query/test/domain/Domain.java @@ -2,90 +2,90 @@ package com.mysema.query.test.domain; public class Domain { - public static class qAuditLog extends com.mysema.query.grammar.Types.DomainType{ - private qItem item; - qAuditLog(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qAuditLog(String path) {super(path);} - public qItem item() { - if (item == null) item = new qItem(this,"item"); + public static class _AuditLog extends com.mysema.query.grammar.Types.DomainType{ + private _Item item; + _AuditLog(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _AuditLog(String path) {super(path);} + public _Item item() { + if (item == null) item = new _Item(this,"item"); return item; } } - public static class qCat extends com.mysema.query.grammar.Types.DomainType{ + public static class _Cat extends com.mysema.query.grammar.Types.DomainType{ public final com.mysema.query.grammar.Types.BooleanProperty alive = _boolean("alive"); public final com.mysema.query.grammar.Types.Reference bodyWeight = _prop("bodyWeight",Integer.class); - private qCat kittens; - private qCat mate; + private _Cat kittens; + private _Cat mate; public final com.mysema.query.grammar.Types.Reference name = _prop("name",String.class); - qCat(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qCat(String path) {super(path);} - public final qCat kittens(){ - if (kittens == null) kittens = new qCat(this,"kittens"); + _Cat(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Cat(String path) {super(path);} + public final _Cat kittens(){ + if (kittens == null) kittens = new _Cat(this,"kittens"); return kittens; } - public final qCat mate(){ - if (mate == null) mate = new qCat(this,"mate"); + public final _Cat mate(){ + if (mate == null) mate = new _Cat(this,"mate"); return mate; } } - public static class qCompany extends com.mysema.query.grammar.Types.DomainType{ + public static class _Company extends com.mysema.query.grammar.Types.DomainType{ public final com.mysema.query.grammar.Types.Reference id = _prop("id",Long.class); public final com.mysema.query.grammar.Types.Reference name = _prop("name",String.class); - qCompany(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qCompany(String path) {super(path);} + _Company(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Company(String path) {super(path);} } - public static class qCustomer extends com.mysema.query.grammar.Types.DomainType{ - private qName name; - qCustomer(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qCustomer(String path) {super(path);} - public final qName name(){ - if (name == null) name = new qName(this, "name"); + public static class _Customer extends com.mysema.query.grammar.Types.DomainType{ + private _Name name; + _Customer(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Customer(String path) {super(path);} + public final _Name name(){ + if (name == null) name = new _Name(this, "name"); return name; } } - public static class qDocument extends com.mysema.query.grammar.Types.DomainType{ + public static class _Document extends com.mysema.query.grammar.Types.DomainType{ public final com.mysema.query.grammar.Types.Reference name = _prop("name",String.class); public final com.mysema.query.grammar.Types.Reference validTo = _prop("validTo",java.util.Date.class); - qDocument(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qDocument(String path){super(path);} + _Document(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Document(String path){super(path);} } - public static class qDomesticCat extends qCat{ - qDomesticCat(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qDomesticCat(String path) {super(path);} + public static class _DomesticCat extends _Cat{ + _DomesticCat(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _DomesticCat(String path) {super(path);} } - public static class qItem extends com.mysema.query.grammar.Types.DomainType{ + public static class _Item extends com.mysema.query.grammar.Types.DomainType{ public com.mysema.query.grammar.Types.Reference id = _prop("id",String.class); - qItem(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qItem(String path){super(path);} + _Item(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Item(String path){super(path);} } - public static class qName extends com.mysema.query.grammar.Types.DomainType{ + public static class _Name extends com.mysema.query.grammar.Types.DomainType{ public final com.mysema.query.grammar.Types.Reference firstName = _prop("firstName",String.class); - qName(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qName(String path){super(path);} + _Name(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Name(String path){super(path);} } - public static class qPayment extends qItem{ - qPayment(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qPayment(String path){super(path);} + public static class _Payment extends _Item{ + _Payment(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _Payment(String path){super(path);} } - public static class qUser extends com.mysema.query.grammar.Types.DomainType{ - private qCompany company; + public static class _User extends com.mysema.query.grammar.Types.DomainType{ + private _Company company; public final com.mysema.query.grammar.Types.Reference firstName = _prop("firstName",String.class); public final com.mysema.query.grammar.Types.Reference id = _prop("id",Long.class); public final com.mysema.query.grammar.Types.Reference lastName = _prop("lastName",String.class); public final com.mysema.query.grammar.Types.Reference userName = _prop("userName",String.class); - qUser(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} - qUser(String path) {super(path);} - public final qCompany company(){ - if (company == null) company = new qCompany(this,"company"); + _User(com.mysema.query.grammar.Types.DomainType type, String path) {super(type,path);} + _User(String path) {super(path);} + public final _Company company(){ + if (company == null) company = new _Company(this,"company"); return company; } } diff --git a/src/test/java/com/mysema/query/test/domain/Instances.java b/src/test/java/com/mysema/query/test/domain/Instances.java index ca1a53317..ce2c1f1e7 100644 --- a/src/test/java/com/mysema/query/test/domain/Instances.java +++ b/src/test/java/com/mysema/query/test/domain/Instances.java @@ -11,46 +11,46 @@ import com.mysema.query.test.domain.Domain.*; public class Instances { // AuditLog - public static final qAuditLog log = new qAuditLog("log"); + public static final _AuditLog log = new _AuditLog("log"); // Cat - public static final qCat cat = new qCat("cat"); - public static final qCat cat1 = new qCat("cat1"); - public static final qCat cat2 = new qCat("cat2"); - public static final qCat cat3 = new qCat("cat3"); - public static final qCat cat4 = new qCat("cat4"); - public static final qCat cat5 = new qCat("cat5"); + public static final _Cat cat = new _Cat("cat"); + public static final _Cat cat1 = new _Cat("cat1"); + public static final _Cat cat2 = new _Cat("cat2"); + public static final _Cat cat3 = new _Cat("cat3"); + public static final _Cat cat4 = new _Cat("cat4"); + public static final _Cat cat5 = new _Cat("cat5"); - public static final qCat kitten = new qCat("kitten"); - public static final qCat child = new qCat("child"); - public static final qCat mate = new qCat("mate"); + public static final _Cat kitten = new _Cat("kitten"); + public static final _Cat child = new _Cat("child"); + public static final _Cat mate = new _Cat("mate"); // Company - public static final qCompany company = new qCompany("company"); - public static final qCompany company1 = new qCompany("company1"); - public static final qCompany company2 = new qCompany("company2"); - public static final qCompany company3 = new qCompany("company3"); - public static final qCompany company4 = new qCompany("company4"); - public static final qCompany company5 = new qCompany("company5"); + public static final _Company company = new _Company("company"); + public static final _Company company1 = new _Company("company1"); + public static final _Company company2 = new _Company("company2"); + public static final _Company company3 = new _Company("company3"); + public static final _Company company4 = new _Company("company4"); + public static final _Company company5 = new _Company("company5"); // Customer - public static final qCustomer cust = new qCustomer("cust"); + public static final _Customer cust = new _Customer("cust"); // Document - public static final qDocument doc = new qDocument("doc"); + public static final _Document doc = new _Document("doc"); // DomesticCat - public static final qDomesticCat domesticCat = new qDomesticCat("domesticCat"); + public static final _DomesticCat domesticCat = new _DomesticCat("domesticCat"); // Payment - public static final qPayment payment = new qPayment("payment"); + public static final _Payment payment = new _Payment("payment"); // User - public static final qUser user = new qUser("user"); - public static final qUser user1 = new qUser("user1"); - public static final qUser user2 = new qUser("user2"); - public static final qUser user3 = new qUser("user3"); - public static final qUser user4 = new qUser("user4"); - public static final qUser user5 = new qUser("user5"); + public static final _User user = new _User("user"); + public static final _User user1 = new _User("user1"); + public static final _User user2 = new _User("user2"); + public static final _User user3 = new _User("user3"); + public static final _User user4 = new _User("user4"); + public static final _User user5 = new _User("user5"); }