You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/02/27 12:44:08 UTC

svn commit: r381324 - in /incubator/tuscany/java/samples/bigbank: account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/ webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/

Author: jsdelfino
Date: Mon Feb 27 03:43:56 2006
New Revision: 381324

URL: http://svn.apache.org/viewcvs?rev=381324&view=rev
Log:
simplified creation of SDO dataobjects, using the generated factory

Modified:
    incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountServiceImpl.java
    incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountServiceComponentImpl.java

Modified: incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountServiceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountServiceImpl.java?rev=381324&r1=381323&r2=381324&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountServiceImpl.java (original)
+++ incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountServiceImpl.java Mon Feb 27 03:43:56 2006
@@ -18,6 +18,7 @@
 
 import java.util.List;
 
+import org.apache.tuscany.samples.bigbank.account.AccountFactory;
 import org.apache.tuscany.samples.bigbank.account.AccountReport;
 import org.apache.tuscany.samples.bigbank.account.AccountSummary;
 import org.apache.tuscany.samples.bigbank.account.services.accountdata.AccountDataService;
@@ -25,15 +26,12 @@
 import org.apache.tuscany.samples.bigbank.account.services.accountdata.SavingsAccount;
 import org.apache.tuscany.samples.bigbank.account.services.accountdata.StockAccount;
 import org.apache.tuscany.samples.bigbank.account.services.stockquote.StockQuoteService;
-import org.apache.tuscany.sdo.helper.HelperProviderImpl;
 import org.osoa.sca.annotations.Property;
 import org.osoa.sca.annotations.Reference;
 
-import commonj.sdo.helper.DataFactory;
-
 public class AccountServiceImpl implements AccountService {
 
-    private DataFactory dataFactory;
+    private AccountFactory accountFactory=new AccountFactory();
 
     @Property
     private String currency = "USD";
@@ -44,31 +42,29 @@
     private StockQuoteService stockQuoteService;
 
     public AccountServiceImpl() {
-        //FIXME How do we get a DataFactory now?? looks like there's no way to inject one into the component...
-        dataFactory = new HelperProviderImpl().getDataFactory();
     }
 
     public AccountReport getAccountReport(String customerID) {
 
-        AccountReport accountReport = (AccountReport) dataFactory.create(AccountReport.class);
+        AccountReport accountReport = accountFactory.createAccountReport();
         List accountSummaries = accountReport.getAccountSummaries();
 
         CheckingAccount checkingAccount = accountDataService.getCheckingAccount(customerID);
-        AccountSummary checkingAccountSummary = (AccountSummary) dataFactory.create(AccountSummary.class);
+        AccountSummary checkingAccountSummary = accountFactory.createAccountSummary();
         checkingAccountSummary.setAccountNumber(checkingAccount.getAccountNumber());
         checkingAccountSummary.setAccountType("checking");
         checkingAccountSummary.setBalance(fromUSDollarToCurrency(checkingAccount.getBalance()));
         accountSummaries.add(checkingAccountSummary);
 
         SavingsAccount savingsAccount = accountDataService.getSavingsAccount(customerID);
-        AccountSummary savingsAccountSummary = (AccountSummary) dataFactory.create(AccountSummary.class);
+        AccountSummary savingsAccountSummary = accountFactory.createAccountSummary();
         savingsAccountSummary.setAccountNumber(savingsAccount.getAccountNumber());
         savingsAccountSummary.setAccountType("savings");
         savingsAccountSummary.setBalance(fromUSDollarToCurrency(savingsAccount.getBalance()));
         accountSummaries.add(savingsAccountSummary);
 
         StockAccount stockAccount = accountDataService.getStockAccount(customerID);
-        AccountSummary stockAccountSummary = (AccountSummary) dataFactory.create(AccountSummary.class);
+        AccountSummary stockAccountSummary = accountFactory.createAccountSummary();
         stockAccountSummary.setAccountNumber(stockAccount.getAccountNumber());
         stockAccountSummary.setAccountType("stock");
         float balance = (stockQuoteService.getQuote(stockAccount.getSymbol())) * stockAccount.getQuantity();

Modified: incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountServiceComponentImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountServiceComponentImpl.java?rev=381324&r1=381323&r2=381324&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountServiceComponentImpl.java (original)
+++ incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountServiceComponentImpl.java Mon Feb 27 03:43:56 2006
@@ -20,8 +20,6 @@
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Service;
 
-import commonj.sdo.DataObject;
-
 /**
  */
 @Service(AccountService.class)
@@ -41,8 +39,7 @@
      * @see org.apache.tuscany.samples.bigbank.webclient.services.account.AccountService#getAccountReport(java.lang.String)
      */
     public AccountReport getAccountReport(String customerID) {
-        DataObject report = (DataObject) accountService.getAccountReport(customerID);
-        return (AccountReport) report;
+        return accountService.getAccountReport(customerID);
     }
 
 }