[infinispan-commits] Infinispan SVN: r534 - in trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc: mixed and 1 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu Jul 9 07:36:59 EDT 2009
Author: vblagojevic at jboss.com
Date: 2009-07-09 07:36:59 -0400 (Thu, 09 Jul 2009)
New Revision: 534
Modified:
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java
Log:
annotate jdbc cache stores
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java 2009-07-09 11:27:49 UTC (rev 533)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java 2009-07-09 11:36:59 UTC (rev 534)
@@ -1,5 +1,8 @@
package org.infinispan.loaders.jdbc.binary;
+import org.infinispan.config.ConfigurationElement;
+import org.infinispan.config.ConfigurationElements;
+import org.infinispan.config.ConfigurationProperty;
import org.infinispan.loaders.LockSupportCacheStoreConfig;
import org.infinispan.loaders.jdbc.TableManipulation;
import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactoryConfig;
@@ -9,6 +12,10 @@
*
* @author Mircea.Markus at jboss.com
*/
+ at ConfigurationElements(elements = {
+ @ConfigurationElement(name = "loader", parent = "loaders",
+ description = "org.infinispan.loaders.jdbc.binary.JdbcBinaryCacheStoreConfig"),
+ @ConfigurationElement(name = "properties", parent = "loader") })
public class JdbcBinaryCacheStoreConfig extends LockSupportCacheStoreConfig {
private ConnectionFactoryConfig connectionFactoryConfig = new ConnectionFactoryConfig();
@@ -36,6 +43,8 @@
/**
* If true, and the table is missing it will be created when starting the cache store. Default to <tt>true</tt>.
*/
+ @ConfigurationProperty(name="createTableOnStart",
+ parentElement="properties")
public void setCreateTableOnStart(boolean createTableOnStart) {
testImmutability("tableManipulation");
tableManipulation.setCreateTableOnStart(createTableOnStart);
@@ -44,41 +53,59 @@
/**
* If true, the table will be created when cache store is stopped. Default to <tt>false</tt>.
*/
+ @ConfigurationProperty(name="dropTableOnExit",
+ parentElement="properties")
public void setDropTableOnExit(boolean dropTableOnExit) {
testImmutability("tableManipulation");
this.tableManipulation.setDropTableOnExit(dropTableOnExit);
}
+ @ConfigurationProperty(name="bucketTableName",
+ parentElement="properties")
public void setBucketTableName(String bucketTableName) {
testImmutability("tableManipulation");
this.tableManipulation.setTableName(bucketTableName);
}
+
+ @ConfigurationProperty(name="idColumnName",
+ parentElement="properties")
public void setIdColumnName(String idColumnName) {
testImmutability("tableManipulation");
this.tableManipulation.setIdColumnName(idColumnName);
}
+ @ConfigurationProperty(name="idColumnType",
+ parentElement="properties")
public void setIdColumnType(String idColumnType) {
testImmutability("tableManipulation");
this.tableManipulation.setIdColumnType(idColumnType);
}
+ @ConfigurationProperty(name="dataColumnName",
+ parentElement="properties")
public void setDataColumnName(String dataColumnName) {
testImmutability("tableManipulation");
this.tableManipulation.setDataColumnName(dataColumnName);
}
+ @ConfigurationProperty(name="dataColumnType",
+ parentElement="properties")
public void setDataColumnType(String dataColumnType) {
testImmutability("tableManipulation");
this.tableManipulation.setDataColumnType(dataColumnType);
}
+ @ConfigurationProperty(name="timestampColumnName",
+ parentElement="properties")
public void setTimestampColumnName(String timestampColumnName) {
testImmutability("tableManipulation");
this.tableManipulation.setTimestampColumnName(timestampColumnName);
}
+
+ @ConfigurationProperty(name="timestampColumnType",
+ parentElement="properties")
public void setTimestampColumnType(String timestampColumnType) {
testImmutability("tableManipulation");
this.tableManipulation.setTimestampColumnType(timestampColumnType);
@@ -87,6 +114,9 @@
/**
* Url connection to the database.
*/
+
+ @ConfigurationProperty(name="connectionUrl",
+ parentElement="properties")
public void setConnectionUrl(String connectionUrl) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setConnectionUrl(connectionUrl);
@@ -95,6 +125,8 @@
/**
* Databse user name.
*/
+ @ConfigurationProperty(name="userName",
+ parentElement="properties")
public void setUserName(String userName) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setUserName(userName);
@@ -103,6 +135,8 @@
/**
* Database username's password.
*/
+ @ConfigurationProperty(name="password",
+ parentElement="properties")
public void setPassword(String password) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setPassword(password);
@@ -111,6 +145,8 @@
/**
* Driver class, will be loaded before initializing the {@link org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactory}
*/
+ @ConfigurationProperty(name="driverClass",
+ parentElement="properties")
public void setDriverClass(String driverClass) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setDriverClass(driverClass);
@@ -121,6 +157,8 @@
*
* @see org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactory
*/
+ @ConfigurationProperty(name="connectionFactoryClass",
+ parentElement="properties")
public void setConnectionFactoryClass(String connectionFactoryClass) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setConnectionFactoryClass(connectionFactoryClass);
@@ -151,6 +189,8 @@
/**
* @see org.infinispan.loaders.jdbc.TableManipulation#getFetchSize()
*/
+ @ConfigurationProperty(name="fetchSize",
+ parentElement="properties")
public void setFetchSize(int fetchSize) {
testImmutability("tableManipulation");
this.tableManipulation.setFetchSize(fetchSize);
@@ -159,6 +199,8 @@
/**
* @see org.infinispan.loaders.jdbc.TableManipulation#getBatchSize()
*/
+ @ConfigurationProperty(name="batchSize",
+ parentElement="properties")
public void setBatchSize(int batchSize) {
testImmutability("tableManipulation");
this.tableManipulation.setBatchSize(batchSize);
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java 2009-07-09 11:27:49 UTC (rev 533)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java 2009-07-09 11:36:59 UTC (rev 534)
@@ -1,5 +1,8 @@
package org.infinispan.loaders.jdbc.mixed;
+import org.infinispan.config.ConfigurationElement;
+import org.infinispan.config.ConfigurationElements;
+import org.infinispan.config.ConfigurationProperty;
import org.infinispan.loaders.AbstractCacheStoreConfig;
import org.infinispan.loaders.LockSupportCacheStoreConfig;
import org.infinispan.loaders.jdbc.TableManipulation;
@@ -12,6 +15,10 @@
*
* @author Mircea.Markus at jboss.com
*/
+ at ConfigurationElements(elements = {
+ @ConfigurationElement(name = "loader", parent = "loaders",
+ description = "org.infinispan.loaders.jdbc.mixed.JdbcMixedCacheStoreConfig"),
+ @ConfigurationElement(name = "properties", parent = "loader") })
public class JdbcMixedCacheStoreConfig extends AbstractCacheStoreConfig {
private ConnectionFactoryConfig connectionFactoryConfig = new ConnectionFactoryConfig();
@@ -66,17 +73,23 @@
if (key2StringMapper != null) config.setKey2StringMapperClass(key2StringMapper);
return config;
}
-
+
+ @ConfigurationProperty(name="idColumnNameForStrings",
+ parentElement="properties")
public void setIdColumnNameForStrings(String idColumnNameForStrings) {
testImmutability("stringsTableManipulation");
this.stringsTableManipulation.setIdColumnName(idColumnNameForStrings);
}
+ @ConfigurationProperty(name="idColumnTypeForStrings",
+ parentElement="properties")
public void setIdColumnTypeForStrings(String idColumnTypeForStrings) {
testImmutability("stringsTableManipulation");
this.stringsTableManipulation.setIdColumnType(idColumnTypeForStrings);
}
+ @ConfigurationProperty(name="tableNameForStrings",
+ parentElement="properties")
public void setTableNameForStrings(String tableNameForStrings) {
testImmutability("stringsTableManipulation");
if (tableNameForStrings == null) throw new IllegalArgumentException("Null table name not allowed.");
@@ -86,45 +99,63 @@
this.stringsTableManipulation.setTableName(tableNameForStrings);
}
+ @ConfigurationProperty(name="dataColumnNameForStrings",
+ parentElement="properties")
public void setDataColumnNameForStrings(String dataColumnNameForStrings) {
testImmutability("stringsTableManipulation");
this.stringsTableManipulation.setDataColumnName(dataColumnNameForStrings);
}
+ @ConfigurationProperty(name="dataColumnTypeForStrings",
+ parentElement="properties")
public void setDataColumnTypeForStrings(String dataColumnTypeForStrings) {
testImmutability("stringsTableManipulation");
this.stringsTableManipulation.setDataColumnType(dataColumnTypeForStrings);
}
+ @ConfigurationProperty(name="timestampColumnNameForStrings",
+ parentElement="properties")
public void setTimestampColumnNameForStrings(String timestampColumnNameForStrings) {
testImmutability("stringsTableManipulation");
this.stringsTableManipulation.setTimestampColumnName(timestampColumnNameForStrings);
}
+ @ConfigurationProperty(name="timestampColumnTypeForStrings",
+ parentElement="properties")
public void setTimestampColumnTypeForStrings(String timestampColumnTypeForStrings) {
testImmutability("stringsTableManipulation");
this.stringsTableManipulation.setTimestampColumnType(timestampColumnTypeForStrings);
}
+ @ConfigurationProperty(name="createTableOnStartForStrings",
+ parentElement="properties")
public void setCreateTableOnStartForStrings(boolean createTableOnStartForStrings) {
testImmutability("stringsTableManipulation");
this.stringsTableManipulation.setCreateTableOnStart(createTableOnStartForStrings);
}
+ @ConfigurationProperty(name="dropTableOnExitForStrings",
+ parentElement="properties")
public void setDropTableOnExitForStrings(boolean dropTableOnExitForStrings) {
testImmutability("stringsTableManipulation");
this.stringsTableManipulation.setDropTableOnExit(dropTableOnExitForStrings);
}
+ @ConfigurationProperty(name="idColumnNameForBinary",
+ parentElement="properties")
public void setIdColumnNameForBinary(String idColumnNameForBinary) {
this.binaryTableManipulation.setIdColumnName(idColumnNameForBinary);
}
+ @ConfigurationProperty(name="idColumnTypeForBinary",
+ parentElement="properties")
public void setIdColumnTypeForBinary(String idColumnTypeForBinary) {
testImmutability("stringsTableManipulation");
this.binaryTableManipulation.setIdColumnType(idColumnTypeForBinary);
}
+ @ConfigurationProperty(name="tableNameForBinary",
+ parentElement="properties")
public void setTableNameForBinary(String tableNameForBinary) {
testImmutability("binaryTableManipulation");
if (tableNameForBinary == null) throw new IllegalArgumentException("Null table name not allowed.");
@@ -134,50 +165,70 @@
this.binaryTableManipulation.setTableName(tableNameForBinary);
}
+ @ConfigurationProperty(name="dataColumnNameForBinary",
+ parentElement="properties")
public void setDataColumnNameForBinary(String dataColumnNameForBinary) {
testImmutability("binaryTableManipulation");
this.binaryTableManipulation.setDataColumnName(dataColumnNameForBinary);
}
+ @ConfigurationProperty(name="dataColumnTypeForBinary",
+ parentElement="properties")
public void setDataColumnTypeForBinary(String dataColumnTypeForBinary) {
testImmutability("binaryTableManipulation");
this.binaryTableManipulation.setDataColumnType(dataColumnTypeForBinary);
}
+ @ConfigurationProperty(name="timestampColumnNameForBinary",
+ parentElement="properties")
public void setTimestampColumnNameForBinary(String timestampColumnNameForBinary) {
testImmutability("binaryTableManipulation");
this.binaryTableManipulation.setTimestampColumnName(timestampColumnNameForBinary);
}
+ @ConfigurationProperty(name="timestampColumnTypeForBinary",
+ parentElement="properties")
public void setTimestampColumnTypeForBinary(String timestampColumnTypeForBinary) {
this.binaryTableManipulation.setTimestampColumnType(timestampColumnTypeForBinary);
}
+ @ConfigurationProperty(name="createTableOnStartForBinary",
+ parentElement="properties")
public void setCreateTableOnStartForBinary(boolean createTableOnStartForBinary) {
testImmutability("binaryTableManipulation");
this.binaryTableManipulation.setCreateTableOnStart(createTableOnStartForBinary);
}
+ @ConfigurationProperty(name="dropTableOnExitForBinary",
+ parentElement="properties")
public void setDropTableOnExitForBinary(boolean dropTableOnExitForBinary) {
testImmutability("binaryTableManipulation");
this.binaryTableManipulation.setDropTableOnExit(dropTableOnExitForBinary);
}
+ @ConfigurationProperty(name="driverClass",
+ parentElement="properties")
public void setDriverClass(String driverClass) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setDriverClass(driverClass);
}
+ @ConfigurationProperty(name="connectionUrl",
+ parentElement="properties")
public void setConnectionUrl(String connectionUrl) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setConnectionUrl(connectionUrl);
}
+ @ConfigurationProperty(name="userName",
+ parentElement="properties")
public void setUserName(String userName) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setUserName(userName);
}
+ @ConfigurationProperty(name="password",
+ parentElement="properties")
public void setPassword(String password) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setPassword(password);
@@ -187,21 +238,29 @@
return connectionFactoryConfig;
}
+ @ConfigurationProperty(name="key2StringMapperClass",
+ parentElement="properties")
public void setKey2StringMapperClass(String name) {
testImmutability("key2StringMapper");
this.key2StringMapper = name;
}
+ @ConfigurationProperty(name="lockConcurrencyLevelForStrings",
+ parentElement="properties")
public void setLockConcurrencyLevelForStrings(int concurrencyLevel) {
testImmutability("stringsConcurrencyLevel");
this.stringsConcurrencyLevel = concurrencyLevel;
}
+ @ConfigurationProperty(name="lockConcurrencyLevelForBinary",
+ parentElement="properties")
public void setLockConcurrencyLevelForBinary(int concurrencyLevel) {
testImmutability("binaryConcurrencyLevel");
this.binaryConcurrencyLevel = concurrencyLevel;
}
+ @ConfigurationProperty(name="lockAcquistionTimeout",
+ parentElement="properties")
public void setLockAcquistionTimeout(int lockAcquistionTimeout) {
testImmutability("lockAcquistionTimeout");
this.lockAcquistionTimeout = lockAcquistionTimeout;
@@ -210,6 +269,8 @@
/**
* @see org.infinispan.loaders.jdbc.TableManipulation#getFetchSize()
*/
+ @ConfigurationProperty(name="fetchSize",
+ parentElement="properties")
public void setFetchSize(int fetchSize) {
testImmutability("tableManipulation");
this.binaryTableManipulation.setFetchSize(fetchSize);
@@ -219,6 +280,8 @@
/**
* @see org.infinispan.loaders.jdbc.TableManipulation#getBatchSize()
*/
+ @ConfigurationProperty(name="batchSize",
+ parentElement="properties")
public void setBatchSize(int batchSize) {
testImmutability("tableManipulation");
this.binaryTableManipulation.setBatchSize(batchSize);
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java 2009-07-09 11:27:49 UTC (rev 533)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java 2009-07-09 11:36:59 UTC (rev 534)
@@ -1,5 +1,8 @@
package org.infinispan.loaders.jdbc.stringbased;
+import org.infinispan.config.ConfigurationElement;
+import org.infinispan.config.ConfigurationElements;
+import org.infinispan.config.ConfigurationProperty;
import org.infinispan.loaders.LockSupportCacheStoreConfig;
import org.infinispan.loaders.jdbc.TableManipulation;
import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactoryConfig;
@@ -11,6 +14,10 @@
* @author Mircea.Markus at jboss.com
* @see org.infinispan.loaders.jdbc.stringbased.Key2StringMapper
*/
+ at ConfigurationElements(elements = {
+ @ConfigurationElement(name = "loader", parent = "loaders",
+ description = "org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStoreConfig"),
+ @ConfigurationElement(name = "properties", parent = "loader") })
public class JdbcStringBasedCacheStoreConfig extends LockSupportCacheStoreConfig {
private Key2StringMapper key2StringMapper;
@@ -50,6 +57,8 @@
*
* @see org.infinispan.loaders.jdbc.stringbased.Key2StringMapper
*/
+ @ConfigurationProperty(name="key2StringMapper",
+ parentElement="properties")
public void setKey2StringMapperClass(String className) {
testImmutability("key2StringMapper");
try {
@@ -62,6 +71,8 @@
/**
* Sets the name of the table where data will be stored.
*/
+ @ConfigurationProperty(name="stringsTableName",
+ parentElement="properties")
public void setStringsTableName(String stringsTableName) {
testImmutability("tableManipulation");
this.tableManipulation.setTableName(stringsTableName);
@@ -74,6 +85,8 @@
* </pre>
* Mandatory.
*/
+ @ConfigurationProperty(name="idColumnName",
+ parentElement="properties")
public void setIdColumnName(String idColumnName) {
testImmutability("tableManipulation");
this.tableManipulation.setIdColumnName(idColumnName);
@@ -82,6 +95,8 @@
/**
* Sets the name of the column where the StoredEntry will be binary stored. Mandatory.
*/
+ @ConfigurationProperty(name="dataColumnName",
+ parentElement="properties")
public void setDataColumnName(String dataColumnName) {
testImmutability("tableManipulation");
this.tableManipulation.setDataColumnName(dataColumnName);
@@ -90,11 +105,15 @@
/**
* Sets the name of the column where the timestamp (Long in java) will be stored. Mandatory.
*/
+ @ConfigurationProperty(name="timestampColumnName",
+ parentElement="properties")
public void setTimestampColumnName(String timestampColumnName) {
testImmutability("tableManipulation");
this.tableManipulation.setTimestampColumnName(timestampColumnName);
}
+ @ConfigurationProperty(name="connectionFactoryClass",
+ parentElement="properties")
public void setConnectionFactoryClass(String connectionFactoryClass) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setConnectionFactoryClass(connectionFactoryClass);
@@ -111,6 +130,8 @@
/**
* Jdbc connection string for connecting to the database. Mandatory.
*/
+ @ConfigurationProperty(name="connectionUrl",
+ parentElement="properties")
public void setConnectionUrl(String connectionUrl) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setConnectionUrl(connectionUrl);
@@ -119,6 +140,8 @@
/**
* Database username.
*/
+ @ConfigurationProperty(name="userName",
+ parentElement="properties")
public void setUserName(String userName) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setUserName(userName);
@@ -127,6 +150,8 @@
/**
* Database username's password.
*/
+ @ConfigurationProperty(name="password",
+ parentElement="properties")
public void setPassword(String password) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setPassword(password);
@@ -136,6 +161,8 @@
* The name of the driver used for connecting to the database. Mandatory, will be loaded before initiating the first
* connection.
*/
+ @ConfigurationProperty(name="driverClass",
+ parentElement="properties")
public void setDriverClass(String driverClassName) {
testImmutability("connectionFactoryConfig");
this.connectionFactoryConfig.setDriverClass(driverClassName);
@@ -144,6 +171,8 @@
/**
* sql equivalent for java's String. Mandatory.
*/
+ @ConfigurationProperty(name="idColumnType",
+ parentElement="properties")
public void setIdColumnType(String idColumnType) {
testImmutability("tableManipulation");
this.tableManipulation.setIdColumnType(idColumnType);
@@ -152,16 +181,23 @@
/**
* Sets the type of the column where data will be binary stored. BLOB-like type, DBMS dependent. Mandatory.
*/
+ @ConfigurationProperty(name="dataColumnType",
+ parentElement="properties")
public void setDataColumnType(String dataColumnType) {
testImmutability("tableManipulation");
this.tableManipulation.setDataColumnType(dataColumnType);
}
+ @ConfigurationProperty(name="dropTableOnExit",
+ parentElement="properties")
public void setDropTableOnExit(boolean dropTableOnExit) {
testImmutability("tableManipulation");
this.tableManipulation.setDropTableOnExit(dropTableOnExit);
}
+
+ @ConfigurationProperty(name="createTableOnStart",
+ parentElement="properties")
public void setCreateTableOnStart(boolean createTableOnStart) {
testImmutability("tableManipulation");
this.tableManipulation.setCreateTableOnStart(createTableOnStart);
@@ -184,6 +220,8 @@
/**
* @see org.infinispan.loaders.jdbc.TableManipulation#getFetchSize()
*/
+ @ConfigurationProperty(name="fetchSize",
+ parentElement="properties")
public void setFetchSize(int fetchSize) {
testImmutability("tableManipulation");
this.tableManipulation.setFetchSize(fetchSize);
@@ -192,6 +230,8 @@
/**
* @see org.infinispan.loaders.jdbc.TableManipulation#getBatchSize()
*/
+ @ConfigurationProperty(name="batchSize",
+ parentElement="properties")
public void setBatchSize(int batchSize) {
testImmutability("tableManipulation");
this.tableManipulation.setBatchSize(batchSize);
More information about the infinispan-commits
mailing list