diff --git a/querydsl-docs/src/main/docbook/en-US/content/general/alias.xml b/querydsl-docs/src/main/docbook/en-US/content/general/alias.xml
index 16d18e39f..51e6e7503 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/general/alias.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/general/alias.xml
@@ -21,7 +21,7 @@
 QCat cat = new QCat("cat");
 for (String name : query.from(cat,cats)
     .where(cat.kittens.size().gt(0))
-    .list(cat.name)){
+    .list(cat.name)) {
     System.out.println(name);
 }
 ]]></programlisting>
@@ -35,7 +35,7 @@ for (String name : query.from(cat,cats)
 Cat c = alias(Cat.class, "cat");
 for (String name : query.from($(c),cats)
     .where($(c.getKittens()).size().gt(0))
-    .list($(c.getName()))){
+    .list($(c.getName()))) {
     System.out.println(name);
 }
 ]]></programlisting>
@@ -59,7 +59,7 @@ import static com.mysema.query.alias.Alias.alias;
 Cat c = alias(Cat.class, "cat");
 for (String name : query.from($(c),cats)
     .where($(c.getKittens().size()).gt(0))
-    .list($(c.getName()))){
+    .list($(c.getName()))) {
     System.out.println(name);
 }
 ]]></programlisting>
diff --git a/querydsl-docs/src/main/docbook/en-US/content/general/codegen.xml b/querydsl-docs/src/main/docbook/en-US/content/general/codegen.xml
index e3b60202c..fa9a343ef 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/general/codegen.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/general/codegen.xml
@@ -27,12 +27,12 @@ class Event {
 }
 
 @Entity
