added generics on Map instances, avoided unnecessary casts

finalized non mutable fields

Author: simotripo

src/main/java/org/apache/ibatis/metadata/Database.java

@@ -6,10 +6,10 @@
 
 public class Database {
 
-  private String catalog;
-  private String schema;
+  private final String catalog;
+  private final String schema;
 
-  private Map tables = new HashMap();
+  private final Map<String, Table> tables = new HashMap<String, Table>();
 
   public Database(String catalog, String schema) {
     this.catalog = catalog;
@@ -29,11 +29,11 @@ public void addTable(Table table) {
   }
 
   public Table getTable(String name) {
-    return (Table) tables.get(name.toUpperCase(Locale.ENGLISH));
+    return tables.get(name.toUpperCase(Locale.ENGLISH));
   }
 
   public String[] getTableNames() {
-    return (String[]) tables.keySet().toArray(new String[tables.size()]);
+    return tables.keySet().toArray(new String[tables.size()]);
   }
 
   public boolean equals(Object o) {

src/main/java/org/apache/ibatis/metadata/Table.java

@@ -5,10 +5,10 @@
 import java.util.Map;
 
 public class Table {
-  private String name;
+  private final String name;
   private String catalog;
   private String schema;
-  private Map columns = new HashMap();
+  private final Map<String, Column> columns = new HashMap<String, Column>();
   private Column primaryKey;
 
   public Table(String name) {
@@ -40,11 +40,11 @@ public void addColumn(Column col) {
   }
 
   public Column getColumn(String name) {
-    return (Column) columns.get(name.toUpperCase(Locale.ENGLISH));
+    return columns.get(name.toUpperCase(Locale.ENGLISH));
   }
 
   public String[] getColumnNames() {
-    return (String[]) columns.keySet().toArray(new String[columns.size()]);
+    return columns.keySet().toArray(new String[columns.size()]);
   }
 
   public void setPrimaryKey(Column column) {