User: dsundstrom
Date: 01/11/01 15:17:05
Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc
JDBCCommandFactory.java
JDBCFindEntitiesCommand.java JDBCFinderCommand.java
Log:
Cleaned up code.
Revision Changes Path
1.8 +3 -3
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCCommandFactory.java
Index: JDBCCommandFactory.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCCommandFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JDBCCommandFactory.java 2001/10/09 00:29:43 1.7
+++ JDBCCommandFactory.java 2001/11/01 23:17:05 1.8
@@ -42,7 +42,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
* @author <a href="[EMAIL PROTECTED]">danch (Dan Christopherson</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class JDBCCommandFactory implements CommandFactory
{
@@ -88,13 +88,13 @@
}
public FindEntitiesCommand createDefinedFinderCommand(JDBCQueryMetaData q)
- throws Exception
+ throws DeploymentException
{
return new JDBCDefinedFinderCommand(manager, q);
}
public FindEntitiesCommand createEJBQLFinderCommand(JDBCQueryMetaData q)
- throws Exception
+ throws DeploymentException
{
return new JDBCEJBQLFinderCommand(manager, q);
}
1.8 +30 -30
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCFindEntitiesCommand.java
Index: JDBCFindEntitiesCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCFindEntitiesCommand.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JDBCFindEntitiesCommand.java 2001/09/01 22:03:15 1.7
+++ JDBCFindEntitiesCommand.java 2001/11/01 23:17:05 1.8
@@ -20,6 +20,7 @@
import javax.ejb.FinderException;
import org.jboss.ejb.EntityEnterpriseContext;
+import org.jboss.ejb.DeploymentException;
import org.jboss.ejb.plugins.cmp.FindEntitiesCommand;
import org.jboss.ejb.plugins.cmp.jdbc.metadata.JDBCAutomaticQueryMetaData;
import org.jboss.ejb.plugins.cmp.jdbc.metadata.JDBCQueryMetaData;
@@ -38,20 +39,17 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Joe Shevland</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class JDBCFindEntitiesCommand implements FindEntitiesCommand {
- // Attributes ----------------------------------------------------
private final Map knownFinderCommands = new HashMap();
private final JDBCStoreManager manager;
- // Constructors --------------------------------------------------
-
public JDBCFindEntitiesCommand(JDBCStoreManager manager) {
this.manager = manager;
}
- public void start() {
+ public void start() throws DeploymentException {
JDBCCommandFactory factory = manager.getCommandFactory();
//
@@ -70,29 +68,28 @@
}
}
} catch (Exception e) {
- // for some reason, this failed; try to use defined or automatic instead
+ // for some reason, this failed; try to use defined
+ // or automatic instead
manager.getLog().debug(e);
}
//
// Defined finders - Overrides automatic finders.
//
- try {
- Iterator definedFinders = manager.getMetaData().getQueries().iterator();
- while(definedFinders.hasNext()) {
- JDBCQueryMetaData q = (JDBCQueryMetaData)definedFinders.next();
-
- if(!knownFinderCommands.containsKey(q.getMethod()) ) {
- if(q instanceof JDBCDeclaredQueryMetaData) {
- knownFinderCommands.put(q.getMethod(),
factory.createDefinedFinderCommand(q));
- } else if(q instanceof JDBCQlQueryMetaData) {
- knownFinderCommands.put(q.getMethod(),
factory.createEJBQLFinderCommand(q));
- }
+ Iterator definedFinders = manager.getMetaData().getQueries().iterator();
+ while(definedFinders.hasNext()) {
+ JDBCQueryMetaData q = (JDBCQueryMetaData)definedFinders.next();
+
+ if(!knownFinderCommands.containsKey(q.getMethod()) ) {
+ if(q instanceof JDBCDeclaredQueryMetaData) {
+ knownFinderCommands.put(
+ q.getMethod(), factory.createDefinedFinderCommand(q));
+
+ } else if(q instanceof JDBCQlQueryMetaData) {
+ knownFinderCommands.put(
+ q.getMethod(), factory.createEJBQLFinderCommand(q));
}
}
- } catch (Exception e) {
- // for some reason, this failed; try to use automatic instead
- manager.getLog().debug(e);
}
//
@@ -109,7 +106,9 @@
}
}
- protected void addAutomaticFinders(JDBCStoreManager manager, Method[]
homeMethods) {
+ protected void addAutomaticFinders(
+ JDBCStoreManager manager, Method[] homeMethods) {
+
for (int i = 0; i < homeMethods.length; i++) {
Method m = homeMethods[i];
@@ -117,11 +116,15 @@
String name = m.getName();
if(name.equals("findAll")) {
JDBCQueryMetaData q = new JDBCAutomaticQueryMetaData(m);
- knownFinderCommands.put(m,
manager.getCommandFactory().createFindAllCommand(q));
- } else if(name.startsWith("findBy") &&
!name.equals("findByPrimaryKey")) {
+ knownFinderCommands.put(
+ m, manager.getCommandFactory().createFindAllCommand(q));
+ } else if(name.startsWith("findBy") &&
+ !name.equals("findByPrimaryKey")) {
+
try {
JDBCQueryMetaData q = new JDBCAutomaticQueryMetaData(m);
- knownFinderCommands.put(m,
manager.getCommandFactory().createFindByCommand(q));
+ knownFinderCommands.put(
+ m, manager.getCommandFactory().createFindByCommand(q));
} catch (IllegalArgumentException e) {
manager.getLog().debug("Could not create the finder " + name +
", because no matching CMP field was found.");
@@ -131,18 +134,15 @@
}
}
- // FindEntitiesCommand implementation -------------------------
-
public FinderResults execute(Method finderMethod,
Object[] args,
- EntityEnterpriseContext ctx)
- throws Exception
- {
+ EntityEnterpriseContext ctx) throws Exception {
+
FindEntitiesCommand finderCommand =
(FindEntitiesCommand)knownFinderCommands.get(finderMethod);
if(finderCommand == null) {
- throw new FinderException("Unknown finder: " + finderMethod.getName());
+ throw new FinderException("Unknown finder: " + finderMethod);
}
return finderCommand.execute(finderMethod, args, ctx);
}
1.7 +6 -11
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCFinderCommand.java
Index: JDBCFinderCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCFinderCommand.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JDBCFinderCommand.java 2001/10/09 00:29:43 1.6
+++ JDBCFinderCommand.java 2001/11/01 23:17:05 1.7
@@ -37,7 +37,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Joe Shevland</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public abstract class JDBCFinderCommand
extends JDBCQueryCommand
@@ -75,20 +75,14 @@
Collection keys = (Collection)jdbcExecute(args);
boolean readAheadOnLoad = queryMetaData.getReadAhead().isOnLoadUsed();
-//
-// The commented out code is for the old readahead code
-// // creat the finder results
-// if(finderMetaData.hasReadAhead()) {
-// result = new FinderResults(keys, getWhereClause(args), this, args);
-// } else {
-// result = new FinderResults(keys, null, null, null);
-// }
result = new FinderResults(keys, null, null, null, readAheadOnLoad);
if (readAheadOnLoad) {
// add to the cache
- manager.getReadAheadCache().insert(new Long(result.getListId()),
result);
+ manager.getReadAheadCache().insert(
+ new Long(result.getListId()), result);
}
} catch (Exception e) {
+ e.printStackTrace();
log.debug(e);
throw new FinderException("Find failed");
}
@@ -96,7 +90,8 @@
}
// JDBCQueryCommand overrides ------------------------------------
- protected Object handleResult(ResultSet rs, Object argOrArgs) throws Exception {
+ protected Object handleResult(ResultSet rs, Object argOrArgs)
+ throws Exception {
Collection result = new ArrayList();
try {
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