-class Account{
+class Account {
     Customer customer;
 }
 
 @Entity
-class Customer{
+class Customer {
     String name;
     Address address;
     // ...
@@ -115,7 +115,7 @@ class Customer{
     <programlisting language="java"><![CDATA[
 @Config(entityAccessors=true)
 @Entity
-public class User {
+public class User {
     //...
 }
 ]]></programlisting>
@@ -253,7 +253,7 @@ import com.mysema.query.annotations.Config;
 
     <programlisting language="java"><![CDATA[
 @Entity
-public class MyEntity{
+public class MyEntity {
     @QueryType(PropertyType.SIMPLE)
     public String stringAsSimple;
 
@@ -285,7 +285,7 @@ public class MyEntity{
 
     <programlisting language="java"><![CDATA[
 @QueryEntity
-public static class User{
+public static class User {
 
     String name;
 
@@ -296,7 +296,7 @@ public static class User{
 
 <programlisting language="java"><![CDATA[
 @QueryDelegate(User.class)
-public static BooleanPath isManagedBy(QUser user, User other){
+public static BooleanPath isManagedBy(QUser user, User other) {
     return user.manager.eq(other);
 }
 ]]></programlisting>
@@ -318,12 +318,12 @@ public BooleanPath isManagedBy(QUser other) {
 public class QueryExtensions {
 
     @QueryDelegate(Date.class)
-    public static BooleanExpression inPeriod(DatePath<Date> date, Pair<Date,Date> period){
+    public static BooleanExpression inPeriod(DatePath<Date> date, Pair<Date,Date> period) {
         return date.goe(period.getFirst()).and(date.loe(period.getSecond()));
     }
 
     @QueryDelegate(Timestamp.class)
-    public static BooleanExpression inDatePeriod(DateTimePath<Timestamp> timestamp, Pair<Date,Date> period){
+    public static BooleanExpression inDatePeriod(DateTimePath<Timestamp> timestamp, Pair<Date,Date> period) {
         Timestamp first = new Timestamp(DateUtils.truncate(period.getFirst(), Calendar.DAY_OF_MONTH).getTime());
         Calendar second = Calendar.getInstance();
         second.setTime(DateUtils.truncate(period.getSecond(), Calendar.DAY_OF_MONTH));
diff --git a/querydsl-docs/src/main/docbook/en-US/content/general/creating-queries.xml b/querydsl-docs/src/main/docbook/en-US/content/general/creating-queries.xml
index 5954d4f48..c1b111f29 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/general/creating-queries.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/general/creating-queries.xml
@@ -19,11 +19,11 @@
     </para>
 
     <programlisting language="java"><![CDATA[
-public List<Customer> getCustomer(String... names){
+public List<Customer> getCustomer(String... names) {
     QCustomer customer = QCustomer.customer;
     JPAQuery query = new JPAQuery(entityManager).from(customer);
     BooleanBuilder builder = new BooleanBuilder();
-    for (String name : names){
+    for (String name : names) {
         builder.or(customer.name.eq(name));
     }
     query.where(builder); // customer.name eq name1 OR customer.name eq name2 OR ...
@@ -186,12 +186,12 @@ Expression<String> cases = customer.annualSpending
 
     <programlisting language="java"><![CDATA[
 // from Account
-QAccount extends EntityPathBase<Account>{
+QAccount extends EntityPathBase<Account> {
     // ...
 }
 
 // from BankAccount extends Account
-QBankAccount extends EntityPathBase<BankAccount>{
+QBankAccount extends EntityPathBase<BankAccount> {
 
     public final QAccount _super = new QAccount(this);
 
diff --git a/querydsl-docs/src/main/docbook/en-US/content/general/result-handling.xml b/querydsl-docs/src/main/docbook/en-US/content/general/result-handling.xml
index 1178351bd..cf0048dc7 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/general/result-handling.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/general/result-handling.xml
@@ -80,7 +80,7 @@ List<UserDTO> dtos = query.list(
 class CustomerDTO {
 
   @QueryProjection
-  public CustomerDTO(long id, String name){
+  public CustomerDTO(long id, String name) {
      ...
   }
 
@@ -110,7 +110,7 @@ List<CustomerDTO> dtos = query.from(customer).list(new QCustomerDTO(customer.id,
 class Customer {
 
   @QueryProjection
-  public Customer(long id, String name){
+  public Customer(long id, String name) {
      ...
   }
 
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/collections.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/collections.xml
index 73f009abe..75c4e083c 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/collections.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/collections.xml
@@ -48,7 +48,7 @@ import static com.mysema.query.alias.Alias.*;
 Cat c = alias(Cat.class, "cat");
 for (String name : from($(c),cats)
   .where($(c.getKittens()).size().gt(0))
-  .list($(c.getName()))){
+  .list($(c.getName()))) {
     System.out.println(name);
 }
 ]]></programlisting>
@@ -63,7 +63,7 @@ for (String name : from($(c),cats)
 Cat c = alias(Cat.class, "cat");
 for (String name : from($(c),cats)
   .where($(c.getKittens().size()).gt(0))
-  .list($(c.getName()))){
+  .list($(c.getName()))) {
     System.out.println(name);
 }
 ]]></programlisting>
@@ -114,7 +114,7 @@ $(c.getMate().getName().toLowerCase())
 QCat cat = new QCat("cat");
 for (String name : from(cat,cats)
   .where(cat.kittens.size().gt(0))
-  .list(cat.name)){
+  .list(cat.name)) {
     System.out.println(name);
 }
 ]]></programlisting>
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/jdo.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/jdo.xml
index ade2d7fe6..c3acf7e89 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/jdo.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/jdo.xml
@@ -151,19 +151,19 @@ public class Customer {
   private String firstName;
   private String lastName;
 
-  public String getFirstName(){
+  public String getFirstName() {
     return firstName;
   }
 
-  public String getLastName(){
+  public String getLastName() {
     return lastName;
   }
 
-  public void setFirstName(String fn){
+  public void setFirstName(String fn) {
     firstName = fn;
   }
 
-  public void setLastName(String ln)[
+  public void setLastName(String ln) {
     lastName = ln;
   }
 }
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/jpa.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/jpa.xml
index 42e232903..8299eadf4 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/jpa.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/jpa.xml
@@ -215,15 +215,15 @@ public class Customer {
     private String firstName;
     private String lastName;
 
-    public String getFirstName(){
+    public String getFirstName() {
         return firstName;
     }
 
-    public String getLastName(){
+    public String getLastName() {
         return lastName;
     }
 
-    public void setFirstName(String fn){
+    public void setFirstName(String fn) {
         firstName = fn;
     }
 
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/lucene.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/lucene.xml
index c09373800..35822df66 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/lucene.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/lucene.xml
@@ -56,7 +56,7 @@
       like this:</para>
 
     <programlisting language="java"><![CDATA[
-public class QDocument extends EntityPathBase<Document>{
+public class QDocument extends EntityPathBase<Document> {
     private static final long serialVersionUID = -4872833626508344081L;
 
     public QDocument(String var) {
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/sql.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/sql.xml
index aa23b2db5..dc1e97214 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/sql.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/sql.xml
@@ -698,11 +698,11 @@ public class MySQLQuery extends AbstractSQLQuery<MySQLQuery> {
         super(conn, new Configuration(templates), metadata);
     }
 
-    public MySQLQuery bigResult(){
+    public MySQLQuery bigResult() {
         return addFlag(Position.AFTER_SELECT, "SQL_BIG_RESULT ");
     }
 
-    public MySQLQuery bufferResult(){
+    public MySQLQuery bufferResult() {
         return addFlag(Position.AFTER_SELECT, "SQL_BUFFER_RESULT ");
     }
 
@@ -991,19 +991,19 @@ assertEquals(1l, delete(e).where(e.id.eq(employee.getId())).execute());
     <para>The factory methods used in the previous example are here:</para>
 
     <programlisting language="java"><![CDATA[
-protected SQLUpdateClause update(RelationalPath<?> e){
+protected SQLUpdateClause update(RelationalPath<?> e) {
     return new SQLUpdateClause(Connections.getConnection(), templates, e);
 }
 
-protected SQLInsertClause insert(RelationalPath<?> e){
+protected SQLInsertClause insert(RelationalPath<?> e) {
     return new SQLInsertClause(Connections.getConnection(), templates, e);
 }
 
-protected SQLDeleteClause delete(RelationalPath<?> e){
+protected SQLDeleteClause delete(RelationalPath<?> e) {
     return new SQLDeleteClause(Connections.getConnection(), templates, e);
 }
 
-protected SQLMergeClause merge(RelationalPath<?> e){
+protected SQLMergeClause merge(RelationalPath<?> e) {
     return new SQLMergeClause(Connections.getConnection(), templates, e);
 }
 
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/general/alias.xml b/querydsl-docs/src/main/docbook/ko-KR/content/general/alias.xml
index 4714a2e3b..9e26ae7bc 100644
--- a/querydsl-docs/src/main/docbook/ko-KR/content/general/alias.xml
+++ b/querydsl-docs/src/main/docbook/ko-KR/content/general/alias.xml
@@ -19,7 +19,7 @@
 QCat cat = new QCat("cat");
 for (String name : query.from(cat,cats)
     .where(cat.kittens.size().gt(0))
-    .list(cat.name)){
+    .list(cat.name)) {
     System.out.println(name);
 }
 ]]></programlisting>
@@ -33,7 +33,7 @@ for (String name : query.from(cat,cats)
 Cat c = alias(Cat.class, "cat");
 for (String name : query.from($(c),cats)
     .where($(c.getKittens()).size().gt(0))
-    .list($(c.getName()))){
+    .list($(c.getName()))) {
     System.out.println(name);
 }
 ]]></programlisting>
@@ -55,7 +55,7 @@ import static com.mysema.query.alias.Alias.alias;
 Cat c = alias(Cat.class, "cat");
 for (String name : query.from($(c),cats)
     .where($(c.getKittens().size()).gt(0))
-    .list($(c.getName()))){
+    .list($(c.getName()))) {
     System.out.println(name);
 }
 ]]></programlisting>
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/general/codegen.xml b/querydsl-docs/src/main/docbook/ko-KR/content/general/codegen.xml
index 47446b02e..9cd68ab7e 100644
--- a/querydsl-docs/src/main/docbook/ko-KR/content/general/codegen.xml
+++ b/querydsl-docs/src/main/docbook/ko-KR/content/general/codegen.xml
@@ -23,12 +23,12 @@ class Event {
 }
 
 @Entity
-class Account{
+class Account {
     Customer customer;
 }
 
 @Entity
-class Customer{
+class Customer {
     String name;
     Address address;
     // ...
@@ -108,7 +108,7 @@ class Customer{
     <programlisting language="java"><![CDATA[
 @Config(entityAccessors=true)
 @Entity
-public class User {
+public class User {
     //...
 }
 ]]></programlisting>
@@ -243,7 +243,7 @@ import com.mysema.query.annotations.Config;
 
     <programlisting language="java"><![CDATA[
 @Entity
-public class MyEntity{
+public class MyEntity {
     @QueryType(PropertyType.SIMPLE)
     public String stringAsSimple;
 
@@ -274,7 +274,7 @@ public class MyEntity{
 
     <programlisting language="java"><![CDATA[
 @QueryEntity
-public static class User{
+public static class User {
 
     String name;
 
@@ -285,7 +285,7 @@ public static class User{
 
 <programlisting language="java"><![CDATA[
 @QueryDelegate(User.class)
-public static BooleanPath isManagedBy(QUser user, User other){
+public static BooleanPath isManagedBy(QUser user, User other) {
     return user.manager.eq(other);
 }
 ]]></programlisting>
@@ -306,12 +306,12 @@ public BooleanPath isManagedBy(QUser other) {
 public class QueryExtensions {
 
     @QueryDelegate(Date.class)
-    public static BooleanExpression inPeriod(DatePath<Date> date, Pair<Date,Date> period){
+    public static BooleanExpression inPeriod(DatePath<Date> date, Pair<Date,Date> period) {
         return date.goe(period.getFirst()).and(date.loe(period.getSecond()));
     }
 
     @QueryDelegate(Timestamp.class)
-    public static BooleanExpression inDatePeriod(DateTimePath<Timestamp> timestamp, Pair<Date,Date> period){
+    public static BooleanExpression inDatePeriod(DateTimePath<Timestamp> timestamp, Pair<Date,Date> period) {
         Timestamp first = new Timestamp(DateUtils.truncate(period.getFirst(), Calendar.DAY_OF_MONTH).getTime());
         Calendar second = Calendar.getInstance();
         second.setTime(DateUtils.truncate(period.getSecond(), Calendar.DAY_OF_MONTH));
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/general/creating-queries.xml b/querydsl-docs/src/main/docbook/ko-KR/content/general/creating-queries.xml
index 3d9ca789f..27b6cf6ee 100644
--- a/querydsl-docs/src/main/docbook/ko-KR/content/general/creating-queries.xml
+++ b/querydsl-docs/src/main/docbook/ko-KR/content/general/creating-queries.xml
@@ -17,11 +17,11 @@
     </para>
 
     <programlisting language="java"><![CDATA[
-public List<Customer> getCustomer(String... names){
+public List<Customer> getCustomer(String... names) {
     QCustomer customer = QCustomer.customer;
     JPAQuery query = new JPAQuery(entityManager).from(customer);
     BooleanBuilder builder = new BooleanBuilder();
-    for (String name : names){
+    for (String name : names) {
         builder.or(customer.name.eq(name));
     }
     query.where(builder); // customer.name eq name1 OR customer.name eq name2 OR ...
@@ -174,12 +174,12 @@ Expression<String> cases = customer.annualSpending
 
     <programlisting language="java"><![CDATA[
 // from Account
-QAccount extends EntityPathBase<Account>{
+QAccount extends EntityPathBase<Account> {
     // ...
 }
 
 // from BankAccount extends Account
-QBankAccount extends EntityPathBase<BankAccount>{
+QBankAccount extends EntityPathBase<BankAccount> {
 
     public final QAccount _super = new QAccount(this);
 
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/general/result-handling.xml b/querydsl-docs/src/main/docbook/ko-KR/content/general/result-handling.xml
index 72297bc7a..6e51b1df9 100644
--- a/querydsl-docs/src/main/docbook/ko-KR/content/general/result-handling.xml
+++ b/querydsl-docs/src/main/docbook/ko-KR/content/general/result-handling.xml
@@ -75,7 +75,7 @@ List<UserDTO> dtos = query.list(
 class CustomerDTO {
 
   @QueryProjection
-  public CustomerDTO(long id, String name){
+  public CustomerDTO(long id, String name) {
      ...
   }
 
@@ -104,7 +104,7 @@ List<CustomerDTO> dtos = query.from(customer).list(new QCustomerDTO(customer.id,
 class Customer {
 
   @QueryProjection
-  public Customer(long id, String name){
+  public Customer(long id, String name) {
      ...
   }
 
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/collections.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/collections.xml
index c9b7ce1ae..92ddc9993 100644
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/collections.xml
+++ b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/collections.xml
@@ -41,7 +41,7 @@ import static com.mysema.query.alias.Alias.*;
 Cat c = alias(Cat.class, "cat");
 for (String name : from($(c),cats)
   .where($(c.getKittens()).size().gt(0))
-  .list($(c.getName()))){
+  .list($(c.getName()))) {
     System.out.println(name);
 }
 ]]></programlisting>
@@ -54,7 +54,7 @@ for (String name : from($(c),cats)
 Cat c = alias(Cat.class, "cat");
 for (String name : from($(c),cats)
   .where($(c.getKittens().size()).gt(0))
-  .list($(c.getName()))){
+  .list($(c.getName()))) {
     System.out.println(name);
 }
 ]]></programlisting>
@@ -104,7 +104,7 @@ $(c.getMate().getName().toLowerCase())
 QCat cat = new QCat("cat");
 for (String name : from(cat,cats)
   .where(cat.kittens.size().gt(0))
-  .list(cat.name)){
+  .list(cat.name)) {
     System.out.println(name);
 }
 ]]></programlisting>
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jdo.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jdo.xml
index fd0e86d80..41b50fd2f 100644
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jdo.xml
+++ b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jdo.xml
@@ -140,19 +140,19 @@ public class Customer {
   private String firstName;
   private String lastName;
 
-  public String getFirstName(){
+  public String getFirstName() {
     return firstName;
   }
 
-  public String getLastName(){
+  public String getLastName() {
     return lastName;
   }
 
-  public void setFirstName(String fn){
+  public void setFirstName(String fn) {
     firstName = fn;
   }
 
-  public void setLastName(String ln)[
+  public void setLastName(String ln) {
     lastName = ln;
   }
 }
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jpa.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jpa.xml
index 021dd1dd1..909ef1e64 100644
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jpa.xml
+++ b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jpa.xml
@@ -218,7 +218,7 @@ public class Customer {
         firstName = fn;
     }
 
-    public void setLastName(String ln)[
+    public void setLastName(String ln) {
         lastName = ln;
     }
 }
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/lucene.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/lucene.xml
index b6267f2b3..691699dc3 100644
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/lucene.xml
+++ b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/lucene.xml
@@ -54,7 +54,7 @@
     <para>다음과 같은 방식으로 year와 title 필드를 가진 쿼리 타입을 직접 작성할 수 있다.</para>
 
     <programlisting language="java"><![CDATA[
-public class QDocument extends EntityPathBase<Document>{
+public class QDocument extends EntityPathBase<Document> {
     private static final long serialVersionUID = -4872833626508344081L;
 
     public QDocument(String var) {
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/sql.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/sql.xml
index 5a19c7a48..e0263fef7 100644
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/sql.xml
+++ b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/sql.xml
@@ -685,11 +685,11 @@ public class MySQLQuery extends AbstractSQLQuery<MySQLQuery> {
         super(conn, new Configuration(templates), metadata);
     }
 
-    public MySQLQuery bigResult(){
+    public MySQLQuery bigResult() {
         return addFlag(Position.AFTER_SELECT, "SQL_BIG_RESULT ");
     }
 
-    public MySQLQuery bufferResult(){
+    public MySQLQuery bufferResult() {
         return addFlag(Position.AFTER_SELECT, "SQL_BUFFER_RESULT ");
     }
 
@@ -972,19 +972,19 @@ assertEquals(1l, delete(e).where(e.id.eq(employee.getId())).execute());
     <para>앞서 예제에서 사용한 팩토리 메서드는 다음과 같다.</para>
 
     <programlisting language="java"><![CDATA[
-protected SQLUpdateClause update(RelationalPath<?> e){
+protected SQLUpdateClause update(RelationalPath<?> e) {
     return new SQLUpdateClause(Connections.getConnection(), templates, e);
 }
 
-protected SQLInsertClause insert(RelationalPath<?> e){
+protected SQLInsertClause insert(RelationalPath<?> e) {
     return new SQLInsertClause(Connections.getConnection(), templates, e);
 }
 
-protected SQLDeleteClause delete(RelationalPath<?> e){
+protected SQLDeleteClause delete(RelationalPath<?> e) {
     return new SQLDeleteClause(Connections.getConnection(), templates, e);
 }
 
-protected SQLMergeClause merge(RelationalPath<?> e){
+protected SQLMergeClause merge(RelationalPath<?> e) {
     return new SQLMergeClause(Connections.getConnection(), templates, e);
 }