diff --git a/querydsl-apt/src/main/resources/querydsl-hibernate.ftl b/querydsl-apt/src/main/resources/querydsl-hibernate.ftl index 75fa094ba..4e5332c81 100644 --- a/querydsl-apt/src/main/resources/querydsl-hibernate.ftl +++ b/querydsl-apt/src/main/resources/querydsl-hibernate.ftl @@ -1,4 +1,4 @@ -<#assign reserved = ["isnull", "isnotnull", "toString", "hashCode", "getClass", "notify", "notifyAll", "wait"]> +<#assign reserved = ["isnull", "isnotnull", "_type", "toString", "hashCode", "getClass", "notify", "notifyAll", "wait"]> package ${package}; <#if (dtoTypes?size > 0)> @@ -38,18 +38,19 @@ ${include} <#list decl.collectionFields as field> public final PathEntityCollection<${field.typeName}> ${field.name} = _collection("${field.name}",${field.typeName}.class); public ${pre}${field.simpleTypeName} ${field.name}(int index) { - return new ${pre}${field.simpleTypeName}(this+".${field.name}["+index+"]"); + return new ${pre}${field.simpleTypeName}(this,"${field.name}["+index+"]"); } <#list decl.entityFields as field> public final PathEntityRenamable<${field.typeName}> ${field.name} = _entity("${field.name}",${field.typeName}.class); ${pre}${decl.simpleName}(String path) {super(${decl.name}.class,path);} + ${pre}${decl.simpleName}(Path parent, String path) {super(${decl.name}.class, parent, path);} <#list decl.entityFields as field> <#if !reserved?seq_contains(field.name)> private ${pre}${field.simpleTypeName} _${field.name}; public ${pre}${field.simpleTypeName} ${field.name}() { - if (_${field.name} == null) _${field.name} = new ${pre}${field.simpleTypeName}(this+".${field.name}"); + if (_${field.name} == null) _${field.name} = new ${pre}${field.simpleTypeName}(this,"${field.name}"); return _${field.name}; }