Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/VerbatimSqlConditionBuilder.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/VerbatimSqlConditionBuilder.java?rev=1448414&r1=1448413&r2=1448414&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/VerbatimSqlConditionBuilder.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/VerbatimSqlConditionBuilder.java Wed Feb 20 21:06:35 2013 @@ -1,87 +1,87 @@ -package org.apache.torque.sql.whereclausebuilder; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.util.Arrays; - -import org.apache.torque.TorqueException; -import org.apache.torque.adapter.Adapter; -import org.apache.torque.criteria.PreparedStatementPart; -import org.apache.torque.sql.WhereClauseExpression; - -/** - * Builds a PreparedStatementPart from a WhereClauseExpression containing - * a verbatim SQL condition. - * - * @version $Id$ - */ -public class VerbatimSqlConditionBuilder implements WhereClausePsPartBuilder -{ - /** - * Builds the PS part for a WhereClauseExpression with a verbatim - * SQL condition. - * - * @param whereClausePart the part of the where clause to build. - * Can be modified in this method. - * @param ignoreCase is ignored here. - * @param adapter The adapter for the database for which the SQL - * should be created, not null. - * - * @return the rendered SQL for the WhereClauseExpression - */ - public PreparedStatementPart buildPs( - WhereClauseExpression whereClausePart, - boolean ignoreCase, - Adapter adapter) - throws TorqueException - { - PreparedStatementPart result = new PreparedStatementPart(); - result.getSql().append(whereClausePart.getSql()); - Object[] replacements - = whereClausePart.getPreparedStatementReplacements(); - if (replacements != null) - { - result.getPreparedStatementReplacements().addAll( - Arrays.asList(replacements)); - } - return result; - } - - /** - * Returns whether this WhereClausePsPartBuilder is applicable for - * a given WhereClauseExpression. - * - * @param whereClauseExpression the WhereClauseExpression in question. - * @param adapter The adapter for the database for which the SQL - * should be created, not null. - * - * @return true if applicable, false otherwise. - */ - public boolean isApplicable( - WhereClauseExpression whereClauseExpression, - Adapter adapter) - { - if (whereClauseExpression.isVerbatimSqlCondition()) - { - return true; - } - return false; - } -} +package org.apache.torque.sql.whereclausebuilder; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.util.Arrays; + +import org.apache.torque.TorqueException; +import org.apache.torque.adapter.Adapter; +import org.apache.torque.criteria.PreparedStatementPart; +import org.apache.torque.sql.WhereClauseExpression; + +/** + * Builds a PreparedStatementPart from a WhereClauseExpression containing + * a verbatim SQL condition. + * + * @version $Id$ + */ +public class VerbatimSqlConditionBuilder implements WhereClausePsPartBuilder +{ + /** + * Builds the PS part for a WhereClauseExpression with a verbatim + * SQL condition. + * + * @param whereClausePart the part of the where clause to build. + * Can be modified in this method. + * @param ignoreCase is ignored here. + * @param adapter The adapter for the database for which the SQL + * should be created, not null. + * + * @return the rendered SQL for the WhereClauseExpression + */ + public PreparedStatementPart buildPs( + WhereClauseExpression whereClausePart, + boolean ignoreCase, + Adapter adapter) + throws TorqueException + { + PreparedStatementPart result = new PreparedStatementPart(); + result.getSql().append(whereClausePart.getSql()); + Object[] replacements + = whereClausePart.getPreparedStatementReplacements(); + if (replacements != null) + { + result.getPreparedStatementReplacements().addAll( + Arrays.asList(replacements)); + } + return result; + } + + /** + * Returns whether this WhereClausePsPartBuilder is applicable for + * a given WhereClauseExpression. + * + * @param whereClauseExpression the WhereClauseExpression in question. + * @param adapter The adapter for the database for which the SQL + * should be created, not null. + * + * @return true if applicable, false otherwise. + */ + public boolean isApplicable( + WhereClauseExpression whereClauseExpression, + Adapter adapter) + { + if (whereClauseExpression.isVerbatimSqlCondition()) + { + return true; + } + return false; + } +}
Propchange: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/VerbatimSqlConditionBuilder.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/WhereClausePsPartBuilder.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/WhereClausePsPartBuilder.java?rev=1448414&r1=1448413&r2=1448414&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/WhereClausePsPartBuilder.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/WhereClausePsPartBuilder.java Wed Feb 20 21:06:35 2013 @@ -1,68 +1,68 @@ -package org.apache.torque.sql.whereclausebuilder; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.torque.TorqueException; -import org.apache.torque.adapter.Adapter; -import org.apache.torque.criteria.PreparedStatementPart; -import org.apache.torque.sql.WhereClauseExpression; - -/** - * Builds a PreparedStatementPart from a WhereClauseExpression. - * - * @version $Id$ - */ -public interface WhereClausePsPartBuilder -{ - /** - * Builds a PreparedStatementPart from a WhereClauseExpression. - * - * @param whereClauseExpression the part of the where clause to build. - * Can be modified in this method. - * @param ignoreCase If true and columns represent Strings, the appropriate - * function defined for the database will be used to ignore - * differences in case. - * @param adapter The adapter for the database for which the SQL - * should be created, not null. - * - * @return the PreparedStatementPart for the WhereClauseExpression. - * - * @throws TorqueException when rendering fails. - */ - PreparedStatementPart buildPs( - WhereClauseExpression whereClauseExpression, - boolean ignoreCase, - Adapter adapter) - throws TorqueException; - - /** - * Returns whether this WhereClausePsPartBuilder is applicable for - * a given WhereClauseExpression. - * - * @param whereClauseExpression the WhereClauseExpression in question. - * @param adapter The adapter for the database for which the SQL - * should be created, not null. - * - * @return true if applicable, false otherwise. - */ - boolean isApplicable( - WhereClauseExpression whereClauseExpression, - Adapter adapter); -} +package org.apache.torque.sql.whereclausebuilder; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.torque.TorqueException; +import org.apache.torque.adapter.Adapter; +import org.apache.torque.criteria.PreparedStatementPart; +import org.apache.torque.sql.WhereClauseExpression; + +/** + * Builds a PreparedStatementPart from a WhereClauseExpression. + * + * @version $Id$ + */ +public interface WhereClausePsPartBuilder +{ + /** + * Builds a PreparedStatementPart from a WhereClauseExpression. + * + * @param whereClauseExpression the part of the where clause to build. + * Can be modified in this method. + * @param ignoreCase If true and columns represent Strings, the appropriate + * function defined for the database will be used to ignore + * differences in case. + * @param adapter The adapter for the database for which the SQL + * should be created, not null. + * + * @return the PreparedStatementPart for the WhereClauseExpression. + * + * @throws TorqueException when rendering fails. + */ + PreparedStatementPart buildPs( + WhereClauseExpression whereClauseExpression, + boolean ignoreCase, + Adapter adapter) + throws TorqueException; + + /** + * Returns whether this WhereClausePsPartBuilder is applicable for + * a given WhereClauseExpression. + * + * @param whereClauseExpression the WhereClauseExpression in question. + * @param adapter The adapter for the database for which the SQL + * should be created, not null. + * + * @return true if applicable, false otherwise. + */ + boolean isApplicable( + WhereClauseExpression whereClauseExpression, + Adapter adapter); +} Propchange: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/WhereClausePsPartBuilder.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/package.html URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/package.html?rev=1448414&r1=1448413&r2=1448414&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/package.html (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/package.html Wed Feb 20 21:06:35 2013 @@ -1,26 +1,26 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<html> - <head> - </head> - <body> - This package contains classes which can build - PreparedStatementParts from a WhereClauseExpression. - </body> -</html> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<html> + <head> + </head> + <body> + This package contains classes which can build + PreparedStatementParts from a WhereClauseExpression. + </body> +</html> Propchange: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/package.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ColumnValues.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ColumnValues.java?rev=1448414&r1=1448413&r2=1448414&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ColumnValues.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ColumnValues.java Wed Feb 20 21:06:35 2013 @@ -1,189 +1,189 @@ -package org.apache.torque.util; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import org.apache.torque.Column; -import org.apache.torque.map.TableMap; - -/** - * A class containing values for database columns. - * - * @version $Id$ - */ -public class ColumnValues implements Map<Column, JdbcTypedValue> -{ - /** The column values, keyed by the column names. */ - private Map<Column, JdbcTypedValue> columnValues; - - /** - * The name of the database handle to use for connection opening if needed, - * or null to use the default database handle for the table. - */ - private String dbName; - - /** - * Constructor with no contained column values. - * - * @throws NullPointerException if table is null. - */ - public ColumnValues() - { - this.columnValues = new HashMap<Column, JdbcTypedValue>(); - } - - /** - * Constructor with no contained column values. - * - * @param dbName the name of the database handle to use for connection - * opening if needed, or null to use the default database handle - * for the table. - * - * @throws NullPointerException if table is null. - */ - public ColumnValues(TableMap table, String dbName) - { - this(); - this.dbName = dbName; - } - - /** - * Constructor. - * - * @param columnValues the column values, or null. - * - * @throws NullPointerException if table is null. - */ - public ColumnValues( - Map<Column, JdbcTypedValue> columnValues) - { - if (columnValues == null) - { - this.columnValues = new HashMap<Column, JdbcTypedValue>(); - } - else - { - this.columnValues = columnValues; - } - } - - /** - * Constructor. - * - * @param columnValues the column values, or null. - * @param dbName the name of the database handle to use for connection - * opening if needed, or null to use the default database handle - * for the table. - * - * @throws NullPointerException if table is null. - */ - public ColumnValues( - Map<Column, JdbcTypedValue> columnValues, - TableMap table, - String dbName) - { - this(columnValues); - this.dbName = dbName; - } - - /** - * Returns the name of the database handle to use for connection - * opening. - * - * @return the database name, or null to use the default database handle - * for the table. - */ - public String getDbName() - { - return dbName; - } - - public int size() - { - return columnValues.size(); - } - - public boolean isEmpty() - { - return columnValues.isEmpty(); - } - - public boolean containsKey(Object key) - { - return columnValues.containsKey(key); - } - - public boolean containsValue(Object value) - { - return columnValues.containsValue(value); - } - - public JdbcTypedValue get(Object key) - { - return columnValues.get(key); - } - - public JdbcTypedValue put(Column key, JdbcTypedValue value) - { - return columnValues.put(key, value); - } - - public JdbcTypedValue remove(Object key) - { - return columnValues.remove(key); - } - - public void putAll(Map<? extends Column, ? extends JdbcTypedValue> t) - { - columnValues.putAll(t); - } - - public void clear() - { - columnValues.clear(); - } - - public Set<Column> keySet() - { - return columnValues.keySet(); - } - - public Collection<JdbcTypedValue> values() - { - return columnValues.values(); - } - - public Set<java.util.Map.Entry<Column, JdbcTypedValue>> entrySet() - { - return columnValues.entrySet(); - } - - @Override - public String toString() - { - return "ColumnValues [dbName=" + dbName - + ", columnValues=" + columnValues + "]"; - } - -} +package org.apache.torque.util; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import org.apache.torque.Column; +import org.apache.torque.map.TableMap; + +/** + * A class containing values for database columns. + * + * @version $Id$ + */ +public class ColumnValues implements Map<Column, JdbcTypedValue> +{ + /** The column values, keyed by the column names. */ + private Map<Column, JdbcTypedValue> columnValues; + + /** + * The name of the database handle to use for connection opening if needed, + * or null to use the default database handle for the table. + */ + private String dbName; + + /** + * Constructor with no contained column values. + * + * @throws NullPointerException if table is null. + */ + public ColumnValues() + { + this.columnValues = new HashMap<Column, JdbcTypedValue>(); + } + + /** + * Constructor with no contained column values. + * + * @param dbName the name of the database handle to use for connection + * opening if needed, or null to use the default database handle + * for the table. + * + * @throws NullPointerException if table is null. + */ + public ColumnValues(TableMap table, String dbName) + { + this(); + this.dbName = dbName; + } + + /** + * Constructor. + * + * @param columnValues the column values, or null. + * + * @throws NullPointerException if table is null. + */ + public ColumnValues( + Map<Column, JdbcTypedValue> columnValues) + { + if (columnValues == null) + { + this.columnValues = new HashMap<Column, JdbcTypedValue>(); + } + else + { + this.columnValues = columnValues; + } + } + + /** + * Constructor. + * + * @param columnValues the column values, or null. + * @param dbName the name of the database handle to use for connection + * opening if needed, or null to use the default database handle + * for the table. + * + * @throws NullPointerException if table is null. + */ + public ColumnValues( + Map<Column, JdbcTypedValue> columnValues, + TableMap table, + String dbName) + { + this(columnValues); + this.dbName = dbName; + } + + /** + * Returns the name of the database handle to use for connection + * opening. + * + * @return the database name, or null to use the default database handle + * for the table. + */ + public String getDbName() + { + return dbName; + } + + public int size() + { + return columnValues.size(); + } + + public boolean isEmpty() + { + return columnValues.isEmpty(); + } + + public boolean containsKey(Object key) + { + return columnValues.containsKey(key); + } + + public boolean containsValue(Object value) + { + return columnValues.containsValue(value); + } + + public JdbcTypedValue get(Object key) + { + return columnValues.get(key); + } + + public JdbcTypedValue put(Column key, JdbcTypedValue value) + { + return columnValues.put(key, value); + } + + public JdbcTypedValue remove(Object key) + { + return columnValues.remove(key); + } + + public void putAll(Map<? extends Column, ? extends JdbcTypedValue> t) + { + columnValues.putAll(t); + } + + public void clear() + { + columnValues.clear(); + } + + public Set<Column> keySet() + { + return columnValues.keySet(); + } + + public Collection<JdbcTypedValue> values() + { + return columnValues.values(); + } + + public Set<java.util.Map.Entry<Column, JdbcTypedValue>> entrySet() + { + return columnValues.entrySet(); + } + + @Override + public String toString() + { + return "ColumnValues [dbName=" + dbName + + ", columnValues=" + columnValues + "]"; + } + +} Propchange: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ColumnValues.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ExceptionMapper.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ExceptionMapperImpl.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/JdbcTypedValue.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/JdbcTypedValue.java?rev=1448414&r1=1448413&r2=1448414&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/JdbcTypedValue.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/JdbcTypedValue.java Wed Feb 20 21:06:35 2013 @@ -1,127 +1,127 @@ -package org.apache.torque.util; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; - -/** - * A value plus its JDBC type. - * - * @version $Id$ - */ -public class JdbcTypedValue -{ - /** The JDBC type as in <code>java.sql.Types</code>. **/ - private int jdbcType; - - /** The value; may be null. */ - private Object value; - - /** - * Constructor. - * - * @param jdbcType The JDBC type as in <code>java.sql.Types</code>. - * @param value The value; may be null. - */ - public JdbcTypedValue(Object value, int jdbcType) - { - this.jdbcType = jdbcType; - this.value = value; - } - - /** - * Returns the JDBC type as in <code>java.sql.Types</code>. - * - * @return the JDBC type of the value. - */ - public int getJdbcType() - { - return jdbcType; - } - - /** - * Sets the JDBC type as in <code>java.sql.Types</code>. - * - * @param jdbcType the JDBC type of the value. - */ - public void setJdbcType(int jdbcType) - { - this.jdbcType = jdbcType; - } - - /** - * Returns the value. - * - * @return value the value, or null. - */ - public Object getValue() - { - return value; - } - - /** - * Sets the value. - * - * @param value the value, may be null. - */ - public void setValue(Object value) - { - this.value = value; - } - - @Override - public int hashCode() - { - HashCodeBuilder hashCodeBuilder = new HashCodeBuilder() - .append(jdbcType) - .append(value); - return hashCodeBuilder.toHashCode(); - } - - @Override - public boolean equals(Object obj) - { - if (this == obj) - { - return true; - } - if (obj == null) - { - return false; - } - if (getClass() != obj.getClass()) - { - return false; - } - JdbcTypedValue other = (JdbcTypedValue) obj; - EqualsBuilder equalsBuilder = new EqualsBuilder() - .append(jdbcType, other.jdbcType) - .append(value, other.value); - return equalsBuilder.isEquals(); - } - - @Override - public String toString() - { - return "JdbcTypedValue [jdbcType=" + jdbcType - + ", value=" + value + "]"; - } -} +package org.apache.torque.util; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; + +/** + * A value plus its JDBC type. + * + * @version $Id$ + */ +public class JdbcTypedValue +{ + /** The JDBC type as in <code>java.sql.Types</code>. **/ + private int jdbcType; + + /** The value; may be null. */ + private Object value; + + /** + * Constructor. + * + * @param jdbcType The JDBC type as in <code>java.sql.Types</code>. + * @param value The value; may be null. + */ + public JdbcTypedValue(Object value, int jdbcType) + { + this.jdbcType = jdbcType; + this.value = value; + } + + /** + * Returns the JDBC type as in <code>java.sql.Types</code>. + * + * @return the JDBC type of the value. + */ + public int getJdbcType() + { + return jdbcType; + } + + /** + * Sets the JDBC type as in <code>java.sql.Types</code>. + * + * @param jdbcType the JDBC type of the value. + */ + public void setJdbcType(int jdbcType) + { + this.jdbcType = jdbcType; + } + + /** + * Returns the value. + * + * @return value the value, or null. + */ + public Object getValue() + { + return value; + } + + /** + * Sets the value. + * + * @param value the value, may be null. + */ + public void setValue(Object value) + { + this.value = value; + } + + @Override + public int hashCode() + { + HashCodeBuilder hashCodeBuilder = new HashCodeBuilder() + .append(jdbcType) + .append(value); + return hashCodeBuilder.toHashCode(); + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + { + return true; + } + if (obj == null) + { + return false; + } + if (getClass() != obj.getClass()) + { + return false; + } + JdbcTypedValue other = (JdbcTypedValue) obj; + EqualsBuilder equalsBuilder = new EqualsBuilder() + .append(jdbcType, other.jdbcType) + .append(value, other.value); + return equalsBuilder.isEquals(); + } + + @Override + public String toString() + { + return "JdbcTypedValue [jdbcType=" + jdbcType + + ", value=" + value + "]"; + } +} Propchange: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/JdbcTypedValue.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ListOrderedMapCI.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ListOrderedMapCI.java?rev=1448414&r1=1448413&r2=1448414&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ListOrderedMapCI.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ListOrderedMapCI.java Wed Feb 20 21:06:35 2013 @@ -1,110 +1,110 @@ -package org.apache.torque.util; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.commons.collections.map.ListOrderedMap; - -/** - * A subclass of the Apache Commons ListOrderedMap that has case insensitive - * String key methods. This is done by converting all String keys to - * lower case. - * - * @author <a href="mailto:greg.mon...@dukece.com">Greg Monroe</a> - * @version $Id$ - */ -public class ListOrderedMapCI extends ListOrderedMap -{ - /** Version id for serializing. */ - private static final long serialVersionUID = -4349246328751938554L; - - /** - * Constructs a new empty ListOrderedMap. - */ - public ListOrderedMapCI() - { - super(); - } - - /** - * Get the object associated with this key. - * - * @param key A case insensitive String. - * @return The value for this key - */ - public Object get(String key) - { - return super.get(key.toLowerCase()); - } - - /** - * Adds a value to the end of the list with the specified key. - * - * @param key A case insensitive String. - * @param value The value to add - * @return The value for previously mapped to this key - */ - public Object put(String key, Object value) - { - return super.put(key.toLowerCase(), value); - } - - /** - * Puts a key-value mapping into the map at the specified index. - * - * @param index The index at which the mapping should be inserted. - * @param key A case insensitive String. - * @param value The value. - * - * @return The value for previously mapped to this key - */ - public Object put(int index, String key, Object value) - { - return super.put(index, key.toLowerCase(), value); - } - /** - * Gets the index of the specified key. - * - * @param key A case insensitive String. - * @return the index, or -1 if not found - */ - public int indexOf(String key) - { - return super.indexOf(key.toLowerCase()); - } - /** - * Removes the mapping for the specified key. - * @param key A case insensitive String. - * @return the removed value, or null if none existed - */ - public Object remove (String key) - { - return super.remove(key.toLowerCase()); - } - /** - * Test if the key exists in the mapping. - * - * @param key The case insensitive key to test for. - * @return True if the key exists. - */ - public boolean containsKey(String key) - { - return super.containsKey(key.toLowerCase()); - } -} +package org.apache.torque.util; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.commons.collections.map.ListOrderedMap; + +/** + * A subclass of the Apache Commons ListOrderedMap that has case insensitive + * String key methods. This is done by converting all String keys to + * lower case. + * + * @author <a href="mailto:greg.mon...@dukece.com">Greg Monroe</a> + * @version $Id$ + */ +public class ListOrderedMapCI extends ListOrderedMap +{ + /** Version id for serializing. */ + private static final long serialVersionUID = -4349246328751938554L; + + /** + * Constructs a new empty ListOrderedMap. + */ + public ListOrderedMapCI() + { + super(); + } + + /** + * Get the object associated with this key. + * + * @param key A case insensitive String. + * @return The value for this key + */ + public Object get(String key) + { + return super.get(key.toLowerCase()); + } + + /** + * Adds a value to the end of the list with the specified key. + * + * @param key A case insensitive String. + * @param value The value to add + * @return The value for previously mapped to this key + */ + public Object put(String key, Object value) + { + return super.put(key.toLowerCase(), value); + } + + /** + * Puts a key-value mapping into the map at the specified index. + * + * @param index The index at which the mapping should be inserted. + * @param key A case insensitive String. + * @param value The value. + * + * @return The value for previously mapped to this key + */ + public Object put(int index, String key, Object value) + { + return super.put(index, key.toLowerCase(), value); + } + /** + * Gets the index of the specified key. + * + * @param key A case insensitive String. + * @return the index, or -1 if not found + */ + public int indexOf(String key) + { + return super.indexOf(key.toLowerCase()); + } + /** + * Removes the mapping for the specified key. + * @param key A case insensitive String. + * @return the removed value, or null if none existed + */ + public Object remove (String key) + { + return super.remove(key.toLowerCase()); + } + /** + * Test if the key exists in the mapping. + * + * @param key The case insensitive key to test for. + * @return True if the key exists. + */ + public boolean containsKey(String key) + { + return super.containsKey(key.toLowerCase()); + } +} Propchange: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ListOrderedMapCI.java ------------------------------------------------------------------------------ svn:eol-style = native --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org