cleanup, using CompileStatic, inlined the template

Author: burtbeckwith

.gitignore

@@ -6,5 +6,6 @@ target
 /grails-db-reverse-engineer-*.zip
 /grails-db-reverse-engineer-*.zip.sha1
 /plugin.xml
+/test-app/grails-app/domain
 /test-app/web-app/WEB-INF/tld
 /web-app

scripts/DbReverseEngineer.groovy

@@ -33,7 +33,7 @@ target(dbReverseEngineer: 'Reverse-engineers a database and creates domain class
 
 		event('StatusUpdate', ["Starting database reverse engineering, connecting to '$mergedConfig.url' as '$mergedConfig.username' ..."])
 
-		runner.run mergedConfig, metadata['app.name']
+		runner.run mergedConfig
 
 		event('StatusUpdate', ['Finished database reverse engineering'])
 	}
@@ -45,16 +45,34 @@ target(dbReverseEngineer: 'Reverse-engineers a database and creates domain class
 
 protected  Map buildMergedConfig() {
 
-	def mergedConfig = [:]
+	def mergedConfig = [
+		alwaysMapManyToManyTables: false,
+		defaultCatalog: '',
+		defaultSchema: '',
+		excludeColumnAntPatterns: [:],
+		excludeColumnRegexes: [:],
+		excludeColumns: [:],
+		excludeTableAntPatterns: [],
+		excludeTableRegexes: [],
+		excludeTables: [],
+		includeTableAntPatterns: [],
+		includeTableRegexes: [],
+		includeTables: [],
+		manyToManyBelongsTos: [:],
+		manyToManyTables: [],
+		mappedManyToManyTables: [],
+		overwriteExisting: true,
+		versionColumns: [:]
+	]
 
 	def dsConfig = config.dataSource
 
 	mergedConfig.driverClassName = dsConfig.driverClassName ?: 'org.h2.Driver'
 	mergedConfig.password = dsConfig.password ?: ''
 	mergedConfig.username = dsConfig.username ?: 'sa'
 	mergedConfig.url = dsConfig.url ?: 'jdbc:h2:mem:testDB'
-	if (dsConfig.dialect instanceof String) {
-		mergedConfig.dialect = dsConfig.dialect
+	if (dsConfig.dialect instanceof CharSequence) {
+		mergedConfig.dialect = dsConfig.dialect.toString()
 	}
 	else if (dsConfig.dialect instanceof Class) {
 		mergedConfig.dialect = dsConfig.dialect.name
@@ -72,23 +90,19 @@ protected  Map buildMergedConfig() {
 	if (revengConfig.overwriteExisting instanceof Boolean) {
 		mergedConfig.overwriteExisting = revengConfig.overwriteExisting
 	}
-	else {
-		mergedConfig.overwriteExisting = true
-	}
 
 	if (revengConfig.alwaysMapManyToManyTables instanceof Boolean) {
 		mergedConfig.alwaysMapManyToManyTables = revengConfig.alwaysMapManyToManyTables
 	}
-	else {
-		mergedConfig.alwaysMapManyToManyTables = false
-	}
 
 	for (String name in ['versionColumns', 'manyToManyTables', 'manyToManyBelongsTos',
 	                     'includeTables', 'includeTableRegexes', 'includeTableAntPatterns',
 	                     'excludeTables', 'excludeTableRegexes', 'excludeTableAntPatterns',
 	                     'excludeColumns', 'excludeColumnRegexes', 'excludeColumnAntPatterns',
 	                     'mappedManyToManyTables']) {
-		mergedConfig[name] = revengConfig[name]
+		if (revengConfig[name]) {
+			mergedConfig[name] = revengConfig[name]
+		}
 	}
 
 	mergedConfig

src/groovy/grails/plugin/reveng/GrailsCfg2JavaTool.groovy

@@ -14,6 +14,9 @@
  */
 package grails.plugin.reveng
 
+import groovy.transform.CompileStatic
+import groovy.util.logging.Slf4j
+
 import org.hibernate.cfg.Configuration
 import org.hibernate.mapping.PersistentClass
 import org.hibernate.tool.hbm2x.Cfg2HbmTool
@@ -25,13 +28,15 @@ import org.hibernate.tool.hbm2x.pojo.POJOClass
  *
  * @author <a href='mailto:[email protected]'>Burt Beckwith</a>
  */
+@CompileStatic
+@Slf4j
 class GrailsCfg2JavaTool extends Cfg2JavaTool {
 
 	protected Cfg2HbmTool c2h
 	protected Configuration configuration
-	protected ConfigObject revengConfig
+	protected Map revengConfig
 
-	GrailsCfg2JavaTool(Cfg2HbmTool c2h, Configuration configuration, ConfigObject revengConfig) {
+	GrailsCfg2JavaTool(Cfg2HbmTool c2h, Configuration configuration, Map revengConfig) {
 		this.c2h = c2h
 		this.configuration = configuration
 		this.revengConfig = revengConfig