Fixed Maven and compiler warnings

Author: ericbn

db-migrator/src/main/java/org/javalite/db_migrator/Migration.java

@@ -11,13 +11,13 @@
 import static org.javalite.db_migrator.DbUtils.exec;
 
 
-public class Migration implements Comparable {
+public class Migration implements Comparable<Migration> {
     private static final Logger logger = LoggerFactory.getLogger(Migration.class);
     private static final String DEFAULT_DELIMITER = ";";
     private static final String DEFAULT_DELIMITER_KEYWORD = "DELIMITER";
 
-    private File migrationFile;
-    private String version;
+    private final File migrationFile;
+    private final String version;
 
     public Migration(String version, File migrationFile) {
         this.migrationFile = migrationFile;
@@ -99,8 +99,7 @@ private boolean commentLine(String line) {
         return line.startsWith("--") || line.startsWith("#") || line.startsWith("//");
     }
 
-    public int compareTo(Object o) {
-        Migration other = (Migration) o;
+    public int compareTo(Migration other) {
         return this.getVersion().compareTo(other.getVersion());
     }
 }

db-migrator/src/main/java/org/javalite/db_migrator/VersionStrategy.java

@@ -13,6 +13,16 @@
 import static org.javalite.db_migrator.DatabaseType.SQL_SERVER;
 import static org.javalite.db_migrator.DbUtils.*;
 
+
+class DefaultMap extends HashMap<DatabaseType, String> {
+    private final String DEFAULT_VALUE = "create table %s (%s varchar(32) not null unique, %s timestamp not null, %s int not null)";
+
+    @Override
+    public String get(Object key) {
+        return containsKey(key) ? super.get(key) : DEFAULT_VALUE;
+    }
+}
+
 /**
  * A trivial VersionStrategy which tracks only the minimal information required to note the current state of the database: the current version.
  */
@@ -24,17 +34,7 @@ public class VersionStrategy {
 
     private static final Logger logger = LoggerFactory.getLogger(VersionStrategy.class);
 
-
-    private static final Map CREATE_VERSION_TABLE_MAP;
-
-    static class DefaultMap extends HashMap<DatabaseType, String> {
-        private String defaultValue = "create table %s (%s varchar(32) not null unique, %s timestamp not null, %s int not null)";
-
-        @Override
-        public String get(Object key) {
-            return containsKey(key) ? super.get(key) : defaultValue;
-        }
-    }
+    private static final Map<DatabaseType, String> CREATE_VERSION_TABLE_MAP;
 
     static {
         CREATE_VERSION_TABLE_MAP = new DefaultMap();
@@ -44,7 +44,7 @@ public String get(Object key) {
 
 
     public void createSchemaVersionTable(DatabaseType dbType) {
-        String ddl = format((String) CREATE_VERSION_TABLE_MAP.get(dbType), VERSION_TABLE, VERSION_COLUMN, APPLIED_DATE_COLUMN, DURATION_COLUMN);
+        String ddl = format(CREATE_VERSION_TABLE_MAP.get(dbType), VERSION_TABLE, VERSION_COLUMN, APPLIED_DATE_COLUMN, DURATION_COLUMN);
         exec(ddl);
     }
 

db-migrator/src/main/java/org/javalite/db_migrator/maven/AbstractDbMigrationMojo.java

@@ -13,7 +13,7 @@
 public abstract class AbstractDbMigrationMojo extends AbstractMigrationMojo {
 
     /**
-     * @parameter expression="${basedir}"
+     * @parameter property="basedir"
      * @required
      * @readonly
      */

db-migrator/src/main/java/org/javalite/db_migrator/maven/AbstractMigrationMojo.java

@@ -6,7 +6,7 @@
 public abstract class AbstractMigrationMojo extends AbstractMojo {
 
     /**
-     * @parameter expression="${project}"
+     * @parameter property="project"
      * @required
      */
     protected MavenProject project;

git-info-maven-plugin/src/main/java/org/javalite/maven/GitInfoPlugin.java

@@ -38,7 +38,7 @@ public class GitInfoPlugin extends AbstractMojo {
     /**
      * The enclosing project.
      *
-     * @parameter expression="${project}"
+     * @parameter property="project"
      * @required
      * @readonly
      */