You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by kw...@apache.org on 2006/06/26 18:52:28 UTC
svn commit: r417235 - in
/incubator/tuscany/java/sampleapps/bigbank/account/src/main:
java/bigbank/account/services/accountdata/
java/bigbank/account/services/accountdb/
java/bigbank/account/services/accountlogger/ resources/
Author: kwilliams
Date: Mon Jun 26 09:52:27 2006
New Revision: 417235
URL: http://svn.apache.org/viewvc?rev=417235&view=rev
Log:
Brent's BigBank changes for T-483
Modified:
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/DasAccountConfiguration.xml
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java?rev=417235&r1=417234&r2=417235&view=diff
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java Mon Jun 26 09:52:27 2006
@@ -45,7 +45,6 @@
import com.bigbank.account.DataGraphRoot;
import com.bigbank.account.StockSummary;
import commonj.sdo.DataObject;
-import commonj.sdo.helper.TypeHelper;
@Service(CustomerIdService.class)
public class AccountDataServiceDASImpl implements CustomerIdService { // TODO fix this!
@@ -65,15 +64,13 @@
try {
InputStream mapping = createConfigStream();
- DAS das = DAS.FACTORY.createDAS(mapping);
+ Connection conn = getConnection();
+ DAS das = DAS.FACTORY.createDAS(mapping, conn);
+
Command select = das.createCommand(
"SELECT firstName, lastName, loginID, password, id FROM customers where loginID = :loginID");
- Connection conn = getConnection();
- select.setConnection(conn);
- select.setParameterValue("loginID", logonID);
- TypeHelper helper = TypeHelper.INSTANCE;
-
- select.setDataObjectModel(helper.getType(DataGraphRoot.class));
+
+ select.setParameterValue("loginID", logonID);
DataGraphRoot root = (DataGraphRoot) select.executeQuery();
conn.close();
@@ -100,15 +97,12 @@
InputStream mapping = createConfigStream();
- DAS das = DAS.FACTORY.createDAS(mapping);
- Command select = das.createCommand("SELECT firstName, lastName, loginID, password, id FROM customers where loginID = :loginID");
Connection conn = getConnection();
- select.setConnection(conn);
- select.setParameterValue("loginID", logonID);
- TypeHelper helper = TypeHelper.INSTANCE;
-
- select.setDataObjectModel(helper.getType(DataGraphRoot.class));
-
+ DAS das = DAS.FACTORY.createDAS(mapping, conn);
+ Command select = das.createCommand("SELECT firstName, lastName, loginID, password, id FROM customers where loginID = :loginID");
+
+ select.setParameterValue("loginID", logonID);
+
DataGraphRoot root = (DataGraphRoot) select.executeQuery();
conn.close();
@@ -122,25 +116,23 @@
throws RemoteException {
try {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into customers (firstName,lastName,address,email, loginID, password ) values ('"
+ customerProfile.getFirstName() + "', '" + customerProfile.getLastName() + "', '" + customerProfile.getAddress() + "', '"
+ customerProfile.getEmail() + "', '" + customerProfile.getLoginID() + "', '" + customerProfile.getPassword() + "')");
- insert.setConnection(getConnection());
+
insert.execute();
CustomerProfileData ret = getCustomerProfile(customerProfile.getLoginID());
String cid = ret.getId() + "";
if (createSavings) {
insert = das.createCommand("insert into accounts (id,accountNumber, accountType, balance ) values (" + cid + ", '"
- + AccountServiceImpl.SAVINGS_ACCOUNT_PREFIX + cid + "', '" + AccountServiceImpl.ACCOUNT_TYPE_SAVINGS + "', " + 1.0F + ")");
- insert.setConnection(getConnection());
+ + AccountServiceImpl.SAVINGS_ACCOUNT_PREFIX + cid + "', '" + AccountServiceImpl.ACCOUNT_TYPE_SAVINGS + "', " + 1.0F + ")");
insert.execute();
}
if (createCheckings) {
insert = das.createCommand("insert into accounts (id,accountNumber, accountType, balance ) values (" + cid + ", '"
- + AccountServiceImpl.CHECKING_ACCOUNT_PREFIX + cid + "', '" + AccountServiceImpl.ACCOUNT_TYPE_CHECKINGS + "', " + 1.0F + ")");
- insert.setConnection(getConnection());
+ + AccountServiceImpl.CHECKING_ACCOUNT_PREFIX + cid + "', '" + AccountServiceImpl.ACCOUNT_TYPE_CHECKINGS + "', " + 1.0F + ")");
insert.execute();
}
@@ -156,13 +148,10 @@
public CustomerProfileData createAccountNOTWORKING(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
throws RemoteException {
try {
- DAS das = DAS.FACTORY.createDAS(createConfigStream());
- das.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(createConfigStream(), getConnection());
Command read = das.getCommand("all customers");
- // select.setDataObjectModel();
- TypeHelper helper = TypeHelper.INSTANCE;
- read.setDataObjectModel(helper.getType(DataGraphRoot.class));
+ // select.setDataObjectModel();
DataObject root = read.executeQuery();
// Create a new stockPurchase
@@ -193,23 +182,20 @@
final AccountReport accountReport = accountFactory.createAccountReport();
InputStream mapping = createConfigStream();
- DAS das = DAS.FACTORY.createDAS(mapping);
- Command select = das.createCommand("SELECT accountNumber, accountType, balance FROM accounts where id = :id");
Connection conn = getConnection();
- select.setConnection(conn);
+ DAS das = DAS.FACTORY.createDAS(mapping, conn);
+
+ Command select = das.createCommand("SELECT accountNumber, accountType, balance FROM accounts where id = :id");
select.setParameterValue("id", customerID);
- TypeHelper helper = TypeHelper.INSTANCE;
- select.setDataObjectModel(helper.getType(DataGraphRoot.class));
+
DataGraphRoot root = (DataGraphRoot) select.executeQuery();
accountReport.getAccountSummaries().addAll(root.getAccountSummaries());
// Get Stocks
select = das.createCommand(
- "SELECT Symbol, quantity, purchasePrice, purchaseDate, purchaseLotNumber FROM stocks where id = :id", createConfigStream());
- select.setConnection(conn);
- select.setParameterValue("id", customerID);
- select.setDataObjectModel(helper.getType(DataGraphRoot.class));
+ "SELECT Symbol, quantity, purchasePrice, purchaseDate, purchaseLotNumber FROM stocks where id = :id");
+ select.setParameterValue("id", customerID);
// select.addConverter("STOCKS.PURCHASEDATE", DateConverter.class.getName());
@@ -235,15 +221,12 @@
public float deposit(String account, float ammount) throws RemoteException {
try {
- DAS das = DAS.FACTORY.createDAS(createConfigStream());
Connection conn = getConnection();
- das.setConnection(conn);
+ DAS das = DAS.FACTORY.createDAS(createConfigStream(), conn);
- Command select = das.createCommand("SELECT accountNumber, balance FROM accounts where accountNumber = :accountNumber");
- select.setConnection(conn);
+ Command select = das.createCommand("SELECT accountNumber, balance FROM accounts where accountNumber = :accountNumber");
select.setParameterValue("accountNumber", account);
- TypeHelper helper = TypeHelper.INSTANCE;
- select.setDataObjectModel(helper.getType(DataGraphRoot.class));
+
DataGraphRoot root = (DataGraphRoot) select.executeQuery();
Collection accounts = root.getAccountSummaries();
AccountSummary accountData = (AccountSummary) accounts.iterator().next();
@@ -265,12 +248,9 @@
public StockSummary sellStock(int purchaseLotNumber, int quantity) throws RemoteException {
try {
- DAS das = DAS.FACTORY.createDAS(createConfigStream());
- das.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(createConfigStream(), getConnection());
- Command read = das.getCommand("stockbylotSelect");
- TypeHelper helper = TypeHelper.INSTANCE;
- read.setDataObjectModel(helper.getType(DataGraphRoot.class));
+ Command read = das.getCommand("stockbylotSelect");
read.setParameterValue("PURCHASELOTNUMBER", purchaseLotNumber);// autoboxing :-)
DataGraphRoot root = (DataGraphRoot) read.executeQuery();
List stocks = root.getStockSummaries();
@@ -280,8 +260,7 @@
if (newQuatity < 1) {
Command delete = das.createCommand("DELETE FROM STOCKS WHERE PURCHASELOTNUMBER = ?");
- delete.setParameterValue(1, purchaseLotNumber);
- delete.setConnection(getConnection());
+ delete.setParameterValue(1, purchaseLotNumber);
delete.execute();
} else {
@@ -306,7 +285,7 @@
public StockSummary purchaseStock(int id, StockSummary stock) throws RemoteException {
try {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das
.createCommand("insert into stocks (id, symbol, quantity, purchasePrice, purchaseDate) values (?,?,?,?,?)");
insert.setParameterValue(1, new Integer(id));
@@ -314,8 +293,7 @@
insert.setParameterValue(3, stock.getQuantity());
insert.setParameterValue(4, stock.getPurchasePrice());
insert.setParameterValue(5, DateConverter.INSTANCE.getColumnValue(stock.getPurchaseDate()));
-
- insert.setConnection(getConnection());
+
insert.execute();
return stock;
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java?rev=417235&r1=417234&r2=417235&view=diff
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java Mon Jun 26 09:52:27 2006
@@ -53,7 +53,6 @@
import com.bigbank.account.purchaseStock;
import com.bigbank.account.withdraw;
import commonj.sdo.DataObject;
-import commonj.sdo.helper.TypeHelper;
public class AccountDBInit extends HttpServlet {
@@ -289,8 +288,7 @@
protected void testStrockPurchaseThroughDAS(purchaseStock sp) throws InstantiationException, IllegalAccessException, ClassNotFoundException,
SQLException {
- DAS das = DAS.FACTORY.createDAS(createConfigStream());
- das.setConnection(createConnection());
+ DAS das = DAS.FACTORY.createDAS(createConfigStream(), createConnection());
Command read = das.getCommand("all stocks");
DataObject root = read.executeQuery();
@@ -312,15 +310,11 @@
public CustomerProfileData testgetCustomerByLoginIDThroughDASRead(final String logonID) throws Exception {
InputStream mapping = createConfigStream();
- DAS das = DAS.FACTORY.createDAS(mapping);
- Command select = das.createCommand("SELECT firstName, lastName, loginID, password, id FROM customers where loginID = :loginID",
- mapping);
Connection conn = createConnection();
- select.setConnection(conn);
- select.setParameterValue("loginID", logonID);
- TypeHelper helper = TypeHelper.INSTANCE;
-
- select.setDataObjectModel(helper.getType(DataGraphRoot.class));
+ DAS das = DAS.FACTORY.createDAS(mapping, conn);
+ Command select = das.createCommand("SELECT firstName, lastName, loginID, password, id FROM customers where loginID = :loginID");
+
+ select.setParameterValue("loginID", logonID);
DataGraphRoot root = (DataGraphRoot) select.executeQuery();
conn.close();
@@ -395,14 +389,11 @@
public void testWithdrawThroughDAS(withdraw wd) throws Exception {
- DAS das = DAS.FACTORY.createDAS(createConfigStream());
+ Connection conn = createConnection();
+ DAS das = DAS.FACTORY.createDAS(createConfigStream(), conn);
Command select = das.createCommand("SELECT accountNumber, balance FROM accounts where accountNumber = :accountNumber");
- Connection conn = createConnection();
- das.setConnection(conn);
- select.setParameterValue("accountNumber", wd.getAccountNumber());
- TypeHelper helper = TypeHelper.INSTANCE;
-
- select.setDataObjectModel(helper.getType(DataGraphRoot.class));
+
+ select.setParameterValue("accountNumber", wd.getAccountNumber());
DataGraphRoot root = (DataGraphRoot) select.executeQuery();
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java?rev=417235&r1=417234&r2=417235&view=diff
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java Mon Jun 26 09:52:27 2006
@@ -32,7 +32,6 @@
import com.bigbank.account.AccountLog;
import com.bigbank.account.DataGraphRoot;
import com.bigbank.account.StockSummary;
-import commonj.sdo.helper.TypeHelper;
/**
* This class implements the Account Logger service component.
@@ -52,14 +51,13 @@
protected static final String protocol = "jdbc:derby:";
public void logDeposit(int id, String account, float amount) throws RemoteException {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into acctLog (id, accountNumber, actionType, amount) values (?,?,?,?)");
insert.setParameterValue(1, new Integer(id));
insert.setParameterValue(2, account);
insert.setParameterValue(3, ACCT_ACTION_TYPE_DEPOSIT);
insert.setParameterValue(4, new Float(amount));
-
- insert.setConnection(getConnection());
+
insert.execute();
/*
performLog("insert into acctLog (id, accountNumber, actionType, amount) values (" +
@@ -67,14 +65,13 @@
}
public void logWithdrawal(int id, String account, float amount) throws RemoteException {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into acctLog (id, accountNumber, actionType, amount) values (?,?,?,?)");
insert.setParameterValue(1, new Integer(id));
insert.setParameterValue(2, account);
insert.setParameterValue(3, ACCT_ACTION_TYPE_WITHDRAW);
insert.setParameterValue(4, new Float(amount));
-
- insert.setConnection(getConnection());
+
insert.execute();
/*
performLog("insert into acctLog (id ,accountNumber, actionType, amount) values (" +
@@ -82,15 +79,14 @@
}
public void logPurchaseStock(int id, StockSummary stock) throws RemoteException {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (?,?,?,?,?)");
insert.setParameterValue(1, new Integer(id));
insert.setParameterValue(2, stock.getSymbol());
insert.setParameterValue(3, new Integer(stock.getQuantity()));
insert.setParameterValue(4, STOCK_ACTION_TYPE_PURCHASE);
insert.setParameterValue(5, new Integer(stock.getPurchaseLotNumber()));
-
- insert.setConnection(getConnection());
+
insert.execute();
/*
performLog("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (" +
@@ -101,15 +97,14 @@
public void logSellStock(int id, StockSummary stock, int quantity) throws RemoteException {
String symbol = ((stock.getSymbol()!=null)?stock.getSymbol():"null");
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (?,?,?,?,?)");
insert.setParameterValue(1, new Integer(id));
insert.setParameterValue(2, symbol);
insert.setParameterValue(3, new Integer(quantity));
insert.setParameterValue(4, STOCK_ACTION_TYPE_SELL);
insert.setParameterValue(5, new Integer(stock.getPurchaseLotNumber()));
-
- insert.setConnection(getConnection());
+
insert.execute();
/*
performLog("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (" +
@@ -181,21 +176,18 @@
final AccountLog accountLog = accountFactory.createAccountLog();
InputStream mapping = createConfigStream();
- DAS das = DAS.FACTORY.createDAS(mapping);
- Command select = das.createCommand("SELECT logSeqNo, accountNumber, actionType, amount FROM acctLog where id = :id");
Connection conn = getConnection();
- select.setConnection(conn);
+ DAS das = DAS.FACTORY.createDAS(mapping, conn);
+ Command select = das.createCommand("SELECT logSeqNo, accountNumber, actionType, amount FROM acctLog where id = :id");
+
select.setParameterValue("id", customerID);
- TypeHelper helper = TypeHelper.INSTANCE;
- select.setDataObjectModel(helper.getType(DataGraphRoot.class));
+
DataGraphRoot root = (DataGraphRoot) select.executeQuery();
accountLog.getAccountLogEntries().addAll(root.getAccountLogEntries());
select = das.createCommand(
- "SELECT logSeqNo, Symbol, quantity, actionType, purchaseLotNumber FROM stockLog where id = :id");
- select.setConnection(conn);
- select.setParameterValue("id", customerID);
- select.setDataObjectModel(helper.getType(DataGraphRoot.class));
+ "SELECT logSeqNo, Symbol, quantity, actionType, purchaseLotNumber FROM stockLog where id = :id");
+ select.setParameterValue("id", customerID);
root = (DataGraphRoot) select.executeQuery();
accountLog.getStockLogEntries().addAll(root.getStockLogEntries());
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/DasAccountConfiguration.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/DasAccountConfiguration.xml?rev=417235&r1=417234&r2=417235&view=diff
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/DasAccountConfiguration.xml (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/DasAccountConfiguration.xml Mon Jun 26 09:52:27 2006
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dataObjectModel="com.bigbank.account.DataGraphRoot">
<Table tableName="CUSTOMERS" typeName="CustomerProfileData">
<!-- Column name="firstName" primaryKey="true"/ -->
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org