diff --git a/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java b/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java
index 20d112b57..e4fda0461 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java
@@ -4,10 +4,10 @@ import com.avaje.ebean.Ebean;
 import com.avaje.ebean.EbeanServer;
 import com.avaje.ebean.config.DbConstraintNaming;
 import com.avaje.ebean.config.DbMigrationConfig;
+import com.avaje.ebean.config.Platform;
 import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.config.dbplatform.DB2Platform;
 import com.avaje.ebean.config.dbplatform.DatabasePlatform;
-import com.avaje.ebean.config.Platform;
 import com.avaje.ebean.config.dbplatform.H2Platform;
 import com.avaje.ebean.config.dbplatform.MsSqlServer2005Platform;
 import com.avaje.ebean.config.dbplatform.MySqlPlatform;
diff --git a/src/main/java/com/avaje/ebean/dbmigration/DdlGenerator.java b/src/main/java/com/avaje/ebean/dbmigration/DdlGenerator.java
index c7426989a..2f995fce2 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/DdlGenerator.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/DdlGenerator.java
@@ -21,7 +21,7 @@ import java.sql.SQLException;
 
 /**
  * Controls the generation and execution of "Create All" and "Drop All" DDL scripts.
- *
+ * <p>
  * Typically the "Create All" DDL is executed for running tests etc and has nothing to do
  * with DB Migration (diff based) DDL.
  */
diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlWrite.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlWrite.java
index e0a6bae94..40a8208a5 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlWrite.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlWrite.java
@@ -60,9 +60,9 @@ public class DdlWrite {
    */
   public boolean isApplyEmpty() {
     return apply.getBuffer().isEmpty()
-        && applyForeignKeys.getBuffer().isEmpty()
-        && applyHistory.getBuffer().isEmpty()
-        && applyDropDependencies.getBuffer().isEmpty();
+      && applyForeignKeys.getBuffer().isEmpty()
+      && applyHistory.getBuffer().isEmpty()
+      && applyDropDependencies.getBuffer().isEmpty();
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 1cb4a9818..344ba3320 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -206,12 +206,12 @@ public class BaseTableDdl implements TableDdl {
       String uqName = col.getUniqueOneToOne();
       String[] columnNames = {col.getName()};
       write.apply()
-          .append(platformDdl.alterTableAddUniqueConstraint(tableName, uqName, columnNames))
-          .endOfStatement();
+        .append(platformDdl.alterTableAddUniqueConstraint(tableName, uqName, columnNames))
+        .endOfStatement();
 
       write.dropAllForeignKeys()
-          .append(platformDdl.dropIndex(uqName, tableName))
-          .endOfStatement();
+        .append(platformDdl.dropIndex(uqName, tableName))
+        .endOfStatement();
     }
   }
 
@@ -338,11 +338,11 @@ public class BaseTableDdl implements TableDdl {
     fkeyBuffer.end();
 
     write.dropAllForeignKeys()
-        .append(platformDdl.alterTableDropForeignKey(tableName, fkName)).endOfStatement();
+      .append(platformDdl.alterTableDropForeignKey(tableName, fkName)).endOfStatement();
 
     if (indexName != null) {
       write.dropAllForeignKeys()
-          .append(platformDdl.dropIndex(indexName, tableName)).endOfStatement();
+        .append(platformDdl.dropIndex(indexName, tableName)).endOfStatement();
     }
 
     write.dropAllForeignKeys().end();
@@ -513,20 +513,20 @@ public class BaseTableDdl implements TableDdl {
 
     String[] cols = toColumnNamesSplit(createIndex.getColumns());
     writer.apply()
-        .append(platformDdl.createIndex(createIndex.getIndexName(), createIndex.getTableName(), cols))
-        .endOfStatement();
+      .append(platformDdl.createIndex(createIndex.getIndexName(), createIndex.getTableName(), cols))
+      .endOfStatement();
 
     writer.dropAll()
-        .append(platformDdl.dropIndex(createIndex.getIndexName(), createIndex.getTableName()))
-        .endOfStatement();
+      .append(platformDdl.dropIndex(createIndex.getIndexName(), createIndex.getTableName()))
+      .endOfStatement();
   }
 
   @Override
   public void generate(DdlWrite writer, DropIndex dropIndex) throws IOException {
 
     writer.apply()
-        .append(platformDdl.dropIndex(dropIndex.getIndexName(), dropIndex.getTableName()))
-        .endOfStatement();
+      .append(platformDdl.dropIndex(dropIndex.getIndexName(), dropIndex.getTableName()))
+      .endOfStatement();
   }
 
   /**
@@ -793,16 +793,16 @@ public class BaseTableDdl implements TableDdl {
   protected void alterColumnDropForeignKey(DdlWrite writer, AlterColumn alter) throws IOException {
 
     writer.apply()
-        .append(platformDdl.alterTableDropForeignKey(alter.getTableName(), alter.getDropForeignKey()))
-        .endOfStatement();
+      .append(platformDdl.alterTableDropForeignKey(alter.getTableName(), alter.getDropForeignKey()))
+      .endOfStatement();
   }
 
 
   protected void alterColumnDropUniqueConstraint(DdlWrite writer, AlterColumn alter) throws IOException {
 
     writer.apply()
-        .append(platformDdl.alterTableDropUniqueConstraint(alter.getTableName(), alter.getDropUnique()))
-        .endOfStatement();
+      .append(platformDdl.alterTableDropUniqueConstraint(alter.getTableName(), alter.getDropUnique()))
+      .endOfStatement();
   }
 
   protected void alterColumnAddUniqueOneToOneConstraint(DdlWrite writer, AlterColumn alter) throws IOException {
@@ -820,27 +820,27 @@ public class BaseTableDdl implements TableDdl {
     String[] cols = {alter.getColumnName()};
 
     writer.apply()
-        .append(platformDdl.alterTableAddUniqueConstraint(alter.getTableName(), uqName, cols))
-        .endOfStatement();
+      .append(platformDdl.alterTableAddUniqueConstraint(alter.getTableName(), uqName, cols))
+      .endOfStatement();
 
     writer.dropAllForeignKeys()
-        .append(platformDdl.dropIndex(uqName, alter.getTableName()))
-        .endOfStatement();
+      .append(platformDdl.dropIndex(uqName, alter.getTableName()))
+      .endOfStatement();
   }
 
 
   protected void alterTableDropColumn(DdlBuffer buffer, String tableName, String columnName) throws IOException {
 
     buffer.append("alter table ").append(tableName).append(" drop column ").append(columnName)
-        .endOfStatement();
+      .endOfStatement();
   }
 
   protected void alterTableAddColumn(DdlBuffer buffer, String tableName, Column column, boolean onHistoryTable) throws IOException {
 
     String convertedType = platformDdl.convert(column.getType(), false);
     buffer.append("alter table ").append(tableName)
-        .append(" add column ").append(column.getName())
-        .append(" ").append(convertedType);
+      .append(" add column ").append(column.getName())
+      .append(" ").append(convertedType);
 
     if (!onHistoryTable) {
       if (isTrue(column.isNotnull())) {
diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
index 4ea033ef7..9d3e844ee 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
@@ -164,9 +164,9 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
   protected void addSysPeriodColumns(DdlBuffer apply, String baseTableName, String whenCreatedColumn) throws IOException {
 
     apply.append("alter table ").append(baseTableName).append(" add column ")
-        .append(sysPeriodStart).append(" ").append(sysPeriodType).append(" default ").append(currentTimestamp).endOfStatement();
+      .append(sysPeriodStart).append(" ").append(sysPeriodType).append(" default ").append(currentTimestamp).endOfStatement();
     apply.append("alter table ").append(baseTableName).append(" add column ")
-        .append(sysPeriodEnd).append(" ").append(sysPeriodType).endOfStatement();
+      .append(sysPeriodEnd).append(" ").append(sysPeriodType).endOfStatement();
 
     if (whenCreatedColumn != null) {
       apply.append("update ").append(baseTableName).append(" set ").append(sysPeriodStart).append(" = ").append(whenCreatedColumn).endOfStatement();
@@ -204,10 +204,10 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
   protected void createWithHistoryView(DdlBuffer apply, String baseTableName) throws IOException {
 
     apply
-        .append("create view ").append(baseTableName).append(viewSuffix)
-        .append(" as select * from ").append(baseTableName)
-        .append(" union all select * from ").append(baseTableName).append(historySuffix)
-        .endOfStatement().end();
+      .append("create view ").append(baseTableName).append(viewSuffix)
+      .append(" as select * from ").append(baseTableName)
+      .append(" union all select * from ").append(baseTableName).append(historySuffix)
+      .endOfStatement().end();
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdl.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
index 1072e1eba..dde2ed843 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
@@ -45,8 +45,8 @@ public class H2HistoryDdl extends DbTriggerBasedHistoryDdl {
     // Note that this does not take into account the historyTable name (excepts _history suffix) and
     // does not take into account excluded columns (all columns included in history)
     apply
-        .append("create trigger ").append(triggerName).append(" before update,delete on ").append(baseTable)
-        .append(" for each row call \"" + TRIGGER_CLASS + "\";").newLine();
+      .append("create trigger ").append(triggerName).append(" before update,delete on ").append(baseTable)
+      .append(" for each row call \"" + TRIGGER_CLASS + "\";").newLine();
   }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
index dc3505f4b..c72e18f7a 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
@@ -36,7 +36,7 @@ public class HistoryTableUpdate {
     }
 
     public String description() {
-      return change.name().toLowerCase()+" "+column;
+      return change.name().toLowerCase() + " " + column;
     }
 
   }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MsSqlServerDdl.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MsSqlServerDdl.java
index d8cf688d4..73eca28c5 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MsSqlServerDdl.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MsSqlServerDdl.java
@@ -37,7 +37,7 @@ public class MsSqlServerDdl extends PlatformDdl {
   public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns) {
 
     // issues#233
-    String start = "create unique nonclustered index " + uqName + " on " + tableName+ "(";
+    String start = "create unique nonclustered index " + uqName + " on " + tableName + "(";
     StringBuilder sb = new StringBuilder(start);
 
     for (int i = 0; i < columns.length; i++) {
diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java
index 545b5ba43..df23acd9d 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java
@@ -15,7 +15,7 @@ public class MySqlDdl extends PlatformDdl {
 
   public MySqlDdl(DatabasePlatform platform) {
     super(platform);
-    this.alterColumn =  "modify";
+    this.alterColumn = "modify";
     this.dropUniqueConstraint = "drop index";
     this.historyDdl = new MySqlHistoryDdl();
     this.inlineComments = true;
diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
index 9de3ccf49..81f727a66 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
@@ -48,22 +48,22 @@ public class MySqlHistoryDdl extends DbTriggerBasedHistoryDdl {
 
     DdlBuffer apply = update.historyBuffer();
     apply
-        .append("delimiter $$").newLine()
-        .append("create trigger ").append(triggerName).append(" before update on ").append(update.getBaseTable())
-        .append(" for each row begin").newLine();
+      .append("delimiter $$").newLine()
+      .append("create trigger ").append(triggerName).append(" before update on ").append(update.getBaseTable())
+      .append(" for each row begin").newLine();
     appendInsertIntoHistory(apply, update.getHistoryTable(), update.getColumns());
     apply
-        .append("    set NEW.").append(sysPeriod).append("_start = now(6)").endOfStatement()
-        .append("end$$").newLine();
+      .append("    set NEW.").append(sysPeriod).append("_start = now(6)").endOfStatement()
+      .append("end$$").newLine();
   }
 
   private void addBeforeDelete(String triggerName, DbTriggerUpdate update) throws IOException {
 
     DdlBuffer apply = update.historyBuffer();
     apply
-        .append("delimiter $$").newLine()
-        .append("create trigger ").append(triggerName).append(" before delete on ").append(update.getBaseTable())
-        .append(" for each row begin").newLine();
+      .append("delimiter $$").newLine()
+      .append("create trigger ").append(triggerName).append(" before delete on ").append(update.getBaseTable())
+      .append(" for each row begin").newLine();
     appendInsertIntoHistory(apply, update.getHistoryTable(), update.getColumns());
     apply.append("end$$").newLine();
   }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/Oracle10Ddl.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
index c4f93b8f9..8037459fe 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
@@ -15,7 +15,7 @@ public class Oracle10Ddl extends PlatformDdl {
     this.dropIndexIfExists = "drop index ";
     this.dropTableCascade = " cascade constraints purge";
     this.foreignKeyRestrict = "";
-    this.alterColumn =  "modify";
+    this.alterColumn = "modify";
     this.columnSetNotnull = "not null";
     this.columnSetNull = "null";
     this.columnSetDefault = "default";
diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 460300bf6..6e177483c 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -320,13 +320,13 @@ public class PlatformDdl {
 
     StringBuilder buffer = new StringBuilder(90);
     buffer
-        .append("alter table ").append(tableName)
-        .append(" add constraint ").append(fkName)
-        .append(" foreign key");
+      .append("alter table ").append(tableName)
+      .append(" add constraint ").append(fkName)
+      .append(" foreign key");
     appendColumns(columns, buffer);
     buffer
-        .append(" references ")
-        .append(lowerTableName(refTable));
+      .append(" references ")
+      .append(lowerTableName(refTable));
     appendColumns(refColumns, buffer);
     appendWithSpace(foreignKeyRestrict, buffer);
 
diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
index 037756905..ccb026e8c 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
@@ -25,8 +25,8 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
 
     String baseTable = table.getName();
     apply
-        .append("create table ").append(baseTable).append(historySuffix)
-        .append("(like ").append(baseTable).append(")").endOfStatement();
+      .append("create table ").append(baseTable).append(historySuffix)
+      .append("(like ").append(baseTable).append(")").endOfStatement();
   }
 
   /**
@@ -35,13 +35,13 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
   @Override
   protected void addSysPeriodColumns(DdlBuffer apply, String baseTableName, String whenCreatedColumn) throws IOException {
     apply
-        .append("alter table ").append(baseTableName)
-        .append(" add column ").append(sysPeriod).append(" tstzrange not null default tstzrange(").append(currentTimestamp).append(", null)")
-        .endOfStatement();
+      .append("alter table ").append(baseTableName)
+      .append(" add column ").append(sysPeriod).append(" tstzrange not null default tstzrange(").append(currentTimestamp).append(", null)")
+      .endOfStatement();
 
     if (whenCreatedColumn != null) {
       apply.append("update ").append(baseTableName).append(" set ")
-          .append(sysPeriod).append(" = tstzrange(").append(whenCreatedColumn).append(", null)").endOfStatement();
+        .append(sysPeriod).append(" = tstzrange(").append(whenCreatedColumn).append(", null)").endOfStatement();
     }
   }
 
@@ -64,9 +64,9 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
 
     DdlBuffer apply = writer.applyHistory();
     apply
-        .append("create trigger ").append(triggerName).newLine()
-        .append("  before update or delete on ").append(baseTableName).newLine()
-        .append("  for each row execute procedure ").append(procedureName).append("();").newLine().newLine();
+      .append("create trigger ").append(triggerName).newLine()
+      .append("  before update or delete on ").append(baseTableName).newLine()
+      .append("  for each row execute procedure ").append(procedureName).append("();").newLine().newLine();
   }
 
   @Override
@@ -79,23 +79,23 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
 
   protected void createOrReplaceFunction(DdlBuffer apply, String procedureName, String historyTable, List<String> includedColumns) throws IOException {
     apply
-        .append("create or replace function ").append(procedureName).append("() returns trigger as $$").newLine()
-        .append("begin").newLine();
+      .append("create or replace function ").append(procedureName).append("() returns trigger as $$").newLine()
+      .append("begin").newLine();
     apply
-        .append("  if (TG_OP = 'UPDATE') then").newLine();
+      .append("  if (TG_OP = 'UPDATE') then").newLine();
     appendInsertIntoHistory(apply, historyTable, includedColumns);
     apply
-        .append("    NEW.").append(sysPeriod).append(" = tstzrange(").append(currentTimestamp).append(",null);").newLine()
-        .append("    return new;").newLine();
+      .append("    NEW.").append(sysPeriod).append(" = tstzrange(").append(currentTimestamp).append(",null);").newLine()
+      .append("    return new;").newLine();
     apply
-        .append("  elsif (TG_OP = 'DELETE') then").newLine();
+      .append("  elsif (TG_OP = 'DELETE') then").newLine();
     appendInsertIntoHistory(apply, historyTable, includedColumns);
     apply
-        .append("    return old;").newLine();
+      .append("    return old;").newLine();
     apply
-        .append("  end if;").newLine()
-        .append("end;").newLine()
-        .append("$$ LANGUAGE plpgsql;").newLine();
+      .append("  end if;").newLine()
+      .append("end;").newLine()
+      .append("$$ LANGUAGE plpgsql;").newLine();
 
     apply.end();
   }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java
index de9db9012..bc99b0701 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java
@@ -39,7 +39,7 @@ public class IndexColumns {
     if (columns.size() != columnNames.size()) {
       return false;
     }
-    for (int i = 0; i <columns.size() ; i++) {
+    for (int i = 0; i < columns.size(); i++) {
       if (!columns.get(i).equals(columnNames.get(i))) {
         return false;
       }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/AddColumn.java b/src/main/java/com/avaje/ebean/dbmigration/migration/AddColumn.java
index 16c01d2af..9392fbc29 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/AddColumn.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/AddColumn.java
@@ -1,21 +1,20 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -29,98 +28,86 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "column"
+  "column"
 })
 @XmlRootElement(name = "addColumn")
 public class AddColumn {
 
-    @XmlElement(required = true)
-    protected List<Column> column;
-    @XmlAttribute(name = "tableName", required = true)
-    protected String tableName;
-    @XmlAttribute(name = "withHistory")
-    protected Boolean withHistory;
+  @XmlElement(required = true)
+  protected List<Column> column;
+  @XmlAttribute(name = "tableName", required = true)
+  protected String tableName;
+  @XmlAttribute(name = "withHistory")
+  protected Boolean withHistory;
 
-    /**
-     * Gets the value of the column property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the column property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getColumn().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Column }
-     * 
-     * 
-     */
-    public List<Column> getColumn() {
-        if (column == null) {
-            column = new ArrayList<>();
-        }
-        return this.column;
+  /**
+   * Gets the value of the column property.
+   * <p>
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the column property.
+   * <p>
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getColumn().add(newItem);
+   * </pre>
+   * <p>
+   * <p>
+   * <p>
+   * Objects of the following type(s) are allowed in the list
+   * {@link Column }
+   */
+  public List<Column> getColumn() {
+    if (column == null) {
+      column = new ArrayList<>();
     }
+    return this.column;
+  }
 
-    /**
-     * Gets the value of the tableName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTableName() {
-        return tableName;
-    }
+  /**
+   * Gets the value of the tableName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getTableName() {
+    return tableName;
+  }
 
-    /**
-     * Sets the value of the tableName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTableName(String value) {
-        this.tableName = value;
-    }
+  /**
+   * Sets the value of the tableName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setTableName(String value) {
+    this.tableName = value;
+  }
 
-    /**
-     * Gets the value of the withHistory property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isWithHistory() {
-        return withHistory;
-    }
+  /**
+   * Gets the value of the withHistory property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isWithHistory() {
+    return withHistory;
+  }
 
-    /**
-     * Sets the value of the withHistory property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setWithHistory(Boolean value) {
-        this.withHistory = value;
-    }
+  /**
+   * Sets the value of the withHistory property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setWithHistory(Boolean value) {
+    this.withHistory = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/AddHistoryTable.java b/src/main/java/com/avaje/ebean/dbmigration/migration/AddHistoryTable.java
index 1ea167f4e..d48f1ae9a 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/AddHistoryTable.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/AddHistoryTable.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -22,39 +21,33 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "addHistoryTable")
 public class AddHistoryTable {
 
-    @XmlAttribute(name = "baseTable", required = true)
-    protected String baseTable;
+  @XmlAttribute(name = "baseTable", required = true)
+  protected String baseTable;
 
-    /**
-     * Gets the value of the baseTable property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBaseTable() {
-        return baseTable;
-    }
+  /**
+   * Gets the value of the baseTable property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getBaseTable() {
+    return baseTable;
+  }
 
-    /**
-     * Sets the value of the baseTable property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBaseTable(String value) {
-        this.baseTable = value;
-    }
+  /**
+   * Sets the value of the baseTable property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setBaseTable(String value) {
+    this.baseTable = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/AddTableComment.java b/src/main/java/com/avaje/ebean/dbmigration/migration/AddTableComment.java
index 40d50c625..a5e81e26e 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/AddTableComment.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/AddTableComment.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -23,65 +22,55 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "addTableComment")
 public class AddTableComment {
 
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-    @XmlAttribute(name = "comment", required = true)
-    protected String comment;
+  @XmlAttribute(name = "name", required = true)
+  protected String name;
+  @XmlAttribute(name = "comment", required = true)
+  protected String comment;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+  /**
+   * Gets the value of the name property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getName() {
+    return name;
+  }
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+  /**
+   * Sets the value of the name property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setName(String value) {
+    this.name = value;
+  }
 
-    /**
-     * Gets the value of the comment property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getComment() {
-        return comment;
-    }
+  /**
+   * Gets the value of the comment property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getComment() {
+    return comment;
+  }
 
-    /**
-     * Sets the value of the comment property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setComment(String value) {
-        this.comment = value;
-    }
+  /**
+   * Sets the value of the comment property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setComment(String value) {
+    this.comment = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/AlterColumn.java b/src/main/java/com/avaje/ebean/dbmigration/migration/AlterColumn.java
index 7f8c683ca..a0676e33e 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/AlterColumn.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/AlterColumn.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -43,585 +42,495 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "alterColumn")
 public class AlterColumn {
 
-    @XmlAttribute(name = "columnName", required = true)
-    protected String columnName;
-    @XmlAttribute(name = "tableName", required = true)
-    protected String tableName;
-    @XmlAttribute(name = "withHistory")
-    protected Boolean withHistory;
-    @XmlAttribute(name = "type")
-    protected String type;
-    @XmlAttribute(name = "currentType")
-    protected String currentType;
-    @XmlAttribute(name = "defaultValue")
-    protected String defaultValue;
-    @XmlAttribute(name = "currentDefaultValue")
-    protected String currentDefaultValue;
-    @XmlAttribute(name = "notnull")
-    protected Boolean notnull;
-    @XmlAttribute(name = "currentNotnull")
-    protected Boolean currentNotnull;
-    @XmlAttribute(name = "comment")
-    protected String comment;
-    @XmlAttribute(name = "historyExclude")
-    protected Boolean historyExclude;
-    @XmlAttribute(name = "checkConstraint")
-    protected String checkConstraint;
-    @XmlAttribute(name = "checkConstraintName")
-    protected String checkConstraintName;
-    @XmlAttribute(name = "dropCheckConstraint")
-    protected String dropCheckConstraint;
-    @XmlAttribute(name = "unique")
-    protected String unique;
-    @XmlAttribute(name = "uniqueOneToOne")
-    protected String uniqueOneToOne;
-    @XmlAttribute(name = "dropUnique")
-    protected String dropUnique;
-    @XmlAttribute(name = "references")
-    protected String references;
-    @XmlAttribute(name = "foreignKeyName")
-    protected String foreignKeyName;
-    @XmlAttribute(name = "foreignKeyIndex")
-    protected String foreignKeyIndex;
-    @XmlAttribute(name = "dropForeignKey")
-    protected String dropForeignKey;
-    @XmlAttribute(name = "dropForeignKeyIndex")
-    protected String dropForeignKeyIndex;
+  @XmlAttribute(name = "columnName", required = true)
+  protected String columnName;
+  @XmlAttribute(name = "tableName", required = true)
+  protected String tableName;
+  @XmlAttribute(name = "withHistory")
+  protected Boolean withHistory;
+  @XmlAttribute(name = "type")
+  protected String type;
+  @XmlAttribute(name = "currentType")
+  protected String currentType;
+  @XmlAttribute(name = "defaultValue")
+  protected String defaultValue;
+  @XmlAttribute(name = "currentDefaultValue")
+  protected String currentDefaultValue;
+  @XmlAttribute(name = "notnull")
+  protected Boolean notnull;
+  @XmlAttribute(name = "currentNotnull")
+  protected Boolean currentNotnull;
+  @XmlAttribute(name = "comment")
+  protected String comment;
+  @XmlAttribute(name = "historyExclude")
+  protected Boolean historyExclude;
+  @XmlAttribute(name = "checkConstraint")
+  protected String checkConstraint;
+  @XmlAttribute(name = "checkConstraintName")
+  protected String checkConstraintName;
+  @XmlAttribute(name = "dropCheckConstraint")
+  protected String dropCheckConstraint;
+  @XmlAttribute(name = "unique")
+  protected String unique;
+  @XmlAttribute(name = "uniqueOneToOne")
+  protected String uniqueOneToOne;
+  @XmlAttribute(name = "dropUnique")
+  protected String dropUnique;
+  @XmlAttribute(name = "references")
+  protected String references;
+  @XmlAttribute(name = "foreignKeyName")
+  protected String foreignKeyName;
+  @XmlAttribute(name = "foreignKeyIndex")
+  protected String foreignKeyIndex;
+  @XmlAttribute(name = "dropForeignKey")
+  protected String dropForeignKey;
+  @XmlAttribute(name = "dropForeignKeyIndex")
+  protected String dropForeignKeyIndex;
 
-    /**
-     * Gets the value of the columnName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getColumnName() {
-        return columnName;
-    }
+  /**
+   * Gets the value of the columnName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getColumnName() {
+    return columnName;
+  }
 
-    /**
-     * Sets the value of the columnName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setColumnName(String value) {
-        this.columnName = value;
-    }
+  /**
+   * Sets the value of the columnName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setColumnName(String value) {
+    this.columnName = value;
+  }
 
-    /**
-     * Gets the value of the tableName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTableName() {
-        return tableName;
-    }
+  /**
+   * Gets the value of the tableName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getTableName() {
+    return tableName;
+  }
 
-    /**
-     * Sets the value of the tableName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTableName(String value) {
-        this.tableName = value;
-    }
+  /**
+   * Sets the value of the tableName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setTableName(String value) {
+    this.tableName = value;
+  }
 
-    /**
-     * Gets the value of the withHistory property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isWithHistory() {
-        return withHistory;
-    }
+  /**
+   * Gets the value of the withHistory property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isWithHistory() {
+    return withHistory;
+  }
 
-    /**
-     * Sets the value of the withHistory property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setWithHistory(Boolean value) {
-        this.withHistory = value;
-    }
+  /**
+   * Sets the value of the withHistory property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setWithHistory(Boolean value) {
+    this.withHistory = value;
+  }
 
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
+  /**
+   * Gets the value of the type property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getType() {
+    return type;
+  }
 
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
+  /**
+   * Sets the value of the type property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setType(String value) {
+    this.type = value;
+  }
 
-    /**
-     * Gets the value of the currentType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrentType() {
-        return currentType;
-    }
+  /**
+   * Gets the value of the currentType property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getCurrentType() {
+    return currentType;
+  }
 
-    /**
-     * Sets the value of the currentType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrentType(String value) {
-        this.currentType = value;
-    }
+  /**
+   * Sets the value of the currentType property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setCurrentType(String value) {
+    this.currentType = value;
+  }
 
-    /**
-     * Gets the value of the defaultValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDefaultValue() {
-        return defaultValue;
-    }
+  /**
+   * Gets the value of the defaultValue property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getDefaultValue() {
+    return defaultValue;
+  }
 
-    /**
-     * Sets the value of the defaultValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDefaultValue(String value) {
-        this.defaultValue = value;
-    }
+  /**
+   * Sets the value of the defaultValue property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setDefaultValue(String value) {
+    this.defaultValue = value;
+  }
 
-    /**
-     * Gets the value of the currentDefaultValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrentDefaultValue() {
-        return currentDefaultValue;
-    }
+  /**
+   * Gets the value of the currentDefaultValue property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getCurrentDefaultValue() {
+    return currentDefaultValue;
+  }
 
-    /**
-     * Sets the value of the currentDefaultValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrentDefaultValue(String value) {
-        this.currentDefaultValue = value;
-    }
+  /**
+   * Sets the value of the currentDefaultValue property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setCurrentDefaultValue(String value) {
+    this.currentDefaultValue = value;
+  }
 
-    /**
-     * Gets the value of the notnull property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isNotnull() {
-        return notnull;
-    }
+  /**
+   * Gets the value of the notnull property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isNotnull() {
+    return notnull;
+  }
 
-    /**
-     * Sets the value of the notnull property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setNotnull(Boolean value) {
-        this.notnull = value;
-    }
+  /**
+   * Sets the value of the notnull property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setNotnull(Boolean value) {
+    this.notnull = value;
+  }
 
-    /**
-     * Gets the value of the currentNotnull property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isCurrentNotnull() {
-        return currentNotnull;
-    }
+  /**
+   * Gets the value of the currentNotnull property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isCurrentNotnull() {
+    return currentNotnull;
+  }
 
-    /**
-     * Sets the value of the currentNotnull property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setCurrentNotnull(Boolean value) {
-        this.currentNotnull = value;
-    }
+  /**
+   * Sets the value of the currentNotnull property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setCurrentNotnull(Boolean value) {
+    this.currentNotnull = value;
+  }
 
-    /**
-     * Gets the value of the comment property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getComment() {
-        return comment;
-    }
+  /**
+   * Gets the value of the comment property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getComment() {
+    return comment;
+  }
 
-    /**
-     * Sets the value of the comment property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setComment(String value) {
-        this.comment = value;
-    }
+  /**
+   * Sets the value of the comment property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setComment(String value) {
+    this.comment = value;
+  }
 
-    /**
-     * Gets the value of the historyExclude property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isHistoryExclude() {
-        return historyExclude;
-    }
+  /**
+   * Gets the value of the historyExclude property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isHistoryExclude() {
+    return historyExclude;
+  }
 
-    /**
-     * Sets the value of the historyExclude property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setHistoryExclude(Boolean value) {
-        this.historyExclude = value;
-    }
+  /**
+   * Sets the value of the historyExclude property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setHistoryExclude(Boolean value) {
+    this.historyExclude = value;
+  }
 
-    /**
-     * Gets the value of the checkConstraint property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCheckConstraint() {
-        return checkConstraint;
-    }
+  /**
+   * Gets the value of the checkConstraint property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getCheckConstraint() {
+    return checkConstraint;
+  }
 
-    /**
-     * Sets the value of the checkConstraint property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCheckConstraint(String value) {
-        this.checkConstraint = value;
-    }
+  /**
+   * Sets the value of the checkConstraint property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setCheckConstraint(String value) {
+    this.checkConstraint = value;
+  }
 
-    /**
-     * Gets the value of the checkConstraintName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCheckConstraintName() {
-        return checkConstraintName;
-    }
+  /**
+   * Gets the value of the checkConstraintName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getCheckConstraintName() {
+    return checkConstraintName;
+  }
 
-    /**
-     * Sets the value of the checkConstraintName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCheckConstraintName(String value) {
-        this.checkConstraintName = value;
-    }
+  /**
+   * Sets the value of the checkConstraintName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setCheckConstraintName(String value) {
+    this.checkConstraintName = value;
+  }
 
-    /**
-     * Gets the value of the dropCheckConstraint property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDropCheckConstraint() {
-        return dropCheckConstraint;
-    }
+  /**
+   * Gets the value of the dropCheckConstraint property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getDropCheckConstraint() {
+    return dropCheckConstraint;
+  }
 
-    /**
-     * Sets the value of the dropCheckConstraint property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDropCheckConstraint(String value) {
-        this.dropCheckConstraint = value;
-    }
+  /**
+   * Sets the value of the dropCheckConstraint property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setDropCheckConstraint(String value) {
+    this.dropCheckConstraint = value;
+  }
 
-    /**
-     * Gets the value of the unique property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUnique() {
-        return unique;
-    }
+  /**
+   * Gets the value of the unique property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getUnique() {
+    return unique;
+  }
 
-    /**
-     * Sets the value of the unique property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUnique(String value) {
-        this.unique = value;
-    }
+  /**
+   * Sets the value of the unique property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setUnique(String value) {
+    this.unique = value;
+  }
 
-    /**
-     * Gets the value of the uniqueOneToOne property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUniqueOneToOne() {
-        return uniqueOneToOne;
-    }
+  /**
+   * Gets the value of the uniqueOneToOne property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getUniqueOneToOne() {
+    return uniqueOneToOne;
+  }
 
-    /**
-     * Sets the value of the uniqueOneToOne property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUniqueOneToOne(String value) {
-        this.uniqueOneToOne = value;
-    }
+  /**
+   * Sets the value of the uniqueOneToOne property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setUniqueOneToOne(String value) {
+    this.uniqueOneToOne = value;
+  }
 
-    /**
-     * Gets the value of the dropUnique property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDropUnique() {
-        return dropUnique;
-    }
+  /**
+   * Gets the value of the dropUnique property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getDropUnique() {
+    return dropUnique;
+  }
 
-    /**
-     * Sets the value of the dropUnique property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDropUnique(String value) {
-        this.dropUnique = value;
-    }
+  /**
+   * Sets the value of the dropUnique property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setDropUnique(String value) {
+    this.dropUnique = value;
+  }
 
-    /**
-     * Gets the value of the references property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReferences() {
-        return references;
-    }
+  /**
+   * Gets the value of the references property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getReferences() {
+    return references;
+  }
 
-    /**
-     * Sets the value of the references property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReferences(String value) {
-        this.references = value;
-    }
+  /**
+   * Sets the value of the references property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setReferences(String value) {
+    this.references = value;
+  }
 
-    /**
-     * Gets the value of the foreignKeyName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getForeignKeyName() {
-        return foreignKeyName;
-    }
+  /**
+   * Gets the value of the foreignKeyName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getForeignKeyName() {
+    return foreignKeyName;
+  }
 
-    /**
-     * Sets the value of the foreignKeyName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setForeignKeyName(String value) {
-        this.foreignKeyName = value;
-    }
+  /**
+   * Sets the value of the foreignKeyName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setForeignKeyName(String value) {
+    this.foreignKeyName = value;
+  }
 
-    /**
-     * Gets the value of the foreignKeyIndex property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getForeignKeyIndex() {
-        return foreignKeyIndex;
-    }
+  /**
+   * Gets the value of the foreignKeyIndex property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getForeignKeyIndex() {
+    return foreignKeyIndex;
+  }
 
-    /**
-     * Sets the value of the foreignKeyIndex property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setForeignKeyIndex(String value) {
-        this.foreignKeyIndex = value;
-    }
+  /**
+   * Sets the value of the foreignKeyIndex property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setForeignKeyIndex(String value) {
+    this.foreignKeyIndex = value;
+  }
 
-    /**
-     * Gets the value of the dropForeignKey property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDropForeignKey() {
-        return dropForeignKey;
-    }
+  /**
+   * Gets the value of the dropForeignKey property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getDropForeignKey() {
+    return dropForeignKey;
+  }
 
-    /**
-     * Sets the value of the dropForeignKey property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDropForeignKey(String value) {
-        this.dropForeignKey = value;
-    }
+  /**
+   * Sets the value of the dropForeignKey property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setDropForeignKey(String value) {
+    this.dropForeignKey = value;
+  }
 
-    /**
-     * Gets the value of the dropForeignKeyIndex property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDropForeignKeyIndex() {
-        return dropForeignKeyIndex;
-    }
+  /**
+   * Gets the value of the dropForeignKeyIndex property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getDropForeignKeyIndex() {
+    return dropForeignKeyIndex;
+  }
 
-    /**
-     * Sets the value of the dropForeignKeyIndex property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDropForeignKeyIndex(String value) {
-        this.dropForeignKeyIndex = value;
-    }
+  /**
+   * Sets the value of the dropForeignKeyIndex property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setDropForeignKeyIndex(String value) {
+    this.dropForeignKeyIndex = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/AlterHistoryTable.java b/src/main/java/com/avaje/ebean/dbmigration/migration/AlterHistoryTable.java
index e57b52add..431188bdc 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/AlterHistoryTable.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/AlterHistoryTable.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -22,39 +21,33 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "alterHistoryTable")
 public class AlterHistoryTable {
 
-    @XmlAttribute(name = "baseTable", required = true)
-    protected String baseTable;
+  @XmlAttribute(name = "baseTable", required = true)
+  protected String baseTable;
 
-    /**
-     * Gets the value of the baseTable property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBaseTable() {
-        return baseTable;
-    }
+  /**
+   * Gets the value of the baseTable property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getBaseTable() {
+    return baseTable;
+  }
 
-    /**
-     * Sets the value of the baseTable property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBaseTable(String value) {
-        this.baseTable = value;
-    }
+  /**
+   * Sets the value of the baseTable property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setBaseTable(String value) {
+    this.baseTable = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Application.java b/src/main/java/com/avaje/ebean/dbmigration/migration/Application.java
index 31b8a130c..2063ffaf6 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/Application.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/Application.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -23,65 +22,55 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "application")
 public class Application {
 
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-    @XmlAttribute(name = "resourcePath", required = true)
-    protected String resourcePath;
+  @XmlAttribute(name = "name", required = true)
+  protected String name;
+  @XmlAttribute(name = "resourcePath", required = true)
+  protected String resourcePath;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+  /**
+   * Gets the value of the name property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getName() {
+    return name;
+  }
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+  /**
+   * Sets the value of the name property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setName(String value) {
+    this.name = value;
+  }
 
-    /**
-     * Gets the value of the resourcePath property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getResourcePath() {
-        return resourcePath;
-    }
+  /**
+   * Gets the value of the resourcePath property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getResourcePath() {
+    return resourcePath;
+  }
 
-    /**
-     * Sets the value of the resourcePath property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setResourcePath(String value) {
-        this.resourcePath = value;
-    }
+  /**
+   * Sets the value of the resourcePath property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setResourcePath(String value) {
+    this.resourcePath = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Applications.java b/src/main/java/com/avaje/ebean/dbmigration/migration/Applications.java
index 262bd6ecc..68c898b31 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/Applications.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/Applications.java
@@ -1,19 +1,18 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -25,45 +24,41 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "application"
+  "application"
 })
 @XmlRootElement(name = "applications")
 public class Applications {
 
-    protected List<Application> application;
+  protected List<Application> application;
 
-    /**
-     * Gets the value of the application property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the application property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getApplication().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Application }
-     * 
-     * 
-     */
-    public List<Application> getApplication() {
-        if (application == null) {
-            application = new ArrayList<>();
-        }
-        return this.application;
+  /**
+   * Gets the value of the application property.
+   * <p>
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the application property.
+   * <p>
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getApplication().add(newItem);
+   * </pre>
+   * <p>
+   * <p>
+   * <p>
+   * Objects of the following type(s) are allowed in the list
+   * {@link Application }
+   */
+  public List<Application> getApplication() {
+    if (application == null) {
+      application = new ArrayList<>();
     }
+    return this.application;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Apply.java b/src/main/java/com/avaje/ebean/dbmigration/migration/Apply.java
index 3ca1a3fca..b43954ace 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/Apply.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/Apply.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlValue;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;simpleContent>
@@ -21,41 +20,35 @@ import javax.xml.bind.annotation.XmlValue;
  *   &lt;/simpleContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "value"
+  "value"
 })
 @XmlRootElement(name = "apply")
 public class Apply {
 
-    @XmlValue
-    protected String value;
+  @XmlValue
+  protected String value;
 
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
+  /**
+   * Gets the value of the value property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getValue() {
+    return value;
+  }
 
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
+  /**
+   * Sets the value of the value property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setValue(String value) {
+    this.value = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSet.java b/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSet.java
index df76e2d0a..6ed514c10 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSet.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSet.java
@@ -1,8 +1,5 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -10,13 +7,15 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -36,230 +35,202 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "changeSetChildren"
+  "changeSetChildren"
 })
 @XmlRootElement(name = "changeSet")
 public class ChangeSet {
 
-    @XmlElements({
-        @XmlElement(name = "configuration", type = Configuration.class),
-        @XmlElement(name = "sql", type = Sql.class),
-        @XmlElement(name = "createTable", type = CreateTable.class),
-        @XmlElement(name = "dropTable", type = DropTable.class),
-        @XmlElement(name = "renameTable", type = RenameTable.class),
-        @XmlElement(name = "addTableComment", type = AddTableComment.class),
-        @XmlElement(name = "addHistoryTable", type = AddHistoryTable.class),
-        @XmlElement(name = "dropHistoryTable", type = DropHistoryTable.class),
-        @XmlElement(name = "addColumn", type = AddColumn.class),
-        @XmlElement(name = "dropColumn", type = DropColumn.class),
-        @XmlElement(name = "alterColumn", type = AlterColumn.class),
-        @XmlElement(name = "renameColumn", type = RenameColumn.class),
-        @XmlElement(name = "createIndex", type = CreateIndex.class),
-        @XmlElement(name = "dropIndex", type = DropIndex.class)
-    })
-    protected List<Object> changeSetChildren;
-    @XmlAttribute(name = "type", required = true)
-    protected ChangeSetType type;
-    @XmlAttribute(name = "dropsFor")
-    protected String dropsFor;
-    @XmlAttribute(name = "suppressDropsForever")
-    protected Boolean suppressDropsForever;
-    @XmlAttribute(name = "generated")
-    protected Boolean generated;
-    @XmlAttribute(name = "author")
-    protected String author;
-    @XmlAttribute(name = "comment")
-    protected String comment;
+  @XmlElements({
+    @XmlElement(name = "configuration", type = Configuration.class),
+    @XmlElement(name = "sql", type = Sql.class),
+    @XmlElement(name = "createTable", type = CreateTable.class),
+    @XmlElement(name = "dropTable", type = DropTable.class),
+    @XmlElement(name = "renameTable", type = RenameTable.class),
+    @XmlElement(name = "addTableComment", type = AddTableComment.class),
+    @XmlElement(name = "addHistoryTable", type = AddHistoryTable.class),
+    @XmlElement(name = "dropHistoryTable", type = DropHistoryTable.class),
+    @XmlElement(name = "addColumn", type = AddColumn.class),
+    @XmlElement(name = "dropColumn", type = DropColumn.class),
+    @XmlElement(name = "alterColumn", type = AlterColumn.class),
+    @XmlElement(name = "renameColumn", type = RenameColumn.class),
+    @XmlElement(name = "createIndex", type = CreateIndex.class),
+    @XmlElement(name = "dropIndex", type = DropIndex.class)
+  })
+  protected List<Object> changeSetChildren;
+  @XmlAttribute(name = "type", required = true)
+  protected ChangeSetType type;
+  @XmlAttribute(name = "dropsFor")
+  protected String dropsFor;
+  @XmlAttribute(name = "suppressDropsForever")
+  protected Boolean suppressDropsForever;
+  @XmlAttribute(name = "generated")
+  protected Boolean generated;
+  @XmlAttribute(name = "author")
+  protected String author;
+  @XmlAttribute(name = "comment")
+  protected String comment;
 
-    /**
-     * Gets the value of the changeSetChildren property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the changeSetChildren property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getChangeSetChildren().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Configuration }
-     * {@link Sql }
-     * {@link CreateTable }
-     * {@link DropTable }
-     * {@link RenameTable }
-     * {@link AddTableComment }
-     * {@link AddHistoryTable }
-     * {@link DropHistoryTable }
-     * {@link AddColumn }
-     * {@link DropColumn }
-     * {@link AlterColumn }
-     * {@link RenameColumn }
-     * {@link CreateIndex }
-     * {@link DropIndex }
-     * 
-     * 
-     */
-    public List<Object> getChangeSetChildren() {
-        if (changeSetChildren == null) {
-            changeSetChildren = new ArrayList<>();
-        }
-        return this.changeSetChildren;
+  /**
+   * Gets the value of the changeSetChildren property.
+   * <p>
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the changeSetChildren property.
+   * <p>
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getChangeSetChildren().add(newItem);
+   * </pre>
+   * <p>
+   * <p>
+   * <p>
+   * Objects of the following type(s) are allowed in the list
+   * {@link Configuration }
+   * {@link Sql }
+   * {@link CreateTable }
+   * {@link DropTable }
+   * {@link RenameTable }
+   * {@link AddTableComment }
+   * {@link AddHistoryTable }
+   * {@link DropHistoryTable }
+   * {@link AddColumn }
+   * {@link DropColumn }
+   * {@link AlterColumn }
+   * {@link RenameColumn }
+   * {@link CreateIndex }
+   * {@link DropIndex }
+   */
+  public List<Object> getChangeSetChildren() {
+    if (changeSetChildren == null) {
+      changeSetChildren = new ArrayList<>();
     }
+    return this.changeSetChildren;
+  }
 
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ChangeSetType }
-     *     
-     */
-    public ChangeSetType getType() {
-        return type;
-    }
+  /**
+   * Gets the value of the type property.
+   *
+   * @return possible object is
+   * {@link ChangeSetType }
+   */
+  public ChangeSetType getType() {
+    return type;
+  }
 
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ChangeSetType }
-     *     
-     */
-    public void setType(ChangeSetType value) {
-        this.type = value;
-    }
+  /**
+   * Sets the value of the type property.
+   *
+   * @param value allowed object is
+   *              {@link ChangeSetType }
+   */
+  public void setType(ChangeSetType value) {
+    this.type = value;
+  }
 
-    /**
-     * Gets the value of the dropsFor property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDropsFor() {
-        return dropsFor;
-    }
+  /**
+   * Gets the value of the dropsFor property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getDropsFor() {
+    return dropsFor;
+  }
 
-    /**
-     * Sets the value of the dropsFor property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDropsFor(String value) {
-        this.dropsFor = value;
-    }
+  /**
+   * Sets the value of the dropsFor property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setDropsFor(String value) {
+    this.dropsFor = value;
+  }
 
-    /**
-     * Gets the value of the suppressDropsForever property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isSuppressDropsForever() {
-        return suppressDropsForever;
-    }
+  /**
+   * Gets the value of the suppressDropsForever property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isSuppressDropsForever() {
+    return suppressDropsForever;
+  }
 
-    /**
-     * Sets the value of the suppressDropsForever property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setSuppressDropsForever(Boolean value) {
-        this.suppressDropsForever = value;
-    }
+  /**
+   * Sets the value of the suppressDropsForever property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setSuppressDropsForever(Boolean value) {
+    this.suppressDropsForever = value;
+  }
 
-    /**
-     * Gets the value of the generated property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isGenerated() {
-        return generated;
-    }
+  /**
+   * Gets the value of the generated property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isGenerated() {
+    return generated;
+  }
 
-    /**
-     * Sets the value of the generated property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setGenerated(Boolean value) {
-        this.generated = value;
-    }
+  /**
+   * Sets the value of the generated property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setGenerated(Boolean value) {
+    this.generated = value;
+  }
 
-    /**
-     * Gets the value of the author property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAuthor() {
-        return author;
-    }
+  /**
+   * Gets the value of the author property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getAuthor() {
+    return author;
+  }
 
-    /**
-     * Sets the value of the author property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAuthor(String value) {
-        this.author = value;
-    }
+  /**
+   * Sets the value of the author property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setAuthor(String value) {
+    this.author = value;
+  }
 
-    /**
-     * Gets the value of the comment property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getComment() {
-        return comment;
-    }
+  /**
+   * Gets the value of the comment property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getComment() {
+    return comment;
+  }
 
-    /**
-     * Sets the value of the comment property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setComment(String value) {
-        this.comment = value;
-    }
+  /**
+   * Sets the value of the comment property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setComment(String value) {
+    this.comment = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSetType.java b/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSetType.java
index b87dffebb..b7708a362 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSetType.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSetType.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlEnum;
@@ -8,7 +7,7 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for changeSetType.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
  * <pre>
@@ -20,35 +19,34 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/restriction>
  * &lt;/simpleType>
  * </pre>
- * 
  */
 @XmlType(name = "changeSetType")
 @XmlEnum
 public enum ChangeSetType {
 
-    @XmlEnumValue("apply")
-    APPLY("apply"),
-    @XmlEnumValue("pendingDrops")
-    PENDING_DROPS("pendingDrops"),
-    @XmlEnumValue("baseline")
-    BASELINE("baseline");
-    private final String value;
+  @XmlEnumValue("apply")
+  APPLY("apply"),
+  @XmlEnumValue("pendingDrops")
+  PENDING_DROPS("pendingDrops"),
+  @XmlEnumValue("baseline")
+  BASELINE("baseline");
+  private final String value;
 
-    ChangeSetType(String v) {
-        value = v;
-    }
+  ChangeSetType(String v) {
+    value = v;
+  }
 
-    public String value() {
-        return value;
-    }
+  public String value() {
+    return value;
+  }
 
-    public static ChangeSetType fromValue(String v) {
-        for (ChangeSetType c: ChangeSetType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
+  public static ChangeSetType fromValue(String v) {
+    for (ChangeSetType c : ChangeSetType.values()) {
+      if (c.value.equals(v)) {
+        return c;
+      }
     }
+    throw new IllegalArgumentException(v);
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Column.java b/src/main/java/com/avaje/ebean/dbmigration/migration/Column.java
index e99569ebe..2e2aecfc7 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/Column.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/Column.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -11,9 +10,9 @@ import javax.xml.bind.annotation.XmlValue;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -37,431 +36,365 @@ import javax.xml.bind.annotation.XmlValue;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "content"
+  "content"
 })
 @XmlRootElement(name = "column")
 public class Column {
 
-    @XmlValue
-    protected String content;
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-    @XmlAttribute(name = "type", required = true)
-    protected String type;
-    @XmlAttribute(name = "defaultValue")
-    protected String defaultValue;
-    @XmlAttribute(name = "notnull")
-    protected Boolean notnull;
-    @XmlAttribute(name = "historyExclude")
-    protected Boolean historyExclude;
-    @XmlAttribute(name = "primaryKey")
-    protected Boolean primaryKey;
-    @XmlAttribute(name = "identity")
-    protected Boolean identity;
-    @XmlAttribute(name = "checkConstraint")
-    protected String checkConstraint;
-    @XmlAttribute(name = "checkConstraintName")
-    protected String checkConstraintName;
-    @XmlAttribute(name = "unique")
-    protected String unique;
-    @XmlAttribute(name = "uniqueOneToOne")
-    protected String uniqueOneToOne;
-    @XmlAttribute(name = "references")
-    protected String references;
-    @XmlAttribute(name = "foreignKeyName")
-    protected String foreignKeyName;
-    @XmlAttribute(name = "foreignKeyIndex")
-    protected String foreignKeyIndex;
-    @XmlAttribute(name = "comment")
-    protected String comment;
+  @XmlValue
+  protected String content;
+  @XmlAttribute(name = "name", required = true)
+  protected String name;
+  @XmlAttribute(name = "type", required = true)
+  protected String type;
+  @XmlAttribute(name = "defaultValue")
+  protected String defaultValue;
+  @XmlAttribute(name = "notnull")
+  protected Boolean notnull;
+  @XmlAttribute(name = "historyExclude")
+  protected Boolean historyExclude;
+  @XmlAttribute(name = "primaryKey")
+  protected Boolean primaryKey;
+  @XmlAttribute(name = "identity")
+  protected Boolean identity;
+  @XmlAttribute(name = "checkConstraint")
+  protected String checkConstraint;
+  @XmlAttribute(name = "checkConstraintName")
+  protected String checkConstraintName;
+  @XmlAttribute(name = "unique")
+  protected String unique;
+  @XmlAttribute(name = "uniqueOneToOne")
+  protected String uniqueOneToOne;
+  @XmlAttribute(name = "references")
+  protected String references;
+  @XmlAttribute(name = "foreignKeyName")
+  protected String foreignKeyName;
+  @XmlAttribute(name = "foreignKeyIndex")
+  protected String foreignKeyIndex;
+  @XmlAttribute(name = "comment")
+  protected String comment;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getContent() {
-        return content;
-    }
+  /**
+   * Gets the value of the content property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getContent() {
+    return content;
+  }
 
-    /**
-     * Sets the value of the content property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setContent(String value) {
-        this.content = value;
-    }
+  /**
+   * Sets the value of the content property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setContent(String value) {
+    this.content = value;
+  }
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+  /**
+   * Gets the value of the name property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getName() {
+    return name;
+  }
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+  /**
+   * Sets the value of the name property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setName(String value) {
+    this.name = value;
+  }
 
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
+  /**
+   * Gets the value of the type property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getType() {
+    return type;
+  }
 
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
+  /**
+   * Sets the value of the type property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setType(String value) {
+    this.type = value;
+  }
 
-    /**
-     * Gets the value of the defaultValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDefaultValue() {
-        return defaultValue;
-    }
+  /**
+   * Gets the value of the defaultValue property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getDefaultValue() {
+    return defaultValue;
+  }
 
-    /**
-     * Sets the value of the defaultValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDefaultValue(String value) {
-        this.defaultValue = value;
-    }
+  /**
+   * Sets the value of the defaultValue property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setDefaultValue(String value) {
+    this.defaultValue = value;
+  }
 
-    /**
-     * Gets the value of the notnull property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isNotnull() {
-        return notnull;
-    }
+  /**
+   * Gets the value of the notnull property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isNotnull() {
+    return notnull;
+  }
 
-    /**
-     * Sets the value of the notnull property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setNotnull(Boolean value) {
-        this.notnull = value;
-    }
+  /**
+   * Sets the value of the notnull property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setNotnull(Boolean value) {
+    this.notnull = value;
+  }
 
-    /**
-     * Gets the value of the historyExclude property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isHistoryExclude() {
-        return historyExclude;
-    }
+  /**
+   * Gets the value of the historyExclude property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isHistoryExclude() {
+    return historyExclude;
+  }
 
-    /**
-     * Sets the value of the historyExclude property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setHistoryExclude(Boolean value) {
-        this.historyExclude = value;
-    }
+  /**
+   * Sets the value of the historyExclude property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setHistoryExclude(Boolean value) {
+    this.historyExclude = value;
+  }
 
-    /**
-     * Gets the value of the primaryKey property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isPrimaryKey() {
-        return primaryKey;
-    }
+  /**
+   * Gets the value of the primaryKey property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isPrimaryKey() {
+    return primaryKey;
+  }
 
-    /**
-     * Sets the value of the primaryKey property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setPrimaryKey(Boolean value) {
-        this.primaryKey = value;
-    }
+  /**
+   * Sets the value of the primaryKey property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setPrimaryKey(Boolean value) {
+    this.primaryKey = value;
+  }
 
-    /**
-     * Gets the value of the identity property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isIdentity() {
-        return identity;
-    }
+  /**
+   * Gets the value of the identity property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isIdentity() {
+    return identity;
+  }
 
-    /**
-     * Sets the value of the identity property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setIdentity(Boolean value) {
-        this.identity = value;
-    }
+  /**
+   * Sets the value of the identity property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setIdentity(Boolean value) {
+    this.identity = value;
+  }
 
-    /**
-     * Gets the value of the checkConstraint property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCheckConstraint() {
-        return checkConstraint;
-    }
+  /**
+   * Gets the value of the checkConstraint property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getCheckConstraint() {
+    return checkConstraint;
+  }
 
-    /**
-     * Sets the value of the checkConstraint property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCheckConstraint(String value) {
-        this.checkConstraint = value;
-    }
+  /**
+   * Sets the value of the checkConstraint property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setCheckConstraint(String value) {
+    this.checkConstraint = value;
+  }
 
-    /**
-     * Gets the value of the checkConstraintName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCheckConstraintName() {
-        return checkConstraintName;
-    }
+  /**
+   * Gets the value of the checkConstraintName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getCheckConstraintName() {
+    return checkConstraintName;
+  }
 
-    /**
-     * Sets the value of the checkConstraintName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCheckConstraintName(String value) {
-        this.checkConstraintName = value;
-    }
+  /**
+   * Sets the value of the checkConstraintName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setCheckConstraintName(String value) {
+    this.checkConstraintName = value;
+  }
 
-    /**
-     * Gets the value of the unique property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUnique() {
-        return unique;
-    }
+  /**
+   * Gets the value of the unique property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getUnique() {
+    return unique;
+  }
 
-    /**
-     * Sets the value of the unique property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUnique(String value) {
-        this.unique = value;
-    }
+  /**
+   * Sets the value of the unique property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setUnique(String value) {
+    this.unique = value;
+  }
 
-    /**
-     * Gets the value of the uniqueOneToOne property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUniqueOneToOne() {
-        return uniqueOneToOne;
-    }
+  /**
+   * Gets the value of the uniqueOneToOne property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getUniqueOneToOne() {
+    return uniqueOneToOne;
+  }
 
-    /**
-     * Sets the value of the uniqueOneToOne property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUniqueOneToOne(String value) {
-        this.uniqueOneToOne = value;
-    }
+  /**
+   * Sets the value of the uniqueOneToOne property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setUniqueOneToOne(String value) {
+    this.uniqueOneToOne = value;
+  }
 
-    /**
-     * Gets the value of the references property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReferences() {
-        return references;
-    }
+  /**
+   * Gets the value of the references property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getReferences() {
+    return references;
+  }
 
-    /**
-     * Sets the value of the references property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReferences(String value) {
-        this.references = value;
-    }
+  /**
+   * Sets the value of the references property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setReferences(String value) {
+    this.references = value;
+  }
 
-    /**
-     * Gets the value of the foreignKeyName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getForeignKeyName() {
-        return foreignKeyName;
-    }
+  /**
+   * Gets the value of the foreignKeyName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getForeignKeyName() {
+    return foreignKeyName;
+  }
 
-    /**
-     * Sets the value of the foreignKeyName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setForeignKeyName(String value) {
-        this.foreignKeyName = value;
-    }
+  /**
+   * Sets the value of the foreignKeyName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setForeignKeyName(String value) {
+    this.foreignKeyName = value;
+  }
 
-    /**
-     * Gets the value of the foreignKeyIndex property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getForeignKeyIndex() {
-        return foreignKeyIndex;
-    }
+  /**
+   * Gets the value of the foreignKeyIndex property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getForeignKeyIndex() {
+    return foreignKeyIndex;
+  }
 
-    /**
-     * Sets the value of the foreignKeyIndex property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setForeignKeyIndex(String value) {
-        this.foreignKeyIndex = value;
-    }
+  /**
+   * Sets the value of the foreignKeyIndex property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setForeignKeyIndex(String value) {
+    this.foreignKeyIndex = value;
+  }
 
-    /**
-     * Gets the value of the comment property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getComment() {
-        return comment;
-    }
+  /**
+   * Gets the value of the comment property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getComment() {
+    return comment;
+  }
 
-    /**
-     * Sets the value of the comment property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setComment(String value) {
-        this.comment = value;
-    }
+  /**
+   * Sets the value of the comment property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setComment(String value) {
+    this.comment = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Configuration.java b/src/main/java/com/avaje/ebean/dbmigration/migration/Configuration.java
index 54c2c3162..9fe8c3f57 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/Configuration.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/Configuration.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -24,41 +23,35 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "defaultTablespace"
+  "defaultTablespace"
 })
 @XmlRootElement(name = "configuration")
 public class Configuration {
 
-    @XmlElement(required = true)
-    protected DefaultTablespace defaultTablespace;
+  @XmlElement(required = true)
+  protected DefaultTablespace defaultTablespace;
 
-    /**
-     * Gets the value of the defaultTablespace property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DefaultTablespace }
-     *     
-     */
-    public DefaultTablespace getDefaultTablespace() {
-        return defaultTablespace;
-    }
+  /**
+   * Gets the value of the defaultTablespace property.
+   *
+   * @return possible object is
+   * {@link DefaultTablespace }
+   */
+  public DefaultTablespace getDefaultTablespace() {
+    return defaultTablespace;
+  }
 
-    /**
-     * Sets the value of the defaultTablespace property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DefaultTablespace }
-     *     
-     */
-    public void setDefaultTablespace(DefaultTablespace value) {
-        this.defaultTablespace = value;
-    }
+  /**
+   * Sets the value of the defaultTablespace property.
+   *
+   * @param value allowed object is
+   *              {@link DefaultTablespace }
+   */
+  public void setDefaultTablespace(DefaultTablespace value) {
+    this.defaultTablespace = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/CreateIndex.java b/src/main/java/com/avaje/ebean/dbmigration/migration/CreateIndex.java
index 0a17ea99b..efdebd503 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/CreateIndex.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/CreateIndex.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -24,91 +23,77 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "createIndex")
 public class CreateIndex {
 
-    @XmlAttribute(name = "indexName", required = true)
-    protected String indexName;
-    @XmlAttribute(name = "tableName", required = true)
-    protected String tableName;
-    @XmlAttribute(name = "columns", required = true)
-    protected String columns;
+  @XmlAttribute(name = "indexName", required = true)
+  protected String indexName;
+  @XmlAttribute(name = "tableName", required = true)
+  protected String tableName;
+  @XmlAttribute(name = "columns", required = true)
+  protected String columns;
 
-    /**
-     * Gets the value of the indexName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIndexName() {
-        return indexName;
-    }
+  /**
+   * Gets the value of the indexName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getIndexName() {
+    return indexName;
+  }
 
-    /**
-     * Sets the value of the indexName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIndexName(String value) {
-        this.indexName = value;
-    }
+  /**
+   * Sets the value of the indexName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setIndexName(String value) {
+    this.indexName = value;
+  }
 
-    /**
-     * Gets the value of the tableName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTableName() {
-        return tableName;
-    }
+  /**
+   * Gets the value of the tableName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getTableName() {
+    return tableName;
+  }
 
-    /**
-     * Sets the value of the tableName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTableName(String value) {
-        this.tableName = value;
-    }
+  /**
+   * Sets the value of the tableName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setTableName(String value) {
+    this.tableName = value;
+  }
 
-    /**
-     * Gets the value of the columns property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getColumns() {
-        return columns;
-    }
+  /**
+   * Gets the value of the columns property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getColumns() {
+    return columns;
+  }
 
-    /**
-     * Sets the value of the columns property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setColumns(String value) {
-        this.columns = value;
-    }
+  /**
+   * Sets the value of the columns property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setColumns(String value) {
+    this.columns = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/CreateTable.java b/src/main/java/com/avaje/ebean/dbmigration/migration/CreateTable.java
index f5a470a89..58012e99c 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/CreateTable.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/CreateTable.java
@@ -1,9 +1,5 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -11,13 +7,16 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -40,396 +39,344 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "column",
-    "uniqueConstraint",
-    "foreignKey"
+  "column",
+  "uniqueConstraint",
+  "foreignKey"
 })
 @XmlRootElement(name = "createTable")
 public class CreateTable {
 
-    @XmlElement(required = true)
-    protected List<Column> column;
-    protected List<UniqueConstraint> uniqueConstraint;
-    protected List<ForeignKey> foreignKey;
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-    @XmlAttribute(name = "withHistory")
-    protected Boolean withHistory;
-    @XmlAttribute(name = "draft")
-    protected Boolean draft;
-    @XmlAttribute(name = "identityType")
-    protected IdentityType identityType;
-    @XmlAttribute(name = "sequenceName")
-    protected String sequenceName;
-    @XmlAttribute(name = "sequenceInitial")
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger sequenceInitial;
-    @XmlAttribute(name = "sequenceAllocate")
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger sequenceAllocate;
-    @XmlAttribute(name = "pkName")
-    protected String pkName;
-    @XmlAttribute(name = "tablespace")
-    protected String tablespace;
-    @XmlAttribute(name = "indexTablespace")
-    protected String indexTablespace;
-    @XmlAttribute(name = "comment")
-    protected String comment;
+  @XmlElement(required = true)
+  protected List<Column> column;
+  protected List<UniqueConstraint> uniqueConstraint;
+  protected List<ForeignKey> foreignKey;
+  @XmlAttribute(name = "name", required = true)
+  protected String name;
+  @XmlAttribute(name = "withHistory")
+  protected Boolean withHistory;
+  @XmlAttribute(name = "draft")
+  protected Boolean draft;
+  @XmlAttribute(name = "identityType")
+  protected IdentityType identityType;
+  @XmlAttribute(name = "sequenceName")
+  protected String sequenceName;
+  @XmlAttribute(name = "sequenceInitial")
+  @XmlSchemaType(name = "positiveInteger")
+  protected BigInteger sequenceInitial;
+  @XmlAttribute(name = "sequenceAllocate")
+  @XmlSchemaType(name = "positiveInteger")
+  protected BigInteger sequenceAllocate;
+  @XmlAttribute(name = "pkName")
+  protected String pkName;
+  @XmlAttribute(name = "tablespace")
+  protected String tablespace;
+  @XmlAttribute(name = "indexTablespace")
+  protected String indexTablespace;
+  @XmlAttribute(name = "comment")
+  protected String comment;
 
-    /**
-     * Gets the value of the column property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the column property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getColumn().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Column }
-     * 
-     * 
-     */
-    public List<Column> getColumn() {
-        if (column == null) {
-            column = new ArrayList<>();
-        }
-        return this.column;
+  /**
+   * Gets the value of the column property.
+   * <p>
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the column property.
+   * <p>
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getColumn().add(newItem);
+   * </pre>
+   * <p>
+   * <p>
+   * <p>
+   * Objects of the following type(s) are allowed in the list
+   * {@link Column }
+   */
+  public List<Column> getColumn() {
+    if (column == null) {
+      column = new ArrayList<>();
     }
+    return this.column;
+  }
 
-    /**
-     * Gets the value of the uniqueConstraint property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the uniqueConstraint property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getUniqueConstraint().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link UniqueConstraint }
-     * 
-     * 
-     */
-    public List<UniqueConstraint> getUniqueConstraint() {
-        if (uniqueConstraint == null) {
-            uniqueConstraint = new ArrayList<>();
-        }
-        return this.uniqueConstraint;
+  /**
+   * Gets the value of the uniqueConstraint property.
+   * <p>
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the uniqueConstraint property.
+   * <p>
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getUniqueConstraint().add(newItem);
+   * </pre>
+   * <p>
+   * <p>
+   * <p>
+   * Objects of the following type(s) are allowed in the list
+   * {@link UniqueConstraint }
+   */
+  public List<UniqueConstraint> getUniqueConstraint() {
+    if (uniqueConstraint == null) {
+      uniqueConstraint = new ArrayList<>();
     }
+    return this.uniqueConstraint;
+  }
 
-    /**
-     * Gets the value of the foreignKey property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the foreignKey property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getForeignKey().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ForeignKey }
-     * 
-     * 
-     */
-    public List<ForeignKey> getForeignKey() {
-        if (foreignKey == null) {
-            foreignKey = new ArrayList<>();
-        }
-        return this.foreignKey;
+  /**
+   * Gets the value of the foreignKey property.
+   * <p>
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the foreignKey property.
+   * <p>
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getForeignKey().add(newItem);
+   * </pre>
+   * <p>
+   * <p>
+   * <p>
+   * Objects of the following type(s) are allowed in the list
+   * {@link ForeignKey }
+   */
+  public List<ForeignKey> getForeignKey() {
+    if (foreignKey == null) {
+      foreignKey = new ArrayList<>();
     }
+    return this.foreignKey;
+  }
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+  /**
+   * Gets the value of the name property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getName() {
+    return name;
+  }
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+  /**
+   * Sets the value of the name property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setName(String value) {
+    this.name = value;
+  }
 
-    /**
-     * Gets the value of the withHistory property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isWithHistory() {
-        return withHistory;
-    }
+  /**
+   * Gets the value of the withHistory property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isWithHistory() {
+    return withHistory;
+  }
 
-    /**
-     * Sets the value of the withHistory property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setWithHistory(Boolean value) {
-        this.withHistory = value;
-    }
+  /**
+   * Sets the value of the withHistory property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setWithHistory(Boolean value) {
+    this.withHistory = value;
+  }
 
-    /**
-     * Gets the value of the draft property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isDraft() {
-        return draft;
-    }
+  /**
+   * Gets the value of the draft property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isDraft() {
+    return draft;
+  }
 
-    /**
-     * Sets the value of the draft property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setDraft(Boolean value) {
-        this.draft = value;
-    }
+  /**
+   * Sets the value of the draft property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setDraft(Boolean value) {
+    this.draft = value;
+  }
 
-    /**
-     * Gets the value of the identityType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link IdentityType }
-     *     
-     */
-    public IdentityType getIdentityType() {
-        return identityType;
-    }
+  /**
+   * Gets the value of the identityType property.
+   *
+   * @return possible object is
+   * {@link IdentityType }
+   */
+  public IdentityType getIdentityType() {
+    return identityType;
+  }
 
-    /**
-     * Sets the value of the identityType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link IdentityType }
-     *     
-     */
-    public void setIdentityType(IdentityType value) {
-        this.identityType = value;
-    }
+  /**
+   * Sets the value of the identityType property.
+   *
+   * @param value allowed object is
+   *              {@link IdentityType }
+   */
+  public void setIdentityType(IdentityType value) {
+    this.identityType = value;
+  }
 
-    /**
-     * Gets the value of the sequenceName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSequenceName() {
-        return sequenceName;
-    }
+  /**
+   * Gets the value of the sequenceName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getSequenceName() {
+    return sequenceName;
+  }
 
-    /**
-     * Sets the value of the sequenceName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSequenceName(String value) {
-        this.sequenceName = value;
-    }
+  /**
+   * Sets the value of the sequenceName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setSequenceName(String value) {
+    this.sequenceName = value;
+  }
 
-    /**
-     * Gets the value of the sequenceInitial property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getSequenceInitial() {
-        return sequenceInitial;
-    }
+  /**
+   * Gets the value of the sequenceInitial property.
+   *
+   * @return possible object is
+   * {@link BigInteger }
+   */
+  public BigInteger getSequenceInitial() {
+    return sequenceInitial;
+  }
 
-    /**
-     * Sets the value of the sequenceInitial property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setSequenceInitial(BigInteger value) {
-        this.sequenceInitial = value;
-    }
+  /**
+   * Sets the value of the sequenceInitial property.
+   *
+   * @param value allowed object is
+   *              {@link BigInteger }
+   */
+  public void setSequenceInitial(BigInteger value) {
+    this.sequenceInitial = value;
+  }
 
-    /**
-     * Gets the value of the sequenceAllocate property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getSequenceAllocate() {
-        return sequenceAllocate;
-    }
+  /**
+   * Gets the value of the sequenceAllocate property.
+   *
+   * @return possible object is
+   * {@link BigInteger }
+   */
+  public BigInteger getSequenceAllocate() {
+    return sequenceAllocate;
+  }
 
-    /**
-     * Sets the value of the sequenceAllocate property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setSequenceAllocate(BigInteger value) {
-        this.sequenceAllocate = value;
-    }
+  /**
+   * Sets the value of the sequenceAllocate property.
+   *
+   * @param value allowed object is
+   *              {@link BigInteger }
+   */
+  public void setSequenceAllocate(BigInteger value) {
+    this.sequenceAllocate = value;
+  }
 
-    /**
-     * Gets the value of the pkName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPkName() {
-        return pkName;
-    }
+  /**
+   * Gets the value of the pkName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getPkName() {
+    return pkName;
+  }
 
-    /**
-     * Sets the value of the pkName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPkName(String value) {
-        this.pkName = value;
-    }
+  /**
+   * Sets the value of the pkName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setPkName(String value) {
+    this.pkName = value;
+  }
 
-    /**
-     * Gets the value of the tablespace property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTablespace() {
-        return tablespace;
-    }
+  /**
+   * Gets the value of the tablespace property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getTablespace() {
+    return tablespace;
+  }
 
-    /**
-     * Sets the value of the tablespace property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTablespace(String value) {
-        this.tablespace = value;
-    }
+  /**
+   * Sets the value of the tablespace property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setTablespace(String value) {
+    this.tablespace = value;
+  }
 
-    /**
-     * Gets the value of the indexTablespace property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIndexTablespace() {
-        return indexTablespace;
-    }
+  /**
+   * Gets the value of the indexTablespace property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getIndexTablespace() {
+    return indexTablespace;
+  }
 
-    /**
-     * Sets the value of the indexTablespace property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIndexTablespace(String value) {
-        this.indexTablespace = value;
-    }
+  /**
+   * Sets the value of the indexTablespace property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setIndexTablespace(String value) {
+    this.indexTablespace = value;
+  }
 
-    /**
-     * Gets the value of the comment property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getComment() {
-        return comment;
-    }
+  /**
+   * Gets the value of the comment property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getComment() {
+    return comment;
+  }
 
-    /**
-     * Sets the value of the comment property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setComment(String value) {
-        this.comment = value;
-    }
+  /**
+   * Sets the value of the comment property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setComment(String value) {
+    this.comment = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/DefaultTablespace.java b/src/main/java/com/avaje/ebean/dbmigration/migration/DefaultTablespace.java
index 5beaf7555..f90124787 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/DefaultTablespace.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/DefaultTablespace.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -24,91 +23,77 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "defaultTablespace")
 public class DefaultTablespace {
 
-    @XmlAttribute(name = "tables")
-    protected String tables;
-    @XmlAttribute(name = "indexes")
-    protected String indexes;
-    @XmlAttribute(name = "history")
-    protected String history;
+  @XmlAttribute(name = "tables")
+  protected String tables;
+  @XmlAttribute(name = "indexes")
+  protected String indexes;
+  @XmlAttribute(name = "history")
+  protected String history;
 
-    /**
-     * Gets the value of the tables property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTables() {
-        return tables;
-    }
+  /**
+   * Gets the value of the tables property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getTables() {
+    return tables;
+  }
 
-    /**
-     * Sets the value of the tables property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTables(String value) {
-        this.tables = value;
-    }
+  /**
+   * Sets the value of the tables property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setTables(String value) {
+    this.tables = value;
+  }
 
-    /**
-     * Gets the value of the indexes property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIndexes() {
-        return indexes;
-    }
+  /**
+   * Gets the value of the indexes property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getIndexes() {
+    return indexes;
+  }
 
-    /**
-     * Sets the value of the indexes property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIndexes(String value) {
-        this.indexes = value;
-    }
+  /**
+   * Sets the value of the indexes property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setIndexes(String value) {
+    this.indexes = value;
+  }
 
-    /**
-     * Gets the value of the history property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHistory() {
-        return history;
-    }
+  /**
+   * Gets the value of the history property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getHistory() {
+    return history;
+  }
 
-    /**
-     * Sets the value of the history property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHistory(String value) {
-        this.history = value;
-    }
+  /**
+   * Sets the value of the history property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setHistory(String value) {
+    this.history = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/DropColumn.java b/src/main/java/com/avaje/ebean/dbmigration/migration/DropColumn.java
index 03d42b2bf..f4c9d1ae2 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/DropColumn.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/DropColumn.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -24,91 +23,77 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "dropColumn")
 public class DropColumn {
 
-    @XmlAttribute(name = "columnName", required = true)
-    protected String columnName;
-    @XmlAttribute(name = "tableName", required = true)
-    protected String tableName;
-    @XmlAttribute(name = "withHistory")
-    protected Boolean withHistory;
+  @XmlAttribute(name = "columnName", required = true)
+  protected String columnName;
+  @XmlAttribute(name = "tableName", required = true)
+  protected String tableName;
+  @XmlAttribute(name = "withHistory")
+  protected Boolean withHistory;
 
-    /**
-     * Gets the value of the columnName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getColumnName() {
-        return columnName;
-    }
+  /**
+   * Gets the value of the columnName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getColumnName() {
+    return columnName;
+  }
 
-    /**
-     * Sets the value of the columnName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setColumnName(String value) {
-        this.columnName = value;
-    }
+  /**
+   * Sets the value of the columnName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setColumnName(String value) {
+    this.columnName = value;
+  }
 
-    /**
-     * Gets the value of the tableName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTableName() {
-        return tableName;
-    }
+  /**
+   * Gets the value of the tableName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getTableName() {
+    return tableName;
+  }
 
-    /**
-     * Sets the value of the tableName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTableName(String value) {
-        this.tableName = value;
-    }
+  /**
+   * Sets the value of the tableName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setTableName(String value) {
+    this.tableName = value;
+  }
 
-    /**
-     * Gets the value of the withHistory property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isWithHistory() {
-        return withHistory;
-    }
+  /**
+   * Gets the value of the withHistory property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isWithHistory() {
+    return withHistory;
+  }
 
-    /**
-     * Sets the value of the withHistory property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setWithHistory(Boolean value) {
-        this.withHistory = value;
-    }
+  /**
+   * Sets the value of the withHistory property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setWithHistory(Boolean value) {
+    this.withHistory = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/DropHistoryTable.java b/src/main/java/com/avaje/ebean/dbmigration/migration/DropHistoryTable.java
index e2ad3f4b8..e50ba686c 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/DropHistoryTable.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/DropHistoryTable.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -22,39 +21,33 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "dropHistoryTable")
 public class DropHistoryTable {
 
-    @XmlAttribute(name = "baseTable", required = true)
-    protected String baseTable;
+  @XmlAttribute(name = "baseTable", required = true)
+  protected String baseTable;
 
-    /**
-     * Gets the value of the baseTable property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBaseTable() {
-        return baseTable;
-    }
+  /**
+   * Gets the value of the baseTable property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getBaseTable() {
+    return baseTable;
+  }
 
-    /**
-     * Sets the value of the baseTable property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBaseTable(String value) {
-        this.baseTable = value;
-    }
+  /**
+   * Sets the value of the baseTable property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setBaseTable(String value) {
+    this.baseTable = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/DropIndex.java b/src/main/java/com/avaje/ebean/dbmigration/migration/DropIndex.java
index 14e97d3a2..c3ffeb583 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/DropIndex.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/DropIndex.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -23,65 +22,55 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "dropIndex")
 public class DropIndex {
 
-    @XmlAttribute(name = "indexName", required = true)
-    protected String indexName;
-    @XmlAttribute(name = "tableName", required = true)
-    protected String tableName;
+  @XmlAttribute(name = "indexName", required = true)
+  protected String indexName;
+  @XmlAttribute(name = "tableName", required = true)
+  protected String tableName;
 
-    /**
-     * Gets the value of the indexName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIndexName() {
-        return indexName;
-    }
+  /**
+   * Gets the value of the indexName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getIndexName() {
+    return indexName;
+  }
 
-    /**
-     * Sets the value of the indexName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIndexName(String value) {
-        this.indexName = value;
-    }
+  /**
+   * Sets the value of the indexName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setIndexName(String value) {
+    this.indexName = value;
+  }
 
-    /**
-     * Gets the value of the tableName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTableName() {
-        return tableName;
-    }
+  /**
+   * Gets the value of the tableName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getTableName() {
+    return tableName;
+  }
 
-    /**
-     * Sets the value of the tableName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTableName(String value) {
-        this.tableName = value;
-    }
+  /**
+   * Sets the value of the tableName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setTableName(String value) {
+    this.tableName = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/DropTable.java b/src/main/java/com/avaje/ebean/dbmigration/migration/DropTable.java
index fe24e36af..47330c14b 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/DropTable.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/DropTable.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -22,39 +21,33 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "dropTable")
 public class DropTable {
 
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
+  @XmlAttribute(name = "name", required = true)
+  protected String name;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+  /**
+   * Gets the value of the name property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getName() {
+    return name;
+  }
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+  /**
+   * Sets the value of the name property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setName(String value) {
+    this.name = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/ForeignKey.java b/src/main/java/com/avaje/ebean/dbmigration/migration/ForeignKey.java
index 7963c73d6..63a1f1ea2 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/ForeignKey.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/ForeignKey.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -26,143 +25,121 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "foreignKey")
 public class ForeignKey {
 
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-    @XmlAttribute(name = "columnNames", required = true)
-    protected String columnNames;
-    @XmlAttribute(name = "refColumnNames", required = true)
-    protected String refColumnNames;
-    @XmlAttribute(name = "refTableName", required = true)
-    protected String refTableName;
-    @XmlAttribute(name = "indexName")
-    protected String indexName;
+  @XmlAttribute(name = "name", required = true)
+  protected String name;
+  @XmlAttribute(name = "columnNames", required = true)
+  protected String columnNames;
+  @XmlAttribute(name = "refColumnNames", required = true)
+  protected String refColumnNames;
+  @XmlAttribute(name = "refTableName", required = true)
+  protected String refTableName;
+  @XmlAttribute(name = "indexName")
+  protected String indexName;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+  /**
+   * Gets the value of the name property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getName() {
+    return name;
+  }
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+  /**
+   * Sets the value of the name property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setName(String value) {
+    this.name = value;
+  }
 
-    /**
-     * Gets the value of the columnNames property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getColumnNames() {
-        return columnNames;
-    }
+  /**
+   * Gets the value of the columnNames property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getColumnNames() {
+    return columnNames;
+  }
 
-    /**
-     * Sets the value of the columnNames property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setColumnNames(String value) {
-        this.columnNames = value;
-    }
+  /**
+   * Sets the value of the columnNames property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setColumnNames(String value) {
+    this.columnNames = value;
+  }
 
-    /**
-     * Gets the value of the refColumnNames property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRefColumnNames() {
-        return refColumnNames;
-    }
+  /**
+   * Gets the value of the refColumnNames property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getRefColumnNames() {
+    return refColumnNames;
+  }
 
-    /**
-     * Sets the value of the refColumnNames property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRefColumnNames(String value) {
-        this.refColumnNames = value;
-    }
+  /**
+   * Sets the value of the refColumnNames property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setRefColumnNames(String value) {
+    this.refColumnNames = value;
+  }
 
-    /**
-     * Gets the value of the refTableName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRefTableName() {
-        return refTableName;
-    }
+  /**
+   * Gets the value of the refTableName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getRefTableName() {
+    return refTableName;
+  }
 
-    /**
-     * Sets the value of the refTableName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRefTableName(String value) {
-        this.refTableName = value;
-    }
+  /**
+   * Sets the value of the refTableName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setRefTableName(String value) {
+    this.refTableName = value;
+  }
 
-    /**
-     * Gets the value of the indexName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIndexName() {
-        return indexName;
-    }
+  /**
+   * Gets the value of the indexName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getIndexName() {
+    return indexName;
+  }
 
-    /**
-     * Sets the value of the indexName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIndexName(String value) {
-        this.indexName = value;
-    }
+  /**
+   * Sets the value of the indexName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setIndexName(String value) {
+    this.indexName = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/IdentityType.java b/src/main/java/com/avaje/ebean/dbmigration/migration/IdentityType.java
index 042346cc8..97b2a542a 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/IdentityType.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/IdentityType.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlEnum;
@@ -8,7 +7,7 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for identityType.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
  * <pre>
@@ -22,39 +21,38 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/restriction>
  * &lt;/simpleType>
  * </pre>
- * 
  */
 @XmlType(name = "identityType")
 @XmlEnum
 public enum IdentityType {
 
-    @XmlEnumValue("identity")
-    IDENTITY("identity"),
-    @XmlEnumValue("sequence")
-    SEQUENCE("sequence"),
-    @XmlEnumValue("generator")
-    GENERATOR("generator"),
-    @XmlEnumValue("external")
-    EXTERNAL("external"),
-    @XmlEnumValue("default")
-    DEFAULT("default");
-    private final String value;
+  @XmlEnumValue("identity")
+  IDENTITY("identity"),
+  @XmlEnumValue("sequence")
+  SEQUENCE("sequence"),
+  @XmlEnumValue("generator")
+  GENERATOR("generator"),
+  @XmlEnumValue("external")
+  EXTERNAL("external"),
+  @XmlEnumValue("default")
+  DEFAULT("default");
+  private final String value;
 
-    IdentityType(String v) {
-        value = v;
-    }
+  IdentityType(String v) {
+    value = v;
+  }
 
-    public String value() {
-        return value;
-    }
+  public String value() {
+    return value;
+  }
 
-    public static IdentityType fromValue(String v) {
-        for (IdentityType c: IdentityType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
+  public static IdentityType fromValue(String v) {
+    for (IdentityType c : IdentityType.values()) {
+      if (c.value.equals(v)) {
+        return c;
+      }
     }
+    throw new IllegalArgumentException(v);
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Migration.java b/src/main/java/com/avaje/ebean/dbmigration/migration/Migration.java
index 611987e0d..0277a79c0 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/Migration.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/Migration.java
@@ -1,20 +1,19 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -26,46 +25,42 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "changeSet"
+  "changeSet"
 })
 @XmlRootElement(name = "migration")
 public class Migration {
 
-    @XmlElement(required = true)
-    protected List<ChangeSet> changeSet;
+  @XmlElement(required = true)
+  protected List<ChangeSet> changeSet;
 
-    /**
-     * Gets the value of the changeSet property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the changeSet property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getChangeSet().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ChangeSet }
-     * 
-     * 
-     */
-    public List<ChangeSet> getChangeSet() {
-        if (changeSet == null) {
-            changeSet = new ArrayList<>();
-        }
-        return this.changeSet;
+  /**
+   * Gets the value of the changeSet property.
+   * <p>
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the changeSet property.
+   * <p>
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getChangeSet().add(newItem);
+   * </pre>
+   * <p>
+   * <p>
+   * <p>
+   * Objects of the following type(s) are allowed in the list
+   * {@link ChangeSet }
+   */
+  public List<ChangeSet> getChangeSet() {
+    if (changeSet == null) {
+      changeSet = new ArrayList<>();
     }
+    return this.changeSet;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/ObjectFactory.java b/src/main/java/com/avaje/ebean/dbmigration/migration/ObjectFactory.java
index 632e62006..0f064b3a6 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/ObjectFactory.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/ObjectFactory.java
@@ -1,216 +1,190 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
 
 /**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.avaje.ebean.dbmigration.migration package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the com.avaje.ebean.dbmigration.migration package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups.  Factory methods for each of these are
  * provided in this class.
- * 
  */
 @XmlRegistry
 public class ObjectFactory {
 
 
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.avaje.ebean.dbmigration.migration
-     * 
-     */
-    public ObjectFactory() {
-    }
+  /**
+   * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.avaje.ebean.dbmigration.migration
+   */
+  public ObjectFactory() {
+  }
 
-    /**
-     * Create an instance of {@link Rollback }
-     * 
-     */
-    public Rollback createRollback() {
-        return new Rollback();
-    }
+  /**
+   * Create an instance of {@link Rollback }
+   */
+  public Rollback createRollback() {
+    return new Rollback();
+  }
 
-    /**
-     * Create an instance of {@link AddColumn }
-     * 
-     */
-    public AddColumn createAddColumn() {
-        return new AddColumn();
-    }
+  /**
+   * Create an instance of {@link AddColumn }
+   */
+  public AddColumn createAddColumn() {
+    return new AddColumn();
+  }
 
-    /**
-     * Create an instance of {@link Column }
-     * 
-     */
-    public Column createColumn() {
-        return new Column();
-    }
+  /**
+   * Create an instance of {@link Column }
+   */
+  public Column createColumn() {
+    return new Column();
+  }
 
-    /**
-     * Create an instance of {@link CreateTable }
-     * 
-     */
-    public CreateTable createCreateTable() {
-        return new CreateTable();
-    }
+  /**
+   * Create an instance of {@link CreateTable }
+   */
+  public CreateTable createCreateTable() {
+    return new CreateTable();
+  }
 
-    /**
-     * Create an instance of {@link UniqueConstraint }
-     * 
-     */
-    public UniqueConstraint createUniqueConstraint() {
-        return new UniqueConstraint();
-    }
+  /**
+   * Create an instance of {@link UniqueConstraint }
+   */
+  public UniqueConstraint createUniqueConstraint() {
+    return new UniqueConstraint();
+  }
 
-    /**
-     * Create an instance of {@link ForeignKey }
-     * 
-     */
-    public ForeignKey createForeignKey() {
-        return new ForeignKey();
-    }
+  /**
+   * Create an instance of {@link ForeignKey }
+   */
+  public ForeignKey createForeignKey() {
+    return new ForeignKey();
+  }
 
-    /**
-     * Create an instance of {@link Apply }
-     * 
-     */
-    public Apply createApply() {
-        return new Apply();
-    }
+  /**
+   * Create an instance of {@link Apply }
+   */
+  public Apply createApply() {
+    return new Apply();
+  }
 
-    /**
-     * Create an instance of {@link Configuration }
-     * 
-     */
-    public Configuration createConfiguration() {
-        return new Configuration();
-    }
+  /**
+   * Create an instance of {@link Configuration }
+   */
+  public Configuration createConfiguration() {
+    return new Configuration();
+  }
 
-    /**
-     * Create an instance of {@link DefaultTablespace }
-     * 
-     */
-    public DefaultTablespace createDefaultTablespace() {
-        return new DefaultTablespace();
-    }
+  /**
+   * Create an instance of {@link DefaultTablespace }
+   */
+  public DefaultTablespace createDefaultTablespace() {
+    return new DefaultTablespace();
+  }
 
-    /**
-     * Create an instance of {@link AddTableComment }
-     * 
-     */
-    public AddTableComment createAddTableComment() {
-        return new AddTableComment();
-    }
+  /**
+   * Create an instance of {@link AddTableComment }
+   */
+  public AddTableComment createAddTableComment() {
+    return new AddTableComment();
+  }
 
-    /**
-     * Create an instance of {@link RenameTable }
-     * 
-     */
-    public RenameTable createRenameTable() {
-        return new RenameTable();
-    }
+  /**
+   * Create an instance of {@link RenameTable }
+   */
+  public RenameTable createRenameTable() {
+    return new RenameTable();
+  }
 
-    /**
-     * Create an instance of {@link DropHistoryTable }
-     * 
-     */
-    public DropHistoryTable createDropHistoryTable() {
-        return new DropHistoryTable();
-    }
+  /**
+   * Create an instance of {@link DropHistoryTable }
+   */
+  public DropHistoryTable createDropHistoryTable() {
+    return new DropHistoryTable();
+  }
 
-    /**
-     * Create an instance of {@link AlterColumn }
-     * 
-     */
-    public AlterColumn createAlterColumn() {
-        return new AlterColumn();
-    }
+  /**
+   * Create an instance of {@link AlterColumn }
+   */
+  public AlterColumn createAlterColumn() {
+    return new AlterColumn();
+  }
 
-    /**
-     * Create an instance of {@link DropColumn }
-     * 
-     */
-    public DropColumn createDropColumn() {
-        return new DropColumn();
-    }
+  /**
+   * Create an instance of {@link DropColumn }
+   */
+  public DropColumn createDropColumn() {
+    return new DropColumn();
+  }
 
-    /**
-     * Create an instance of {@link CreateIndex }
-     * 
-     */
-    public CreateIndex createCreateIndex() {
-        return new CreateIndex();
-    }
+  /**
+   * Create an instance of {@link CreateIndex }
+   */
+  public CreateIndex createCreateIndex() {
+    return new CreateIndex();
+  }
 
-    /**
-     * Create an instance of {@link ChangeSet }
-     * 
-     */
-    public ChangeSet createChangeSet() {
-        return new ChangeSet();
-    }
+  /**
+   * Create an instance of {@link ChangeSet }
+   */
+  public ChangeSet createChangeSet() {
+    return new ChangeSet();
+  }
 
-    /**
-     * Create an instance of {@link Sql }
-     * 
-     */
-    public Sql createSql() {
-        return new Sql();
-    }
+  /**
+   * Create an instance of {@link Sql }
+   */
+  public Sql createSql() {
+    return new Sql();
+  }
 
-    /**
-     * Create an instance of {@link DropTable }
-     * 
-     */
-    public DropTable createDropTable() {
-        return new DropTable();
-    }
+  /**
+   * Create an instance of {@link DropTable }
+   */
+  public DropTable createDropTable() {
+    return new DropTable();
+  }
 
-    /**
-     * Create an instance of {@link AddHistoryTable }
-     * 
-     */
-    public AddHistoryTable createAddHistoryTable() {
-        return new AddHistoryTable();
-    }
+  /**
+   * Create an instance of {@link AddHistoryTable }
+   */
+  public AddHistoryTable createAddHistoryTable() {
+    return new AddHistoryTable();
+  }
 
-    /**
-     * Create an instance of {@link RenameColumn }
-     * 
-     */
-    public RenameColumn createRenameColumn() {
-        return new RenameColumn();
-    }
+  /**
+   * Create an instance of {@link RenameColumn }
+   */
+  public RenameColumn createRenameColumn() {
+    return new RenameColumn();
+  }
 
-    /**
-     * Create an instance of {@link DropIndex }
-     * 
-     */
-    public DropIndex createDropIndex() {
-        return new DropIndex();
-    }
+  /**
+   * Create an instance of {@link DropIndex }
+   */
+  public DropIndex createDropIndex() {
+    return new DropIndex();
+  }
 
-    /**
-     * Create an instance of {@link AlterHistoryTable }
-     * 
-     */
-    public AlterHistoryTable createAlterHistoryTable() {
-        return new AlterHistoryTable();
-    }
+  /**
+   * Create an instance of {@link AlterHistoryTable }
+   */
+  public AlterHistoryTable createAlterHistoryTable() {
+    return new AlterHistoryTable();
+  }
 
-    /**
-     * Create an instance of {@link Migration }
-     * 
-     */
-    public Migration createMigration() {
-        return new Migration();
-    }
+  /**
+   * Create an instance of {@link Migration }
+   */
+  public Migration createMigration() {
+    return new Migration();
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/RenameColumn.java b/src/main/java/com/avaje/ebean/dbmigration/migration/RenameColumn.java
index 00e1b30f4..0b9711f51 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/RenameColumn.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/RenameColumn.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -25,117 +24,99 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "renameColumn")
 public class RenameColumn {
 
-    @XmlAttribute(name = "oldName", required = true)
-    protected String oldName;
-    @XmlAttribute(name = "newName", required = true)
-    protected String newName;
-    @XmlAttribute(name = "tableName", required = true)
-    protected String tableName;
-    @XmlAttribute(name = "dataType")
-    protected String dataType;
+  @XmlAttribute(name = "oldName", required = true)
+  protected String oldName;
+  @XmlAttribute(name = "newName", required = true)
+  protected String newName;
+  @XmlAttribute(name = "tableName", required = true)
+  protected String tableName;
+  @XmlAttribute(name = "dataType")
+  protected String dataType;
 
-    /**
-     * Gets the value of the oldName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOldName() {
-        return oldName;
-    }
+  /**
+   * Gets the value of the oldName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getOldName() {
+    return oldName;
+  }
 
-    /**
-     * Sets the value of the oldName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOldName(String value) {
-        this.oldName = value;
-    }
+  /**
+   * Sets the value of the oldName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setOldName(String value) {
+    this.oldName = value;
+  }
 
-    /**
-     * Gets the value of the newName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNewName() {
-        return newName;
-    }
+  /**
+   * Gets the value of the newName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getNewName() {
+    return newName;
+  }
 
-    /**
-     * Sets the value of the newName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNewName(String value) {
-        this.newName = value;
-    }
+  /**
+   * Sets the value of the newName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setNewName(String value) {
+    this.newName = value;
+  }
 
-    /**
-     * Gets the value of the tableName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTableName() {
-        return tableName;
-    }
+  /**
+   * Gets the value of the tableName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getTableName() {
+    return tableName;
+  }
 
-    /**
-     * Sets the value of the tableName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTableName(String value) {
-        this.tableName = value;
-    }
+  /**
+   * Sets the value of the tableName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setTableName(String value) {
+    this.tableName = value;
+  }
 
-    /**
-     * Gets the value of the dataType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDataType() {
-        return dataType;
-    }
+  /**
+   * Gets the value of the dataType property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getDataType() {
+    return dataType;
+  }
 
-    /**
-     * Sets the value of the dataType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDataType(String value) {
-        this.dataType = value;
-    }
+  /**
+   * Sets the value of the dataType property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setDataType(String value) {
+    this.dataType = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/RenameTable.java b/src/main/java/com/avaje/ebean/dbmigration/migration/RenameTable.java
index aca4f7f88..3a4c83623 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/RenameTable.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/RenameTable.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -23,65 +22,55 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "renameTable")
 public class RenameTable {
 
-    @XmlAttribute(name = "oldName", required = true)
-    protected String oldName;
-    @XmlAttribute(name = "newName", required = true)
-    protected String newName;
+  @XmlAttribute(name = "oldName", required = true)
+  protected String oldName;
+  @XmlAttribute(name = "newName", required = true)
+  protected String newName;
 
-    /**
-     * Gets the value of the oldName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOldName() {
-        return oldName;
-    }
+  /**
+   * Gets the value of the oldName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getOldName() {
+    return oldName;
+  }
 
-    /**
-     * Sets the value of the oldName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOldName(String value) {
-        this.oldName = value;
-    }
+  /**
+   * Sets the value of the oldName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setOldName(String value) {
+    this.oldName = value;
+  }
 
-    /**
-     * Gets the value of the newName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNewName() {
-        return newName;
-    }
+  /**
+   * Gets the value of the newName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getNewName() {
+    return newName;
+  }
 
-    /**
-     * Sets the value of the newName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNewName(String value) {
-        this.newName = value;
-    }
+  /**
+   * Sets the value of the newName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setNewName(String value) {
+    this.newName = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Rollback.java b/src/main/java/com/avaje/ebean/dbmigration/migration/Rollback.java
index 9779712a9..3d9c18d32 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/Rollback.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/Rollback.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlValue;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;simpleContent>
@@ -21,41 +20,35 @@ import javax.xml.bind.annotation.XmlValue;
  *   &lt;/simpleContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "value"
+  "value"
 })
 @XmlRootElement(name = "rollback")
 public class Rollback {
 
-    @XmlValue
-    protected String value;
+  @XmlValue
+  protected String value;
 
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
+  /**
+   * Gets the value of the value property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getValue() {
+    return value;
+  }
 
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
+  /**
+   * Sets the value of the value property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setValue(String value) {
+    this.value = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Sql.java b/src/main/java/com/avaje/ebean/dbmigration/migration/Sql.java
index 534536ddc..f2a951d7c 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/Sql.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/Sql.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -25,68 +24,58 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "apply",
-    "rollback"
+  "apply",
+  "rollback"
 })
 @XmlRootElement(name = "sql")
 public class Sql {
 
-    @XmlElement(required = true)
-    protected Apply apply;
-    @XmlElement(required = true)
-    protected Rollback rollback;
+  @XmlElement(required = true)
+  protected Apply apply;
+  @XmlElement(required = true)
+  protected Rollback rollback;
 
-    /**
-     * Gets the value of the apply property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Apply }
-     *     
-     */
-    public Apply getApply() {
-        return apply;
-    }
+  /**
+   * Gets the value of the apply property.
+   *
+   * @return possible object is
+   * {@link Apply }
+   */
+  public Apply getApply() {
+    return apply;
+  }
 
-    /**
-     * Sets the value of the apply property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Apply }
-     *     
-     */
-    public void setApply(Apply value) {
-        this.apply = value;
-    }
+  /**
+   * Sets the value of the apply property.
+   *
+   * @param value allowed object is
+   *              {@link Apply }
+   */
+  public void setApply(Apply value) {
+    this.apply = value;
+  }
 
-    /**
-     * Gets the value of the rollback property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Rollback }
-     *     
-     */
-    public Rollback getRollback() {
-        return rollback;
-    }
+  /**
+   * Gets the value of the rollback property.
+   *
+   * @return possible object is
+   * {@link Rollback }
+   */
+  public Rollback getRollback() {
+    return rollback;
+  }
 
-    /**
-     * Sets the value of the rollback property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Rollback }
-     *     
-     */
-    public void setRollback(Rollback value) {
-        this.rollback = value;
-    }
+  /**
+   * Sets the value of the rollback property.
+   *
+   * @param value allowed object is
+   *              {@link Rollback }
+   */
+  public void setRollback(Rollback value) {
+    this.rollback = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/UniqueConstraint.java b/src/main/java/com/avaje/ebean/dbmigration/migration/UniqueConstraint.java
index f560218cc..0301e9a4a 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migration/UniqueConstraint.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migration/UniqueConstraint.java
@@ -1,4 +1,3 @@
-
 package com.avaje.ebean.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -23,65 +22,55 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "uniqueConstraint")
 public class UniqueConstraint {
 
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-    @XmlAttribute(name = "columnNames", required = true)
-    protected String columnNames;
+  @XmlAttribute(name = "name", required = true)
+  protected String name;
+  @XmlAttribute(name = "columnNames", required = true)
+  protected String columnNames;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+  /**
+   * Gets the value of the name property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getName() {
+    return name;
+  }
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+  /**
+   * Sets the value of the name property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setName(String value) {
+    this.name = value;
+  }
 
-    /**
-     * Gets the value of the columnNames property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getColumnNames() {
-        return columnNames;
-    }
+  /**
+   * Gets the value of the columnNames property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getColumnNames() {
+    return columnNames;
+  }
 
-    /**
-     * Sets the value of the columnNames property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setColumnNames(String value) {
-        this.columnNames = value;
-    }
+  /**
+   * Sets the value of the columnNames property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setColumnNames(String value) {
+    this.columnNames = value;
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlReader.java b/src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlReader.java
index 68e67323f..055ae7918 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlReader.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlReader.java
@@ -16,8 +16,9 @@ import java.io.InputStream;
  */
 public class MigrationXmlReader {
 
-  private MigrationXmlReader() {}
-  
+  private MigrationXmlReader() {
+  }
+
   /**
    * Read and return a Migration from an xml document at the given resource path.
    */
diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/CurrentModel.java b/src/main/java/com/avaje/ebean/dbmigration/model/CurrentModel.java
index 99dd89acf..1b3949a5e 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/CurrentModel.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/CurrentModel.java
@@ -85,7 +85,7 @@ public class CurrentModel {
   }
 
   public void setChangeSet(ChangeSet changeSet) {
-   this.changeSet = changeSet;
+    this.changeSet = changeSet;
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MCompoundUniqueConstraint.java b/src/main/java/com/avaje/ebean/dbmigration/model/MCompoundUniqueConstraint.java
index 2bd087eb1..3d13e20ef 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/MCompoundUniqueConstraint.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/MCompoundUniqueConstraint.java
@@ -3,8 +3,8 @@ package com.avaje.ebean.dbmigration.model;
 /**
  * A unique constraint for multiple columns.
  * <p>
- *   Note that unique constraint on a single column is instead
- *   a boolean flag on the associated MColumn.
+ * Note that unique constraint on a single column is instead
+ * a boolean flag on the associated MColumn.
  * </p>
  */
 public class MCompoundUniqueConstraint {
diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MConfiguration.java b/src/main/java/com/avaje/ebean/dbmigration/model/MConfiguration.java
index f6165a670..1c24a7650 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/MConfiguration.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/MConfiguration.java
@@ -27,8 +27,8 @@ public class MConfiguration {
   /**
    * Apply the migration configuration.
    * <p>
-   *   It is expected that these are applied in the correct chronological order
-   *   from earliest to latest.
+   * It is expected that these are applied in the correct chronological order
+   * from earliest to latest.
    * </p>
    */
   public void apply(Configuration configuration) {
diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MTable.java b/src/main/java/com/avaje/ebean/dbmigration/model/MTable.java
index f23614ead..8c1eeea99 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/MTable.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/MTable.java
@@ -126,7 +126,7 @@ public class MTable {
 
   /**
    * Create a copy of this table structure as a 'draft' table.
-   *
+   * <p>
    * Note that both tables contain @DraftOnly MColumns and these are filtered out
    * later when creating the CreateTable object.
    */
diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java b/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java
index 17b27e751..ba4bccaa3 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java
@@ -4,7 +4,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.io.FileFilter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -46,14 +45,14 @@ public class MigrationModel {
 
     List<MigrationResource> resources = new ArrayList<>();
 
-    for (File xmlFile: xmlFiles) {
+    for (File xmlFile : xmlFiles) {
       resources.add(new MigrationResource(xmlFile, createVersion(xmlFile)));
     }
 
     // sort into version order before applying
     Collections.sort(resources);
 
-    for (MigrationResource migrationResource: resources) {
+    for (MigrationResource migrationResource : resources) {
       logger.debug("read {}", migrationResource);
       model.apply(migrationResource.read(), migrationResource.getVersion());
     }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/ModelContainer.java b/src/main/java/com/avaje/ebean/dbmigration/model/ModelContainer.java
index 1870ff332..1b0dbadf3 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/ModelContainer.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/ModelContainer.java
@@ -307,7 +307,7 @@ public class ModelContainer {
 
     MTable table = getTable(dropColumn.getTableName());
     if (table == null) {
-      throw new IllegalArgumentException("Table ["+dropColumn.getTableName()+"] not found?");
+      throw new IllegalArgumentException("Table [" + dropColumn.getTableName() + "] not found?");
     }
     table.registerPendingDropColumn(dropColumn.getColumnName());
   }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/PendingDrops.java b/src/main/java/com/avaje/ebean/dbmigration/model/PendingDrops.java
index 5a2875487..456202cec 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/PendingDrops.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/PendingDrops.java
@@ -86,7 +86,7 @@ public class PendingDrops {
     }
 
     if (migration.getChangeSet().isEmpty()) {
-      throw new IllegalArgumentException("The remaining pendingDrops changeSets in migration ["+pendingVersion+"] are suppressDropsForever=true and can't be applied");
+      throw new IllegalArgumentException("The remaining pendingDrops changeSets in migration [" + pendingVersion + "] are suppressDropsForever=true and can't be applied");
     }
 
     if (!entry.containsSuppressForever()) {
@@ -206,10 +206,10 @@ public class PendingDrops {
       Iterator<Object> iterator = pending.iterator();
       while (iterator.hasNext()) {
         Object pendingDrop = iterator.next();
-        if (pendingDrop instanceof DropColumn && dropColumnIn((DropColumn)pendingDrop, appliedDrops)) {
+        if (pendingDrop instanceof DropColumn && dropColumnIn((DropColumn) pendingDrop, appliedDrops)) {
           iterator.remove();
 
-        } else if (pendingDrop instanceof DropTable && dropTableIn((DropTable)pendingDrop, appliedDrops)) {
+        } else if (pendingDrop instanceof DropTable && dropTableIn((DropTable) pendingDrop, appliedDrops)) {
           iterator.remove();
         }
       }
@@ -220,7 +220,7 @@ public class PendingDrops {
      */
     private boolean dropTableIn(DropTable pendingDrop, ChangeSet appliedDrops) {
       for (Object o : appliedDrops.getChangeSetChildren()) {
-        if (o instanceof DropTable && sameTable(pendingDrop, (DropTable)o)) {
+        if (o instanceof DropTable && sameTable(pendingDrop, (DropTable) o)) {
           return true;
         }
       }
@@ -251,7 +251,7 @@ public class PendingDrops {
      */
     private boolean sameColumn(DropColumn pending, DropColumn o) {
       return pending.getColumnName().equals(o.getColumnName())
-          && pending.getTableName().equals(o.getTableName());
+        && pending.getTableName().equals(o.getTableName());
     }
 
   }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/PlatformDdlWriter.java b/src/main/java/com/avaje/ebean/dbmigration/model/PlatformDdlWriter.java
index 1a6f3f965..3c65d0920 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/PlatformDdlWriter.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/PlatformDdlWriter.java
@@ -83,7 +83,7 @@ public class PlatformDdlWriter {
 
   protected FileWriter createWriter(File path, String fullVersion, String suffix) throws IOException {
 
-    File applyFile = new File(path,  fullVersion + suffix);
+    File applyFile = new File(path, fullVersion + suffix);
     return new FileWriter(applyFile);
   }
 
diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildContext.java b/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildContext.java
index e18c53356..f891798ab 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildContext.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildContext.java
@@ -165,7 +165,7 @@ public class ModelBuildContext {
     int ixCount = 0;
     int uqCount = 0;
     Collection<MColumn> cols = draftTable.allColumns();
-    for (MColumn col: cols) {
+    for (MColumn col : cols) {
       if (col.getForeignKeyName() != null) {
         // Note that we adjust the 'references' table later in a second pass
         // after we know all the tables that are 'draftable'
@@ -176,10 +176,10 @@ public class ModelBuildContext {
         col.setForeignKeyIndex(foreignKeyIndexName(draftTable.getName(), indexCols, ++ixCount));
       }
       // adjust the unique constraint names
-      if (col.getUnique() != null){
+      if (col.getUnique() != null) {
         col.setUnique(uniqueConstraintName(draftTable.getName(), col.getName(), ++uqCount));
       }
-      if (col.getUniqueOneToOne() != null){
+      if (col.getUniqueOneToOne() != null) {
         col.setUniqueOneToOne(uniqueConstraintName(draftTable.getName(), col.getName(), ++uqCount));
       }
     }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java b/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java
index 27f38d287..4dde64375 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java
@@ -15,22 +15,22 @@ import com.avaje.ebeaninternal.server.deploy.TableJoinColumn;
  */
 public class ModelBuildIntersectionTable {
 
-	private final ModelBuildContext ctx;
+  private final ModelBuildContext ctx;
 
-	private final BeanPropertyAssocMany<?> manyProp;
-	private final TableJoin intersectionTableJoin;
-	private final TableJoin tableJoin;
+  private final BeanPropertyAssocMany<?> manyProp;
+  private final TableJoin intersectionTableJoin;
+  private final TableJoin tableJoin;
 
   private MTable intersectionTable;
 
   private int countForeignKey;
 
-	public ModelBuildIntersectionTable(ModelBuildContext ctx, BeanPropertyAssocMany<?> manyProp) {
-		this.ctx = ctx;
-		this.manyProp = manyProp;
-		this.intersectionTableJoin = manyProp.getIntersectionTableJoin();
-		this.tableJoin = manyProp.getTableJoin();
-	}
+  public ModelBuildIntersectionTable(ModelBuildContext ctx, BeanPropertyAssocMany<?> manyProp) {
+    this.ctx = ctx;
+    this.manyProp = manyProp;
+    this.intersectionTableJoin = manyProp.getIntersectionTableJoin();
+    this.tableJoin = manyProp.getTableJoin();
+  }
 
   public void build() {
 
@@ -38,7 +38,7 @@ public class ModelBuildIntersectionTable {
     MTable existingTable = ctx.addTable(intersectionTable);
     if (existingTable != null) {
       throw new IllegalStateException("Property " + manyProp.getFullBeanName() + " has duplicate ManyToMany intersection table " + intersectionTable.getName()
-          + ". Please use @JoinTable to define unique table to use");
+        + ". Please use @JoinTable to define unique table to use");
     }
 
     buildFkConstraints();
@@ -47,21 +47,21 @@ public class ModelBuildIntersectionTable {
       ctx.createDraft(intersectionTable, false);
     }
 
-	}
+  }
 
-	private void buildFkConstraints() {
+  private void buildFkConstraints() {
 
-		BeanDescriptor<?> localDesc = manyProp.getBeanDescriptor();
-		buildFkConstraints(localDesc, intersectionTableJoin.columns(), true);
+    BeanDescriptor<?> localDesc = manyProp.getBeanDescriptor();
+    buildFkConstraints(localDesc, intersectionTableJoin.columns(), true);
 
-		BeanDescriptor<?> targetDesc = manyProp.getTargetDescriptor();
-		buildFkConstraints(targetDesc, tableJoin.columns(), false);
+    BeanDescriptor<?> targetDesc = manyProp.getTargetDescriptor();
+    buildFkConstraints(targetDesc, tableJoin.columns(), false);
 
     intersectionTable.checkDuplicateForeignKeys();
-	}
+  }
 
 
-	private void buildFkConstraints(BeanDescriptor<?> desc, TableJoinColumn[] columns, boolean direction) {
+  private void buildFkConstraints(BeanDescriptor<?> desc, TableJoinColumn[] columns, boolean direction) {
 
     String tableName = intersectionTableJoin.getTable();
     String baseTable = ctx.normaliseTable(desc.getBaseTable());
@@ -78,43 +78,43 @@ public class ModelBuildIntersectionTable {
     }
   }
 
-	private MTable createTable() {
+  private MTable createTable() {
 
-		BeanDescriptor<?> localDesc = manyProp.getBeanDescriptor();
-		BeanDescriptor<?> targetDesc = manyProp.getTargetDescriptor();
+    BeanDescriptor<?> localDesc = manyProp.getBeanDescriptor();
+    BeanDescriptor<?> targetDesc = manyProp.getTargetDescriptor();
 
     String tableName = intersectionTableJoin.getTable();
     MTable table = new MTable(tableName);
-		if (!manyProp.isExcludedFromHistory()) {
-			if (localDesc.isHistorySupport()) {
-				table.setWithHistory(true);
-			}
-		}
+    if (!manyProp.isExcludedFromHistory()) {
+      if (localDesc.isHistorySupport()) {
+        table.setWithHistory(true);
+      }
+    }
     table.setPkName(ctx.primaryKeyName(tableName));
 
-		TableJoinColumn[] columns = intersectionTableJoin.columns();
+    TableJoinColumn[] columns = intersectionTableJoin.columns();
     for (TableJoinColumn column : columns) {
       addColumn(table, localDesc, column.getForeignDbColumn(), column.getLocalDbColumn());
     }
 
-		TableJoinColumn[] otherColumns = tableJoin.columns();
+    TableJoinColumn[] otherColumns = tableJoin.columns();
     for (TableJoinColumn otherColumn : otherColumns) {
       addColumn(table, targetDesc, otherColumn.getLocalDbColumn(), otherColumn.getForeignDbColumn());
     }
 
     return table;
-	}
+  }
 
-	private void addColumn(MTable table, BeanDescriptor<?> desc, String column, String findPropColumn) {
+  private void addColumn(MTable table, BeanDescriptor<?> desc, String column, String findPropColumn) {
 
-		BeanProperty p = desc.getIdBinder().findBeanProperty(findPropColumn);
-		if (p == null) {
-			throw new RuntimeException("Could not find id property for " + findPropColumn);
-		}
+    BeanProperty p = desc.getIdBinder().findBeanProperty(findPropColumn);
+    if (p == null) {
+      throw new RuntimeException("Could not find id property for " + findPropColumn);
+    }
 
     MColumn col = new MColumn(column, ctx.getColumnDefn(p, true), true);
     col.setPrimaryKey(true);
     table.addColumn(col);
-	}
+  }
 
 }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java
index 339bec4c5..7fb97ec5c 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -222,7 +222,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
   }
 
   @Override
-	public void visitScalar(BeanProperty p) {
+  public void visitScalar(BeanProperty p) {
 
     if (p.isSecondaryTable()) {
       lastColumn = null;
@@ -262,7 +262,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
 
     lastColumn = col;
     table.addColumn(col);
-	}
+  }
 
   /**
    * Build the check constraint clause given the db column and values.
diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/visitor/BeanVisitor.java b/src/main/java/com/avaje/ebean/dbmigration/model/visitor/BeanVisitor.java
index 3483c88d0..44f0fb8c8 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/visitor/BeanVisitor.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/visitor/BeanVisitor.java
@@ -9,10 +9,10 @@ import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
  */
 public interface BeanVisitor {
 
-	/**
-	 * Visit a BeanDescriptor and return a PropertyVisitor to use to visit each
+  /**
+   * Visit a BeanDescriptor and return a PropertyVisitor to use to visit each
    * property on the entity bean (return null to skip visiting this bean).
-	 */
+   */
   ModelBuildPropertyVisitor visitBean(BeanDescriptor<?> descriptor);
 
 }