User: dsundstrom
Date: 01/07/25 20:01:26
Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge
JDBCCMP1xFieldBridge.java JDBCCMP2xFieldBridge.java
JDBCEntityBridge.java
Log:
Removed passing of log objects, which can be obtained directly from the store
manager.
Other minor changed because of changes in the metadata package.
Revision Changes Path
1.3 +4 -4
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/JDBCCMP1xFieldBridge.java
Index: JDBCCMP1xFieldBridge.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/JDBCCMP1xFieldBridge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JDBCCMP1xFieldBridge.java 2001/07/09 23:53:57 1.2
+++ JDBCCMP1xFieldBridge.java 2001/07/26 03:01:26 1.3
@@ -36,16 +36,16 @@
* One for each entity bean cmp field.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class JDBCCMP1xFieldBridge extends JDBCAbstractCMPFieldBridge {
protected Field field;
- public JDBCCMP1xFieldBridge(JDBCStoreManager manager, JDBCCMPFieldMetaData
metadata, Log log) throws DeploymentException {
- super(manager, metadata, log);
+ public JDBCCMP1xFieldBridge(JDBCStoreManager manager, JDBCCMPFieldMetaData
metadata) throws DeploymentException {
+ super(manager, metadata);
try {
- field =
metadata.getJDBCEntity().getEntityClass().getField(getFieldName());
+ field =
manager.getMetaData().getEntityClass().getField(getFieldName());
} catch(NoSuchFieldException e) {
// Non recoverable internal exception
throw new DeploymentException("No field named '" +
getFieldName() + "' found in entity class.");
1.3 +8 -3
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/JDBCCMP2xFieldBridge.java
Index: JDBCCMP2xFieldBridge.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/JDBCCMP2xFieldBridge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JDBCCMP2xFieldBridge.java 2001/07/09 23:53:57 1.2
+++ JDBCCMP2xFieldBridge.java 2001/07/26 03:01:26 1.3
@@ -16,6 +16,7 @@
import org.jboss.ejb.plugins.cmp.CMPStoreManager;
import org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager;
+import org.jboss.ejb.plugins.cmp.jdbc.JDBCType;
import org.jboss.ejb.plugins.cmp.jdbc.metadata.JDBCCMPFieldMetaData;
import org.jboss.logging.Log;
@@ -33,11 +34,15 @@
* One for each entity bean cmp field.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class JDBCCMP2xFieldBridge extends JDBCAbstractCMPFieldBridge {
- public JDBCCMP2xFieldBridge(JDBCStoreManager manager, JDBCCMPFieldMetaData
metadata, Log log) throws DeploymentException {
- super(manager, metadata, log);
+ public JDBCCMP2xFieldBridge(JDBCStoreManager manager, JDBCCMPFieldMetaData
metadata) throws DeploymentException {
+ super(manager, metadata);
+ }
+
+ public JDBCCMP2xFieldBridge(JDBCStoreManager manager, JDBCCMPFieldMetaData
metadata, JDBCType jdbcType) throws DeploymentException {
+ super(manager, metadata, jdbcType);
}
public Object getInstanceValue(EntityEnterpriseContext ctx) {
1.4 +14 -14
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/JDBCEntityBridge.java
Index: JDBCEntityBridge.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/JDBCEntityBridge.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JDBCEntityBridge.java 2001/07/09 23:53:57 1.3
+++ JDBCEntityBridge.java 2001/07/26 03:01:26 1.4
@@ -51,7 +51,7 @@
* One per cmp entity bean type.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class JDBCEntityBridge implements EntityBridge {
protected JDBCEntityMetaData metadata;
@@ -84,14 +84,14 @@
protected void loadCMPFields(JDBCEntityMetaData metadata) throws
DeploymentException {
// map between field names and field objects
- cmpFieldsByName = new HashMap(metadata.getCMPFieldCount());
+ cmpFieldsByName = new HashMap(metadata.getCMPFields().size());
// non primary key cmp fields
- ArrayList cmpFieldList = new ArrayList(metadata.getCMPFieldCount());
+ ArrayList cmpFieldList = new ArrayList(metadata.getCMPFields().size());
// primary key cmp fields
- ArrayList pkFieldList = new ArrayList(metadata.getCMPFieldCount());
+ ArrayList pkFieldList = new ArrayList(metadata.getCMPFields().size());
// create each field
- Iterator iter = metadata.getCMPFields();
+ Iterator iter = metadata.getCMPFields().iterator();
while(iter.hasNext()) {
JDBCCMPFieldMetaData cmpFieldMetaData =
(JDBCCMPFieldMetaData)iter.next();
JDBCCMPFieldBridge cmpField = createCMPField(metadata,
cmpFieldMetaData);
@@ -118,8 +118,8 @@
}
protected void loadEagerLoadFields(JDBCEntityMetaData metadata) throws
DeploymentException {
- ArrayList fields = new ArrayList(metadata.getCMPFieldCount());
- Iterator iter = metadata.getEagerLoadFields();
+ ArrayList fields = new ArrayList(metadata.getCMPFields().size());
+ Iterator iter = metadata.getEagerLoadFields().iterator();
while(iter.hasNext()) {
JDBCCMPFieldMetaData field = (JDBCCMPFieldMetaData)iter.next();
fields.add(getExistingCMPFieldByName(field.getFieldName()));
@@ -131,7 +131,7 @@
protected void loadLazyLoadGroups(JDBCEntityMetaData metadata) throws
DeploymentException {
lazyLoadGroups = new ArrayList();
- Iterator groups = metadata.getLazyLoadGroups();
+ Iterator groups = metadata.getLazyLoadGroups().iterator();
while(groups.hasNext()) {
ArrayList group = new ArrayList();
@@ -147,20 +147,20 @@
protected JDBCCMPFieldBridge createCMPField(JDBCEntityMetaData metadata,
JDBCCMPFieldMetaData cmpFieldMetaData)
throws DeploymentException {
if(metadata.isCMP1x()) {
- return new JDBCCMP1xFieldBridge(manager, cmpFieldMetaData,
log);
+ return new JDBCCMP1xFieldBridge(manager, cmpFieldMetaData);
} else {
- return new JDBCCMP2xFieldBridge(manager, cmpFieldMetaData,
log);
+ return new JDBCCMP2xFieldBridge(manager, cmpFieldMetaData);
}
}
protected void loadCMRFields(JDBCEntityMetaData metadata) throws
DeploymentException {
- ArrayList cmrFieldList = new ArrayList(metadata.getCMPFieldCount());
+ ArrayList cmrFieldList = new ArrayList(metadata.getCMPFields().size());
// create each field
- Iterator iter = metadata.getRelationshipRoles();
+ Iterator iter = metadata.getRelationshipRoles().iterator();
while(iter.hasNext()) {
JDBCRelationshipRoleMetaData relationshipRole =
(JDBCRelationshipRoleMetaData)iter.next();
- JDBCCMRFieldBridge cmrField = new JDBCCMRFieldBridge(this,
manager, relationshipRole, log);
+ JDBCCMRFieldBridge cmrField = new JDBCCMRFieldBridge(this,
manager, relationshipRole);
cmrFieldList.add(cmrField);
}
@@ -190,7 +190,7 @@
}
public Object createPrimaryKeyInstance() {
- if(metadata.getPrimKeyField() == null) {
+ if(metadata.getPrimaryKeyFieldName() == null) {
try {
return getPrimaryKeyClass().newInstance();
} catch(Exception e) {
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
