From 61b62704898e20ba992486b1ac57ab9c0ee1a029 Mon Sep 17 00:00:00 2001 From: chenson42 Date: Tue, 29 Jun 2010 00:43:21 +0000 Subject: [PATCH] move the H2 platform over to the symmetric-ddl project --- .../jumpmind/symmetric/ddl/PlatformFactory.java | 5 +++++ .../symmetric/ddl/platform/JdbcModelReader.java | 8 ++++---- .../symmetric/ddl/platform}/h2/H2Builder.java | 2 +- .../symmetric/ddl/platform}/h2/H2ModelReader.java | 14 ++++---------- .../symmetric/ddl/platform}/h2/H2Platform.java | 2 +- .../jumpmind/symmetric/db/DbDialectFactory.java | 2 +- .../symmetric/ddlutils/PlatformFactory.java | 5 ----- .../platform}/h2/H2PlatformUnitTest.java | 3 +-- 8 files changed, 17 insertions(+), 24 deletions(-) rename symmetric/{symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils => symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform}/h2/H2Builder.java (99%) rename symmetric/{symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils => symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform}/h2/H2ModelReader.java (91%) rename symmetric/{symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils => symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform}/h2/H2Platform.java (98%) rename symmetric/symmetric-ds/src/test/java/org/jumpmind/symmetric/{db => ddl/platform}/h2/H2PlatformUnitTest.java (98%) diff --git a/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/PlatformFactory.java b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/PlatformFactory.java index 46ed046cdd..efcf22d17b 100644 --- a/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/PlatformFactory.java +++ b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/PlatformFactory.java @@ -30,6 +30,7 @@ import org.jumpmind.symmetric.ddl.platform.db2.Db2v8Platform; import org.jumpmind.symmetric.ddl.platform.derby.DerbyPlatform; import org.jumpmind.symmetric.ddl.platform.firebird.FirebirdPlatform; +import org.jumpmind.symmetric.ddl.platform.h2.H2Platform; import org.jumpmind.symmetric.ddl.platform.hsqldb.HsqlDbPlatform; import org.jumpmind.symmetric.ddl.platform.hsqldb2.HsqlDb2Platform; import org.jumpmind.symmetric.ddl.platform.informix.InformixPlatform; @@ -186,6 +187,10 @@ public static synchronized void registerPlatform(String platformName, Class readColumns(DatabaseMetaDataWrapper metaData, String tableName) throws SQLException { ResultSet columnData = null; @@ -746,11 +746,11 @@ protected Collection readColumns(DatabaseMetaDataWrapper metaData, String tableN { columnData = metaData.getColumns(tableName, getDefaultColumnPattern()); - List columns = new ArrayList(); + List columns = new ArrayList(); while (columnData.next()) { - Map values = readColumns(columnData, getColumnsForColumn()); + Map values = readColumns(columnData, getColumnsForColumn()); columns.add(readColumn(metaData, values)); } @@ -772,7 +772,7 @@ protected Collection readColumns(DatabaseMetaDataWrapper metaData, String tableN * @param values The column meta data values as defined by {@link #getColumnsForColumn()} * @return The column */ - protected Column readColumn(DatabaseMetaDataWrapper metaData, Map values) throws SQLException + protected Column readColumn(DatabaseMetaDataWrapper metaData, Map values) throws SQLException { Column column = new Column(); diff --git a/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils/h2/H2Builder.java b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/h2/H2Builder.java similarity index 99% rename from symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils/h2/H2Builder.java rename to symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/h2/H2Builder.java index 3361bc6ccf..93d88c065c 100644 --- a/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils/h2/H2Builder.java +++ b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/h2/H2Builder.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package org.jumpmind.symmetric.ddlutils.h2; +package org.jumpmind.symmetric.ddl.platform.h2; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils/h2/H2ModelReader.java b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/h2/H2ModelReader.java similarity index 91% rename from symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils/h2/H2ModelReader.java rename to symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/h2/H2ModelReader.java index 661ebafcb5..74a3eb59e4 100644 --- a/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils/h2/H2ModelReader.java +++ b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/h2/H2ModelReader.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.ddlutils.h2; +package org.jumpmind.symmetric.ddl.platform.h2; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,8 +24,6 @@ import java.util.List; import java.util.Map; -import org.jumpmind.symmetric.common.logging.ILog; -import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.ddl.Platform; import org.jumpmind.symmetric.ddl.model.Column; import org.jumpmind.symmetric.ddl.model.ForeignKey; @@ -43,8 +41,6 @@ */ public class H2ModelReader extends JdbcModelReader { - final ILog logger = LogFactory.getLog(getClass()); - /** * Creates a new model reader for H2 databases. * @@ -58,8 +54,7 @@ public H2ModelReader(Platform platform) { } @Override - @SuppressWarnings("unchecked") - protected Column readColumn(DatabaseMetaDataWrapper metaData, Map values) throws SQLException { + protected Column readColumn(DatabaseMetaDataWrapper metaData, Map values) throws SQLException { Column column = super.readColumn(metaData, values); if (values.get("CHARACTER_MAXIMUM_LENGTH") != null) { column.setSize(values.get("CHARACTER_MAXIMUM_LENGTH").toString()); @@ -76,10 +71,9 @@ protected Column readColumn(DatabaseMetaDataWrapper metaData, Map values) throws return column; } - @SuppressWarnings("unchecked") @Override - protected List initColumnsForColumn() { - List result = new ArrayList(); + protected List initColumnsForColumn() { + List result = new ArrayList(); result.add(new MetaDataColumnDescriptor("COLUMN_DEF", 12)); result.add(new MetaDataColumnDescriptor("COLUMN_DEFAULT", 12)); result.add(new MetaDataColumnDescriptor("TABLE_NAME", 12)); diff --git a/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils/h2/H2Platform.java b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/h2/H2Platform.java similarity index 98% rename from symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils/h2/H2Platform.java rename to symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/h2/H2Platform.java index 1c15cf024d..64f995b954 100644 --- a/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils/h2/H2Platform.java +++ b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/h2/H2Platform.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.ddlutils.h2; +package org.jumpmind.symmetric.ddl.platform.h2; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/db/DbDialectFactory.java b/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/db/DbDialectFactory.java index d64e1627d1..bdd78974c5 100644 --- a/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/db/DbDialectFactory.java +++ b/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/db/DbDialectFactory.java @@ -29,6 +29,7 @@ import org.jumpmind.symmetric.ddl.platform.db2.Db2Platform; import org.jumpmind.symmetric.ddl.platform.derby.DerbyPlatform; import org.jumpmind.symmetric.ddl.platform.firebird.FirebirdPlatform; +import org.jumpmind.symmetric.ddl.platform.h2.H2Platform; import org.jumpmind.symmetric.ddl.platform.hsqldb.HsqlDbPlatform; import org.jumpmind.symmetric.ddl.platform.hsqldb2.HsqlDb2Platform; import org.jumpmind.symmetric.ddl.platform.informix.InformixPlatform; @@ -39,7 +40,6 @@ import org.jumpmind.symmetric.ddl.platform.oracle.Oracle9Platform; import org.jumpmind.symmetric.ddl.platform.postgresql.PostgreSqlPlatform; import org.jumpmind.symmetric.ddlutils.PlatformFactory; -import org.jumpmind.symmetric.ddlutils.h2.H2Platform; import org.jumpmind.symmetric.ddlutils.sqlite.SqLitePlatform; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; diff --git a/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils/PlatformFactory.java b/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils/PlatformFactory.java index 71abdefac6..872efd5183 100644 --- a/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils/PlatformFactory.java +++ b/symmetric/symmetric-ds/src/main/java/org/jumpmind/symmetric/ddlutils/PlatformFactory.java @@ -10,7 +10,6 @@ import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.ddl.Platform; import org.jumpmind.symmetric.ddl.platform.mssql.MSSqlPlatform; -import org.jumpmind.symmetric.ddlutils.h2.H2Platform; import org.jumpmind.symmetric.ddlutils.oracle.OraclePlatform; import org.jumpmind.symmetric.ddlutils.sqlite.SqLitePlatform; import org.springframework.dao.DataAccessException; @@ -107,10 +106,6 @@ private synchronized static void initPlatforms() { SqLitePlatform.class); org.jumpmind.symmetric.ddl.PlatformFactory.registerPlatform(OraclePlatform.DATABASENAME, OraclePlatform.class); - for (String name : H2Platform.DATABASENAMES) { - org.jumpmind.symmetric.ddl.PlatformFactory.registerPlatform(name, - H2Platform.class); - } initialized = true; } } diff --git a/symmetric/symmetric-ds/src/test/java/org/jumpmind/symmetric/db/h2/H2PlatformUnitTest.java b/symmetric/symmetric-ds/src/test/java/org/jumpmind/symmetric/ddl/platform/h2/H2PlatformUnitTest.java similarity index 98% rename from symmetric/symmetric-ds/src/test/java/org/jumpmind/symmetric/db/h2/H2PlatformUnitTest.java rename to symmetric/symmetric-ds/src/test/java/org/jumpmind/symmetric/ddl/platform/h2/H2PlatformUnitTest.java index 0a832afb37..4366ac0360 100644 --- a/symmetric/symmetric-ds/src/test/java/org/jumpmind/symmetric/db/h2/H2PlatformUnitTest.java +++ b/symmetric/symmetric-ds/src/test/java/org/jumpmind/symmetric/ddl/platform/h2/H2PlatformUnitTest.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.db.h2; +package org.jumpmind.symmetric.ddl.platform.h2; import java.sql.Connection; import java.sql.DriverManager; @@ -11,7 +11,6 @@ import org.jumpmind.symmetric.ddl.model.Column; import org.jumpmind.symmetric.ddl.model.Database; import org.jumpmind.symmetric.ddl.model.Table; -import org.jumpmind.symmetric.ddlutils.h2.H2Platform; import org.junit.Test; import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; import org.springframework.jdbc.datasource.SingleConnectionDataSource;