From 74f4ff00072d55f697eeb8da47ce54d6dfda3538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Sat, 13 Oct 2012 15:07:23 +0300
Subject: [PATCH] #247 furhter code generation improvements

---
 .../test/java/com/mysema/query/domain/Expression.java    | 8 ++++++++
 .../java/com/mysema/query/codegen/EntitySerializer.java  | 9 +++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 querydsl-apt/src/test/java/com/mysema/query/domain/Expression.java

diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Expression.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Expression.java
new file mode 100644
index 000000000..f9bcef6ce
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/Expression.java
@@ -0,0 +1,8 @@
+package com.mysema.query.domain;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Expression {
+
+}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/EntitySerializer.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/EntitySerializer.java
index 2345719c0..1055d9039 100644
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/EntitySerializer.java
+++ b/querydsl-codegen/src/main/java/com/mysema/query/codegen/EntitySerializer.java
@@ -59,6 +59,7 @@ import com.mysema.query.types.Path;
 import com.mysema.query.types.PathMetadata;
 import com.mysema.query.types.PathMetadataFactory;
 import com.mysema.query.types.expr.ComparableExpression;
+import com.mysema.query.types.expr.SimpleExpression;
 import com.mysema.query.types.path.ArrayPath;
 import com.mysema.query.types.path.BooleanPath;
 import com.mysema.query.types.path.CollectionPath;
@@ -429,8 +430,8 @@ public class EntitySerializer implements Serializer{
         // other packages
         List<Package> packages = Lists.newArrayList();
         packages.add(SimplePath.class.getPackage());        
-        if (!model.getConstructors().isEmpty()) {
-            packages.add(ConstructorExpression.class.getPackage());
+        if (!model.getConstructors().isEmpty()) {            
+            packages.add(SimpleExpression.class.getPackage());
         }        
         if (isImportExprPackage(model)) {
             packages.add(ComparableExpression.class.getPackage());
@@ -442,6 +443,10 @@ public class EntitySerializer implements Serializer{
         if (!model.getSimpleName().equals("Path")) {
             classes.add(Path.class); 
         }        
+        if (!model.getConstructors().isEmpty()) {
+            classes.add(ConstructorExpression.class);
+            classes.add(Expression.class);
+        }
         boolean inits = false;
         if (model.hasEntityFields() || model.hasInits()) {
             inits = true;