You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by bd...@apache.org on 2006/10/05 22:03:24 UTC
svn commit: r453343 [3/3] - in /incubator/tuscany/java/das/rdb/src:
main/java/org/apache/tuscany/das/rdb/
main/java/org/apache/tuscany/das/rdb/config/wrapper/
main/java/org/apache/tuscany/das/rdb/generator/impl/
main/java/org/apache/tuscany/das/rdb/gra...
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java Thu Oct 5 13:03:20 2006
@@ -57,8 +57,9 @@
Iterator i = engine.getList("subparts").iterator();
while (i.hasNext()) {
DataObject obj = (DataObject) i.next();
- if (obj.getString("NAME").equals("Piston"))
+ if (obj.getString("NAME").equals("Piston")) {
piston = obj;
+ }
}
assertEquals("Piston", piston.getString("NAME"));
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -50,7 +50,8 @@
*/
public void testRead() throws Exception {
- String statement = "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID WHERE CUSTOMER.ID = 1";
+ String statement = "SELECT * FROM CUSTOMER LEFT JOIN ANORDER "
+ + "ON CUSTOMER.ID = ANORDER.CUSTOMER_ID WHERE CUSTOMER.ID = 1";
DAS das = DAS.FACTORY.createDAS(getConfig("customerOrderRelationshipMapping.xml"), getConnection());
// Read some customers and related orders
@@ -83,8 +84,8 @@
Integer cust1ID = (Integer) cust1.get("ID");
Integer cust2ID = (Integer) cust2.get("ID");
// save order count
- Integer cust1OrderCount = new Integer(cust1.getList("orders").size());
- Integer cust2OrderCount = new Integer(cust2.getList("orders").size());
+ Integer cust1OrderCount = Integer.valueOf(cust1.getList("orders").size());
+ Integer cust2OrderCount = Integer.valueOf(cust2.getList("orders").size());
// Move an order to cust1 from cust2
DataObject order = (DataObject) cust2.getList("orders").get(0);
@@ -95,7 +96,8 @@
// verify cust1 relationship updates
select = das
- .createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
+ .createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON "
+ + "CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
select.setParameter(1, cust1ID);
root = select.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java Thu Oct 5 13:03:20 2006
@@ -19,8 +19,10 @@
package org.apache.tuscany.das.rdb.test;
/*
- * This class provides tests for all supported "types". The current plan is to use the Data type definitions provided in the SDO 2 specification. We
- * must test the ability to use all of these types as well as different mapping from thse types to types used in the database. For example, a SDO Data
+ * This class provides tests for all supported "types". The current plan
+ * is to use the Data type definitions provided in the SDO 2 specification. We
+ * must test the ability to use all of these types as well as different mapping
+ * from thse types to types used in the database. For example, a SDO Data
* Type "STRING", might be staored as a "TIMESTAMP" in DB2.
*
*/
@@ -41,23 +43,32 @@
public void testReadandSerialize() throws Exception {
/**
- * Currently failing because of TUSCANY-22 Command select = Command.FACTORY .createCommand("Select * from TYPETEST where ID = 1");
+ * Currently failing because of TUSCANY-22
+ * Command select = Command.FACTORY .createCommand("Select * from TYPETEST where ID = 1");
* select.setConnection(getConnection()); DataObject root = select.executeQuery();
*
* DataObject obj = root.getDataObject("TYPETEST[1]");
*
- * assertTrue(obj.isSet("ID")); assertTrue(obj.isSet("ATIMESTAMP")); assertTrue(obj.isSet("ADECIMAL")); assertTrue(obj.isSet("AFLOAT"));
+ * assertTrue(obj.isSet("ID")); assertTrue(obj.isSet("ATIMESTAMP"));
+ * assertTrue(obj.isSet("ADECIMAL")); assertTrue(obj.isSet("AFLOAT"));
*
* //Java serilaization to file FileOutputStream fos = null; ObjectOutputStream out = null; try { fos = new
- * FileOutputStream("serializedGraph.xml"); out = new ObjectOutputStream(fos); out.writeObject(root); out.flush(); } finally { out.close();
+ * FileOutputStream("serializedGraph.xml"); out = new ObjectOutputStream(fos);
+ * out.writeObject(root);
+ * out.flush();
+ * } finally {
+ * out.close();
* fos.close(); }
*
- * //Reconstruct the graph FileInputStream fis = null; ObjectInputStream in = null; DataObject root2; try { fis = new
- * FileInputStream("serializedGraph.xml"); in = new ObjectInputStream(fis); root2 = (DataObject) in.readObject(); } finally { in.close();
+ * //Reconstruct the graph FileInputStream fis = null; ObjectInputStream in = null;
+ * DataObject root2; try { fis = new
+ * FileInputStream("serializedGraph.xml"); in = new ObjectInputStream(fis);
+ * root2 = (DataObject) in.readObject(); } finally { in.close();
* fis.close(); }
*
* assertEquals(1, root.getInt("TYPETEST[1]/ID")); assertEquals(TypesData.getTimestamp(),
- * (java.sql.Timestamp)root.get("TYPETEST[1]/ATIMESTAMP")); assertEquals(1234567.89f, root2.getFloat("TYPETEST[1]/ADECIMAL"), .001);
+ * (java.sql.Timestamp)root.get("TYPETEST[1]/ATIMESTAMP"));
+ * assertEquals(1234567.89f, root2.getFloat("TYPETEST[1]/ADECIMAL"), .001);
* assertEquals(1234567.89f, root2.getFloat("TYPETEST[1]/AFLOAT"), .001);
*
*/
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -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, new Integer(10));
+ insert.setParameter(1, Integer.valueOf(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, new Integer(1));
+ update.setParameter(2, Integer.valueOf(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, new Integer(1));
+ update.setParameter(2, Integer.valueOf(1));
update.execute();
//Verify update - reuse select command
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -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, new Integer(1));
+ read.setParameter(1, Integer.valueOf(1));
DataObject root = read.executeQuery();
@@ -101,9 +101,12 @@
}
/**
- * Call a stored proc requiring an in parameter and producing an out parameter and a resultset
+ * Call a stored proc requiring an in parameter and producing
+ * an out parameter and a resultset
*
- * This stored proc takes a lastname argument and returns a graph of customers with that last name. The number of read customers is returned in
+ * This stored proc takes a lastname argument and returns a
+ * graph of customers with that last name. The number of read
+ * customers is returned in
* the out parameter
*/
public void testGetNamedCustomers() throws Exception {
@@ -126,7 +129,7 @@
public void testDelete() throws Exception {
DAS das = DAS.FACTORY.createDAS(getConnection());
Command delete = das.createCommand("{call DELETECUSTOMER(?)}");
- delete.setParameter(1, new Integer(1));
+ delete.setParameter(1, Integer.valueOf(1));
delete.execute();
// Verify DELETE
@@ -135,31 +138,5 @@
assertTrue(root.getList("CUSTOMER").isEmpty());
}
-
- /*
- * // For debug public void testRawCall() throws Exception {
- *
- * Connection c = getConnection(); CallableStatement cs = c.prepareCall("{call GETNAMEDCUSTOMERS(?,?)}"); ParameterMetaData pm =
- * cs.getParameterMetaData(); int count = pm.getParameterCount(); for (int i = 1; i <= count; i++) { int mode = pm.getParameterMode(i); if (mode ==
- * ParameterMetaData.parameterModeOut || mode == ParameterMetaData.parameterModeInOut) cs.registerOutParameter(i, pm.getParameterType(i)); }
- * cs.setString(1, "Williams"); // cs.registerOutParameter(2,java.sql.Types.INTEGER); boolean isResultSet = cs.execute(); System.out.println("Has
- * a result set => " + isResultSet); ResultSet rs = cs.getResultSet();
- *
- * if (isResultSet) { System.out.println("Results are: "); while (rs.next()) { System.out.println(rs.getObject(2)); } } System.out.println("Count
- * is =>" + cs.getObject(2)); c.commit(); }
- * // For debug public void testRawCall2() throws Exception {
- *
- * Connection c = getConnection(); CallableStatement cs = c.prepareCall("{call getCustomerAndOrders(?)}"); cs.setObject(1, new Integer(1));
- * boolean isResultSet = cs.execute(); System.out.println("call getCustomerAndOrders(?) has a result set => " + isResultSet); ResultSet rs =
- * cs.getResultSet();
- *
- * write(rs); c.commit(); }
- *
- * public void testGetAllOrders() throws Exception {
- *
- * System.out.println("all orders"); Connection c = getConnection(); PreparedStatement s = c.prepareStatement("select * from anorder"); write
- * (s.executeQuery()); c.commit();
- * }
- */
}
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.das.rdb.test;
-import java.io.IOException;
import java.sql.SQLException;
import org.apache.tuscany.das.rdb.Command;
@@ -44,7 +43,7 @@
}
// Uses dynamic SDOs but user provides the model
- public void testUserProvidedModelDynamic() throws SQLException, IOException {
+ public void testUserProvidedModelDynamic() throws SQLException {
DAS das = DAS.FACTORY.createDAS(getConfig("staticCustomerOrder.xml"), getConnection());
@@ -53,7 +52,7 @@
SDOUtil.registerStaticTypes(CustomerFactory.class);
// Parameterize the command
- select.setParameter(1, new Integer(1));
+ select.setParameter(1, Integer.valueOf(1));
// Get the graph - DataGraphRoot is from the typed package
DataObject root = select.executeQuery();
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -27,12 +27,13 @@
// CREATE TABLE BOOK (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(50), AUTHOR VARCHAR(30), QUANTITY INT, OCC INTEGER)
- private static int[] bookTypes = { Types.INTEGER, Types.VARCHAR, Types.VARCHAR, Types.INTEGER, Types.INTEGER };
+ private static int[] bookTypes = {Types.INTEGER, Types.VARCHAR, Types.VARCHAR, Types.INTEGER, Types.INTEGER};
- 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 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 String[] bookColumns = { "BOOK_ID", "NAME", "AUTHOR", "QUANTITY", "OCC" };
+ private static String[] bookColumns = {"BOOK_ID", "NAME", "AUTHOR", "QUANTITY", "OCC"};
public BookData(Connection connection) {
super(connection, bookData, bookColumns, bookTypes);
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -25,8 +25,11 @@
public class CityData extends TestData {
- 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" }
+ 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"}
};
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java Thu Oct 5 13:03:20 2006
@@ -27,11 +27,11 @@
// CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY ,NAME VARCHAR(30))
- private static int[] columnTypes = { Types.VARCHAR };
+ private static int[] columnTypes = {Types.VARCHAR};
- private static Object[][] companyData = { { "ACME Publishing" }, { "Do-rite plumbing" }, { "MegaCorp" } };
+ private static Object[][] companyData = {{"ACME Publishing"}, {"Do-rite plumbing"}, {"MegaCorp"}};
- private static String[] companyColumns = { "NAME" };
+ private static String[] companyColumns = {"NAME"};
public CompanyData(Connection connection) {
super(connection, companyData, companyColumns, columnTypes);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java Thu Oct 5 13:03:20 2006
@@ -24,7 +24,7 @@
public class CompanyDeptData extends RelationshipData {
- public static Object[][] data = { { "MegaCorp", "Advanced Technologies" } };
+ private static Object[][] data = {{"MegaCorp", "Advanced Technologies"}};
public CompanyDeptData(Connection c) {
super(c, data);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java Thu Oct 5 13:03:20 2006
@@ -25,7 +25,7 @@
public class CompanyEmpData extends RelationshipData {
- public static Object[][] data = {
+ protected static Object[][] data = {
{"Mary Smith", "ACME Publishing" },
{"Jane Doe", "Do-rite plumbing"},
{"Al Smith", "MegaCorp"}};
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -24,9 +24,9 @@
public class CustomerData extends TestData {
- 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" } };
+ 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"}};
public CustomerData(Connection connection) {
super(connection, customerData);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java Thu Oct 5 13:03:20 2006
@@ -24,8 +24,9 @@
public class DepEmpData extends RelationshipData {
- private static Object[][] data = { { "Advanced Technologies", "John Jones" }, { "Advanced Technologies", "Jane Doe" },
- { "Advanced Technologies", "Al Smith" } };
+ private static Object[][] data = {{"Advanced Technologies", "John Jones"},
+ {"Advanced Technologies", "Jane Doe"},
+ {"Advanced Technologies", "Al Smith"}};
public DepEmpData(Connection c) {
super(c, data);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java Thu Oct 5 13:03:20 2006
@@ -25,20 +25,19 @@
public class DepartmentData extends TestDataWithExplicitColumns {
-
- private static int[] columnTypes = {Types.VARCHAR, Types.VARCHAR, Types.VARCHAR};
- private static Object[][] deptData = {{"Advanced Technologies", "NY",
- "123"}};
+ private static int[] columnTypes = {Types.VARCHAR, Types.VARCHAR, Types.VARCHAR};
- private static String[] deptColumns = {"NAME", "LOCATION", "DEPNUMBER"};
-
- public DepartmentData(Connection connection) {
- super(connection, deptData, deptColumns, columnTypes);
- }
-
- public String getTableName() {
- return "DEPARTMENT";
- }
+ private static Object[][] deptData = {{"Advanced Technologies", "NY", "123" }};
+
+ private static String[] deptColumns = {"NAME", "LOCATION", "DEPNUMBER"};
+
+ public DepartmentData(Connection connection) {
+ super(connection, deptData, deptColumns, columnTypes);
+ }
+
+ public String getTableName() {
+ return "DEPARTMENT";
+ }
}
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -23,34 +23,32 @@
import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
-
public class DogData extends TestDataWithExplicitColumns {
-/* CREATE TABLE DOG (
- ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
- OWNER_ID INTEGER UNSIGNED NOT NULL,
- NAME VARCHAR(20) NOT NULL,
- BREED VARCHAR(20) NULL,
- OCC_COUNT INTEGER UNSIGNED NULL,
- PRIMARY KEY(ID),
- );*/
-
- //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", new Integer(1)},
- {"Max", "German Shepherd", new Integer(1)},
- {"Saddie", "Collie", new Integer(1)}};
-
- private static String[] columns = {"NAME", "BREED", "OCC_COUNT"};
-
- public DogData(Connection connection) {
- super(connection, data, columns, columnTypes);
- }
-
- public String getTableName() {
- return "DOG";
- }
+ /* CREATE TABLE DOG (
+ ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+ OWNER_ID INTEGER UNSIGNED NOT NULL,
+ NAME VARCHAR(20) NOT NULL,
+ BREED VARCHAR(20) NULL,
+ OCC_COUNT INTEGER UNSIGNED NULL,
+ PRIMARY KEY(ID),
+ );*/
+
+ //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 String[] columns = {"NAME", "BREED", "OCC_COUNT"};
+
+ public DogData(Connection connection) {
+ super(connection, data, columns, columnTypes);
+ }
+
+ public String getTableName() {
+ return "DOG";
+ }
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java Thu Oct 5 13:03:20 2006
@@ -23,25 +23,22 @@
import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
-
public class EmployeeData extends TestDataWithExplicitColumns {
- private static int[] columnTypes = {Types.VARCHAR, Types.VARCHAR, Types.SMALLINT};
+ private static int[] columnTypes = {Types.VARCHAR, Types.VARCHAR, Types.SMALLINT};
+
+ private static Object[][] employeeData = {{"John Jones", "E0001", Boolean.valueOf(false)},
+ {"Mary Smith", "E0002", Boolean.valueOf(true)},
+ {"Jane Doe", "E0003", Boolean.valueOf(false)}, {"Al Smith", "E0004", Boolean.valueOf(true)}};
+
+ private static String[] employeeColumns = {"NAME", "SN", "MANAGER"};
- private static Object[][] employeeData = {
- {"John Jones", "E0001", new Boolean(false)},
- {"Mary Smith", "E0002", new Boolean(true)},
- {"Jane Doe", "E0003", new Boolean(false)},
- {"Al Smith", "E0004", new Boolean(true)}};
+ public EmployeeData(Connection connection) {
+ super(connection, employeeData, employeeColumns, columnTypes);
+ }
- private static String[] employeeColumns = {"NAME", "SN", "MANAGER"};
-
- public EmployeeData(Connection connection) {
- super(connection, employeeData, employeeColumns, columnTypes);
- }
-
- public String getTableName() {
- return "EMPLOYEE";
- }
+ public String getTableName() {
+ return "EMPLOYEE";
+ }
}
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -23,33 +23,31 @@
import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
-
public class KennelData extends TestDataWithExplicitColumns {
-/* CREATE TABLE KENNEL (
- ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
- KNUMBER INTEGER UNSIGNED NULL,
- KIND VARCHAR(20) NULL,
- OCC_COUNT INTEGER UNSIGNED NULL,
- PRIMARY KEY(ID)
- );*/
-
- //id omitted. id is auto-generated.
- private static int[] columnTypes = {Types.INTEGER, Types.VARCHAR, Types.INTEGER};
-
- 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"};
-
- public KennelData(Connection connection) {
- super(connection, data, columns, columnTypes);
- }
-
- public String getTableName() {
- return "KENNEL";
- }
+ /* CREATE TABLE KENNEL (
+ ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+ KNUMBER INTEGER UNSIGNED NULL,
+ KIND VARCHAR(20) NULL,
+ OCC_COUNT INTEGER UNSIGNED NULL,
+ PRIMARY KEY(ID)
+ );*/
+
+ //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 String[] columns = {"KNUMBER", "KIND", "OCC_COUNT"};
+
+ public KennelData(Connection connection) {
+ super(connection, data, columns, columnTypes);
+ }
+
+ public String getTableName() {
+ return "KENNEL";
+ }
}
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -24,9 +24,11 @@
public class OrderData extends TestData {
- public static Object[][] orderData = { { 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) } };
+ 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)}};
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -22,24 +22,22 @@
import org.apache.tuscany.das.rdb.test.framework.TestData;
-
public class OrderDetailsData extends TestData {
- //CREATE TABLE ORDERDETAILS (ORDERID INT NOT NULL, PRODUCTID INT NOT NULL, PRICE FLOAT, PRIMARY KEY (ORDERID, PRODUCTID))
+ // 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)}};
+
+ public OrderDetailsData(Connection c) {
+ super(c, orderDetailsData);
+ }
- public 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);
- }
-
- public String getTableName() {
- return "ORDERDETAILS";
- }
+ public String getTableName() {
+ return "ORDERDETAILS";
+ }
}
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -23,33 +23,31 @@
import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
-
public class OwnerData extends TestDataWithExplicitColumns {
-/* CREATE TABLE OWNER (
- ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
- NAME VARCHAR(20) NULL,
- CONTACT_PHONE VARCHAR(20) NULL,
- OCC_COUNT INTEGER UNSIGNED NULL,
- PRIMARY KEY(ID)
- );*/
-
- //id omitted. id is auto-generated.
- private static int[] columnTypes = {Types.VARCHAR, Types.VARCHAR, Types.INTEGER};
-
- 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"};
-
- public OwnerData(Connection connection) {
- super(connection, data, columns, columnTypes);
- }
-
- public String getTableName() {
- return "OWNER";
- }
+ /* CREATE TABLE OWNER (
+ ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+ NAME VARCHAR(20) NULL,
+ CONTACT_PHONE VARCHAR(20) NULL,
+ OCC_COUNT INTEGER UNSIGNED NULL,
+ PRIMARY KEY(ID)
+ );*/
+
+ //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 String[] columns = {"NAME", "CONTACT_PHONE", "OCC_COUNT"};
+
+ public OwnerData(Connection connection) {
+ super(connection, data, columns, columnTypes);
+ }
+
+ public String getTableName() {
+ return "OWNER";
+ }
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java Thu Oct 5 13:03:20 2006
@@ -24,10 +24,10 @@
public class OwnerDogData extends RelationshipData {
- public static Object[][] data = {{"Fanny", "Fido"}, {"Manny", "Max"}, {"Sammy", "Saddie"}};
+ private static final Object[][] DATA = {{"Fanny", "Fido"}, {"Manny", "Max"}, {"Sammy", "Saddie"}};
public OwnerDogData(Connection c) {
- super(c, data);
+ super(c, DATA);
}
protected String getParentRetrievalStatement() {
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -27,13 +27,15 @@
// CREATE TABLE PART (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(50), QUANTITY INT, PARENT_ID INT )
- private static String[] partColumns = { "ID", "NAME", "QUANTITY", "PARENT_ID" };
+ private static String[] partColumns = {"ID", "NAME", "QUANTITY", "PARENT_ID"};
- private static int[] columnTypes = { Types.INTEGER, Types.VARCHAR, Types.INTEGER, Types.INTEGER };
+ private static int[] columnTypes = {Types.INTEGER, Types.VARCHAR, Types.INTEGER, Types.INTEGER};
- 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) } };
+ 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)}};
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -24,7 +24,8 @@
import org.apache.tuscany.das.rdb.test.framework.TestData;
public class StateData extends TestData {
- private static Object[][] stateData = { { new Integer(1), "NC" }, { new Integer(2), "CO" }, { new Integer(3), "CA" } };
+ private static Object[][] stateData = {{Integer.valueOf(1), "NC"}, {Integer.valueOf(2), "CO"},
+ {Integer.valueOf(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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -24,7 +24,8 @@
public class TypesData extends TestData {
- private static Object[][] customerData = { { new Integer(1), timestamp, new Float(1234567.89), new Float(1234567.89) } };
+ private static Object[][] customerData = {{Integer.valueOf(1), TIMESTAMP,
+ new Float(1234567.89), new Float(1234567.89)}};
public TypesData(Connection connection) {
super(connection, customerData);
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -26,18 +26,20 @@
public class VisitData extends TestDataWithExplicitColumns {
/*
- * CREATE TABLE VISIT ( ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, CHECK_IN TIMESTAMP NULL, CHECK_OUT TIMESTAMP NULL, OCC_COUNT INTEGER UNSIGNED
+ * CREATE TABLE VISIT ( ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+ * CHECK_IN TIMESTAMP NULL, CHECK_OUT TIMESTAMP NULL, OCC_COUNT INTEGER UNSIGNED
* NULL, PRIMARY KEY(ID) );
*/
// id omitted. id is auto-generated.
- private static int[] columnTypes = { Types.TIMESTAMP, Types.TIMESTAMP, Types.INTEGER };
+ 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"), 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 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)}};
- private static String[] columns = { "CHECK_IN", "CHECK_OUT", "OCC_COUNT" };
+ private static String[] columns = {"CHECK_IN", "CHECK_OUT", "OCC_COUNT"};
public VisitData(Connection connection) {
super(connection, data, columns, columnTypes);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java Thu Oct 5 13:03:20 2006
@@ -18,8 +18,6 @@
*/
package org.apache.tuscany.das.rdb.test.framework;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.ResultSet;
@@ -67,16 +65,19 @@
* This provides the default connection for runing single test cases on a chosen platform.
*/
private Connection primGetConnection() {
- if (connection == null)
+ if (connection == null) {
defaultSetup();
+ }
return connection;
}
/**
- * This is a bit of a hack since it counts on constructor initialization of the DatabaseSet up class and also calls its setUp method directly.
+ * This is a bit of a hack since it counts on constructor initialization
+ * of the DatabaseSet up class and also calls its setUp method directly.
* This is a misuse of this JUnit TestSetup subclass .
*
- * TODO - refactor to avoid this hackiness ... could move this logic to its own class that is then invoked by DatabaseSetUp
+ * TODO - refactor to avoid this hackiness ... could move this logic to its
+ * own class that is then invoked by DatabaseSetUp
*/
private void defaultSetup() {
@@ -91,11 +92,11 @@
}
// Utilities
- protected InputStream getConfig(String fileName) throws FileNotFoundException {
+ protected InputStream getConfig(String fileName) {
return Thread.currentThread().getContextClassLoader().getResourceAsStream(fileName);
}
- protected void write(String label, ResultSet rs) throws IOException, SQLException {
+ protected void write(String label, ResultSet rs) throws SQLException {
ResultSetMetaData md = rs.getMetaData();
int count = md.getColumnCount();
@@ -133,8 +134,9 @@
System.out.println();
} else if (!p.getType().isDataType()) {
DataObject child = obj.getDataObject(p);
- if (child != null)
+ if (child != null) {
System.out.println("[ " + p.getName() + " ] " + "[ " + child.get("ID") + " ]");
+ }
} else {
System.out.println("[ " + p.getName() + " ] " + obj.get(p));
}
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -289,20 +289,23 @@
protected String getCreateEmployee() {
return "CREATE TABLE EMPLOYEE (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL "
+ getGeneratedKeyClause() + ","
- + getStringColumn("NAME", 30) + "," + getStringColumn("SN", 10) + ", MANAGER SMALLINT, " + getIntegerColumn("DEPARTMENTID") + ")";
+ + getStringColumn("NAME", 30) + "," + getStringColumn("SN", 10) + ", MANAGER SMALLINT, "
+ + getIntegerColumn("DEPARTMENTID") + ")";
}
protected String getCreateDepartment() {
return "CREATE TABLE DEPARTMENT (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL "
+ getGeneratedKeyClause() + ", "
- + getStringColumn("NAME", 30) + "," + getStringColumn("LOCATION", 30) + ", " + getStringColumn("DEPNUMBER", 10) + ","
+ + getStringColumn("NAME", 30) + "," + getStringColumn("LOCATION", 30) + ", "
+ + getStringColumn("DEPNUMBER", 10) + ","
+ getIntegerColumn("COMPANYID") + ")";
}
protected String getCreateBook() {
return "CREATE TABLE BOOK (" + getIntegerColumn("BOOK_ID") + " PRIMARY KEY NOT NULL, "
+ getStringColumn("NAME", 50) + ","
- + getStringColumn("AUTHOR", 30) + ", " + getIntegerColumn("QUANTITY") + "," + getIntegerColumn("OCC") + ")";
+ + getStringColumn("AUTHOR", 30) + ", " + getIntegerColumn("QUANTITY") + ","
+ + getIntegerColumn("OCC") + ")";
}
protected String getCreatePart() {
@@ -312,16 +315,19 @@
}
protected String getCreateTypeTest() {
- return "CREATE TABLE TYPETEST (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, " + getTimestampColumn("ATIMESTAMP") + ","
+ return "CREATE TABLE TYPETEST (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, "
+ + getTimestampColumn("ATIMESTAMP") + ","
+ getDecimalColumn("ADECIMAL", 9, 2) + "," + getFloatColumn("AFLOAT") + ")";
}
protected String getCreateStates() {
- return "CREATE TABLE STATES (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, " + getStringColumn("NAME", 2) + ")";
+ return "CREATE TABLE STATES (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, "
+ + getStringColumn("NAME", 2) + ")";
}
protected String getCreateCities() {
- return "CREATE TABLE CITIES (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL," + getStringColumn("NAME", 50) + ","
+ return "CREATE TABLE CITIES (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL,"
+ + getStringColumn("NAME", 50) + ","
+ getIntegerColumn("STATE_ID") + "," + getForeignKeyConstraint("STATES", "ID", "STATE_ID") + ")";
}
@@ -335,24 +341,31 @@
// Dog Kennel Schema
protected String getCreateDog() {
- return "CREATE TABLE DOG (" + getIntegerColumn("ID") + " NOT NULL " + getGeneratedKeyClause() + " , " + getIntegerColumn("OWNER_ID") + " , "
- + getStringColumn("NAME", 20) + ", " + getStringColumn("BREED", 20) + ", " + getIntegerColumn("OCC_COUNT") + ", "
+ return "CREATE TABLE DOG (" + getIntegerColumn("ID") + " NOT NULL " + getGeneratedKeyClause() + " , "
+ + getIntegerColumn("OWNER_ID") + " , "
+ + getStringColumn("NAME", 20) + ", " + getStringColumn("BREED", 20) + ", "
+ + getIntegerColumn("OCC_COUNT") + ", "
+ "PRIMARY KEY(ID))";
}
protected String getCreateOwner() {
- return "CREATE TABLE OWNER (" + getIntegerColumn("ID") + " NOT NULL " + getGeneratedKeyClause() + " , " + getStringColumn("NAME", 20) + ", "
- + getStringColumn("CONTACT_PHONE", 20) + ", " + getIntegerColumn("OCC_COUNT") + ", " + "PRIMARY KEY(ID))";
+ return "CREATE TABLE OWNER (" + getIntegerColumn("ID") + " NOT NULL " + getGeneratedKeyClause() + " , "
+ + getStringColumn("NAME", 20) + ", "
+ + getStringColumn("CONTACT_PHONE", 20) + ", " + getIntegerColumn("OCC_COUNT") + ", "
+ + "PRIMARY KEY(ID))";
}
protected String getCreateKennel() {
- return "CREATE TABLE KENNEL (" + getIntegerColumn("ID") + " NOT NULL " + getGeneratedKeyClause() + " , " + getIntegerColumn("KNUMBER") + ", "
+ return "CREATE TABLE KENNEL (" + getIntegerColumn("ID") + " NOT NULL " + getGeneratedKeyClause()
+ + " , " + getIntegerColumn("KNUMBER") + ", "
+ getStringColumn("KIND", 20) + ", " + getIntegerColumn("OCC_COUNT") + ", " + "PRIMARY KEY(ID))";
}
protected String getCreateVisit() {
- return "CREATE TABLE VISIT (" + getIntegerColumn("ID") + " NOT NULL " + getGeneratedKeyClause() + " , " + getTimestampColumn("CHECK_IN")
- + ", " + getTimestampColumn("CHECK_OUT") + ", " + getIntegerColumn("OCC_COUNT") + ", " + "PRIMARY KEY(ID))";
+ return "CREATE TABLE VISIT (" + getIntegerColumn("ID") + " NOT NULL " + getGeneratedKeyClause() + " , "
+ + getTimestampColumn("CHECK_IN")
+ + ", " + getTimestampColumn("CHECK_OUT") + ", " + getIntegerColumn("OCC_COUNT") + ", "
+ + "PRIMARY KEY(ID))";
}
// /////////////////
@@ -370,7 +383,7 @@
}
protected String getStringColumn(String name, int length) {
- return name + ' ' + stringType + "(" + new Integer(length).toString() + ")";
+ return name + ' ' + stringType + "(" + Integer.valueOf(length).toString() + ")";
}
protected String getIntegerColumn(String name) {
@@ -382,7 +395,8 @@
}
protected String getDecimalColumn(String name, int size1, int size2) {
- return name + ' ' + decimalType + "(" + new Integer(size1).toString() + ',' + new Integer(size2).toString() + ")";
+ return name + ' ' + decimalType + "(" + Integer.valueOf(size1).toString() + ','
+ + Integer.valueOf(size2).toString() + ")";
}
protected String getFloatColumn(String name) {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java Thu Oct 5 13:03:20 2006
@@ -24,21 +24,21 @@
public class DerbySetup extends DatabaseSetup {
- public DerbySetup(Test test) {
- super(test);
- }
+ public DerbySetup(Test test) {
+ super(test);
+ }
- protected void initConnectionProtocol() {
-
- //Set the derby property to explicitly specify the database location relative
- //from current directory to "target"
- Properties p = System.getProperties();
- p.put("derby.system.home", "target");
+ protected void initConnectionProtocol() {
+
+ // Set the derby property to explicitly specify the database location relative
+ // from current directory to "target"
+ Properties p = System.getProperties();
+ p.put("derby.system.home", "target");
+
+ platformName = "Derby";
+ driverName = "org.apache.derby.jdbc.EmbeddedDriver";
+ databaseURL = "jdbc:derby:dastest; create = true";
+
+ }
- platformName = "Derby";
- driverName = "org.apache.derby.jdbc.EmbeddedDriver";
- databaseURL = "jdbc:derby:dastest; create = true";
-
- }
-
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java Thu Oct 5 13:03:20 2006
@@ -24,70 +24,75 @@
public class MySQLSetup extends DatabaseSetup {
- public MySQLSetup(Test test) {
- super(test);
- }
-
- protected void initConnectionProtocol() {
-
- platformName = "MySQL";
- driverName = "com.mysql.jdbc.Driver";
- databaseURL = "jdbc:mysql:///dastest?user=dastester&password=dastester";
-
- }
-
-
- protected void createProcedures() {
-
- String createGetAllCompanies = "CREATE PROCEDURE `dastest`.`GETALLCOMPANIES` () "
- + " SELECT * FROM COMPANY ";
-
- String createDeleteCustomer = "CREATE PROCEDURE `dastest`.`DELETECUSTOMER` (theId INT) "
- + " DELETE FROM CUSTOMER WHERE ID = theId ";
-
- String createGetNamedCustomers = "CREATE PROCEDURE `dastest`.`GETNAMEDCUSTOMERS`(IN thename VARCHAR(30), OUT theCount INTEGER ) "
- + " BEGIN "
- + " SELECT * FROM CUSTOMER AS CUSTOMER WHERE LASTNAME = theName; "
- + " SET theCount = (SELECT COUNT(*) FROM CUSTOMER WHERE LASTNAME = theName); "
- + " END ";
-
- String createGetCustomerAndOrders = " CREATE PROCEDURE `dastest`.`GETCUSTOMERANDORDERS` (theId INT) "
- + " SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID WHERE CUSTOMER.ID = theId ";
-
- String createGetNamedCompany = " CREATE PROCEDURE `dastest`.`GETNAMEDCOMPANY` (theName VARCHAR(100)) "
- + " SELECT * FROM COMPANY WHERE NAME = theName";
-
- System.out.println("Creating procedures");
- try {
-
- s.execute(createGetAllCompanies);
- s.execute(createDeleteCustomer);
- s.execute(createGetNamedCompany);
- s.execute(createGetCustomerAndOrders);
- s.execute(createGetNamedCustomers);
-
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
- }
-
-
- //Overrides for table creation
- protected String getCreateCompany() {
- return "CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, NAME VARCHAR(30), EOTMID INT)";
- }
- protected String getCreateEmployee() {
- return "CREATE TABLE EMPLOYEE (ID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, NAME VARCHAR(30), SN VARCHAR(10), MANAGER SMALLINT, DEPARTMENTID INT)";
- }
- protected String getCreateDepartment() {
- return "CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, NAME VARCHAR(30), LOCATION VARCHAR(30), NUMBER VARCHAR(10), COMPANYID INT, EOTM INT)";
- }
- protected String getCreateTypeTest() {
- return "CREATE TABLE TYPETEST (ID INT PRIMARY KEY NOT NULL, ATIMESTAMP DATETIME, ADECIMAL DECIMAL(9,2), AFLOAT FLOAT)";
- }
-
- protected String getCreateServerStatus() {
- return "CREATE TABLE CONMGT.SERVERSTATUS (STATUSID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, MANAGEDSERVERID INTEGER NOT NULL, TIMESTAMP TIMESTAMP NOT NULL)";
- }
+ public MySQLSetup(Test test) {
+ super(test);
+ }
+
+ protected void initConnectionProtocol() {
+
+ platformName = "MySQL";
+ driverName = "com.mysql.jdbc.Driver";
+ databaseURL = "jdbc:mysql:///dastest?user=dastester&password=dastester";
+
+ }
+
+ protected void createProcedures() {
+
+ String createGetAllCompanies = "CREATE PROCEDURE `dastest`.`GETALLCOMPANIES` () "
+ + " SELECT * FROM COMPANY ";
+
+ String createDeleteCustomer = "CREATE PROCEDURE `dastest`.`DELETECUSTOMER` (theId INT) "
+ + " DELETE FROM CUSTOMER WHERE ID = theId ";
+
+ String createGetNamedCustomers = "CREATE PROCEDURE `dastest`.`GETNAMEDCUSTOMERS`(IN thename VARCHAR(30), "
+ + "OUT theCount INTEGER ) " + " BEGIN "
+ + " SELECT * FROM CUSTOMER AS CUSTOMER WHERE LASTNAME = theName; "
+ + " SET theCount = (SELECT COUNT(*) FROM CUSTOMER WHERE LASTNAME = theName); " + " END ";
+
+ String createGetCustomerAndOrders = " CREATE PROCEDURE `dastest`.`GETCUSTOMERANDORDERS` (theId INT) "
+ + " SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID "
+ + "WHERE CUSTOMER.ID = theId ";
+
+ String createGetNamedCompany = " CREATE PROCEDURE `dastest`.`GETNAMEDCOMPANY` (theName VARCHAR(100)) "
+ + " SELECT * FROM COMPANY WHERE NAME = theName";
+
+ System.out.println("Creating procedures");
+ try {
+
+ s.execute(createGetAllCompanies);
+ s.execute(createDeleteCustomer);
+ s.execute(createGetNamedCompany);
+ s.execute(createGetCustomerAndOrders);
+ s.execute(createGetNamedCustomers);
+
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ // Overrides for table creation
+ protected String getCreateCompany() {
+ return "CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, NAME VARCHAR(30), EOTMID INT)";
+ }
+
+ protected String getCreateEmployee() {
+ return "CREATE TABLE EMPLOYEE (ID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, NAME VARCHAR(30), "
+ + "SN VARCHAR(10), MANAGER SMALLINT, DEPARTMENTID INT)";
+ }
+
+ protected String getCreateDepartment() {
+ return "CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, NAME VARCHAR(30), "
+ + "LOCATION VARCHAR(30), NUMBER VARCHAR(10), COMPANYID INT, EOTM INT)";
+ }
+
+ protected String getCreateTypeTest() {
+ return "CREATE TABLE TYPETEST (ID INT PRIMARY KEY NOT NULL, ATIMESTAMP DATETIME, ADECIMAL DECIMAL(9,2), "
+ + "AFLOAT FLOAT)";
+ }
+
+ protected String getCreateServerStatus() {
+ return "CREATE TABLE CONMGT.SERVERSTATUS (STATUSID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, "
+ + "MANAGEDSERVERID INTEGER NOT NULL, TIMESTAMP TIMESTAMP NOT NULL)";
+ }
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java Thu Oct 5 13:03:20 2006
@@ -45,10 +45,7 @@
public boolean next() {
++currentRow;
- if (currentRow < numberOfRows())
- return true;
- else
- return false;
+ return currentRow < numberOfRows();
}
public void refresh() throws SQLException {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java Thu Oct 5 13:03:20 2006
@@ -29,9 +29,9 @@
public abstract class TestData {
- protected static DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:ss:mm.SSS");
+ protected static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd hh:ss:mm.SSS");
- protected static Timestamp timestamp = getTimestamp();
+ protected static final Timestamp TIMESTAMP = getTimestamp();
protected Object[][] data;
@@ -100,7 +100,7 @@
protected static Date getDate() {
try {
- return dateFormat.parse("1966-12-20 00:00:00.0");
+ return DATE_FORMAT.parse("1966-12-20 00:00:00.0");
} catch (ParseException e) {
throw new RuntimeException(e);
}
@@ -109,7 +109,7 @@
protected static Date getDate(String timeStamp) {
try {
- return dateFormat.parse("1966-12-20 00:00:00.0");
+ return DATE_FORMAT.parse("1966-12-20 00:00:00.0");
} catch (ParseException e) {
throw new RuntimeException(e);
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java Thu Oct 5 13:03:20 2006
@@ -27,9 +27,9 @@
public abstract class TestDataWithExplicitColumns extends TestData {
- protected String[] columns;
+ private String[] columns;
- protected int[] sqlTypes;
+ private int[] sqlTypes;
private final Logger logger = LoggerFactory.INSTANCE.getLogger(TestDataWithExplicitColumns.class);
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -22,21 +22,22 @@
public class IntegerToBooleanConverter implements Converter {
- public IntegerToBooleanConverter() {
- super();
- }
+ public IntegerToBooleanConverter() {
+ super();
+ }
- public Object getPropertyValue(Object columnData) {
- Integer value = (Integer) columnData;
- return value.intValue() == 0 ? Boolean.FALSE : Boolean.TRUE;
- }
-
- public Object getColumnValue(Object propertyData) {
- Boolean value = (Boolean) propertyData;
- if (value.booleanValue())
- return new Integer(1);
- else
- return new Integer(0);
- }
+ public Object getPropertyValue(Object columnData) {
+ Integer value = (Integer) columnData;
+ return value.intValue() == 0 ? Boolean.FALSE : Boolean.TRUE;
+ }
+
+ public Object getColumnValue(Object propertyData) {
+ Boolean value = (Boolean) propertyData;
+ if (value.booleanValue()) {
+ return Integer.valueOf(1);
+ }
+ return Integer.valueOf(0);
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org