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 [1/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...
Author: bdaniel
Date: Thu Oct 5 13:03:20 2006
New Revision: 453343
URL: http://svn.apache.org/viewvc?view=rev&rev=453343
Log:
More checkstyle fixes. Mostly removing tab characters and correcting formatting
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.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/CreateOperation.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.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/OptimisticWriteCommandImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerFactory.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerLayout.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/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/DefectTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.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/KennelTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.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/PassiveConnectionTests.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/ReadDBSchemaTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.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/SerializationTests.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/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/CompanyData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.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/DepEmpData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.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/EmployeeData.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/OwnerData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.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/DasTest.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/framework/DerbySetup.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java Thu Oct 5 13:03:20 2006
@@ -32,21 +32,23 @@
public interface Converter {
/**
- * Transform the columnData object to a new value and possibly new type. This should be the invers operation of #getColumnValue
+ * Transform the columnData object to a new value and possibly
+ * new type. This should be the invers operation of #getColumnValue
*
* @param columnData
* The column value to transorm
* @return Returns the transformed value
*/
- public Object getPropertyValue(Object columnData);
+ Object getPropertyValue(Object columnData);
/**
- * Transform the columnData object to a new value and possibly new type. This should be the invers operation of #getPropertyValue
+ * Transform the columnData object to a new value and possibly new
+ * type. This should be the invers operation of #getPropertyValue
*
* @param propertyData
* The property value to transform
* @return Returns the transformed value
*/
- public Object getColumnValue(Object propertyData);
+ Object getColumnValue(Object propertyData);
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java Thu Oct 5 13:03:20 2006
@@ -37,7 +37,7 @@
* A stream over a DAS config file
* @return returns a DAS instance
*/
- public DAS createDAS(InputStream configStream);
+ DAS createDAS(InputStream configStream);
/**
* Creates a DAS based on the provide config file stream and connection
@@ -45,7 +45,7 @@
* @param connection
* @return
*/
- public DAS createDAS(InputStream configStream, Connection connection);
+ DAS createDAS(InputStream configStream, Connection connection);
/**
* Creates a DAS based on the provided config
@@ -54,7 +54,7 @@
* A DAS config object
* @return returns a DAS instance
*/
- public DAS createDAS(Config config);
+ DAS createDAS(Config config);
/**
* Creates a DAS based on the provided config and connection
@@ -62,14 +62,14 @@
* @param connection
* @return
*/
- public DAS createDAS(Config config, Connection connection);
+ DAS createDAS(Config config, Connection connection);
/**
* Creates a DAS based on the provided connection
* @param connection
* @return
*/
- public DAS createDAS(Connection connection);
+ DAS createDAS(Connection connection);
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java Thu Oct 5 13:03:20 2006
@@ -21,44 +21,44 @@
import commonj.sdo.DataObject;
/**
- * An iterator-like interface to conveniently move through chunks of data. The
- * idea is that a Pager works with a read Command. The read command returns a
- * large amount of data and the client wants to work with chunks of it at a
- * time. So the Pager is created on the command and each call to next returns
- * the next chunk of data. This is done completely disconnected. No cursor is
- * maintained between calls to #next.
+ * An iterator-like interface to conveniently move through chunks of data. The
+ * idea is that a Pager works with a read Command. The read command
+ * returns a large amount of data and the client wants to work with chunks
+ * of it at a time. So the Pager is created on the command and each call to
+ * next returns the next chunk of data. This is done completely disconnected.
+ * No cursor is maintained between calls to #next.
*
- * TODO - This is very preliminary. We need to look at this interface in the
- * context of disonnected scenarios such as a web app. The Pager instance will
- * probably be saved in session so it must be very light and cannot reference a
- * connection. Also, we probably need to define a factory or add a method to set
- * page size.
+ * TODO - This is very preliminary. We need to look at this interface
+ * in the context of disonnected scenarios such as a web app. The Pager instance
+ * will probably be saved in session so it must be very light and cannot
+ * reference a connection. Also, we probably need to define a factory or add a
+ * method to set page size.
*
*
*/
public interface Pager {
- /**
- * Get the next page of data
- *
- * @return the next page of data
- */
- public DataObject next();
+ /**
+ * Get the next page of data
+ *
+ * @return the next page of data
+ */
+ DataObject next();
- /**
- * Get the page prior to the last page returned
- *
- * @return the previous page
- */
- public DataObject previous();
+ /**
+ * Get the page prior to the last page returned
+ *
+ * @return the previous page
+ */
+ DataObject previous();
- /**
- * Return a specific identified page.
- *
- * @param page
- * The number of the page to return
- * @return the indicated page
- */
- public DataObject getPage(int page);
+ /**
+ * Return a specific identified page.
+ *
+ * @param page
+ * The number of the page to return
+ * @return the indicated page
+ */
+ DataObject getPage(int page);
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java Thu Oct 5 13:03:20 2006
@@ -217,14 +217,18 @@
Iterator i = t.getColumn().iterator();
while (i.hasNext()) {
Column c = (Column) i.next();
- if (c.getColumnName().equals(propertyName))
+ if (c.getColumnName().equals(propertyName)) {
return c;
- if (c.getPropertyName() != null && c.getPropertyName().equals(propertyName))
+ }
+
+ if (c.getPropertyName() != null && c.getPropertyName().equals(propertyName)) {
return c;
+ }
}
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug("WARNING: Could not find column " + propertyName + " in table " + t.getTableName());
+ }
return null;
}
@@ -232,20 +236,23 @@
public String getColumnPropertyName(String tableName, String columnName) {
Table t = getTable(tableName);
Column c = getColumn(t, columnName);
- if (c == null)
+ if (c == null) {
return columnName;
+ }
String propertyName = c.getPropertyName();
- if (propertyName == null)
+ if (propertyName == null) {
return c.getColumnName();
+ }
return propertyName;
}
public Table addTable(String tableName, String typeName) {
Table table = getTable(tableName);
- if (table != null)
+ if (table != null) {
throw new RuntimeException("Table " + tableName + "already exists");
+ }
table = ConfigFactory.INSTANCE.createTable();
table.setTableName(tableName);
@@ -270,8 +277,9 @@
Iterator i = t.getColumn().iterator();
while (i.hasNext()) {
Column c = (Column) i.next();
- if (name.equals(c.getColumnName()))
+ if (name.equals(c.getColumnName())) {
return c;
+ }
}
Column c = ConfigFactory.INSTANCE.createColumn();
@@ -285,8 +293,9 @@
Iterator i = getConfig().getRelationship().iterator();
while (i.hasNext()) {
Relationship r = (Relationship) i.next();
- if (r.getPrimaryKeyTable().equals(r.getForeignKeyTable()))
+ if (r.getPrimaryKeyTable().equals(r.getForeignKeyTable())) {
return true;
+ }
}
}
return false;
@@ -298,8 +307,9 @@
Iterator i = getConfig().getRelationship().iterator();
while (i.hasNext()) {
Relationship r = (Relationship) i.next();
- if (name.equals(r.getForeignKeyTable()))
+ if (name.equals(r.getForeignKeyTable())) {
results.add(r);
+ }
}
}
return results;
@@ -324,17 +334,16 @@
children.add(r.getForeignKeyTable());
parentToChild.put(r.getPrimaryKeyTable(), r.getForeignKeyTable());
}
-
while (parents.size() > 0) {
String parent = (String) parents.get(0);
if (!children.contains(parent)) {
- if (!inserts.contains(parent))
+ if (!inserts.contains(parent)) {
inserts.add(parent);
-
+ }
String child = (String) parentToChild.get(parent);
- if (!inserts.contains(child))
+ if (!inserts.contains(child)) {
inserts.add(child);
-
+ }
parents.remove(parent);
children.remove(child);
} else {
@@ -342,11 +351,11 @@
}
}
inserts.addAll(children);
-
}
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug(inserts);
+ }
return inserts;
}
@@ -370,8 +379,9 @@
public String getConverter(String tableName, String columnName) {
Table t = getTable(tableName);
Column c = getColumn(t, columnName);
- if (c != null)
+ if (c != null) {
return c.getConverterClassName();
+ }
return null;
}
@@ -383,8 +393,9 @@
Column c = (Column) columns.next();
if (c.getConverterClassName() != null) {
String property = c.getPropertyName();
- if (property == null)
+ if (property == null) {
property = c.getColumnName();
+ }
converters.put(property, c.getConverterClassName());
}
}
@@ -395,8 +406,9 @@
Iterator i = config.getRelationship().iterator();
while (i.hasNext()) {
Relationship r = (Relationship) i.next();
- if (ref.getName().equals(r.getName()) || ref.getOpposite().getName().equals(r.getName()))
+ if (ref.getName().equals(r.getName()) || ref.getOpposite().getName().equals(r.getName())) {
return r;
+ }
}
throw new RuntimeException("Could not find relationship " + ref.getName() + " in the configuration");
}
@@ -405,8 +417,9 @@
Iterator i = config.getRelationship().iterator();
while (i.hasNext()) {
Relationship r = (Relationship) i.next();
- if (name.equals(r.getName()))
+ if (name.equals(r.getName())) {
return r;
+ }
}
throw new RuntimeException("Could not find relationship " + name + " in the configuration");
}
@@ -463,8 +476,9 @@
boolean hasPK = false;
while (i.hasNext()) {
Column c = (Column) i.next();
- if (c.isPrimaryKey())
+ if (c.isPrimaryKey()) {
hasPK = true;
+ }
}
if (!hasPK) {
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java Thu Oct 5 13:03:20 2006
@@ -23,26 +23,27 @@
public class QualifiedColumn {
- private final String tableName;
- private final String columnName;
+ private final String tableName;
+
+ private final String columnName;
private final Logger logger = LoggerFactory.INSTANCE.getLogger(QualifiedColumn.class);
- public QualifiedColumn(String name) {
- tableName = name.substring(0, name.indexOf('.'));
- columnName = name.substring(name.indexOf('.') + 1);
+ public QualifiedColumn(String name) {
+ tableName = name.substring(0, name.indexOf('.'));
+ columnName = name.substring(name.indexOf('.') + 1);
if (this.logger.isDebugEnabled()) {
this.logger.debug("Table name: " + tableName);
this.logger.debug("Column name: " + columnName);
}
- }
+ }
+
+ public String getTableName() {
+ return this.tableName;
+ }
- public String getTableName() {
- return this.tableName;
- }
-
- public String getColumnName() {
- return this.columnName;
- }
+ public String getColumnName() {
+ return this.columnName;
+ }
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java Thu Oct 5 13:03:20 2006
@@ -52,12 +52,14 @@
String name = (String) names.next();
statement.append(name);
statement.append(" = ?");
- if (names.hasNext() && properties.hasNext())
+ if (names.hasNext() && properties.hasNext()) {
statement.append(" and ");
+ }
}
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug(statement.toString());
+ }
return statement.toString();
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java Thu Oct 5 13:03:20 2006
@@ -41,7 +41,7 @@
public final class UpdateGenerator extends BaseGenerator {
- public static UpdateGenerator instance = new UpdateGenerator();
+ public static final UpdateGenerator INSTANCE = new UpdateGenerator();
private final Logger logger = LoggerFactory.INSTANCE.getLogger(UpdateGenerator.class);
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java Thu Oct 5 13:03:20 2006
@@ -23,71 +23,62 @@
import org.apache.tuscany.das.rdb.Converter;
-
public class DefaultConverter implements Converter {
- public DefaultConverter() {
- super();
- }
-
- public Object getColumnValue(Object data) {
- return data;
- }
-
- public Object getPropertyValue(Object data) {
-// if (type.isInstance(data))
-// return data;
-//
-// if ( data == null )
-// return null;
-//
-// String name = type.getInstanceClass().getName();
-// if (name == "java.lang.Byte" || name == "byte") {
-// return new Byte(data.toString());
-// }
-//
-// else if (name == "java.lang.Double" || name == "double") {
-// return new Double(data.toString());
-// }
-//
-// else if (name == "java.lang.Float" || name == "float") {
-// return new Float(data.toString());
-// }
-//
-// else if (name == "java.lang.Integer" || name == "int") {
-// return new Integer(data.toString());
-// }
-//
-// else if (name == "java.lang.Long" || name == "long") {
-// return new Long(data.toString());
-// }
-//
-// else if (name == "java.lang.Short" || name == "short") {
-// return new Short(data.toString());
-// }
-//
-// else if (name == "java.lang.String") {
-// return String.valueOf(data.toString());
-// }
-
- if (data instanceof Blob) {
- Blob b = (Blob) data;
- try {
- return b.getBytes(1, (int)b.length());
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
- } else {
- return data;
- }
-
-
-
-// else {
-//
-// throw new IllegalArgumentException("The database value of type "
-// + data.getClass().getName() + " must be converted to type "
-// + type.getInstanceClass().getName());
-// }
- }
+ public DefaultConverter() {
+ super();
+ }
+
+ public Object getColumnValue(Object data) {
+ return data;
+ }
+
+ public Object getPropertyValue(Object data) {
+ // if (type.isInstance(data))
+ // return data;
+ //
+ // if ( data == null )
+ // return null;
+ //
+ // String name = type.getInstanceClass().getName();
+ // if (name == "java.lang.Byte" || name == "byte") {
+ // return new Byte(data.toString());
+ // }
+ //
+ // else if (name == "java.lang.Double" || name == "double") {
+ // return new Double(data.toString());
+ // }
+ //
+ // else if (name == "java.lang.Float" || name == "float") {
+ // return new Float(data.toString());
+ // }
+ //
+ // else if (name == "java.lang.Integer" || name == "int") {
+ // return new Integer(data.toString());
+ // }
+ //
+ // else if (name == "java.lang.Long" || name == "long") {
+ // return new Long(data.toString());
+ // }
+ //
+ // else if (name == "java.lang.Short" || name == "short") {
+ // return new Short(data.toString());
+ // }
+ //
+ // else if (name == "java.lang.String") {
+ // return String.valueOf(data.toString());
+ // }
+
+ if (data instanceof Blob) {
+ Blob b = (Blob) data;
+ try {
+ return b.getBytes(1, (int) b.length());
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ return data;
+
+ }
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java Thu Oct 5 13:03:20 2006
@@ -87,10 +87,11 @@
*/
public Type getRootType() {
if (this.rootType == null) {
- if (this.typeURI == null)
+ if (this.typeURI == null) {
createDynamicTypes();
- else
+ } else {
createDynamicRoot();
+ }
}
return this.rootType;
@@ -135,6 +136,11 @@
Property ref = root.getProperty(resultMetadata.getTablePropertyName(i));
+ if (ref == null) {
+ throw new RuntimeException("Could not find table " + resultMetadata.getTablePropertyName(i)
+ + " in the SDO model");
+ }
+
// TODO Temporary code to check to see if a property has already been added.
// Replace when Tuscany-203 is fixed
List addedProperties = (List) tablePropertyMap.get(ref.getName());
@@ -143,8 +149,7 @@
tablePropertyMap.put(ref.getName(), addedProperties);
}
- if (ref == null)
- throw new RuntimeException("Could not find table " + resultMetadata.getTablePropertyName(i) + " in the SDO model");
+
String columnName = resultMetadata.getColumnPropertyName(i);
@@ -169,10 +174,12 @@
String childName = wrapper.getTableTypeName(r.getForeignKeyTable());
if (parentName == null) {
- throw new RuntimeException("The parent table (" + r.getPrimaryKeyTable() + ") in relationship " + r.getName()
+ throw new RuntimeException("The parent table (" + r.getPrimaryKeyTable()
+ + ") in relationship " + r.getName()
+ " was not found in the mapping information.");
} else if (childName == null) {
- throw new RuntimeException("The child table (" + r.getForeignKeyTable() + ") in relationship " + r.getName()
+ throw new RuntimeException("The child table (" + r.getForeignKeyTable()
+ + ") in relationship " + r.getName()
+ " was not found in the mapping information.");
}
@@ -180,9 +187,11 @@
Property childProperty = root.getProperty(childName);
if (parentProperty == null) {
- throw new RuntimeException("The parent table (" + parentName + ") in relationship " + r.getName() + " was not found.");
+ throw new RuntimeException("The parent table (" + parentName + ") in relationship "
+ + r.getName() + " was not found.");
} else if (childProperty == null) {
- throw new RuntimeException("The child table (" + childName + ") in relationship " + r.getName() + " was not found.");
+ throw new RuntimeException("The child table (" + childName + ") in relationship "
+ + r.getName() + " was not found.");
}
Type parent = parentProperty.getType();
@@ -210,8 +219,9 @@
Type root = SDOUtil.createType(typeHelper, getDefaultURI() + "/DataGraphRoot", "DataGraphRoot", false);
List types = SDOUtil.getTypes(typeHelper, typeURI);
- if (types == null)
+ if (types == null) {
throw new RuntimeException("SDO Types have not been registered for URI " + typeURI);
+ }
Iterator i = types.iterator();
while (i.hasNext()) {
@@ -226,11 +236,12 @@
public List getDefinedTypes() {
if (this.typeURI == null) {
return SDOUtil.getTypes(typeHelper, getDefaultURI());
- } else {
- List types = SDOUtil.getTypes(typeHelper, typeURI);
- types.add(rootType);
- return types;
- }
+ }
+
+ List types = SDOUtil.getTypes(typeHelper, typeURI);
+ types.add(rootType);
+ return types;
+
}
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java Thu Oct 5 13:03:20 2006
@@ -68,8 +68,9 @@
* @param value
*/
public void put(String tableName, List primaryKey, DataObject value) {
- if (getPkMap(tableName).put(primaryKey, value) == null)
+ if (getPkMap(tableName).put(primaryKey, value) == null) {
getCreateValueList(tableName).add(value);
+ }
}
/**
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java Thu Oct 5 13:03:20 2006
@@ -51,10 +51,11 @@
*/
public ResultSetRow(ResultSet rs, ResultMetadata m) throws SQLException {
this.metadata = m;
- if (m.isRecursive())
+ if (m.isRecursive()) {
processRecursiveRow(rs);
- else
+ } else {
processRow(rs);
+ }
}
/**
@@ -64,15 +65,18 @@
*/
private void processRow(ResultSet rs) throws SQLException {
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug("");
+ }
for (int i = 1; i <= metadata.getResultSetSize(); i++) {
Object data = getObject(rs, i);
TableData table = getRawData(metadata.getTablePropertyName(i));
- if (this.logger.isDebugEnabled())
- this.logger.debug("Adding column: " + metadata.getColumnPropertyName(i) + "\tValue: " + data + "\tTable: "
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("Adding column: " + metadata.getColumnPropertyName(i) + "\tValue: "
+ + data + "\tTable: "
+ metadata.getTablePropertyName(i));
+ }
table.addData(metadata.getColumnPropertyName(i), metadata.isPKColumn(i), data);
}
@@ -81,29 +85,35 @@
public void processRecursiveRow(ResultSet rs) throws SQLException {
this.allTableData = new ArrayList();
int i = 1;
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug("");
+ }
while (i <= metadata.getResultSetSize()) {
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug("");
+ }
TableData table = new TableData(metadata.getTablePropertyName(i));
this.allTableData.add(table);
while ((i <= metadata.getResultSetSize()) && (metadata.isPKColumn(i))) {
Object data = getObject(rs, i);
- if (this.logger.isDebugEnabled())
- this.logger.debug("Adding column: " + metadata.getColumnPropertyName(i) + "\tValue: " + data + "\tTable: "
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("Adding column: " + metadata.getColumnPropertyName(i)
+ + "\tValue: " + data + "\tTable: "
+ metadata.getTablePropertyName(i));
+ }
table.addData(metadata.getColumnPropertyName(i), true, data);
i++;
}
while ((i <= metadata.getResultSetSize()) && (!metadata.isPKColumn(i))) {
Object data = getObject(rs, i);
- if (this.logger.isDebugEnabled())
- this.logger.debug("Adding column: " + metadata.getColumnPropertyName(i) + "\tValue: " + data + "\tTable: "
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("Adding column: " + metadata.getColumnPropertyName(i)
+ + "\tValue: " + data + "\tTable: "
+ metadata.getTablePropertyName(i));
+ }
table.addData(metadata.getColumnPropertyName(i), false, data);
i++;
}
@@ -120,10 +130,12 @@
Object data = rs.getObject(i);
- if (rs.wasNull())
+ if (rs.wasNull()) {
return null;
- else
- return metadata.getConverter(i).getPropertyValue(data);
+ }
+
+ return metadata.getConverter(i).getPropertyValue(data);
+
}
/**
@@ -138,7 +150,8 @@
}
/**
- * Returns a HashMap that holds data for the specified table If the HashMap doesn't exist, it will be created. This is used internally to build
+ * Returns a HashMap that holds data for the specified table If the HashMap
+ * doesn't exist, it will be created. This is used internally to build
* the ResultSetRow, whereas getTable is used externally to retrieve existing table data.
*
* @param tableName
@@ -163,8 +176,9 @@
this.allTableData.addAll(tableMap.values());
}
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug(allTableData);
+ }
return this.allTableData;
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java Thu Oct 5 13:03:20 2006
@@ -26,26 +26,16 @@
*/
public class SingleTableRegistry implements TableRegistry {
- // private HashMap<List,DataObject> values = new HashMap<List,DataObject>();
public SingleTableRegistry() {
// Empty Constructor
}
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.ws.sdo.mediator.jdbc.graphbuilder.impl.TableRegistry#get(java.lang.String, java.util.List)
- */
public DataObject get(String tableName, List primaryKey) {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.ws.sdo.mediator.jdbc.graphbuilder.impl.TableRegistry#put(java.lang.String, java.util.List, java.lang.Object)
- */
+
public void put(String tableName, List primaryKey, DataObject value) {
// do nothing
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java Thu Oct 5 13:03:20 2006
@@ -29,7 +29,7 @@
*/
public class ResultSetTypeMap {
- public static ResultSetTypeMap instance = new ResultSetTypeMap();
+ public static final ResultSetTypeMap INSTANCE = new ResultSetTypeMap();
/**
* Constructor for ResultSetTypeMap.
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java Thu Oct 5 13:03:20 2006
@@ -153,7 +153,7 @@
}
Update update = table.getUpdate();
if (update == null) {
- updateCommand = UpdateGenerator.instance.getUpdateCommand(mapping, changedObject, table);
+ updateCommand = UpdateGenerator.INSTANCE.getUpdateCommand(mapping, changedObject, table);
} else {
TableWrapper t = new TableWrapper(table);
if (t.getCollisionColumn() != null) {
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -50,8 +50,9 @@
} else {
this.useGetGeneratedKeys = true;
}
- if (connection.getAutoCommit())
+ if (connection.getAutoCommit()) {
throw new RuntimeException("AutoCommit must be off");
+ }
} catch (SQLException e) {
throw new RuntimeException(e);
}
@@ -65,9 +66,9 @@
public void cleanUp() {
try {
if (managingTransaction) {
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug("Committing Transaction");
-
+ }
connection.commit();
}
} catch (SQLException e) {
@@ -78,9 +79,9 @@
public void errorCleanUp() {
try {
if (managingTransaction) {
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug("Rolling back Transaction");
-
+ }
connection.rollback();
}
} catch (SQLException e) {
@@ -89,21 +90,23 @@
}
public PreparedStatement prepareStatement(String queryString, String[] returnKeys) throws SQLException {
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug("Preparing Statement: " + queryString);
+ }
- if (useGetGeneratedKeys)
+ if (useGetGeneratedKeys) {
return connection.prepareStatement(queryString, Statement.RETURN_GENERATED_KEYS);
-
- else if (returnKeys.length > 0)
+ } else if (returnKeys.length > 0) {
return connection.prepareStatement(queryString, returnKeys);
+ }
return connection.prepareStatement(queryString);
}
public PreparedStatement preparePagedStatement(String queryString) throws SQLException {
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug("Preparing Statement: " + queryString);
+ }
return connection.prepareStatement(queryString, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java Thu Oct 5 13:03:20 2006
@@ -22,9 +22,9 @@
public class CreateOperation extends ChangeOperation {
- public CreateOperation(InsertCommandImpl command, DataObject changedObject, String ID) {
+ public CreateOperation(InsertCommandImpl command, DataObject changedObject, String id) {
super(command, changedObject);
- this.propagatedID = ID;
+ this.propagatedID = id;
}
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java Thu Oct 5 13:03:20 2006
@@ -60,17 +60,20 @@
public DASImpl(Config inConfig) {
Config cfg = inConfig;
- if (cfg == null)
+ if (cfg == null) {
cfg = ConfigFactory.INSTANCE.createConfig();
+ }
this.configWrapper = new MappingWrapper(cfg);
Iterator i = configWrapper.getConfig().getCommand().iterator();
while (i.hasNext()) {
- org.apache.tuscany.das.rdb.config.Command commandConfig = (org.apache.tuscany.das.rdb.config.Command) i.next();
+ org.apache.tuscany.das.rdb.config.Command commandConfig =
+ (org.apache.tuscany.das.rdb.config.Command) i.next();
String kind = commandConfig.getKind();
if (kind.equalsIgnoreCase("select")) {
commands
- .put(commandConfig.getName(), new ReadCommandImpl(commandConfig.getSQL(), configWrapper, commandConfig.getResultDescriptor()));
+ .put(commandConfig.getName(), new ReadCommandImpl(commandConfig.getSQL(),
+ configWrapper, commandConfig.getResultDescriptor()));
} else if (kind.equalsIgnoreCase("update")) {
commands.put(commandConfig.getName(), new UpdateCommandImpl(commandConfig.getSQL()));
} else if (kind.equalsIgnoreCase("insert")) {
@@ -78,7 +81,8 @@
} else if (kind.equalsIgnoreCase("delete")) {
commands.put(commandConfig.getName(), new DeleteCommandImpl(commandConfig.getSQL()));
} else if (kind.equalsIgnoreCase("procedure")) {
- commands.put(commandConfig.getName(), new SPCommandImpl(commandConfig.getSQL(), configWrapper, commandConfig.getParameter()));
+ commands.put(commandConfig.getName(), new SPCommandImpl(commandConfig.getSQL(),
+ configWrapper, commandConfig.getParameter()));
} else {
throw new RuntimeException("Invalid kind of command: " + kind);
}
@@ -117,8 +121,9 @@
* @see org.apache.tuscany.das.rdb.CommandGroup#getCommand(java.lang.String)
*/
public Command getCommand(String name) {
- if (!commands.containsKey(name))
+ if (!commands.containsKey(name)) {
throw new RuntimeException("CommandGroup has no command named: " + name);
+ }
CommandImpl cmd = (CommandImpl) commands.get(name);
cmd.setConnection(getConnection(), configWrapper.getConfig());
return cmd;
@@ -129,14 +134,16 @@
}
public Connection getConnection() {
- if (connection == null)
+ if (connection == null) {
initializeConnection();
+ }
return connection;
}
private void initializeConnection() {
Config config = configWrapper.getConfig();
- if (config == null || config.getConnectionInfo() == null || config.getConnectionInfo().getDataSource() == null) {
+ if (config == null || config.getConnectionInfo() == null
+ || config.getConnectionInfo().getDataSource() == null) {
throw new RuntimeException("No connection has been provided and no data source has been specified");
}
@@ -152,8 +159,9 @@
DataSource ds = (DataSource) ctx.lookup(configWrapper.getConfig().getConnectionInfo().getDataSource());
try {
connection = ds.getConnection();
- if (connection == null)
+ if (connection == null) {
throw new RuntimeException("Could not obtain a Connection from DataSource");
+ }
connection.setAutoCommit(false);
setConnection(connection);
} catch (SQLException e) {
@@ -167,18 +175,20 @@
public void releaseResources() {
- if (managingConnections())
+ if (managingConnections()) {
closeConnection();
+ }
}
private void closeConnection() {
- if (connection != null)
+ if (connection != null) {
try {
connection.close();
connection = null;
} catch (SQLException e) {
throw new RuntimeException(e);
}
+ }
}
/**
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java Thu Oct 5 13:03:20 2006
@@ -22,13 +22,13 @@
public class DeleteCommandImpl extends WriteCommandImpl {
- public DeleteCommandImpl(String sqlString) {
- super(sqlString);
- }
+ public DeleteCommandImpl(String sqlString) {
+ super(sqlString);
+ }
- public DeleteCommandImpl(Delete delete) {
- super(delete.getSql());
- addParameters(delete.getParameters());
- }
+ public DeleteCommandImpl(Delete delete) {
+ super(delete.getSql());
+ addParameters(delete.getParameters());
+ }
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java Thu Oct 5 13:03:20 2006
@@ -48,9 +48,9 @@
} else {
String name = op.getTableName();
List ops = (List) opsByTableName.get(name);
- if (ops == null)
+ if (ops == null) {
ops = new ArrayList();
-
+ }
ops.add(op);
opsByTableName.put(name, ops);
}
@@ -61,8 +61,9 @@
Iterator i = this.order.iterator();
while (i.hasNext()) {
String name = (String) i.next();
- if (opsByTableName.get(name) != null)
+ if (opsByTableName.get(name) != null) {
deleteOperations.addAll((Collection) opsByTableName.get(name));
+ }
}
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java Thu Oct 5 13:03:20 2006
@@ -24,17 +24,15 @@
public class DeleteOperation extends ChangeOperation {
-
- /**
- * @param command
- * @param changedObject
- * Objects deleted from the graph have lost their "settings" and must
- * be restored
- */
- public DeleteOperation(DeleteCommandImpl command, DataObject changedObject) {
- super(command);
- this.dObject = new DatabaseObject(command.getMappingModel(), DataObjectUtil.getRestoredCopy(changedObject));
+ /**
+ * @param command
+ * @param changedObject
+ * Objects deleted from the graph have lost their "settings" and must be restored
+ */
+ public DeleteOperation(DeleteCommandImpl command, DataObject changedObject) {
+ super(command);
+ this.dObject = new DatabaseObject(command.getMappingModel(), DataObjectUtil.getRestoredCopy(changedObject));
- }
+ }
}
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -24,43 +24,43 @@
public class InsertCommandImpl extends WriteCommandImpl {
- private String[] keys;
-
- public InsertCommandImpl(String sqlString, String[] generatedKeys) {
- super(sqlString);
- keys = generatedKeys;
- }
-
- public InsertCommandImpl(Create create) {
- super(create.getSql());
- addParameters(create.getParameters());
- this.keys = new String[0];
- }
-
- public void execute() {
-
- boolean success = false;
- try {
- statement.executeUpdate(parameters, keys);
- success = true;
- } catch (SQLException e) {
- throw new RuntimeException(e);
- } finally {
- if (success) {
- statement.getConnection().cleanUp();
- } else {
- statement.getConnection().errorCleanUp();
- }
- }
-
- }
- public int getGeneratedKey() {
- try {
- return statement.getGeneratedKey();
- } catch (SQLException ex) {
- throw new RuntimeException(ex);
- }
- }
+ private String[] keys;
+ public InsertCommandImpl(String sqlString, String[] generatedKeys) {
+ super(sqlString);
+ keys = generatedKeys;
+ }
+
+ public InsertCommandImpl(Create create) {
+ super(create.getSql());
+ addParameters(create.getParameters());
+ this.keys = new String[0];
+ }
+
+ public void execute() {
+
+ boolean success = false;
+ try {
+ statement.executeUpdate(parameters, keys);
+ success = true;
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ } finally {
+ if (success) {
+ statement.getConnection().cleanUp();
+ } else {
+ statement.getConnection().errorCleanUp();
+ }
+ }
+
+ }
+
+ public int getGeneratedKey() {
+ try {
+ return statement.getGeneratedKey();
+ } 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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -21,19 +21,19 @@
import java.math.BigDecimal;
public class ManagedParameterImpl extends ParameterImpl {
-
- public void setValue(Object oldValue) {
- this.value = updateValue(oldValue);
- }
-
- private Object updateValue(Object oldValue) {
- if (oldValue instanceof Integer)
- return new Integer(((Integer) oldValue).intValue() + 1);
- else if (oldValue instanceof BigDecimal)
- return ((BigDecimal)oldValue).add(new BigDecimal(1));
- else
- throw new RuntimeException("Unsupported type for managed column: " + oldValue.getClass().getName());
- }
-
+
+ public void setValue(Object oldValue) {
+ this.value = updateValue(oldValue);
+ }
+
+ private Object updateValue(Object oldValue) {
+ if (oldValue instanceof Integer) {
+ return Integer.valueOf(((Integer) oldValue).intValue() + 1);
+ } else if (oldValue instanceof BigDecimal) {
+ return ((BigDecimal) oldValue).add(new BigDecimal(1));
+ } else {
+ throw new RuntimeException("Unsupported type for managed column: " + oldValue.getClass().getName());
+ }
+ }
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java Thu Oct 5 13:03:20 2006
@@ -24,31 +24,33 @@
public class OptimisticWriteCommandImpl extends UpdateCommandImpl {
- public OptimisticWriteCommandImpl(String sqlString) {
- super(sqlString);
- }
+ public OptimisticWriteCommandImpl(String sqlString) {
+ super(sqlString);
+ }
- public OptimisticWriteCommandImpl(Update update) {
- super(update);
- addParameters(update.getParameters());
- }
+ public OptimisticWriteCommandImpl(Update update) {
+ super(update);
+ addParameters(update.getParameters());
+ }
- public void execute() {
+ public void execute() {
- boolean success = false;
- try {
- int rowsAffected = statement.executeUpdate(parameters);
- success = true;
- if (rowsAffected == 0)
- throw new RuntimeException("OCC Exception");
- } catch (SQLException e) {
- throw new RuntimeException(e);
- } finally {
- if (success)
- statement.getConnection().cleanUp();
- else
- statement.getConnection().errorCleanUp();
- }
+ boolean success = false;
+ try {
+ int rowsAffected = statement.executeUpdate(parameters);
+ success = true;
+ if (rowsAffected == 0) {
+ throw new RuntimeException("An update collision occurred");
+ }
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ } finally {
+ if (success) {
+ statement.getConnection().cleanUp();
+ } else {
+ statement.getConnection().errorCleanUp();
+ }
+ }
- }
+ }
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java Thu Oct 5 13:03:20 2006
@@ -25,42 +25,45 @@
public class PagerImpl implements Pager {
- private final ReadCommandImpl command;
- private final int size;
- private int idx = 1;
-
- public PagerImpl(Command command, int size) {
- this.command = (ReadCommandImpl)command;
- this.command.enablePaging();
- this.size = size;
- }
-
- public DataObject next() {
- int start = idx;
- int end = idx + size;
- idx += size;
- command.setStartRow(start);
- command.setEndRow(end);
- return command.executeQuery();
- }
-
- public DataObject getPage(int page) {
- int end = (page * size) + 1;
- int start = end - size;
- idx = end;
- command.setStartRow(start);
- command.setEndRow(end);
- return command.executeQuery();
- }
-
- public DataObject previous() {
- int start = idx - (2 * size);
- if (start < 1)
- start = 1;
- int end = start + size;
- idx = end;
- command.setStartRow(start);
- command.setEndRow(end);
- return command.executeQuery();
- }
+ private final ReadCommandImpl command;
+
+ private final int size;
+
+ private int idx = 1;
+
+ public PagerImpl(Command command, int size) {
+ this.command = (ReadCommandImpl) command;
+ this.command.enablePaging();
+ this.size = size;
+ }
+
+ public DataObject next() {
+ int start = idx;
+ int end = idx + size;
+ idx += size;
+ command.setStartRow(start);
+ command.setEndRow(end);
+ return command.executeQuery();
+ }
+
+ public DataObject getPage(int page) {
+ int end = (page * size) + 1;
+ int start = end - size;
+ idx = end;
+ command.setStartRow(start);
+ command.setEndRow(end);
+ return command.executeQuery();
+ }
+
+ public DataObject previous() {
+ int start = idx - (2 * size);
+ if (start < 1) {
+ start = 1;
+ }
+ int end = start + size;
+ idx = end;
+ command.setStartRow(start);
+ command.setEndRow(end);
+ return command.executeQuery();
+ }
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java Thu Oct 5 13:03:20 2006
@@ -67,8 +67,9 @@
}
public void setIndex(int index) {
- if (index == 0)
+ if (index == 0) {
throw new RuntimeException("Index of zero not allowed");
+ }
this.index = index;
}
@@ -99,9 +100,9 @@
public Object getValue() {
if (getConverter() != null) {
return getConverter().getColumnValue(this.value);
- } else {
- return this.value;
- }
+ }
+
+ return this.value;
}
public int getDirection() {
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java Thu Oct 5 13:03:20 2006
@@ -53,10 +53,11 @@
}
private void addParameter(ParameterImpl param) {
- if (param.getDirection() == ParameterImpl.IN)
+ if (param.getDirection() == ParameterImpl.IN) {
inParams.add(param);
- else if ((param.getDirection() == ParameterImpl.OUT) || (param.getDirection() == ParameterImpl.IN_OUT))
+ } else if ((param.getDirection() == ParameterImpl.OUT) || (param.getDirection() == ParameterImpl.IN_OUT)) {
outParams.add(param);
+ }
this.parameters.add(param);
}
@@ -70,11 +71,13 @@
while (i.hasNext()) {
ParameterImpl param = (ParameterImpl) i.next();
- if (param.getIndex() == index)
+ if (param.getIndex() == index) {
return param;
+ }
}
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug("Creating new parameter with index " + index);
+ }
ParameterImpl newParam = new ParameterImpl(index);
newParam.setDirection(direction);
@@ -101,8 +104,9 @@
while (i.hasNext()) {
ParameterImpl param = (ParameterImpl) i.next();
- if (param.getIndex() == index)
+ if (param.getIndex() == index) {
return param;
+ }
}
return null;
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java Thu Oct 5 13:03:20 2006
@@ -40,8 +40,9 @@
super(sqlString);
this.configWrapper = mapping;
- if (resultDescriptor != null && !resultDescriptor.isEmpty())
- this.resultSetShape = new ResultSetShape(resultDescriptor);
+ if (resultDescriptor != null && !resultDescriptor.isEmpty()) {
+ this.resultSetShape = new ResultSetShape(resultDescriptor);
+ }
}
@@ -51,8 +52,9 @@
public DataObject executeQuery() {
- if (statement.getConnection() == null)
+ if (statement.getConnection() == null) {
throw new RuntimeException("A DASConnection object must be specified before executing the query.");
+ }
boolean success = false;
try {
@@ -62,10 +64,11 @@
} catch (SQLException e) {
throw new RuntimeException(e);
} finally {
- if (success)
+ if (success) {
statement.getConnection().cleanUp();
- else
+ } else {
statement.getConnection().errorCleanUp();
+ }
}
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java Thu Oct 5 13:03:20 2006
@@ -29,8 +29,11 @@
import commonj.sdo.helper.TypeHelper;
/**
- * Describes the structure of the result set returned from execution of a SELECT statement. This description is typcially not required since the shape
- * can be retreived from the JDBC ResultSetMetadata. However, some platforms such as Oracle do not support fully suport ResultSetMedata.
+ * Describes the structure of the result set returned from
+ * execution of a SELECT statement. This description is typcially
+ * not required since the shape can be retreived from the JDBC
+ * ResultSetMetadata. However, some platforms such as Oracle do not
+ * support fully suport ResultSetMedata.
* <p>
* There may also be a performance boost when using this interface.
*
@@ -49,7 +52,7 @@
tables = new String[metadata.getColumnCount()];
types = new Type[metadata.getColumnCount()];
- ResultSetTypeMap typeMap = ResultSetTypeMap.instance;
+ ResultSetTypeMap typeMap = ResultSetTypeMap.INSTANCE;
for (int i = 1; i <= metadata.getColumnCount(); i++) {
tables[i - 1] = metadata.getTableName(i);
columns[i - 1] = metadata.getColumnName(i);
@@ -74,8 +77,10 @@
String typeName = desc.getColumnType().substring(idx + 1);
types[i] = helper.getType(uri, typeName);
- if (types[i] == null)
- throw new RuntimeException("Could not find type " + desc.getColumnType() + " for column " + desc.getColumnName());
+ if (types[i] == null) {
+ throw new RuntimeException("Could not find type " + desc.getColumnType()
+ + " for column " + desc.getColumnName());
+ }
}
}
@@ -104,10 +109,11 @@
result.append('\t');
result.append(tables[i]);
result.append('\t');
- if (types[i] == null)
+ if (types[i] == null) {
result.append("null");
- else
+ } else {
result.append(types[i].getName());
+ }
result.append('\n');
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java Thu Oct 5 13:03:20 2006
@@ -47,10 +47,11 @@
Type sdoType = TypeHelper.INSTANCE.getType(pkg, typeName);
int direction = ParameterImpl.IN;
- if ("OUT".equalsIgnoreCase(p.getDirection()))
+ if ("OUT".equalsIgnoreCase(p.getDirection())) {
direction = ParameterImpl.OUT;
- else if ("INOUT".equalsIgnoreCase(p.getDirection()))
+ } else if ("INOUT".equalsIgnoreCase(p.getDirection())) {
direction = ParameterImpl.IN_OUT;
+ }
parameters.findOrCreateParameterWithIndex(idx, direction, sdoType);
}
@@ -65,15 +66,17 @@
return buildGraph(results);
} catch (SQLException e) {
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug(e);
+ }
throw new RuntimeException(e);
} finally {
- if (success)
+ if (success) {
statement.getConnection().cleanUp();
- else
+ } else {
statement.getConnection().errorCleanUp();
+ }
}
}
@@ -86,10 +89,11 @@
} catch (SQLException e) {
throw new RuntimeException(e);
} finally {
- if (success)
+ if (success) {
statement.getConnection().cleanUp();
- else
+ } else {
statement.getConnection().errorCleanUp();
+ }
}
}
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -71,8 +71,9 @@
Iterator outParams = parameters.outParams().iterator();
while (outParams.hasNext()) {
ParameterImpl param = (ParameterImpl) outParams.next();
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug("Registering parameter " + param.getName());
+ }
cs.registerOutParameter(param.getIndex(), SDODataTypeHelper.sqlTypeFor(param.getType()));
}
@@ -111,8 +112,9 @@
while (outParams.hasNext()) {
ParameterImpl param = (ParameterImpl) outParams.next();
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug("Registering parameter " + param.getName());
+ }
cs.registerOutParameter(param.getIndex(), SDODataTypeHelper.sqlTypeFor(param.getType()));
}
@@ -140,16 +142,18 @@
* has been specified and try setObject otherwise.
*/
private int executeUpdate(PreparedStatement ps, Parameters parameters) throws SQLException {
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug("Executing statement " + queryString);
+ }
Iterator i = parameters.inParams().iterator();
while (i.hasNext()) {
ParameterImpl param = (ParameterImpl) i.next();
Object value = param.getValue();
- if (this.logger.isDebugEnabled())
+ if (this.logger.isDebugEnabled()) {
this.logger.debug("Setting parameter " + param.getIndex() + " to " + value);
+ }
if (value == null) {
if (param.getType() == null) {
@@ -159,8 +163,9 @@
} catch (SQLException ex) {
ps.setNull(param.getIndex(), SDODataTypeHelper.sqlTypeFor(null));
}
- } else
+ } else {
ps.setNull(param.getIndex(), SDODataTypeHelper.sqlTypeFor(param.getType()));
+ }
} else {
ps.setObject(param.getIndex(), value);
}
@@ -187,11 +192,13 @@
private PreparedStatement getPreparedStatement(String[] returnKeys) throws SQLException {
- if (preparedStatement == null)
- if (isPaging)
+ if (preparedStatement == null) {
+ if (isPaging) {
preparedStatement = jdbcConnection.preparePagedStatement(queryString);
- else
+ } else {
preparedStatement = jdbcConnection.prepareStatement(queryString, returnKeys);
+ }
+ }
return preparedStatement;
}
@@ -200,8 +207,9 @@
if (getConnection().useGetGeneratedKeys()) {
ResultSet rs = preparedStatement.getGeneratedKeys();
- if (rs.next())
- return new Integer(rs.getInt(1));
+ if (rs.next()) {
+ return Integer.valueOf(rs.getInt(1));
+ }
}
return null;
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java Thu Oct 5 13:03:20 2006
@@ -56,16 +56,18 @@
// (Tuscany-583)
public DataObject emptyGraph(Config config) {
- if (config.getDataObjectModel() == null)
+ if (config.getDataObjectModel() == null) {
throw new RuntimeException("DataObjectModel must be specified in the Config");
+ }
String uri = "http:///org.apache.tuscany.das.rdb/das";
TypeHelper typeHelper = SDOUtil.createTypeHelper();
Type rootType = SDOUtil.createType(typeHelper, uri + "/DataGraphRoot", "DataGraphRoot", false);
List types = SDOUtil.getTypes(typeHelper, config.getDataObjectModel());
- if (types == null)
+ if (types == null) {
throw new RuntimeException("SDO Types have not been registered for URI " + config.getDataObjectModel());
+ }
Iterator i = types.iterator();
while (i.hasNext()) {
@@ -91,8 +93,9 @@
DataObject primaryGraph = (DataObject) graphs.get(0);
Iterator i = graphs.iterator();
- if (i.hasNext())
+ if (i.hasNext()) {
i.next();
+ }
while (i.hasNext()) {
primaryGraph = merge(primaryGraph, (DataObject) i.next());
}
@@ -147,7 +150,8 @@
while (iter.hasNext()) {
DataObject refObject = (DataObject) iter.next();
createObjectWithSubtree(root, refObject.getContainmentProperty(), refObject);
- refObject = registry.get(refObject.getType().getName(), Collections.singletonList(getPrimaryKey(refObject)));
+ refObject = registry.get(refObject.getType().getName(),
+ Collections.singletonList(getPrimaryKey(refObject)));
if (ref.isMany()) {
newObject.getList(newObject.getType().getProperty(ref.getName())).add(refObject);
} else {
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerFactory.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerFactory.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerFactory.java Thu Oct 5 13:03:20 2006
@@ -37,14 +37,14 @@
public final class LoggerFactory {
public static final LoggerFactory INSTANCE = new LoggerFactory();
- private static Layout _defaultLayout;
+ private static Layout defaultLayout;
- private static Appender _defaultAppender;
+ private static Appender defaultAppender;
static {
synchronized (LoggerFactory.class) {
- _defaultLayout = new PatternLayout(LoggerLayout.Layout());
- _defaultAppender = new ConsoleAppender(_defaultLayout);
+ defaultLayout = new PatternLayout(LoggerLayout.layout());
+ defaultAppender = new ConsoleAppender(defaultLayout);
}
}
@@ -55,7 +55,7 @@
public Logger getLogger(Class loggingClass) {
Logger logger = Logger.getLogger(loggingClass);
logger.setLevel(Level.OFF);
- logger.addAppender(_defaultAppender);
+ logger.addAppender(defaultAppender);
return logger;
}
@@ -63,7 +63,7 @@
public Logger getLogger(Class loggingClass, Level logLevel) {
Logger logger = Logger.getLogger(loggingClass);
logger.setLevel(logLevel);
- logger.addAppender(_defaultAppender);
+ logger.addAppender(defaultAppender);
return logger;
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerLayout.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerLayout.java?view=diff&rev=453343&r1=453342&r2=453343
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerLayout.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerLayout.java Thu Oct 5 13:03:20 2006
@@ -28,7 +28,7 @@
}
- public static String Layout() {
+ public static String layout() {
/*
* Substitute symbols
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -72,7 +72,7 @@
DAS das = DAS.FACTORY.createDAS(getConfig("BooksConfigWithAlias.xml"), getConnection());
Command select = das.getCommand("get book by ID");
- select.setParameter(1, new Integer(1));
+ select.setParameter(1, Integer.valueOf(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, new Integer(1));
+ select.setParameter(1, Integer.valueOf(1));
DataObject root = select.executeQuery();
@@ -137,7 +137,7 @@
root = select.executeQuery();
// Verify
- select.setParameter(1, new Integer(1001));
+ select.setParameter(1, Integer.valueOf(1001));
root = select.executeQuery();
assertEquals("Ant Colonies of the Old World", root.getString("Book[1]/NAME"));
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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -141,7 +141,7 @@
DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection());
Command select = das.getCommand("company by id with departments");
- Integer idOfNoExistingCompany = new Integer(-1);
+ Integer idOfNoExistingCompany = Integer.valueOf(-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=453343&r1=453342&r2=453343
==============================================================================
--- 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 Oct 5 13:03:20 2006
@@ -91,7 +91,7 @@
+ "CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
// Parameterize the command
- select.setParameter(1, new Integer(1));
+ select.setParameter(1, Integer.valueOf(1));
// Get the graph
DataObject root = select.executeQuery();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org