User: dsundstrom
Date: 01/07/25 19:53:22
Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge
JDBCAbstractCMPFieldBridge.java
Log:
Remove constraint that funtion that opperate on the primary key object only
worked with cmp fields that were a member of the primary key. This allows
the cmp code to be reused for foreign keys, which are not members of the
primary key but need to opperate on the primary key.
Revision Changes Path
1.2 +8 -20
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/JDBCAbstractCMPFieldBridge.java
Index: JDBCAbstractCMPFieldBridge.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/JDBCAbstractCMPFieldBridge.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDBCAbstractCMPFieldBridge.java 2001/07/09 23:53:57 1.1
+++ JDBCAbstractCMPFieldBridge.java 2001/07/26 02:53:22 1.2
@@ -41,7 +41,7 @@
* One for each entity bean cmp field.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class JDBCAbstractCMPFieldBridge implements JDBCCMPFieldBridge {
protected JDBCStoreManager manager;
@@ -49,12 +49,15 @@
protected JDBCType jdbcType;
protected Log log;
- public JDBCAbstractCMPFieldBridge(JDBCStoreManager manager,
JDBCCMPFieldMetaData metadata, Log log) throws DeploymentException {
+ public JDBCAbstractCMPFieldBridge(JDBCStoreManager manager,
JDBCCMPFieldMetaData metadata) throws DeploymentException {
+ this(manager, metadata,
manager.getJDBCTypeFactory().getFieldJDBCType(metadata));
+ }
+
+ public JDBCAbstractCMPFieldBridge(JDBCStoreManager manager,
JDBCCMPFieldMetaData metadata, JDBCType jdbcType) throws DeploymentException {
this.manager = manager;
this.metadata = metadata;
- this.log = log;
-
- jdbcType = manager.getJDBCTypeFactory().getFieldJDBCType(metadata);
+ this.jdbcType = jdbcType;
+ this.log = manager.getLog();
}
public JDBCCMPFieldMetaData getMetaData() {
@@ -80,10 +83,6 @@
}
public Object getPrimaryKeyValue(Object primaryKey) throws
IllegalArgumentException {
- if(!isPrimaryKeyMember()) {
- throw new IllegalArgumentException(getFieldName() + " is not a
member of the primary key.");
- }
-
try {
if(metadata.getPrimaryKeyField() != null) {
if(primaryKey == null) {
@@ -103,10 +102,6 @@
}
public Object setPrimaryKeyValue(Object primaryKey, Object value) throws
IllegalArgumentException {
- if(!isPrimaryKeyMember()) {
- throw new IllegalArgumentException(getFieldName() + " is not a
member of the primary key.");
- }
-
try {
if(metadata.getPrimaryKeyField() != null) {
// if we are tring to set a null value
@@ -175,9 +170,6 @@
}
public int setPrimaryKeyParameters(PreparedStatement ps, int parameterIndex,
Object primaryKey) throws IllegalArgumentException {
- if(!isPrimaryKeyMember()) {
- throw new IllegalArgumentException(getFieldName() + " is not a
member of the primary key.");
- }
Object primaryKeyValue = getPrimaryKeyValue(primaryKey);
return setArgumentParameters(ps, parameterIndex, primaryKeyValue);
}
@@ -217,10 +209,6 @@
}
public int loadPrimaryKeyResults(ResultSet rs, int parameterIndex, Object[]
pkRef) throws IllegalArgumentException {
- if(!isPrimaryKeyMember()) {
- throw new IllegalArgumentException(getFieldName() + " is not a
member of the primary key.");
- }
-
try {
// value of this field, will be filled in below
Object value = null;
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
