CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-30 21:08:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:mysema/querydsl

Browse Source
This commit is contained in:
Lassi Immonen 2011-08-08 13:16:49 +03:00
commit 02419f892a
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
querydsl-core/src/main/java/com/mysema/query/codegen/EmbeddableSerializer.java
View File

@ -114,11 +114,16 @@ public final class EmbeddableSerializer extends EntitySerializer {
List<Package> packages = new ArrayList<Package>();
packages.add(PathMetadata.class.getPackage());
packages.add(SimplePath.class.getPackage());
if ((model.hasLists() && config.useListAccessors())
|| !model.getDelegates().isEmpty()
|| (model.hasMaps() && config.useMapAccessors())){
// if ((model.hasLists() && config.useListAccessors())
// || !model.getDelegates().isEmpty()
// || (model.hasMaps() && config.useMapAccessors())){
// packages.add(ComparableExpression.class.getPackage());
// }
if (isImportExprPackage(model)) {
packages.add(ComparableExpression.class.getPackage());
}
writer.imports(packages.toArray(new Package[packages.size()]));
writer.imports(Generated.class);

25
querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java
View File

@ -363,7 +363,8 @@ public class EntitySerializer implements Serializer{
List<Package> packages = new ArrayList<Package>();
packages.add(PathMetadata.class.getPackage());
packages.add(SimplePath.class.getPackage());
if (!model.getConstructors().isEmpty() || !model.getDelegates().isEmpty()){
if (isImportExprPackage(model)) {
packages.add(ComparableExpression.class.getPackage());
}
@ -371,7 +372,27 @@ public class EntitySerializer implements Serializer{
writer.imports(Generated.class);
}
protected boolean isImportExprPackage(EntityType model) {
if (!model.getConstructors().isEmpty() || !model.getDelegates().isEmpty()){
boolean importExprPackage = false;
for (Constructor c : model.getConstructors()) {
for (Parameter cp : c.getParameters()) {
importExprPackage |= cp.getType().getPackageName().equals(ComparableExpression.class.getPackage().getName());
}
}
for (Delegate d : model.getDelegates()) {
for (Parameter dp : d.getParameters()) {
importExprPackage |= dp.getType().getPackageName().equals(ComparableExpression.class.getPackage().getName());
}
}
return importExprPackage;
} else {
return false;
}
}
protected void introDelegatePackages(CodeWriter writer, EntityType model) throws IOException {
Set<String> packages = new HashSet<String>();
for (Delegate delegate : model.getDelegates()){

2
querydsl-core/src/main/java/com/mysema/query/codegen/TypeMappings.java
View File

@ -139,7 +139,7 @@ public final class TypeMappings {
}
}
@SuppressWarnings("unchecked")
public void register(TypeCategory category,
@Nullable Class<? extends Expression> expr,