Author: rhauch Date: 2008-12-09 10:09:16 -0500 (Tue, 09 Dec 2008) New Revision: 677 Modified: trunk/extensions/dna-common-jdbc/.classpath trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/BestRowIdentifierScopeType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ColumnPseudoType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/IndexType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/KeyDeferrabilityType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/KeyModifyRuleType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/NullabilityType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ParameterIoType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/PrivilegeType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/SortSequenceType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/StoredProcedureResultType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/TransactionIsolationLevelType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/spi/CoreMetaDataBean.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/provider/DefaultDriverDatabaseMetadataProvider.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/util/DatabaseUtil.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/AttributeBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/BestRowIdentifierBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/CatalogBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ColumnBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/CoreMetaDataBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/DatabaseBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/DatabaseNamedObjectBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ForeignKeyBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ForeignKeyColumnBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/IndexBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/IndexColumnBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/KeyColumnBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ParameterBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/PrimaryKeyBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/PrimaryKeyColumnBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/PrivilegeBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ReferenceBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SchemaBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SchemaObjectBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SqlTypeConversionPairBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SqlTypeInfoBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/StoredProcedureBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/TableBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/TableColumnBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/TableTypeBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/UserDefinedTypeBeanTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/provider/DataSourceDatabaseMetadataProviderTest.java trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/util/DatabaseUtilTest.java trunk/extensions/dna-connector-jdbc-metadata/src/main/java/org/jboss/dna/connector/jdbc/JdbcRepositorySource.java Log: Corrected most of the compiler warnings. Modified: trunk/extensions/dna-common-jdbc/.classpath =================================================================== --- trunk/extensions/dna-common-jdbc/.classpath 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/.classpath 2008-12-09 15:09:16 UTC (rev 677) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/main/resources"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> \ No newline at end of file Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/BestRowIdentifierScopeType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/BestRowIdentifierScopeType.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/BestRowIdentifierScopeType.java 2008-12-09 15:09:16 UTC (rev 677) @@ -31,7 +31,7 @@ public enum BestRowIdentifierScopeType { TEMPORARY(DatabaseMetaData.bestRowTemporary), // Indicates that the scope is very temporary, lasting only while the row is - // being used. + // being used. TRANSACTION(DatabaseMetaData.bestRowTransaction), // Indicates that the scope is the remainder of the current transaction. SESSION(DatabaseMetaData.bestRowSession); // Indicates that the scope is the remainder of the current session. @@ -43,7 +43,7 @@ public int getScope() { return scope; - }; + } public String getName() { return name(); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ColumnPseudoType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ColumnPseudoType.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ColumnPseudoType.java 2008-12-09 15:09:16 UTC (rev 677) @@ -40,7 +40,7 @@ public int getType() { return type; - }; + } public String getName() { return name(); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/IndexType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/IndexType.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/IndexType.java 2008-12-09 15:09:16 UTC (rev 677) @@ -45,7 +45,7 @@ public int getType() { return type; - }; + } public String getName() { return name(); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/KeyDeferrabilityType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/KeyDeferrabilityType.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/KeyDeferrabilityType.java 2008-12-09 15:09:16 UTC (rev 677) @@ -42,7 +42,7 @@ public int getDeferrability() { return deferrability; - }; + } public String getName() { return name(); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/KeyModifyRuleType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/KeyModifyRuleType.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/KeyModifyRuleType.java 2008-12-09 15:09:16 UTC (rev 677) @@ -31,14 +31,14 @@ public enum KeyModifyRuleType { CASCADE(DatabaseMetaData.importedKeyCascade), // when the primary key is updated/deleted, the foreign key (imported key) is - // changed/deleted to agree with it; + // changed/deleted to agree with it; RESTRICT(DatabaseMetaData.importedKeyRestrict), // a primary key may not be updated/deleted if it has been imported by another - // table as a foreign key. + // table as a foreign key. SET_NULL(DatabaseMetaData.importedKeySetNull), // when the primary key is updated or deleted, the foreign key (imported key) - // is changed to <code>NULL</code>. + // is changed to <code>NULL</code>. NO_ACTION(DatabaseMetaData.importedKeyNoAction), // if the primary key has been imported, it cannot be updated or deleted. SET_DEFAULT(DatabaseMetaData.importedKeySetDefault); // if the primary key is updated or deleted, the foreign key (imported - // key) is set to the default value. + // key) is set to the default value. private final int rule; @@ -48,7 +48,7 @@ public int getRule() { return rule; - }; + } public String getName() { return name(); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/NullabilityType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/NullabilityType.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/NullabilityType.java 2008-12-09 15:09:16 UTC (rev 677) @@ -40,7 +40,7 @@ public int getNullability() { return nullability; - }; + } public String getName() { return name(); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ParameterIoType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ParameterIoType.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ParameterIoType.java 2008-12-09 15:09:16 UTC (rev 677) @@ -45,7 +45,7 @@ public int getType() { return type; - }; + } public String getName() { return name(); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/PrivilegeType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/PrivilegeType.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/PrivilegeType.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,7 +21,6 @@ */ package org.jboss.dna.common.jdbc.model.api; -import java.sql.DatabaseMetaData; /** * Provides RDBMS supported privilege types as enumeration set. @@ -44,7 +43,7 @@ public String getType() { return type; - }; + } public String getName() { return name(); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/SortSequenceType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/SortSequenceType.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/SortSequenceType.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,7 +21,6 @@ */ package org.jboss.dna.common.jdbc.model.api; -import java.sql.DatabaseMetaData; /** * Provides RDBMS supported sort sequence types as enumeration set. @@ -41,7 +40,7 @@ public String getType() { return type; - }; + } public String getName() { return name(); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/StoredProcedureResultType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/StoredProcedureResultType.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/StoredProcedureResultType.java 2008-12-09 15:09:16 UTC (rev 677) @@ -42,7 +42,7 @@ public int getType() { return type; - }; + } public String getName() { return name(); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/TransactionIsolationLevelType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/TransactionIsolationLevelType.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/TransactionIsolationLevelType.java 2008-12-09 15:09:16 UTC (rev 677) @@ -44,7 +44,7 @@ public int getLevel() { return level; - }; + } public String getName() { return name(); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/spi/CoreMetaDataBean.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/spi/CoreMetaDataBean.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/spi/CoreMetaDataBean.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,7 +21,6 @@ */ package org.jboss.dna.common.jdbc.model.spi; -import java.io.Serializable; import org.jboss.dna.common.jdbc.model.api.CoreMetaData; /** @@ -30,7 +29,13 @@ * @author <a href="mailto:litsenko_sergey@yahoo.com">Sergiy Litsenko</a> */ public class CoreMetaDataBean implements CoreMetaData { + /** + * Serializable version {@value} + */ + private static final long serialVersionUID = 1L; + + /** * Default constructor */ public CoreMetaDataBean() { Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/provider/DefaultDriverDatabaseMetadataProvider.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/provider/DefaultDriverDatabaseMetadataProvider.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/provider/DefaultDriverDatabaseMetadataProvider.java 2008-12-09 15:09:16 UTC (rev 677) @@ -62,8 +62,9 @@ * Opens new database connection based on suppied parameters * * @return new database connection based on suppied parameters - * @throws Exception + * @throws Exception */ + @Override protected Connection openConnection() throws Exception { // log debug info if (log.isDebugEnabled()) { Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/util/DatabaseUtil.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/util/DatabaseUtil.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/util/DatabaseUtil.java 2008-12-09 15:09:16 UTC (rev 677) @@ -27,12 +27,48 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; - import org.apache.commons.beanutils.PropertyUtils; -import org.jboss.dna.common.util.Logger; import org.jboss.dna.common.jdbc.JdbcMetadataI18n; -import org.jboss.dna.common.jdbc.model.api.*; import org.jboss.dna.common.jdbc.model.ModelFactory; +import org.jboss.dna.common.jdbc.model.api.Attribute; +import org.jboss.dna.common.jdbc.model.api.BestRowIdentifier; +import org.jboss.dna.common.jdbc.model.api.BestRowIdentifierScopeType; +import org.jboss.dna.common.jdbc.model.api.Catalog; +import org.jboss.dna.common.jdbc.model.api.ColumnPseudoType; +import org.jboss.dna.common.jdbc.model.api.Database; +import org.jboss.dna.common.jdbc.model.api.DatabaseMetaDataMethodException; +import org.jboss.dna.common.jdbc.model.api.ForeignKey; +import org.jboss.dna.common.jdbc.model.api.ForeignKeyColumn; +import org.jboss.dna.common.jdbc.model.api.Index; +import org.jboss.dna.common.jdbc.model.api.IndexColumn; +import org.jboss.dna.common.jdbc.model.api.IndexType; +import org.jboss.dna.common.jdbc.model.api.KeyDeferrabilityType; +import org.jboss.dna.common.jdbc.model.api.KeyModifyRuleType; +import org.jboss.dna.common.jdbc.model.api.NullabilityType; +import org.jboss.dna.common.jdbc.model.api.Parameter; +import org.jboss.dna.common.jdbc.model.api.ParameterIoType; +import org.jboss.dna.common.jdbc.model.api.PrimaryKey; +import org.jboss.dna.common.jdbc.model.api.PrimaryKeyColumn; +import org.jboss.dna.common.jdbc.model.api.Privilege; +import org.jboss.dna.common.jdbc.model.api.PrivilegeType; +import org.jboss.dna.common.jdbc.model.api.Reference; +import org.jboss.dna.common.jdbc.model.api.ResultSetConcurrencyType; +import org.jboss.dna.common.jdbc.model.api.ResultSetHoldabilityType; +import org.jboss.dna.common.jdbc.model.api.ResultSetType; +import org.jboss.dna.common.jdbc.model.api.SQLStateType; +import org.jboss.dna.common.jdbc.model.api.Schema; +import org.jboss.dna.common.jdbc.model.api.SearchabilityType; +import org.jboss.dna.common.jdbc.model.api.SortSequenceType; +import org.jboss.dna.common.jdbc.model.api.SqlType; +import org.jboss.dna.common.jdbc.model.api.SqlTypeInfo; +import org.jboss.dna.common.jdbc.model.api.StoredProcedure; +import org.jboss.dna.common.jdbc.model.api.StoredProcedureResultType; +import org.jboss.dna.common.jdbc.model.api.Table; +import org.jboss.dna.common.jdbc.model.api.TableColumn; +import org.jboss.dna.common.jdbc.model.api.TableType; +import org.jboss.dna.common.jdbc.model.api.TransactionIsolationLevelType; +import org.jboss.dna.common.jdbc.model.api.UserDefinedType; +import org.jboss.dna.common.util.Logger; /** * Database related utilities @@ -50,7 +86,7 @@ */ private static String standardUserDefinedTypes = "JAVA_OBJECT,STRUCT,DISTINCT"; - private static Map standardUserDefinedTypesMapping = new HashMap(); + private static Map<String, Integer> standardUserDefinedTypesMapping = new HashMap<String, Integer>(); static { standardUserDefinedTypesMapping.put("JAVA_OBJECT", new Integer(SqlType.JAVA_OBJECT.getType())); @@ -91,7 +127,7 @@ // fill array for (int i = 0; i < userDefinedTypesStringArray.length; i++) { // get value from map - Integer udtType = (Integer)standardUserDefinedTypesMapping.get(userDefinedTypesStringArray[i]); + Integer udtType = standardUserDefinedTypesMapping.get(userDefinedTypesStringArray[i]); // set int value userDefinedTypesArray[i] = (udtType == null) ? Types.NULL : udtType.intValue(); } @@ -104,7 +140,7 @@ * @param resultSet the result set to fetch from * @param columnName the name of column * @return boolean with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Boolean getBoolean( ResultSet resultSet, String columnName ) throws SQLException { @@ -125,7 +161,7 @@ * @param columnName the name of column * @param failOnError if true raises exception * @return boolean with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Boolean getBoolean( ResultSet resultSet, String columnName, @@ -143,10 +179,9 @@ } catch (SQLException e) { if (failOnError) { throw e; - } else { - log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnName, e.getMessage()); - return null; } + log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnName, e.getMessage()); + return null; } } @@ -156,7 +191,7 @@ * @param resultSet the result set to fetch from * @param columnIndex the index of column * @return boolean with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Boolean getBoolean( ResultSet resultSet, int columnIndex ) throws SQLException { @@ -177,7 +212,7 @@ * @param columnIndex the index of column * @param failOnError if true raises exception * @return boolean with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Boolean getBoolean( ResultSet resultSet, int columnIndex, @@ -195,10 +230,9 @@ } catch (SQLException e) { if (failOnError) { throw e; - } else { - log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnIndex, e.getMessage()); - return null; } + log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnIndex, e.getMessage()); + return null; } } @@ -208,7 +242,7 @@ * @param resultSet the result set to fetch from * @param columnName the name of column * @return integer with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Integer getInteger( ResultSet resultSet, String columnName ) throws SQLException { @@ -229,7 +263,7 @@ * @param columnName the name of column * @param failOnError if true raises exception * @return integer with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Integer getInteger( ResultSet resultSet, String columnName, @@ -248,10 +282,9 @@ } catch (SQLException e) { if (failOnError) { throw e; - } else { - log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnName, e.getMessage()); - return null; } + log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnName, e.getMessage()); + return null; } } @@ -261,7 +294,7 @@ * @param resultSet the result set to fetch from * @param columnIndex the index of column * @return integer with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Integer getInteger( ResultSet resultSet, int columnIndex ) throws SQLException { @@ -282,7 +315,7 @@ * @param columnIndex the index of column * @param failOnError if true raises exception * @return integer with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Integer getInteger( ResultSet resultSet, int columnIndex, @@ -301,10 +334,9 @@ } catch (SQLException e) { if (failOnError) { throw e; - } else { - log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnIndex, e.getMessage()); - return null; } + log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnIndex, e.getMessage()); + return null; } } @@ -314,7 +346,7 @@ * @param resultSet the result set to fetch from * @param columnName the name of column * @return long with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Long getLong( ResultSet resultSet, String columnName ) throws SQLException { @@ -335,7 +367,7 @@ * @param columnName the name of column * @param failOnError if true raises exception * @return long with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Long getLong( ResultSet resultSet, String columnName, @@ -354,10 +386,9 @@ } catch (SQLException e) { if (failOnError) { throw e; - } else { - log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnName, e.getMessage()); - return null; } + log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnName, e.getMessage()); + return null; } } @@ -367,7 +398,7 @@ * @param resultSet the result set to fetch from * @param columnIndex the index of column * @return long with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Long getLong( ResultSet resultSet, int columnIndex ) throws SQLException { @@ -388,7 +419,7 @@ * @param columnIndex the index of column * @param failOnError if true raises exception * @return long with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Long getLong( ResultSet resultSet, int columnIndex, @@ -407,10 +438,9 @@ } catch (SQLException e) { if (failOnError) { throw e; - } else { - log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnIndex, e.getMessage()); - return null; } + log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnIndex, e.getMessage()); + return null; } } @@ -420,7 +450,7 @@ * @param resultSet the result set to fetch from * @param columnName the name of column * @return double with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Double getDouble( ResultSet resultSet, String columnName ) throws SQLException { @@ -441,7 +471,7 @@ * @param columnName the name of column * @param failOnError if true raises exception * @return double with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Double getDouble( ResultSet resultSet, String columnName, @@ -460,10 +490,9 @@ } catch (SQLException e) { if (failOnError) { throw e; - } else { - log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnName, e.getMessage()); - return null; } + log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnName, e.getMessage()); + return null; } } @@ -473,7 +502,7 @@ * @param resultSet the result set to fetch from * @param columnIndex the index of column * @return double with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Double getDouble( ResultSet resultSet, int columnIndex ) throws SQLException { @@ -494,7 +523,7 @@ * @param columnIndex the index of column * @param failOnError if true raises exception * @return double with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static Double getDouble( ResultSet resultSet, int columnIndex, @@ -513,10 +542,9 @@ } catch (SQLException e) { if (failOnError) { throw e; - } else { - log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnIndex, e.getMessage()); - return null; } + log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnIndex, e.getMessage()); + return null; } } @@ -526,7 +554,7 @@ * @param resultSet the result set to fetch from * @param columnName the name of column * @return double with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static String getString( ResultSet resultSet, String columnName ) throws SQLException { @@ -547,7 +575,7 @@ * @param columnName the name of column * @param failOnError if true raises exception * @return double with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static String getString( ResultSet resultSet, String columnName, @@ -566,10 +594,9 @@ } catch (SQLException e) { if (failOnError) { throw e; - } else { - log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnName, e.getMessage()); - return null; } + log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnName, e.getMessage()); + return null; } } @@ -579,7 +606,7 @@ * @param resultSet the result set to fetch from * @param columnIndex the index of column * @return double with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static String getString( ResultSet resultSet, int columnIndex ) throws SQLException { @@ -600,7 +627,7 @@ * @param columnIndex the index of column * @param failOnError if true raises exception * @return double with respect to NULL values (could be null) - * @throws SQLException + * @throws SQLException */ public static String getString( ResultSet resultSet, int columnIndex, @@ -618,10 +645,9 @@ } catch (SQLException e) { if (failOnError) { throw e; - } else { - log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnIndex, e.getMessage()); - return null; } + log.error(JdbcMetadataI18n.unableToGetValueFromColumn, columnIndex, e.getMessage()); + return null; } } @@ -644,7 +670,7 @@ } // log only if not found log.debug(String.format("[%s] Unknown best row identifier scope type %d", "getBestRowIdentifierScopeType", type)); - + return null; } @@ -949,6 +975,7 @@ /** * Returns SqlType based on data type, or null + * * @param type the SQL type * @return SqlType based on data type, or null */ @@ -1021,7 +1048,7 @@ * @param factory the model factory to create table * @param resultSet the table result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @return created catalog * @throws Exception if any error occurs and failOnError is true then generates exception @@ -1089,7 +1116,7 @@ * @param factory the model factory to create table * @param resultSet the table result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @return created schema * @throws Exception if any error occurs and failOnError is true then generates exception @@ -1166,7 +1193,7 @@ * @param factory the model factory to create table * @param resultSet the table result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @return created schema * @throws Exception if any error occurs and failOnError is true then generates exception @@ -1235,7 +1262,7 @@ * @param factory the model factory to create SP * @param resultSet the stored procedure result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @return created SP * @throws Exception if any error occurs and failOnError is true then generates exception @@ -1303,10 +1330,10 @@ // warn if null if (catalog == null) { traceLog.debug(String.format("[Database %s] Unable to find catalog '%4$s' for the procedure %s (schema %s, catalog %s)", - database.getName(), - procedureName, - procedureSchema, - procedureCatalog)); + database.getName(), + procedureName, + procedureSchema, + procedureCatalog)); } // if fail is enabled if (failOnError && (catalog == null)) { @@ -1323,14 +1350,14 @@ // warn if null if (schema == null) { traceLog.debug(String.format("[Database %s] Unable to find schema '%3$s' for the procedure %s (schema %s, catalog %s)", - database.getName(), - procedureName, - procedureSchema, - procedureCatalog)); + database.getName(), + procedureName, + procedureSchema, + procedureCatalog)); } // if fail is enabled if (failOnError && (schema == null)) { - throw new DatabaseMetaDataMethodException("Schema name shall be provided", "populateStoredProcedure"); + throw new DatabaseMetaDataMethodException("Schema name shall be provided", "populateStoredProcedure"); } } @@ -1362,7 +1389,7 @@ * @param factory the model factory to create SP parameter * @param resultSet the stored procedure parameter result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @param storedProcedure the owner stored procedure * @param ordinalPosition the parameter ordinal position @@ -1500,7 +1527,7 @@ * @param factory the model factory to create table * @param resultSet the table result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @return created table * @throws Exception if any error occurs and failOnError is true then generates exception @@ -1581,10 +1608,10 @@ // warn if null if (catalog == null) { traceLog.debug(String.format("[Database %s] Unable to find catalog '%4$s' for the table %s (schema %s, catalog %s)", - database.getName(), - tableName, - tableSchema, - tableCatalog)); + database.getName(), + tableName, + tableSchema, + tableCatalog)); } // if fail is enabled if (failOnError) { @@ -1602,10 +1629,10 @@ // warn if null if (schema == null) { traceLog.debug(String.format("[Database %s] Unable to find schema '%3$s' for the table %s (schema %s, catalog %s)", - database.getName(), - tableName, - tableSchema, - tableCatalog)); + database.getName(), + tableName, + tableSchema, + tableCatalog)); } // if fail is enabled if (failOnError) { @@ -1636,10 +1663,10 @@ // warn if null if (typeCatalog == null) { traceLog.debug(String.format("[Database %s] Unable to find catalog '%4$s' for the table %s (schema %s, catalog %s)", - database.getName(), - tableName, - tableSchema, - typeCatalogName)); + database.getName(), + tableName, + tableSchema, + typeCatalogName)); } } @@ -1652,10 +1679,10 @@ // warn if null if (typeSchema == null) { traceLog.debug(String.format("[Database %s] Unable to find schema '%3$s' for the table %s (schema %s, catalog %s)", - database.getName(), - tableName, - typeSchemaName, - typeCatalogName)); + database.getName(), + tableName, + typeSchemaName, + typeCatalogName)); } // if fail is enabled if (failOnError && (typeSchema == null)) { @@ -1691,7 +1718,7 @@ * @param factory the model factory to create SP parameter * @param resultSet the stored procedure parameter result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @param table the owner table * @return created table column @@ -1757,7 +1784,7 @@ // ordinal position Integer ordinalPosition = getInteger(resultSet, "ORDINAL_POSITION", false); // is nullable string - String isNullableString = getString(resultSet, "IS_NULLABLE", false); + // String isNullableString = getString(resultSet, "IS_NULLABLE", false); // scope catalog String scopeCatalog = getString(resultSet, "SCOPE_CATLOG", false); // scope schema @@ -1850,7 +1877,7 @@ * @param factory the model factory to create SP parameter * @param resultSet the stored procedure parameter result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @param table the owner table * @return created table best row identifier @@ -1920,9 +1947,8 @@ // if exception generation is enabled then raise exception - invalid scope if (failOnError == true) { throw new IllegalArgumentException("scopeType"); - } else { - return null; } + return null; } // find table best row identifier object @@ -2018,7 +2044,7 @@ * @param factory the model factory to create SP parameter * @param resultSet the stored procedure parameter result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @param table the owner table * @return created primary key @@ -2161,7 +2187,7 @@ * @param factory the model factory to create SP parameter * @param resultSet the stored procedure parameter result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @param table the owner table * @return created list of foreign keys @@ -2284,7 +2310,7 @@ // trying to find table column with specified name TableColumn tableColumn = table.findColumnByName(fkColumnName); - + String errMessage = null; // warn if null if (tableColumn == null) { @@ -2365,7 +2391,7 @@ * @param factory the model factory to create SP parameter * @param resultSet the stored procedure parameter result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @param table the owner table * @return created list of index @@ -2499,7 +2525,7 @@ // trying to find table column with specified name TableColumn tableColumn = table.findColumnByName(indexColumnName); - + String errMessage = null; // warn if null if (tableColumn == null) { @@ -2563,7 +2589,7 @@ * @param factory the model factory to create SP parameter * @param resultSet the stored procedure parameter result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @param table the owner table * @return created/updated version table column @@ -2616,7 +2642,7 @@ // size Integer size = getInteger(resultSet, "COLUMN_SIZE", false); // column length in bytes - Integer bufferLength = getInteger(resultSet, "BUFFER_LENGTH", false); + // Integer bufferLength = getInteger(resultSet, "BUFFER_LENGTH", false); // precision Integer precision = getInteger(resultSet, "DECIMAL_DIGITS", false); @@ -2685,7 +2711,7 @@ * @param factory the model factory to create SP parameter * @param resultSet the stored procedure parameter result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @param table the owner table * @return created list of privileges @@ -2775,7 +2801,7 @@ * @param factory the model factory to create SP parameter * @param resultSet the stored procedure parameter result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @param table the owner table * @param column the table column @@ -2874,7 +2900,7 @@ * @param factory the model factory to create table * @param resultSet the table result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @return created SQL type info * @throws Exception if any error occurs and failOnError is true then generates exception @@ -3003,7 +3029,7 @@ * @param factory the model factory to create table * @param resultSet the table result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @return created UDT * @throws Exception if any error occurs and failOnError is true then generates exception @@ -3072,7 +3098,7 @@ Catalog catalog = database.findCatalogByName(udtCatalog); // set catalog udt.setCatalog(catalog); - + String errMessage = null; // warn if null if (catalog == null) { @@ -3085,7 +3111,7 @@ } // if fail is enabled if (failOnError) { - throw new DatabaseMetaDataMethodException(errMessage,"populateUDT"); + throw new DatabaseMetaDataMethodException(errMessage, "populateUDT"); } } @@ -3095,7 +3121,7 @@ Schema schema = database.findSchemaByName(udtCatalog, udtSchema); // set schema udt.setSchema(schema); - + String errMessage = null; // warn if null if (schema == null) { @@ -3145,7 +3171,7 @@ * @param factory the model factory to create SP parameter * @param resultSet the stored procedure parameter result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @param udt the owner UDT * @return created UDT attribute @@ -3211,7 +3237,7 @@ // ordinal position Integer ordinalPosition = getInteger(resultSet, "ORDINAL_POSITION", false); // is nullable string - String isNullableString = getString(resultSet, "IS_NULLABLE", false); + // String isNullableString = getString(resultSet, "IS_NULLABLE", false); // scope catalog String scopeCatalog = getString(resultSet, "SCOPE_CATLOG", false); // scope schema @@ -3301,7 +3327,7 @@ * @param factory the model factory to create SP parameter * @param resultSet the stored procedure parameter result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @param udt the UDT to update * @throws Exception if any error occurs and failOnError is true then generates exception @@ -3376,7 +3402,7 @@ * @param factory the model factory to create SP parameter * @param resultSet the stored procedure parameter result set from DatabaseMetadata * @param traceLog the log to write if any - * @param failOnError + * @param failOnError * @param database the owner database * @param table the table to update * @throws Exception if any error occurs and failOnError is true then generates exception Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/AttributeBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/AttributeBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/AttributeBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,10 +21,10 @@ */ package org.jboss.dna.common.jdbc.model.spi; +import junit.framework.TestCase; import org.jboss.dna.common.jdbc.model.DefaultModelFactory; import org.jboss.dna.common.jdbc.model.api.Attribute; import org.jboss.dna.common.jdbc.model.api.Reference; -import junit.framework.TestCase; /** * AttributeBean test @@ -38,6 +38,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -47,6 +48,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/BestRowIdentifierBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/BestRowIdentifierBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/BestRowIdentifierBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -22,11 +22,11 @@ package org.jboss.dna.common.jdbc.model.spi; import java.util.Set; +import junit.framework.TestCase; import org.jboss.dna.common.jdbc.model.DefaultModelFactory; +import org.jboss.dna.common.jdbc.model.api.BestRowIdentifier; import org.jboss.dna.common.jdbc.model.api.BestRowIdentifierScopeType; -import org.jboss.dna.common.jdbc.model.api.BestRowIdentifier; import org.jboss.dna.common.jdbc.model.api.Column; -import junit.framework.TestCase; /** * BestRowIdentifierBean test @@ -40,6 +40,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); @@ -50,6 +51,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/CatalogBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/CatalogBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/CatalogBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -22,7 +22,6 @@ package org.jboss.dna.common.jdbc.model.spi; import junit.framework.TestCase; -import org.jboss.dna.common.jdbc.model.spi.CatalogBean; import org.jboss.dna.common.jdbc.model.api.Catalog; /** @@ -37,6 +36,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -46,6 +46,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ColumnBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ColumnBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ColumnBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,15 +21,14 @@ */ package org.jboss.dna.common.jdbc.model.spi; +import java.util.Set; import junit.framework.TestCase; -import java.util.Set; import org.jboss.dna.common.jdbc.model.DefaultModelFactory; -import org.jboss.dna.common.jdbc.model.spi.ColumnBean; import org.jboss.dna.common.jdbc.model.api.Column; -import org.jboss.dna.common.jdbc.model.api.Table; import org.jboss.dna.common.jdbc.model.api.NullabilityType; +import org.jboss.dna.common.jdbc.model.api.Privilege; import org.jboss.dna.common.jdbc.model.api.SqlType; -import org.jboss.dna.common.jdbc.model.api.Privilege; +import org.jboss.dna.common.jdbc.model.api.Table; /** * ColumnBean test @@ -43,6 +42,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -52,6 +52,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/CoreMetaDataBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/CoreMetaDataBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/CoreMetaDataBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -23,7 +23,6 @@ import junit.framework.TestCase; import org.jboss.dna.common.jdbc.model.api.CoreMetaData; -import org.jboss.dna.common.jdbc.model.spi.CoreMetaDataBean; /** * CoreMetaDataBean test @@ -37,6 +36,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -46,6 +46,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/DatabaseBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/DatabaseBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/DatabaseBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,13 +21,27 @@ */ package org.jboss.dna.common.jdbc.model.spi; +import java.util.List; +import java.util.Set; import junit.framework.TestCase; -import java.util.Set; -import java.util.List; -import org.jboss.dna.common.jdbc.model.api.*; import org.jboss.dna.common.jdbc.model.DefaultModelFactory; import org.jboss.dna.common.jdbc.model.ModelFactory; +import org.jboss.dna.common.jdbc.model.api.Catalog; +import org.jboss.dna.common.jdbc.model.api.Database; import org.jboss.dna.common.jdbc.model.api.DatabaseMetaDataMethodException; +import org.jboss.dna.common.jdbc.model.api.ResultSetConcurrencyType; +import org.jboss.dna.common.jdbc.model.api.ResultSetHoldabilityType; +import org.jboss.dna.common.jdbc.model.api.ResultSetType; +import org.jboss.dna.common.jdbc.model.api.SQLStateType; +import org.jboss.dna.common.jdbc.model.api.Schema; +import org.jboss.dna.common.jdbc.model.api.SqlType; +import org.jboss.dna.common.jdbc.model.api.SqlTypeConversionPair; +import org.jboss.dna.common.jdbc.model.api.SqlTypeInfo; +import org.jboss.dna.common.jdbc.model.api.StoredProcedure; +import org.jboss.dna.common.jdbc.model.api.Table; +import org.jboss.dna.common.jdbc.model.api.TableType; +import org.jboss.dna.common.jdbc.model.api.TransactionIsolationLevelType; +import org.jboss.dna.common.jdbc.model.api.UserDefinedType; /** * DatabaseBean test @@ -42,6 +56,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -52,6 +67,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/DatabaseNamedObjectBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/DatabaseNamedObjectBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/DatabaseNamedObjectBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,10 +21,9 @@ */ package org.jboss.dna.common.jdbc.model.spi; +import java.util.Map; import junit.framework.TestCase; -import java.util.Map; import org.jboss.dna.common.jdbc.model.api.DatabaseNamedObject; -import org.jboss.dna.common.jdbc.model.spi.DatabaseNamedObjectBean; /** * DatabaseNamedObjectBean test @@ -38,6 +37,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -47,6 +47,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ForeignKeyBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ForeignKeyBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ForeignKeyBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,11 +21,9 @@ */ package org.jboss.dna.common.jdbc.model.spi; +import java.util.Set; import junit.framework.TestCase; -import java.util.Set; import org.jboss.dna.common.jdbc.model.DefaultModelFactory; -import org.jboss.dna.common.jdbc.model.spi.ForeignKeyBean; -import org.jboss.dna.common.jdbc.model.api.Column; import org.jboss.dna.common.jdbc.model.api.ForeignKey; import org.jboss.dna.common.jdbc.model.api.ForeignKeyColumn; import org.jboss.dna.common.jdbc.model.api.KeyDeferrabilityType; @@ -45,6 +43,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -54,6 +53,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ForeignKeyColumnBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ForeignKeyColumnBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ForeignKeyColumnBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -22,9 +22,9 @@ package org.jboss.dna.common.jdbc.model.spi; import junit.framework.TestCase; +import org.jboss.dna.common.jdbc.model.DefaultModelFactory; import org.jboss.dna.common.jdbc.model.api.ForeignKeyColumn; import org.jboss.dna.common.jdbc.model.api.TableColumn; -import org.jboss.dna.common.jdbc.model.DefaultModelFactory; /** * ForeignKeyColumnBean test @@ -38,6 +38,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -47,6 +48,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/IndexBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/IndexBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/IndexBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,10 +21,9 @@ */ package org.jboss.dna.common.jdbc.model.spi; +import java.util.Set; import junit.framework.TestCase; -import java.util.Set; import org.jboss.dna.common.jdbc.model.DefaultModelFactory; -import org.jboss.dna.common.jdbc.model.api.ForeignKeyColumn; import org.jboss.dna.common.jdbc.model.api.Index; import org.jboss.dna.common.jdbc.model.api.IndexColumn; import org.jboss.dna.common.jdbc.model.api.IndexType; @@ -40,6 +39,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -49,6 +49,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/IndexColumnBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/IndexColumnBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/IndexColumnBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -22,7 +22,6 @@ package org.jboss.dna.common.jdbc.model.spi; import junit.framework.TestCase; -import org.jboss.dna.common.jdbc.model.DefaultModelFactory; import org.jboss.dna.common.jdbc.model.api.IndexColumn; import org.jboss.dna.common.jdbc.model.api.SortSequenceType; @@ -37,6 +36,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -46,6 +46,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/KeyColumnBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/KeyColumnBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/KeyColumnBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -34,6 +34,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -43,6 +44,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ParameterBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ParameterBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ParameterBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -36,6 +36,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -45,6 +46,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/PrimaryKeyBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/PrimaryKeyBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/PrimaryKeyBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,8 +21,8 @@ */ package org.jboss.dna.common.jdbc.model.spi; +import java.util.Set; import junit.framework.TestCase; -import java.util.Set; import org.jboss.dna.common.jdbc.model.DefaultModelFactory; import org.jboss.dna.common.jdbc.model.api.PrimaryKey; import org.jboss.dna.common.jdbc.model.api.PrimaryKeyColumn; @@ -39,6 +39,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -48,6 +49,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/PrimaryKeyColumnBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/PrimaryKeyColumnBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/PrimaryKeyColumnBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -36,6 +36,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -45,6 +46,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/PrivilegeBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/PrivilegeBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/PrivilegeBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -37,6 +37,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -46,6 +47,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ReferenceBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ReferenceBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/ReferenceBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -39,6 +39,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -48,6 +49,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SchemaBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SchemaBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SchemaBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -38,6 +38,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -47,6 +48,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SchemaObjectBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SchemaObjectBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SchemaObjectBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -39,6 +39,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -48,6 +49,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SqlTypeConversionPairBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SqlTypeConversionPairBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SqlTypeConversionPairBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -22,7 +22,6 @@ package org.jboss.dna.common.jdbc.model.spi; import junit.framework.TestCase; -import org.jboss.dna.common.jdbc.model.DefaultModelFactory; import org.jboss.dna.common.jdbc.model.api.SqlType; import org.jboss.dna.common.jdbc.model.api.SqlTypeConversionPair; @@ -38,6 +37,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -47,6 +47,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SqlTypeInfoBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SqlTypeInfoBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/SqlTypeInfoBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -39,6 +39,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -49,6 +50,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/StoredProcedureBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/StoredProcedureBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/StoredProcedureBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,10 +21,9 @@ */ package org.jboss.dna.common.jdbc.model.spi; +import java.util.Set; import junit.framework.TestCase; -import java.util.Set; import org.jboss.dna.common.jdbc.model.DefaultModelFactory; -import org.jboss.dna.common.jdbc.model.api.ForeignKeyColumn; import org.jboss.dna.common.jdbc.model.api.Parameter; import org.jboss.dna.common.jdbc.model.api.StoredProcedure; import org.jboss.dna.common.jdbc.model.api.StoredProcedureResultType; @@ -41,6 +40,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -50,6 +50,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/TableBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/TableBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/TableBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,9 +21,8 @@ */ package org.jboss.dna.common.jdbc.model.spi; -import junit.framework.TestCase; import java.util.Set; -import java.util.HashSet; +import junit.framework.TestCase; import org.jboss.dna.common.jdbc.model.DefaultModelFactory; import org.jboss.dna.common.jdbc.model.ModelFactory; import org.jboss.dna.common.jdbc.model.api.BestRowIdentifier; @@ -31,14 +30,12 @@ import org.jboss.dna.common.jdbc.model.api.Catalog; import org.jboss.dna.common.jdbc.model.api.ForeignKey; import org.jboss.dna.common.jdbc.model.api.Index; -import org.jboss.dna.common.jdbc.model.api.Parameter; import org.jboss.dna.common.jdbc.model.api.PrimaryKey; import org.jboss.dna.common.jdbc.model.api.Privilege; import org.jboss.dna.common.jdbc.model.api.Schema; import org.jboss.dna.common.jdbc.model.api.Table; import org.jboss.dna.common.jdbc.model.api.TableColumn; import org.jboss.dna.common.jdbc.model.api.TableType; -import org.jboss.dna.common.jdbc.model.spi.TableBean; /** * TableBean test @@ -53,6 +50,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -63,6 +61,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/TableColumnBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/TableColumnBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/TableColumnBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -24,8 +24,8 @@ import junit.framework.TestCase; import org.jboss.dna.common.jdbc.model.DefaultModelFactory; import org.jboss.dna.common.jdbc.model.api.ColumnPseudoType; +import org.jboss.dna.common.jdbc.model.api.Reference; import org.jboss.dna.common.jdbc.model.api.TableColumn; -import org.jboss.dna.common.jdbc.model.api.Reference; /** * TableColumnBean test @@ -39,6 +39,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -48,6 +49,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/TableTypeBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/TableTypeBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/TableTypeBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -36,6 +36,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -45,6 +46,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/UserDefinedTypeBeanTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/UserDefinedTypeBeanTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/UserDefinedTypeBeanTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,13 +21,12 @@ */ package org.jboss.dna.common.jdbc.model.spi; +import java.util.Set; import junit.framework.TestCase; -import java.util.Set; +import org.jboss.dna.common.jdbc.model.DefaultModelFactory; import org.jboss.dna.common.jdbc.model.api.Attribute; +import org.jboss.dna.common.jdbc.model.api.SqlType; import org.jboss.dna.common.jdbc.model.api.UserDefinedType; -import org.jboss.dna.common.jdbc.model.api.SqlType; -import org.jboss.dna.common.jdbc.model.DefaultModelFactory; -import org.jboss.dna.common.jdbc.model.spi.UserDefinedTypeBean; /** * UserDefinedTypeBean test @@ -41,6 +40,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); // create @@ -50,6 +50,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { // release bean = null; Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/provider/DataSourceDatabaseMetadataProviderTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/provider/DataSourceDatabaseMetadataProviderTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/provider/DataSourceDatabaseMetadataProviderTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -21,13 +21,9 @@ */ package org.jboss.dna.common.jdbc.provider; +import java.util.Properties; import junit.framework.TestCase; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.util.Properties; -import javax.sql.DataSource; - /** * Data Source Database Metadata Provider Test * @@ -72,8 +68,8 @@ /** * Test get data source - * @throws Exception * + * @throws Exception */ public void testGetDataSource() throws Exception { // set provider name @@ -97,7 +93,7 @@ // TODO: validate the testGetDataSource try { // trying to get data source - DataSource dataSource = dataSourceProvider.getDataSource(); + dataSourceProvider.getDataSource(); fail("DataSource provider should raise an exception when app server is not running"); } catch (Exception e) { // we're should be here because app server is not running so far @@ -147,7 +143,7 @@ // TODO: validate the testGetDatabaseMetaData try { // trying to get connection - DatabaseMetaData databaseMetaData = dataSourceProvider.getDatabaseMetaData(); + dataSourceProvider.getDatabaseMetaData(); fail("DataSource provider should raise an exception when app server is not running"); } catch (Exception e) { // we're should be here because app server is not running so far @@ -157,7 +153,7 @@ /** * Test get connection * - * @throws Exception + * @throws Exception */ public void testGetConnection() throws Exception { // set provider name @@ -181,7 +177,7 @@ // TODO: validate the testGetConnection try { // trying to get connection - Connection connection = dataSourceProvider.getConnection(); + dataSourceProvider.getConnection(); fail("DataSource provider should raise an exception when app server is not running"); } catch (Exception e) { // we're should be here because app server is not running so far Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/util/DatabaseUtilTest.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/util/DatabaseUtilTest.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/util/DatabaseUtilTest.java 2008-12-09 15:09:16 UTC (rev 677) @@ -35,6 +35,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); } @@ -42,6 +43,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { super.tearDown(); } Modified: trunk/extensions/dna-connector-jdbc-metadata/src/main/java/org/jboss/dna/connector/jdbc/JdbcRepositorySource.java =================================================================== --- trunk/extensions/dna-connector-jdbc-metadata/src/main/java/org/jboss/dna/connector/jdbc/JdbcRepositorySource.java 2008-12-09 10:19:19 UTC (rev 676) +++ trunk/extensions/dna-connector-jdbc-metadata/src/main/java/org/jboss/dna/connector/jdbc/JdbcRepositorySource.java 2008-12-09 15:09:16 UTC (rev 677) @@ -35,12 +35,10 @@ import javax.naming.BinaryRefAddr; import javax.naming.Context; import javax.naming.Name; -import javax.naming.NamingException; import javax.naming.RefAddr; import javax.naming.Reference; import javax.naming.StringRefAddr; import javax.naming.spi.ObjectFactory; - import net.jcip.annotations.ThreadSafe; import org.jboss.dna.common.i18n.I18n; import org.jboss.dna.graph.cache.CachePolicy; @@ -51,10 +49,9 @@ import org.jboss.dna.graph.connectors.RepositorySourceException; /** - * A description of a JDBC resource that can be used to access database information. + * A description of a JDBC resource that can be used to access database information. * * @author <a href="mailto:litsenko_sergey@yahoo.com">Sergiy Litsenko</a> - * */ public class JdbcRepositorySource implements RepositorySource, ObjectFactory { private static final long serialVersionUID = 1L; @@ -77,7 +74,7 @@ * This source does not support same-name-siblings. */ protected static final boolean SUPPORTS_SAME_NAME_SIBLINGS = false; - + private final AtomicInteger retryLimit = new AtomicInteger(DEFAULT_RETRY_LIMIT); protected String name; protected final Capabilities capabilities = new Capabilities(); @@ -89,7 +86,7 @@ protected static final String REPO_JNDI_NAME = "jndiName"; protected static final String REPO_FACTORY_JNDI_NAME = "factoryJndiName"; protected static final String RETRY_LIMIT = "retryLimit"; - + /** * default constructor */ @@ -98,7 +95,7 @@ /** * {@inheritDoc} - * + * * @see org.jboss.dna.graph.connectors.RepositorySource#getCapabilities() */ public RepositorySourceCapabilities getCapabilities() { @@ -107,7 +104,7 @@ /** * {@inheritDoc} - * + * * @see org.jboss.dna.graph.connectors.RepositorySource#getConnection() */ public RepositoryConnection getConnection() throws RepositorySourceException { @@ -117,7 +114,7 @@ /** * {@inheritDoc} - * + * * @see org.jboss.dna.graph.connectors.RepositorySource#getName() */ public String getName() { @@ -132,10 +129,10 @@ public void setName( String name ) { this.name = name; } - + /** * {@inheritDoc} - * + * * @see org.jboss.dna.graph.connectors.RepositorySource#getRetryLimit() */ public int getRetryLimit() { @@ -144,7 +141,7 @@ /** * {@inheritDoc} - * + * * @see org.jboss.dna.graph.connectors.RepositorySource#initialize(org.jboss.dna.graph.connectors.RepositoryContext) */ public void initialize( RepositoryContext context ) throws RepositorySourceException { @@ -153,7 +150,7 @@ /** * {@inheritDoc} - * + * * @see org.jboss.dna.graph.connectors.RepositorySource#setRetryLimit(int) */ public void setRetryLimit( int limit ) { @@ -176,7 +173,7 @@ * content. */ public synchronized void setSupportsUpdates( boolean supportsUpdates ) { - capabilities.setSupportsUpdates (supportsUpdates); + capabilities.setSupportsUpdates(supportsUpdates); } /** @@ -194,7 +191,7 @@ public synchronized void setDefaultCachePolicy( CachePolicy defaultCachePolicy ) { this.defaultCachePolicy = defaultCachePolicy; } - + /** * {@inheritDoc} */ @@ -212,13 +209,13 @@ } return false; } - + /** * {@inheritDoc} - * + * * @see javax.naming.Referenceable#getReference() */ - public Reference getReference() throws NamingException { + public Reference getReference() { String className = getClass().getName(); String factoryClassName = this.getClass().getName(); Reference ref = new Reference(className, factoryClassName, null); @@ -245,8 +242,9 @@ /** * {@inheritDoc} - * - * @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object, javax.naming.Name, javax.naming.Context, java.util.Hashtable) + * + * @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object, javax.naming.Name, javax.naming.Context, + * java.util.Hashtable) */ public Object getObjectInstance( Object obj, Name name,