You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/07/19 19:22:34 UTC
svn commit: r557695 - in /incubator/tuscany/java/das: ./
rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/
rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/
rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ rdb/src/test/java/o...
Author: lresende
Date: Thu Jul 19 10:22:31 2007
New Revision: 557695
URL: http://svn.apache.org/viewvc?view=rev&rev=557695
Log:
TUSCANY-1237 - Submitting Ron's patch.
Modified:
incubator/tuscany/java/das/pom.xml
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MultiSchemaTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TransactionTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
incubator/tuscany/java/das/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyDBInit.java
incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DB2Setup.java
incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java
incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java
incubator/tuscany/java/das/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
Modified: incubator/tuscany/java/das/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/pom.xml?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/pom.xml (original)
+++ incubator/tuscany/java/das/pom.xml Thu Jul 19 10:22:31 2007
@@ -93,8 +93,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.4</source>
+ <target>1.4</target>
</configuration>
</plugin>
<plugin>
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java Thu Jul 19 10:22:31 2007
@@ -33,6 +33,7 @@
import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
import org.apache.tuscany.das.rdb.impl.InsertCommandImpl;
import org.apache.tuscany.das.rdb.impl.ParameterImpl;
+import org.apache.tuscany.das.rdb.util.CollectionsUtil;
import commonj.sdo.DataObject;
import commonj.sdo.Property;
@@ -169,7 +170,7 @@
RelationshipWrapper rw = new RelationshipWrapper(rel);
if ((rel.getForeignKeyTable().equals(tw.getTableName()))
- && (Collections.disjoint(tw.getPrimaryKeyProperties(), rw.getForeignKeys()))) {
+ && (CollectionsUtil.disjoint(tw.getPrimaryKeyProperties(), rw.getForeignKeys()))) {
return true;
}
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java Thu Jul 19 10:22:31 2007
@@ -86,7 +86,7 @@
}
String columnName = resultSetShape.getColumnName(i);
- if (columnName.contains("_ID")) {
+ if (columnName.indexOf("_ID") >= 0) {
String colName = "";
if(this.configWrapper.getConfig().isDatabaseSchemaNameSupported()){
colName = schemaName+"."+columnName;
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java Thu Jul 19 10:22:31 2007
@@ -32,6 +32,7 @@
import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
import org.apache.tuscany.das.rdb.config.wrapper.RelationshipWrapper;
import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
+import org.apache.tuscany.das.rdb.util.CollectionsUtil;
import org.apache.tuscany.sdo.impl.ChangeSummaryImpl;
import commonj.sdo.ChangeSummary;
@@ -161,7 +162,7 @@
TableWrapper tw = new TableWrapper(t);
RelationshipWrapper rw = new RelationshipWrapper(rel);
if ((rel.getForeignKeyTable().equals(t.getTableName()))
- && (Collections.disjoint(tw.getPrimaryKeyProperties(), rw.getForeignKeys()))) {
+ && (CollectionsUtil.disjoint(tw.getPrimaryKeyProperties(), rw.getForeignKeys()))) {
return true;
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java Thu Jul 19 10:22:31 2007
@@ -44,7 +44,7 @@
try {
DatabaseMetaData dbmd = connection.getMetaData();
- if (dbmd.getDatabaseProductName().contains("Oracle") || dbmd.getDatabaseProductName().contains("PostgreSQL")) {
+ if (dbmd.getDatabaseProductName().indexOf("Oracle") >= 0 || dbmd.getDatabaseProductName().indexOf("PostgreSQL") >= 0) {
this.useGetGeneratedKeys = false;
} else {
this.useGetGeneratedKeys = true;
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java Thu Jul 19 10:22:31 2007
@@ -57,7 +57,7 @@
public int getGeneratedKey() {
try {
- return statement.getGeneratedKey();
+ return statement.getGeneratedKey().intValue();
} catch (SQLException ex) {
throw new RuntimeException(ex);
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java Thu Jul 19 10:22:31 2007
@@ -28,7 +28,7 @@
private Object updateValue(Object oldValue) {
if (oldValue instanceof Integer) {
- return Integer.valueOf(((Integer) oldValue).intValue() + 1);
+ return new Integer(((Integer) oldValue).intValue() + 1);
} else if (oldValue instanceof BigDecimal) {
return ((BigDecimal) oldValue).add(new BigDecimal(1));
} else {
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java Thu Jul 19 10:22:31 2007
@@ -207,7 +207,7 @@
if (getConnection().useGetGeneratedKeys()) {
ResultSet rs = preparedStatement.getGeneratedKeys();
if (rs.next()) {
- return Integer.valueOf(rs.getInt(1));
+ return new Integer(rs.getInt(1));
}
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java Thu Jul 19 10:22:31 2007
@@ -72,7 +72,7 @@
DAS das = DAS.FACTORY.createDAS(getConfig("BooksConfigWithAlias.xml"), getConnection());
Command select = das.getCommand("get book by ID");
- select.setParameter(1, Integer.valueOf(1));
+ select.setParameter(1, new Integer(1));
// *******Verifys a column entry is readable
DataObject root = select.executeQuery();
@@ -123,7 +123,7 @@
DAS das = DAS.FACTORY.createDAS(getConfig("BooksConfigWithAlias.xml"), getConnection());
Command select = das.getCommand("get book by ID");
- select.setParameter(1, Integer.valueOf(1));
+ select.setParameter(1, new Integer(1));
DataObject root = select.executeQuery();
@@ -137,7 +137,7 @@
root = select.executeQuery();
// Verify
- select.setParameter(1, Integer.valueOf(1001));
+ select.setParameter(1, new Integer(1001));
root = select.executeQuery();
assertEquals("Ant Colonies of the Old World", root.getString("Book[1]/NAME"));
@@ -159,4 +159,4 @@
assertEquals("Williams", customer.getString("lastname"));
}
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java Thu Jul 19 10:22:31 2007
@@ -141,7 +141,7 @@
DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection());
Command select = das.getCommand("company by id with departments");
- Integer idOfNoExistingCompany = Integer.valueOf(-1);
+ Integer idOfNoExistingCompany = new Integer(-1);
select.setParameter(1, idOfNoExistingCompany);
DataObject root = select.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java Thu Jul 19 10:22:31 2007
@@ -91,7 +91,7 @@
+ "CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
// Parameterize the command
- select.setParameter(1, Integer.valueOf(1));
+ select.setParameter(1, new Integer(1));
// Get the graph
DataObject root = select.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java Thu Jul 19 10:22:31 2007
@@ -97,7 +97,7 @@
DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
Command read = das.getCommand("order by id");
- read.setParameter(1, Integer.valueOf(1));
+ read.setParameter(1, new Integer(1));
DataObject root = read.executeQuery();
assertEquals("recombobulator", root.getString("ANORDER[1]/PRODUCT"));
@@ -118,7 +118,7 @@
int id = root.getInt("CUSTOMER[1]/ID");
Command update = das.getCommand("update customer");
- update.setParameter(1, Integer.valueOf(id));
+ update.setParameter(1, new Integer(id));
update.execute();
// Verify update - reuse select command
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java Thu Jul 19 10:22:31 2007
@@ -95,8 +95,8 @@
Integer prod2ID = (Integer) ordDet2.get("PRODUCTID");
// save order count
- Integer order1DetDescCount = Integer.valueOf(ordDet1.getList("orderDetailsDesc").size());
- Integer order2DetDescCount = Integer.valueOf(ordDet2.getList("orderDetailsDesc").size());
+ Integer order1DetDescCount = new Integer(ordDet1.getList("orderDetailsDesc").size());
+ Integer order2DetDescCount = new Integer(ordDet2.getList("orderDetailsDesc").size());
// Move an order detail desc to ord det1 from ord det2
DataObject orderDetailsDesc = (DataObject) ordDet2.getList("orderDetailsDesc").get(0);
@@ -142,7 +142,7 @@
// Move an order det desc to ord det1 from ord det2
DataObject orderDetDesc = (DataObject) ordDet2.getList("orderDetailsDesc").get(0);
ordDet1.getList("orderDetailsDesc").add(orderDetDesc);
- orderDetDesc.setInt("ORDERID", ord1ID);
+ orderDetDesc.setInt("ORDERID", ord1ID.intValue());
try {
das.applyChanges(root);
@@ -172,7 +172,7 @@
// Create an order det desc for ord det1
DataObject orderDetDesc = root.createDataObject("ORDERDETAILSDESC");
orderDetDesc.setInt("ID", 500);
- orderDetDesc.setInt("ORDERID", ord1ID);
+ orderDetDesc.setInt("ORDERID", ord1ID.intValue());
ordDet1.getList("orderDetailsDesc").add(orderDetDesc);
try {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java Thu Jul 19 10:22:31 2007
@@ -46,8 +46,8 @@
DAS das = DAS.FACTORY.createDAS(getConnection());
Command getOrderDetails = das.createCommand("Select * from ORDERDETAILS where ORDERID = ? AND PRODUCTID = ?");
- getOrderDetails.setParameter(1, Integer.valueOf(1));
- getOrderDetails.setParameter(2, Integer.valueOf(1));
+ getOrderDetails.setParameter(1, new Integer(1));
+ getOrderDetails.setParameter(2, new Integer(1));
DataObject root = getOrderDetails.executeQuery();
@@ -96,8 +96,8 @@
DAS das = DAS.FACTORY.createDAS(getConfig("OrdersOrderDetailsConfig.xml"), getConnection());
Command getOrderDetails = das.createCommand("Select * from ORDERDETAILS where ORDERID = ? AND PRODUCTID = ?");
- getOrderDetails.setParameter(1, Integer.valueOf(1));
- getOrderDetails.setParameter(2, Integer.valueOf(1));
+ getOrderDetails.setParameter(1, new Integer(1));
+ getOrderDetails.setParameter(2, new Integer(1));
DataObject root = getOrderDetails.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java Thu Jul 19 10:22:31 2007
@@ -109,7 +109,7 @@
.createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER " + "ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
// Parameterize the command
- select.setParameter(1, Integer.valueOf(1));
+ select.setParameter(1, new Integer(1));
// Get the graph
try {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java Thu Jul 19 10:22:31 2007
@@ -77,9 +77,9 @@
// Create a new Order and add to customer1
DataObject order = root.createDataObject("ANORDER");
- order.set("ID", Integer.valueOf(99));
+ order.set("ID", new Integer(99));
order.set("PRODUCT", "The 99th product");
- order.set("QUANTITY", Integer.valueOf(99));
+ order.set("QUANTITY", new Integer(99));
cust.getList("orders").add(order);
assertEquals(custOrderCount + 1, cust.getList("orders").size());
@@ -91,7 +91,7 @@
select = das.createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER "
+ "ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
- select.setParameter(1, Integer.valueOf(custID));
+ select.setParameter(1, new Integer(custID));
root = select.executeQuery();
assertEquals(custOrderCount + 1, root.getList("CUSTOMER[1]/orders").size());
@@ -109,7 +109,7 @@
DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand(sql);
- insert.setParameter(1, Integer.valueOf(316405209));
+ insert.setParameter(1, new Integer(316405209));
insert.setParameter(2, "2005-11-23 19:29:52.636");
insert.execute();
@@ -131,7 +131,7 @@
int numCustomers = root.getList("CUSTOMER").size();
DataObject newCust = root.createDataObject("CUSTOMER");
- newCust.set("ID", Integer.valueOf(100));
+ newCust.set("ID", new Integer(100));
newCust.set("ADDRESS", "5528 Wells Fargo Drive");
newCust.set("LASTNAME", "Gerkin");
@@ -153,7 +153,7 @@
public void testDiltonsNullParameterBug1() throws Exception {
DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into CUSTOMER values (?, ?, ?)");
- insert.setParameter(1, Integer.valueOf(10));
+ insert.setParameter(1, new Integer(10));
insert.setParameter(2, null);
insert.setParameter(3, "5528 Wells Fargo Dr");
insert.execute();
@@ -172,7 +172,7 @@
public void testDiltonsNullParameterBug2() throws Exception {
DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into CUSTOMER values (?, ?, ?)");
- insert.setParameter(1, Integer.valueOf(10));
+ insert.setParameter(1, new Integer(10));
// insert.setParameterValue("LASTNAME", null);
insert.setParameter(3, "5528 Wells Fargo Dr");
@@ -190,7 +190,7 @@
public void testDiltonsNullParameterBug3() throws Exception {
DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into CUSTOMER values (?, ?, ?)");
- insert.setParameter(1, Integer.valueOf(10));
+ insert.setParameter(1, new Integer(10));
insert.setParameter(2, "");
insert.setParameter(3, "5528 Wells Fargo Dr");
insert.execute();
@@ -238,7 +238,7 @@
public void testYingChen12162005() throws Exception {
DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into CUSTOMER values (?, ?, ?)");
- insert.setParameter(1, Integer.valueOf(10));
+ insert.setParameter(1, new Integer(10));
insert.setParameter(2, "Williams");
insert.setParameter(3, null);
insert.execute();
@@ -301,4 +301,4 @@
}
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java Thu Jul 19 10:22:31 2007
@@ -197,7 +197,7 @@
DAS das = DAS.FACTORY.createDAS(getConfig("CustomerConfig.xml"), getConnection());
// Read customer with particular ID
Command select = das.getCommand("getCustomer");
- select.setParameter(1, 1);
+ select.setParameter(1, new Integer(1));
DataObject root = select.executeQuery();
assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
@@ -268,7 +268,7 @@
// Create a new customer
DataObject cust4 = root.createDataObject("CUSTOMER");
- cust4.set("ID", Integer.valueOf(100));
+ cust4.set("ID", new Integer(100));
cust4.set("ADDRESS", "5528 Wells Fargo Drive");
cust4.set("LASTNAME", "Gerkin");
@@ -277,23 +277,23 @@
// Verify deletes
select = das.createCommand("Select * from CUSTOMER where ID = ?");
- select.setParameter(1, Integer.valueOf(cust2ID));
+ select.setParameter(1, new Integer(cust2ID));
root = select.executeQuery();
assertTrue(root.getList("CUSTOMER").isEmpty());
// reparameterize same command
- select.setParameter(1, Integer.valueOf(cust3ID));
+ select.setParameter(1, new Integer(cust3ID));
root = select.executeQuery();
assertTrue(root.getList("CUSTOMER").isEmpty());
// verify insert
- select.setParameter(1, Integer.valueOf(100));
+ select.setParameter(1, new Integer(100));
root = select.executeQuery();
assertEquals(1, root.getList("CUSTOMER").size());
assertEquals("5528 Wells Fargo Drive", root.getString("CUSTOMER[1]/ADDRESS"));
assertEquals("Gerkin", root.getString("CUSTOMER[1]/LASTNAME"));
// verify update
- select.setParameter(1, Integer.valueOf(cust1ID));
+ select.setParameter(1, new Integer(cust1ID));
root = select.executeQuery();
assertEquals("Pavick", root.getString("CUSTOMER[1]/LASTNAME"));
@@ -346,7 +346,7 @@
try {
das.applyChanges(root);
} catch (RuntimeException ex) {
- assertTrue(ex.getMessage().contains("changed in the DataGraph but is not present in the Config"));
+ assertTrue(ex.getMessage().indexOf("changed in the DataGraph but is not present in the Config") >= 0);
}
}
@@ -365,7 +365,7 @@
try {
das.applyChanges(root);
} catch (RuntimeException ex) {
- assertTrue(ex.getMessage().contains("changed in the DataGraph but is not present in the Config"));
+ assertTrue(ex.getMessage().indexOf("changed in the DataGraph but is not present in the Config") >= 0);
}
}
@@ -387,7 +387,7 @@
try {
das.applyChanges(root);
} catch (RuntimeException ex) {
- assertTrue(ex.getMessage().contains("changed in the DataGraph but is not present in the Config"));
+ assertTrue(ex.getMessage().indexOf("changed in the DataGraph but is not present in the Config") >= 0);
}
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java Thu Jul 19 10:22:31 2007
@@ -94,7 +94,7 @@
insert.setParameter(1, "AAA Rental");
insert.execute();
// Integer key = (Integer) insert.getParameterValue("generated_key");
- Integer key = (Integer) insert.getGeneratedKey();
+ Integer key = new Integer(insert.getGeneratedKey());
// Verify insert
Command select = das.createCommand("Select ID, NAME from COMPANY where ID = ?");
@@ -310,4 +310,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java Thu Jul 19 10:22:31 2007
@@ -131,13 +131,13 @@
Command select = das.createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON "
+ "CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
- select.setParameter(1, Integer.valueOf(1));
+ select.setParameter(1, new Integer(1));
DataObject graph1 = select.executeQuery();
DataObject customer = (DataObject) graph1.getList("CUSTOMER").get(0);
assertEquals(2, customer.getList("orders").size());
- select.setParameter(1, Integer.valueOf(2));
+ select.setParameter(1, new Integer(2));
DataObject graph2 = select.executeQuery();
DataObject customer2 = (DataObject) graph2.getList("CUSTOMER").get(0);
assertEquals(1, graph2.getList("CUSTOMER").size());
@@ -166,7 +166,7 @@
Command select = das.createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON "
+ "CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
- select.setParameter(1, Integer.valueOf(1));
+ select.setParameter(1, new Integer(1));
DataObject graph1 = select.executeQuery();
DataObject customer = (DataObject) graph1.getList("CUSTOMER").get(0);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java Thu Jul 19 10:22:31 2007
@@ -90,9 +90,9 @@
// Create a new Order and add to customer1
DataObject order = root.createDataObject("ANORDER");
- order.set("ID", Integer.valueOf(99));
+ order.set("ID", new Integer(99));
order.set("PRODUCT", "The 99th product");
- order.set("QUANTITY", Integer.valueOf(99));
+ order.set("QUANTITY", new Integer(99));
cust.getList("ANORDER").add(order);
assertEquals(custOrderCount + 1, cust.getList("ANORDER").size());
@@ -104,7 +104,7 @@
select = das.createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID "
+ "where CUSTOMER.ID = ?");
- select.setParameter(1, Integer.valueOf(custID));
+ select.setParameter(1, new Integer(custID));
root = select.executeQuery();
assertEquals(custOrderCount + 1, root.getList("CUSTOMER[1]/ANORDER").size());
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MultiSchemaTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MultiSchemaTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MultiSchemaTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MultiSchemaTests.java Thu Jul 19 10:22:31 2007
@@ -120,7 +120,7 @@
//test update
//System.out.println("Result:test case 2 - UPDATE");
changeFirstAccountBalance(das);
- assertEquals( ((DataObject)getAccounts(das).get(0)).get("BALANCE"), 45000);
+ assertEquals( ((DataObject)getAccounts(das).get(0)).get("BALANCE"), new Integer(45000));
//System.out.println("******************************************");
}
@@ -287,8 +287,8 @@
//System.out.println("cust 1 ID :"+cust1ID);
//System.out.println("cust 2 ID :"+cust2ID);
// save account count
- Integer cust1AccountCount = Integer.valueOf(cust1.getList("accounts").size());
- Integer cust2AccountCount = Integer.valueOf(cust2.getList("accounts").size());
+ Integer cust1AccountCount = new Integer(cust1.getList("accounts").size());
+ Integer cust2AccountCount = new Integer(cust2.getList("accounts").size());
// Move an account to cust1 from cust2
DataObject account = (DataObject) cust2.getList("accounts").get(0);
@@ -341,8 +341,8 @@
Integer prod2ID = (Integer) ordDet2.get("PRODUCTID");
// save order count
- Integer order1DetDescCount = Integer.valueOf(ordDet1.getList("orderDetailsDesc").size());
- Integer order2DetDescCount = Integer.valueOf(ordDet2.getList("orderDetailsDesc").size());
+ Integer order1DetDescCount = new Integer(ordDet1.getList("orderDetailsDesc").size());
+ Integer order2DetDescCount = new Integer(ordDet2.getList("orderDetailsDesc").size());
// Move an order detail desc to ord det1 from ord det2
DataObject orderDetailsDesc = (DataObject) ordDet2.getList("orderDetailsDesc").get(0);
@@ -563,7 +563,7 @@
DataObject root = readAll.executeQuery();
DataObject firstAccount = root.getDataObject("DASTEST2.ACCOUNT[1]");
- firstAccount.set("BALANCE", 45000);
+ firstAccount.set("BALANCE", new Integer(45000));
das.applyChanges(root);
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java Thu Jul 19 10:22:31 2007
@@ -192,7 +192,7 @@
// Create a new customer
DataObject newCust = root.createDataObject("CUSTOMER");
- newCust.set("ID", Integer.valueOf(200));
+ newCust.set("ID", new Integer(200));
// Purposely do not set lastname to let it default to 'Garfugengheist'
// newCust.set("LASTNAME", "Gerkin" );
@@ -219,7 +219,7 @@
// Create a new customer
DataObject newCust = root.createDataObject("CUSTOMER");
- newCust.set("ID", Integer.valueOf(300));
+ newCust.set("ID", new Integer(300));
newCust.set("ADDRESS", "5528 Wells Fargo Drive");
newCust.set("LASTNAME", "Gerkin" );
@@ -244,7 +244,7 @@
// Create a new customer
DataObject newCust = root.createDataObject("CUSTOMER");
- newCust.set("ID", Integer.valueOf(100));
+ newCust.set("ID", new Integer(100));
newCust.set("ADDRESS", "5528 Wells Fargo Drive");
// Purposely do not set lastname to let it default to 'Garfugengheist'
// newCust.set("LASTNAME", "Gerkin" );
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java Thu Jul 19 10:22:31 2007
@@ -64,7 +64,7 @@
// Read a book instance
Command select = das.getCommand("select book by id");
- select.setParameter(1, Integer.valueOf(1));
+ select.setParameter(1, new Integer(1));
DataObject root = select.executeQuery();
DataObject book = root.getDataObject("BOOK[1]");
// Change a field to mark the instance 'dirty'
@@ -164,7 +164,7 @@
DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
Command select = das.createCommand(statement);
- select.setParameter(1, Integer.valueOf(1));
+ select.setParameter(1, new Integer(1));
DataObject root = select.executeQuery();
@@ -176,7 +176,7 @@
das.applyChanges(root);
//Verify
- select.setParameter(1, Integer.valueOf(1001));
+ select.setParameter(1, new Integer(1001));
root = select.executeQuery();
assertEquals("Ant Colonies of the Old World", root.getString("Book[1]/NAME"));
@@ -195,7 +195,7 @@
helper.addColumn(table, "NAME", "bookName");
DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
Command select = das.createCommand(statement);
- select.setParameter(1, Integer.valueOf(1));
+ select.setParameter(1, new Integer(1));
DataObject root = select.executeQuery();
@@ -207,7 +207,7 @@
das.applyChanges(root);
//Verify
- select.setParameter(1, Integer.valueOf(1001));
+ select.setParameter(1, new Integer(1001));
root = select.executeQuery();
assertEquals("Ant Colonies of the Old World", root.getString("Book[1]/bookName"));
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java Thu Jul 19 10:22:31 2007
@@ -98,8 +98,8 @@
Integer cust1ID = (Integer) cust1.get("ID");
Integer cust2ID = (Integer) cust2.get("ID");
// save order count
- Integer cust1OrderCount = Integer.valueOf(cust1.getList("orders").size());
- Integer cust2OrderCount = Integer.valueOf(cust2.getList("orders").size());
+ Integer cust1OrderCount = new Integer(cust1.getList("orders").size());
+ Integer cust2OrderCount = new Integer(cust2.getList("orders").size());
// Move an order to cust1 from cust2
DataObject order = (DataObject) cust2.getList("orders").get(0);
@@ -178,7 +178,7 @@
// Move an order to cust1 from cust2
DataObject order = (DataObject) cust2.getList("orders").get(0);
cust1.getList("orders").add(order);
- order.setInt("CUSTOMER_ID", cust1ID);
+ order.setInt("CUSTOMER_ID", cust1ID.intValue());
try {
das.applyChanges(root);
@@ -205,7 +205,7 @@
// Move an order to cust1 from cust2
DataObject order = root.createDataObject("ANORDER");
order.setInt("ID", 500);
- order.setInt("CUSTOMER_ID", cust1ID);
+ order.setInt("CUSTOMER_ID", cust1ID.intValue());
cust1.getList("orders").add(order);
try {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java Thu Jul 19 10:22:31 2007
@@ -143,7 +143,7 @@
public void testInsertWithParameters() throws Exception {
DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into CUSTOMER values (?, ?, ?)");
- insert.setParameter(1, Integer.valueOf(10));
+ insert.setParameter(1, new Integer(10));
insert.setParameter(2, "Williams");
insert.setParameter(3, "5528 Wells Fargo Dr");
insert.execute();
@@ -198,7 +198,7 @@
Command update = das.createCommand("update CUSTOMER set LASTNAME = ? where ID = ?");
update.setParameter(1, "Pavick");
- update.setParameter(2, Integer.valueOf(1));
+ update.setParameter(2, new Integer(1));
update.execute();
// Verify update - reuse select command
@@ -216,7 +216,7 @@
Command update = das.createCommand("update CUSTOMER set LASTNAME = ? where ID = ?");
update.setParameter(1, "Pavick");
- update.setParameter(2, Integer.valueOf(1));
+ update.setParameter(2, new Integer(1));
update.execute();
//Verify update - reuse select command
@@ -225,4 +225,4 @@
}
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java Thu Jul 19 10:22:31 2007
@@ -91,7 +91,7 @@
public void testGetCustomersAndOrder() throws Exception {
DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
Command read = das.createCommand("{call getCustomerAndOrders(?)}");
- read.setParameter(1, Integer.valueOf(1));
+ read.setParameter(1, new Integer(1));
DataObject root = read.executeQuery();
@@ -129,7 +129,7 @@
public void testDelete() throws Exception {
DAS das = DAS.FACTORY.createDAS(getConnection());
Command delete = das.createCommand("{call DELETECUSTOMER(?)}");
- delete.setParameter(1, Integer.valueOf(1));
+ delete.setParameter(1, new Integer(1));
delete.execute();
// Verify DELETE
@@ -139,4 +139,4 @@
}
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java Thu Jul 19 10:22:31 2007
@@ -52,7 +52,7 @@
SDOUtil.registerStaticTypes(CustomerFactory.class);
// Parameterize the command
- select.setParameter(1, Integer.valueOf(1));
+ select.setParameter(1, new Integer(1));
// Get the graph - DataGraphRoot is from the typed package
DataObject root = select.executeQuery();
@@ -70,4 +70,4 @@
}
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TransactionTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TransactionTests.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TransactionTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TransactionTests.java Thu Jul 19 10:22:31 2007
@@ -62,12 +62,12 @@
//Create two identical customers. Will force insert error on dup key
DataObject custA = root.createDataObject("CUSTOMER");
- custA.set("ID", Integer.valueOf(100));
+ custA.set("ID", new Integer(100));
custA.set("ADDRESS", "5528 Wells Fargo Drive");
custA.set("LASTNAME", "Gerkin");
DataObject custB = root.createDataObject("CUSTOMER");
- custB.set("ID", Integer.valueOf(100));
+ custB.set("ID", new Integer(100));
custB.set("ADDRESS", "5528 Wells Fargo Drive");
custB.set("LASTNAME", "Gerkin");
try {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java Thu Jul 19 10:22:31 2007
@@ -29,9 +29,9 @@
private static int[] bookTypes = {Types.INTEGER, Types.VARCHAR, Types.VARCHAR, Types.INTEGER, Types.INTEGER};
- private static Object[][] bookData = {{Integer.valueOf(1), "The Brothers Karamazov", "Fyodor Dostoevsky",
- Integer.valueOf(5), Integer.valueOf(17)},
- {Integer.valueOf(2), "Cat in the Hat", "Doctor Seuss", Integer.valueOf(10), Integer.valueOf(1)}};
+ private static Object[][] bookData = {{new Integer(1), "The Brothers Karamazov", "Fyodor Dostoevsky",
+ new Integer(5), new Integer(17)},
+ {new Integer(2), "Cat in the Hat", "Doctor Seuss", new Integer(10), new Integer(1)}};
private static String[] bookColumns = {"BOOK_ID", "NAME", "AUTHOR", "QUANTITY", "OCC"};
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java Thu Jul 19 10:22:31 2007
@@ -25,11 +25,11 @@
public class CityData extends TestData {
- private static Object[][] cityData = {{Integer.valueOf(1), "Lizard Lick", "1"},
- {Integer.valueOf(2), "Morrisville", "1"},
- {Integer.valueOf(3), "Breckenridge", "2"},
- {Integer.valueOf(4), "Barstow", "3"},
- {Integer.valueOf(5), "Sacramento", "3"}
+ private static Object[][] cityData = {{new Integer(1), "Lizard Lick", "1"},
+ {new Integer(2), "Morrisville", "1"},
+ {new Integer(3), "Breckenridge", "2"},
+ {new Integer(4), "Barstow", "3"},
+ {new Integer(5), "Sacramento", "3"}
};
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java Thu Jul 19 10:22:31 2007
@@ -24,9 +24,9 @@
public class CustomerData extends TestData {
- private static Object[][] customerData = {{Integer.valueOf(1), "Williams", "1212 foobar lane"},
- {Integer.valueOf(2), "Daniel", "156 Brentfield Loop"}, {Integer.valueOf(3), "Williams", "456 penny lane"},
- {Integer.valueOf(4), "Williams", "5000 pineville"}, {Integer.valueOf(5), "Williams", "100000 firefly lane"}};
+ private static Object[][] customerData = {{new Integer(1), "Williams", "1212 foobar lane"},
+ {new Integer(2), "Daniel", "156 Brentfield Loop"}, {new Integer(3), "Williams", "456 penny lane"},
+ {new Integer(4), "Williams", "5000 pineville"}, {new Integer(5), "Williams", "100000 firefly lane"}};
public CustomerData(Connection connection) {
super(connection, customerData);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java Thu Jul 19 10:22:31 2007
@@ -37,9 +37,9 @@
//id and owner_id omitted. id is auto-generated. owner_id is filled in by DogOwner data
private static int[] columnTypes = {Types.VARCHAR, Types.VARCHAR, Types.INTEGER};
- private static Object[][] data = {{"Fido", "Mutt", Integer.valueOf(1)},
- {"Max", "German Shepherd", Integer.valueOf(1)},
- {"Saddie", "Collie", Integer.valueOf(1)}};
+ private static Object[][] data = {{"Fido", "Mutt", new Integer(1)},
+ {"Max", "German Shepherd", new Integer(1)},
+ {"Saddie", "Collie", new Integer(1)}};
private static String[] columns = {"NAME", "BREED", "OCC_COUNT"};
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java Thu Jul 19 10:22:31 2007
@@ -36,9 +36,9 @@
//id omitted. id is auto-generated.
private static int[] columnTypes = {Types.INTEGER, Types.VARCHAR, Types.INTEGER};
- private static Object[][] data = {{Integer.valueOf(100), "Small", Integer.valueOf(1)},
- {Integer.valueOf(101), "Small", Integer.valueOf(1)},
- {Integer.valueOf(102), "Large", Integer.valueOf(1)}};
+ private static Object[][] data = {{new Integer(100), "Small", new Integer(1)},
+ {new Integer(101), "Small", new Integer(1)},
+ {new Integer(102), "Large", new Integer(1)}};
private static String[] columns = {"KNUMBER", "KIND", "OCC_COUNT"};
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java Thu Jul 19 10:22:31 2007
@@ -25,10 +25,10 @@
public class OrderData extends TestData {
protected static Object[][] orderData = {
- {Integer.valueOf(1), "recombobulator", Integer.valueOf(47), Integer.valueOf(1)},
- {Integer.valueOf(2), "wrench", Integer.valueOf(17), Integer.valueOf(3)},
- {Integer.valueOf(3), "pliers", Integer.valueOf(500), Integer.valueOf(1)},
- {Integer.valueOf(4), "Tooth Paste", Integer.valueOf(12), Integer.valueOf(2)}};
+ {new Integer(1), "recombobulator", new Integer(47), new Integer(1)},
+ {new Integer(2), "wrench", new Integer(17), new Integer(3)},
+ {new Integer(3), "pliers", new Integer(500), new Integer(1)},
+ {new Integer(4), "Tooth Paste", new Integer(12), new Integer(2)}};
public OrderData(Connection c) {
super(c, orderData);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java Thu Jul 19 10:22:31 2007
@@ -27,10 +27,10 @@
// CREATE TABLE ORDERDETAILS (ORDERID INT NOT NULL, PRODUCTID INT NOT NULL, PRICE FLOAT,
// PRIMARY KEY (ORDERID, PRODUCTID))
- protected static Object[][] orderDetailsData = {{Integer.valueOf(1), Integer.valueOf(1), new Float(1.1)},
- {Integer.valueOf(1), Integer.valueOf(2), new Float(1.2)},
- {Integer.valueOf(2), Integer.valueOf(1), new Float(2.1)},
- {Integer.valueOf(2), Integer.valueOf(2), new Float(2.2)}};
+ protected static Object[][] orderDetailsData = {{new Integer(1), new Integer(1), new Float(1.1)},
+ {new Integer(1), new Integer(2), new Float(1.2)},
+ {new Integer(2), new Integer(1), new Float(2.1)},
+ {new Integer(2), new Integer(2), new Float(2.2)}};
public OrderDetailsData(Connection c) {
super(c, orderDetailsData);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java Thu Jul 19 10:22:31 2007
@@ -30,12 +30,12 @@
// PRIMARY KEY ID, FOREIGN KEY (ORDERID, PRODUCTID))
protected static Object[][] orderDetailsDescriptionData =
- { {Integer.valueOf(1), Integer.valueOf(1), Integer.valueOf(1), "Descr 1,1,1"},
- {Integer.valueOf(2), Integer.valueOf(1), Integer.valueOf(1), "Descr 2,1,1"},
- {Integer.valueOf(3), Integer.valueOf(1), Integer.valueOf(2), "Descr 3,1,2"},
- {Integer.valueOf(4), Integer.valueOf(1), Integer.valueOf(2), "Descr 4,1,2"},
- {Integer.valueOf(5), Integer.valueOf(2), Integer.valueOf(1), "Descr 6,2,1"},
- {Integer.valueOf(6), Integer.valueOf(2), Integer.valueOf(2), "Descr 6,2,2"}};
+ { {new Integer(1), new Integer(1), new Integer(1), "Descr 1,1,1"},
+ {new Integer(2), new Integer(1), new Integer(1), "Descr 2,1,1"},
+ {new Integer(3), new Integer(1), new Integer(2), "Descr 3,1,2"},
+ {new Integer(4), new Integer(1), new Integer(2), "Descr 4,1,2"},
+ {new Integer(5), new Integer(2), new Integer(1), "Descr 6,2,1"},
+ {new Integer(6), new Integer(2), new Integer(2), "Descr 6,2,2"}};
public OrderDetailsDescriptionData(Connection c) {
super(c, orderDetailsDescriptionData);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java Thu Jul 19 10:22:31 2007
@@ -36,9 +36,9 @@
//id omitted. id is auto-generated.
private static int[] columnTypes = {Types.VARCHAR, Types.VARCHAR, Types.INTEGER};
- private static Object[][] data = {{"Fanny", "222-2222", Integer.valueOf(1)},
- {"Manny", "333-3333", Integer.valueOf(1)},
- {"Sammy", "444-4444", Integer.valueOf(1)}};
+ private static Object[][] data = {{"Fanny", "222-2222", new Integer(1)},
+ {"Manny", "333-3333", new Integer(1)},
+ {"Sammy", "444-4444", new Integer(1)}};
private static String[] columns = {"NAME", "CONTACT_PHONE", "OCC_COUNT"};
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java Thu Jul 19 10:22:31 2007
@@ -31,11 +31,11 @@
private static int[] columnTypes = {Types.INTEGER, Types.VARCHAR, Types.INTEGER, Types.INTEGER};
- private static Object[][] partData = {{Integer.valueOf(1), "Engine", Integer.valueOf(1), null},
- {Integer.valueOf(2), "Block", Integer.valueOf(1), Integer.valueOf(1)},
- {Integer.valueOf(3), "Cam Shaft", Integer.valueOf(2), Integer.valueOf(1)},
- {Integer.valueOf(4), "Piston", Integer.valueOf(8), Integer.valueOf(1)},
- {Integer.valueOf(5), "Piston Ring", Integer.valueOf(2), Integer.valueOf(4)}};
+ private static Object[][] partData = {{new Integer(1), "Engine", new Integer(1), null},
+ {new Integer(2), "Block", new Integer(1), new Integer(1)},
+ {new Integer(3), "Cam Shaft", new Integer(2), new Integer(1)},
+ {new Integer(4), "Piston", new Integer(8), new Integer(1)},
+ {new Integer(5), "Piston Ring", new Integer(2), new Integer(4)}};
public PartData(Connection connection) {
super(connection, partData, partColumns, columnTypes);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java Thu Jul 19 10:22:31 2007
@@ -24,8 +24,8 @@
import org.apache.tuscany.das.rdb.test.framework.TestData;
public class StateData extends TestData {
- private static Object[][] stateData = {{Integer.valueOf(1), "NC"}, {Integer.valueOf(2), "CO"},
- {Integer.valueOf(3), "CA"}};
+ private static Object[][] stateData = {{new Integer(1), "NC"}, {new Integer(2), "CO"},
+ {new Integer(3), "CA"}};
public StateData(Connection c) {
super(c, stateData);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java Thu Jul 19 10:22:31 2007
@@ -24,7 +24,7 @@
public class TypesData extends TestData {
- private static Object[][] customerData = {{Integer.valueOf(1), TIMESTAMP,
+ private static Object[][] customerData = {{new Integer(1), TIMESTAMP,
new Float(1234567.89), new Float(1234567.89)}};
public TypesData(Connection connection) {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java Thu Jul 19 10:22:31 2007
@@ -35,9 +35,9 @@
private static int[] columnTypes = {Types.TIMESTAMP, Types.TIMESTAMP, Types.INTEGER};
private static Object[][] data = {
- {getTimestamp("2006-10-20 00:00:00.0"), getTimestamp("2006-10-22 00:00:00.0"), Integer.valueOf(1)},
- {getTimestamp("2006-10-20 00:00:00.0"), getTimestamp("2006-10-22 00:00:00.0"), Integer.valueOf(1)},
- {getTimestamp("2006-10-20 00:00:00.0"), getTimestamp("2006-10-22 00:00:00.0"), Integer.valueOf(1)}};
+ {getTimestamp("2006-10-20 00:00:00.0"), getTimestamp("2006-10-22 00:00:00.0"), new Integer(1)},
+ {getTimestamp("2006-10-20 00:00:00.0"), getTimestamp("2006-10-22 00:00:00.0"), new Integer(1)},
+ {getTimestamp("2006-10-20 00:00:00.0"), getTimestamp("2006-10-22 00:00:00.0"), new Integer(1)}};
private static String[] columns = {"CHECK_IN", "CHECK_OUT", "OCC_COUNT"};
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java Thu Jul 19 10:22:31 2007
@@ -139,8 +139,8 @@
s.execute(statements[i]);
} catch (SQLException e) {
// If the table does not exist then ignore the exception on drop
- if ((!e.getMessage().contains("does not exist")) && (!e.getMessage().contains("Unknown table"))
- && (!e.getMessage().contains("42704"))) {
+ if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0))
+ && (!(e.getMessage().indexOf("42704") >= 0))) {
throw new RuntimeException(e);
}
}
@@ -170,8 +170,8 @@
s.execute(statements[i]);
} catch (SQLException e) {
// If the table does not exist then ignore the exception on drop
- if ((!e.getMessage().contains("does not exist")) && (!e.getMessage().contains("Unknown table"))
- && (!e.getMessage().contains("42704"))) {
+ if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0))
+ && (!(e.getMessage().indexOf("42704") >= 0))) {
throw new RuntimeException(e);
}
}
@@ -211,7 +211,7 @@
s.execute(statements[i]);
} catch (SQLException e) {
// If the proc does not exist then ignore the exception on drop
- if (!e.getMessage().contains("does not exist") && !e.getMessage().contains("42704")) {
+ if (!(e.getMessage().indexOf("does not exist") >= 0) && !(e.getMessage().indexOf("42704") >= 0)) {
throw new RuntimeException(e);
}
}
@@ -498,7 +498,7 @@
}
protected String getStringColumn(String name, int length) {
- return name + ' ' + stringType + "(" + Integer.valueOf(length).toString() + ")";
+ return name + ' ' + stringType + "(" + new Integer(length).toString() + ")";
}
protected String getIntegerColumn(String name) {
@@ -510,8 +510,8 @@
}
protected String getDecimalColumn(String name, int size1, int size2) {
- return name + ' ' + decimalType + "(" + Integer.valueOf(size1).toString() + ','
- + Integer.valueOf(size2).toString() + ")";
+ return name + ' ' + decimalType + "(" + new Integer(size1).toString() + ','
+ + new Integer(size2).toString() + ")";
}
protected String getFloatColumn(String name) {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java Thu Jul 19 10:22:31 2007
@@ -34,9 +34,9 @@
public Object getColumnValue(Object propertyData) {
Boolean value = (Boolean) propertyData;
if (value.booleanValue()) {
- return Integer.valueOf(1);
+ return new Integer(1);
}
- return Integer.valueOf(0);
+ return new Integer(0);
}
Modified: incubator/tuscany/java/das/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyDBInit.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyDBInit.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyDBInit.java (original)
+++ incubator/tuscany/java/das/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyDBInit.java Thu Jul 19 10:22:31 2007
@@ -33,7 +33,6 @@
private static final long serialVersionUID = -4795999792460944805L;
private static final String dbConfigFile = "CompanyWebDBConfig.xml";
- @Override
public void init() throws ServletException {
try {
DBInitializer dbInitializer;
Modified: incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DB2Setup.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DB2Setup.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DB2Setup.java (original)
+++ incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DB2Setup.java Thu Jul 19 10:22:31 2007
@@ -75,8 +75,8 @@
s.execute(statements[i]);
} catch (SQLException e) {
// If the table does not exist then ignore the exception on drop
- if ((!e.getMessage().contains("does not exist")) && (!e.getMessage().contains("Unknown table"))
- && (!e.getMessage().contains("42704"))) {
+ if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0))
+ && (!(e.getMessage().indexOf("42704") >= 0))) {
throw new RuntimeException(e);
}
}
@@ -95,8 +95,8 @@
s.execute(statements[i]);
} catch (SQLException e) {
// If the table does not exist then ignore the exception on drop
- if ((!e.getMessage().contains("does not exist")) && (!e.getMessage().contains("Unknown table"))
- && (!e.getMessage().contains("42704"))) {
+ if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0))
+ && (!(e.getMessage().indexOf("42704") >= 0))) {
throw new RuntimeException(e);
}
}
@@ -134,7 +134,7 @@
s.execute(statements[i]);
} catch (SQLException e) {
// If the proc does not exist then ignore the exception on drop
- if (!e.getMessage().contains("does not exist") && !e.getMessage().contains("42704")) {
+ if (!(e.getMessage().indexOf("does not exist") >= 0) && !(e.getMessage().indexOf("42704") >= 0)) {
throw new RuntimeException(e);
}
}
@@ -198,7 +198,7 @@
}
protected String getStringColumn(String name, int length) {
- return name + ' ' + stringType + "(" + Integer.valueOf(length).toString() + ")";
+ return name + ' ' + stringType + "(" + new Integer(length).toString() + ")";
}
protected String getIntegerColumn(String name) {
@@ -210,8 +210,8 @@
}
protected String getDecimalColumn(String name, int size1, int size2) {
- return name + ' ' + decimalType + "(" + Integer.valueOf(size1).toString() + ','
- + Integer.valueOf(size2).toString() + ")";
+ return name + ' ' + decimalType + "(" + new Integer(size1).toString() + ','
+ + new Integer(size2).toString() + ")";
}
protected String getFloatColumn(String name) {
Modified: incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java (original)
+++ incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java Thu Jul 19 10:22:31 2007
@@ -75,8 +75,8 @@
s.execute(statements[i]);
} catch (SQLException e) {
// If the table does not exist then ignore the exception on drop
- if ((!e.getMessage().contains("does not exist")) && (!e.getMessage().contains("Unknown table"))
- && (!e.getMessage().contains("42704"))) {
+ if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0))
+ && (!(e.getMessage().indexOf("42704") >= 0))) {
throw new RuntimeException(e);
}
}
@@ -92,8 +92,8 @@
s.execute(statements[i]);
} catch (SQLException e) {
// If the table does not exist then ignore the exception on drop
- if ((!e.getMessage().contains("does not exist")) && (!e.getMessage().contains("Unknown table"))
- && (!e.getMessage().contains("42704"))) {
+ if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0))
+ && (!(e.getMessage().indexOf("42704") >= 0))) {
throw new RuntimeException(e);
}
}
@@ -127,7 +127,7 @@
s.execute(statements[i]);
} catch (SQLException e) {
// If the proc does not exist then ignore the exception on drop
- if (!e.getMessage().contains("does not exist") && !e.getMessage().contains("42704")) {
+ if (!(e.getMessage().indexOf("does not exist") >= 0) && !(e.getMessage().indexOf("42704") >= 0)) {
throw new RuntimeException(e);
}
}
@@ -183,7 +183,7 @@
}
protected String getStringColumn(String name, int length) {
- return name + ' ' + stringType + "(" + Integer.valueOf(length).toString() + ")";
+ return name + ' ' + stringType + "(" + new Integer(length).toString() + ")";
}
protected String getIntegerColumn(String name) {
@@ -195,8 +195,8 @@
}
protected String getDecimalColumn(String name, int size1, int size2) {
- return name + ' ' + decimalType + "(" + Integer.valueOf(size1).toString() + ','
- + Integer.valueOf(size2).toString() + ")";
+ return name + ' ' + decimalType + "(" + new Integer(size1).toString() + ','
+ + new Integer(size2).toString() + ")";
}
protected String getFloatColumn(String name) {
Modified: incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java (original)
+++ incubator/tuscany/java/das/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java Thu Jul 19 10:22:31 2007
@@ -72,8 +72,8 @@
s.execute(statements[i]);
} catch (SQLException e) {
// If the table does not exist then ignore the exception on drop
- if ((!e.getMessage().contains("does not exist")) && (!e.getMessage().contains("Unknown table"))
- && (!e.getMessage().contains("42704"))) {
+ if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0))
+ && (!(e.getMessage().indexOf("42704") >= 0))) {
throw new RuntimeException(e);
}
}
@@ -90,8 +90,8 @@
s.execute(statements[i]);
} catch (SQLException e) {
// If the table does not exist then ignore the exception on drop
- if ((!e.getMessage().contains("does not exist")) && (!e.getMessage().contains("Unknown table"))
- && (!e.getMessage().contains("42704"))) {
+ if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0))
+ && (!(e.getMessage().indexOf("42704") >= 0))) {
throw new RuntimeException(e);
}
}
@@ -125,7 +125,7 @@
s.execute(statements[i]);
} catch (SQLException e) {
// If the proc does not exist then ignore the exception on drop
- if (!e.getMessage().contains("does not exist") && !e.getMessage().contains("42704")) {
+ if (!(e.getMessage().indexOf("does not exist") >= 0) && !(e.getMessage().indexOf("42704") >= 0)) {
throw new RuntimeException(e);
}
}
@@ -171,7 +171,7 @@
}
protected String getStringColumn(String name, int length) {
- return name + ' ' + stringType + "(" + Integer.valueOf(length).toString() + ")";
+ return name + ' ' + stringType + "(" + new Integer(length).toString() + ")";
}
protected String getIntegerColumn(String name) {
@@ -179,8 +179,8 @@
}
protected String getDecimalColumn(String name, int size1, int size2) {
- return name + ' ' + decimalType + "(" + Integer.valueOf(size1).toString() + ','
- + Integer.valueOf(size2).toString() + ")";
+ return name + ' ' + decimalType + "(" + new Integer(size1).toString() + ','
+ + new Integer(size2).toString() + ")";
}
protected String getFloatColumn(String name) {
Modified: incubator/tuscany/java/das/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java?view=diff&rev=557695&r1=557694&r2=557695
==============================================================================
--- incubator/tuscany/java/das/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java (original)
+++ incubator/tuscany/java/das/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java Thu Jul 19 10:22:31 2007
@@ -165,11 +165,11 @@
root = read.executeQuery();
}
else{
- Vector<String> batch = formQueries(qry);//separate {}{} in different queries
+ Vector batch = formQueries(qry);//separate {}{} in different queries
if(batch != null){
for(int i=0; i<batch.size(); i++){
- String curQry = batch.get(i);
+ String curQry = (String) batch.get(i);
if(curQry.substring(0, 6).equalsIgnoreCase("select")){
read = das.createCommand(curQry);
root = read.executeQuery();
@@ -188,14 +188,14 @@
String methodName = "get"+qry; //some convention to form method name instead of lenghtening code
Method commandMethod = this.getClass().getMethod(methodName, new Class[]{String.class});
- root = (DataObject)commandMethod.invoke(this, qry);
+ root = (DataObject)commandMethod.invoke(this, new Object[] {qry});
}
return root;
}
/* Separate batch of queries into vector of queries - for adhoc*/
- private Vector<String> formQueries(String qry){
- Vector<String> batch = new Vector<String>();
+ private Vector formQueries(String qry){
+ Vector batch = new Vector();
StringTokenizer strTok = new StringTokenizer(qry, "{");
while(strTok.hasMoreTokens()){
String curQry = strTok.nextToken();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org