Author: galder.zamarreno(a)jboss.com Date: 2008-05-16 03:36:32 -0400 (Fri, 16 May 2008) New Revision: 5863 Modified: core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java Log: [JBCACHE-1342] Default values now work for both setProperties() and individual property setting paths. Modified: core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java 2008-05-15 23:03:49 UTC (rev 5862) +++ core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java 2008-05-16 07:36:32 UTC (rev 5863) @@ -18,13 +18,23 @@ * The serialVersionUID */ private static final long serialVersionUID = -8371846151643130281L; - - private boolean createTable; + + private static final boolean CREATE_TABLE_DEFAULT = true; + private static final boolean DROP_TABLE_DEFAULT = false; + private static final String PARENT_COLUMN_DEFAULT = "parent"; + private static final String NODE_TYPE_DEFAULT = "blob"; + private static final String NODE_COLUMN_DEFAULT = "node"; + private static final String FQN_TYPE_DEFAULT = "varchar(255)"; + private static final String FQN_COLUMN_DEFAULT = "fqn"; + private static final String PRIMARY_KEY_DEFAULT = "jbosscache_pk"; + private static final String TABLE_DEFAULT = "jbosscache"; + + private boolean createTable = CREATE_TABLE_DEFAULT; private String createTableDDL; private String datasourceName; private String deleteAllSql; private String deleteNodeSql; - private boolean dropTable; + private boolean dropTable = DROP_TABLE_DEFAULT; private String dropTableDDL; private String driverClass; private String insertNodeSql; @@ -37,13 +47,13 @@ private String updateNodeSql; private String updateTableSql; private String connectionFactoryClass; - private String primaryKey; - private String fqnType; - private String nodeType; - private String parentColumn; - protected String table; - protected String nodeColumn; - protected String fqnColumn; + private String primaryKey = PRIMARY_KEY_DEFAULT; + private String fqnType = FQN_TYPE_DEFAULT; + private String nodeType = NODE_TYPE_DEFAULT; + private String parentColumn = PARENT_COLUMN_DEFAULT; + protected String table = TABLE_DEFAULT; + protected String nodeColumn = NODE_COLUMN_DEFAULT; + protected String fqnColumn = FQN_COLUMN_DEFAULT; public AdjListJDBCCacheLoaderConfig() { @@ -398,17 +408,17 @@ } String prop = props.getProperty("cache.jdbc.table.create"); - this.createTable = (prop == null || Boolean.valueOf(prop)); + this.createTable = prop == null ? CREATE_TABLE_DEFAULT : Boolean.valueOf(prop); prop = props.getProperty("cache.jdbc.table.drop"); - this.dropTable = prop == null ? false : Boolean.valueOf(prop); + this.dropTable = prop == null ? DROP_TABLE_DEFAULT : Boolean.valueOf(prop); - this.table = props.getProperty("cache.jdbc.table.name", "jbosscache"); - primaryKey = props.getProperty("cache.jdbc.table.primarykey", "jbosscache_pk"); - fqnColumn = props.getProperty("cache.jdbc.fqn.column", "fqn"); - fqnType = props.getProperty("cache.jdbc.fqn.type", "varchar(255)"); - nodeColumn = props.getProperty("cache.jdbc.node.column", "node"); - nodeType = props.getProperty("cache.jdbc.node.type", "blob"); - parentColumn = props.getProperty("cache.jdbc.parent.column", "parent"); + this.table = props.getProperty("cache.jdbc.table.name", TABLE_DEFAULT); + primaryKey = props.getProperty("cache.jdbc.table.primarykey", PRIMARY_KEY_DEFAULT); + fqnColumn = props.getProperty("cache.jdbc.fqn.column", FQN_COLUMN_DEFAULT); + fqnType = props.getProperty("cache.jdbc.fqn.type", FQN_TYPE_DEFAULT); + nodeColumn = props.getProperty("cache.jdbc.node.column", NODE_COLUMN_DEFAULT); + nodeType = props.getProperty("cache.jdbc.node.type", NODE_TYPE_DEFAULT); + parentColumn = props.getProperty("cache.jdbc.parent.column", PARENT_COLUMN_DEFAULT); selectChildNamesSql = constructSelectChildNamesSql(); deleteNodeSql = constructDeleteNodeSql();