commit 3b8d5560d64e0cf3e74f38733350aedc52eb648e
author Shawn O. Pearce <sop@google.com> Fri May 28 18:12:32 2010 -0700
committer Shawn O. Pearce <sop@google.com> Fri May 28 18:57:27 2010 -0700
tree ecaaf8d08f0534048bb7b63cd3d9127349b387b2
parent 97d147d4d73d864e302e7430e77cd158e2938c9f

Remove the pointless WeakReference based schema factory

Using a WeakHashMap to cache transient objects which are created in
our constructor and quickly discarded is useless.  Its very likely the
GC will purge these, and the map will lose the binding, so we just
generate the code again later.

Besides, applications aren't supposed to create Database objects
often.  Instead they create them once and hold onto it, resuing
the object as a factory/connection pool.

Change-Id: Ia6dc43757443ca60820c066393a1746fc7a2f001
Signed-off-by: Shawn O. Pearce <sop@google.com>

src/main/java/com/google/gwtorm/jdbc/Database.java

diff --git a/src/main/java/com/google/gwtorm/jdbc/Database.java b/src/main/java/com/google/gwtorm/jdbc/Database.java
index a38974f..aa48022 100644
--- a/src/main/java/com/google/gwtorm/jdbc/Database.java
+++ b/src/main/java/com/google/gwtorm/jdbc/Database.java
@@ -31,9 +31,6 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.Collections;
-import java.util.Map;
-import java.util.WeakHashMap;
 
 import javax.sql.DataSource;
 
@@ -53,36 +50,6 @@
  * @param <T>
  */
 public class Database<T extends Schema> implements SchemaFactory<T> {
-  private static final Map<SchemaKey, String> schemaFactoryNames =
-      Collections.synchronizedMap(new WeakHashMap<SchemaKey, String>());
-
-  private static class SchemaKey {
-    final Class<?> schema;
-    final SqlDialect dialect;
-
-    SchemaKey(Class<?> s, SqlDialect d) {
-      schema = s;
-      dialect = d;
-    }
-
-    @Override
-    public int hashCode() {
-      return schema.hashCode() * 31 + dialect.getClass().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      if (o instanceof SchemaKey) {
-        SchemaKey a = this;
-        SchemaKey b = (SchemaKey) o;
-
-        return a.schema == b.schema
-            && a.dialect.getClass() == b.dialect.getClass();
-      }
-      return false;
-    }
-  }
-
   static {
     KeyUtil.setEncoderImpl(new StandardKeyEncoder());
   }
@@ -132,35 +99,15 @@
 
     schemaModel = new JavaSchemaModel(schema);
     final GeneratedClassLoader loader = newLoader(schema);
-    final SchemaKey key = new SchemaKey(schema, dialect);
-    final String cachedName = schemaFactoryNames.get(key);
-    SchemaFactory<T> factory = null;
-    if (cachedName != null) {
-      factory = newFactory(loader, cachedName);
-    }
-    if (factory == null) {
-      Class<T> impl =
-          (Class<T>) new SchemaGen(loader, schemaModel, dialect).create();
-      factory = new SchemaConstructorGen<T>(loader, impl, this).create();
-      schemaFactoryNames.put(key, factory.getClass().getName());
-    }
-    implFactory = factory;
+    final Class<T> impl = generate(dialect, loader);
+    implFactory = new SchemaConstructorGen<T>(loader, impl, this).create();
     implDialect = dialect;
   }
 
   @SuppressWarnings("unchecked")
-  private SchemaFactory<T> newFactory(final ClassLoader cl,
-      final String name) {
-    try {
-      final Class<?> ft = Class.forName(name, true, cl);
-      return (SchemaFactory<T>) ft.newInstance();
-    } catch (InstantiationException e) {
-      return null;
-    } catch (IllegalAccessException e) {
-      return null;
-    } catch (ClassNotFoundException e) {
-      return null;
-    }
+  private Class<T> generate(SqlDialect dialect,
+      final GeneratedClassLoader loader) throws OrmException {
+    return (Class<T>) new SchemaGen(loader, schemaModel, dialect).create();
   }
 
   SqlDialect getDialect() {