Author: cbegin
Date: Sat May 1 20:53:51 2010
New Revision: 940108
URL: http://svn.apache.org/viewvc?rev=940108&view=rev
Log:
ibatis-759 ensure uppercase uses english characters.
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLMapperEntityResolver.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/dynamic/TrimSqlNode.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderMap.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/resultset/FastResultSetHandler.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/mapping/ResultMap.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/metadata/Database.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/metadata/Table.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/reflection/Reflector.java
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java?rev=940108&r1=940107&r2=940108&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
Sat May 1 20:53:51 2010
@@ -285,7 +285,7 @@ public class MapperAnnotationBuilder {
} else if (type == DeleteProvider.class) {
type = Delete.class;
}
- return SqlCommandType.valueOf(type.getSimpleName().toUpperCase());
+ return
SqlCommandType.valueOf(type.getSimpleName().toUpperCase(Locale.ENGLISH));
}
return SqlCommandType.UNKNOWN;
}
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLMapperEntityResolver.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLMapperEntityResolver.java?rev=940108&r1=940107&r2=940108&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLMapperEntityResolver.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLMapperEntityResolver.java
Sat May 1 20:53:51 2010
@@ -8,6 +8,7 @@ import org.xml.sax.SAXException;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
/**
@@ -21,11 +22,11 @@ public class XMLMapperEntityResolver imp
private static final Map<String, String> doctypeMap = new HashMap<String,
String>();
static {
-
doctypeMap.put("http://ibatis.apache.org/dtd/ibatis-3-config.dtd".toUpperCase(),
MAPPER_CONFIG_DTD_RESOURCE);
- doctypeMap.put("-//ibatis.apache.org//DTD Config 3.0//EN".toUpperCase(),
MAPPER_CONFIG_DTD_RESOURCE);
+
doctypeMap.put("http://ibatis.apache.org/dtd/ibatis-3-config.dtd".toUpperCase(Locale.ENGLISH),
MAPPER_CONFIG_DTD_RESOURCE);
+ doctypeMap.put("-//ibatis.apache.org//DTD Config
3.0//EN".toUpperCase(Locale.ENGLISH), MAPPER_CONFIG_DTD_RESOURCE);
-
doctypeMap.put("http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd".toUpperCase(),
MAPPER_DTD_RESOURCE);
- doctypeMap.put("-//ibatis.apache.org//DTD Mapper 3.0//EN".toUpperCase(),
MAPPER_DTD_RESOURCE);
+
doctypeMap.put("http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd".toUpperCase(Locale.ENGLISH),
MAPPER_DTD_RESOURCE);
+ doctypeMap.put("-//ibatis.apache.org//DTD Mapper
3.0//EN".toUpperCase(Locale.ENGLISH), MAPPER_DTD_RESOURCE);
}
/**
@@ -39,8 +40,8 @@ public class XMLMapperEntityResolver imp
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException {
- if (publicId != null) publicId = publicId.toUpperCase();
- if (systemId != null) systemId = systemId.toUpperCase();
+ if (publicId != null) publicId = publicId.toUpperCase(Locale.ENGLISH);
+ if (systemId != null) systemId = systemId.toUpperCase(Locale.ENGLISH);
InputSource source = null;
try {
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java?rev=940108&r1=940107&r2=940108&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
Sat May 1 20:53:51 2010
@@ -14,10 +14,7 @@ import org.apache.ibatis.session.Configu
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
public class XMLStatementBuilder extends BaseBuilder {
@@ -49,7 +46,7 @@ public class XMLStatementBuilder extends
MixedSqlNode rootSqlNode = new MixedSqlNode(contents);
SqlSource sqlSource = new DynamicSqlSource(configuration, rootSqlNode);
String nodeName = context.getNode().getNodeName();
- SqlCommandType sqlCommandType =
SqlCommandType.valueOf(nodeName.toUpperCase());
+ SqlCommandType sqlCommandType =
SqlCommandType.valueOf(nodeName.toUpperCase(Locale.ENGLISH));
boolean isSelect = sqlCommandType == SqlCommandType.SELECT;
boolean flushCache = context.getBooleanAttribute("flushCache", !isSelect);
boolean useCache = context.getBooleanAttribute("useCache", isSelect);
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/dynamic/TrimSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/dynamic/TrimSqlNode.java?rev=940108&r1=940107&r2=940108&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/dynamic/TrimSqlNode.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/dynamic/TrimSqlNode.java
Sat May 1 20:53:51 2010
@@ -35,7 +35,7 @@ public class TrimSqlNode implements SqlN
return new ArrayList<String>() {
{
while (parser.hasMoreTokens()) {
- add(parser.nextToken().toUpperCase());
+ add(parser.nextToken().toUpperCase(Locale.ENGLISH));
}
}
};
@@ -59,7 +59,7 @@ public class TrimSqlNode implements SqlN
public void applyAll() {
sqlBuffer = new StringBuilder(sqlBuffer.toString().trim());
- String trimmedUppercaseSql = sqlBuffer.toString().toUpperCase();
+ String trimmedUppercaseSql =
sqlBuffer.toString().toUpperCase(Locale.ENGLISH);
if (trimmedUppercaseSql.length() > 0) {
applyPrefix(sqlBuffer, trimmedUppercaseSql);
applySuffix(sqlBuffer, trimmedUppercaseSql);
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderMap.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderMap.java?rev=940108&r1=940107&r2=940108&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderMap.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderMap.java
Sat May 1 20:53:51 2010
@@ -5,6 +5,7 @@ import org.apache.ibatis.reflection.Meta
import java.io.Serializable;
import java.sql.SQLException;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -22,11 +23,11 @@ public class ResultLoaderMap implements
}
public boolean hasLoader(String methodName) throws SQLException {
- return loaderMap.containsKey(methodName.toUpperCase());
+ return loaderMap.containsKey(methodName.toUpperCase(Locale.ENGLISH));
}
public boolean load(String property) throws SQLException {
- LoadPair pair = loaderMap.remove(property.toUpperCase());
+ LoadPair pair = loaderMap.remove(property.toUpperCase(Locale.ENGLISH));
if (pair != null) {
pair.load();
return true;
@@ -44,7 +45,7 @@ public class ResultLoaderMap implements
private static String getUppercaseFirstProperty(String property) {
String[] parts = property.split("\\.");
- return parts[0].toUpperCase();
+ return parts[0].toUpperCase(Locale.ENGLISH);
}
private static class LoadPair {
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/resultset/FastResultSetHandler.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/resultset/FastResultSetHandler.java?rev=940108&r1=940107&r2=940108&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/resultset/FastResultSetHandler.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/resultset/FastResultSetHandler.java
Sat May 1 20:53:51 2010
@@ -17,11 +17,7 @@ import org.apache.ibatis.type.TypeHandle
import org.apache.ibatis.type.TypeHandlerRegistry;
import java.sql.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
public class FastResultSetHandler implements ResultSetHandler {
@@ -221,7 +217,7 @@ public class FastResultSetHandler implem
final List<ResultMapping> propertyMappings =
resultMap.getPropertyResultMappings();
for (ResultMapping propertyMapping : propertyMappings) {
final String column = propertyMapping.getColumn();
- if (propertyMapping.isCompositeResult() || (column != null &&
mappedColumnNames.contains(column.toUpperCase()))) {
+ if (propertyMapping.isCompositeResult() || (column != null &&
mappedColumnNames.contains(column.toUpperCase(Locale.ENGLISH)))) {
Object value = getPropertyMappingValue(rs, metaObject,
propertyMapping, lazyLoader);
if (value != null) {
final String property = propertyMapping.getProperty();
@@ -271,7 +267,7 @@ public class FastResultSetHandler implem
final Set<String> mappedColumns = resultMap.getMappedColumns();
for (int i = 1; i <= columnCount; i++) {
final String columnName = configuration.isUseColumnLabel() ?
rsmd.getColumnLabel(i) : rsmd.getColumnName(i);
- final String upperColumnName = columnName.toUpperCase();
+ final String upperColumnName = columnName.toUpperCase(Locale.ENGLISH);
if (mappedColumns.contains(upperColumnName)) {
mappedColumnNames.add(upperColumnName);
mappedColumnNames.add(columnName);
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java?rev=940108&r1=940107&r2=940108&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
Sat May 1 20:53:51 2010
@@ -212,7 +212,7 @@ public class SqlRunner {
for (int i = 0, n = columns.size(); i < n; i++) {
String name = columns.get(i);
TypeHandler handler = typeHandlers.get(i);
- row.put(name.toUpperCase(), handler.getResult(rs, name));
+ row.put(name.toUpperCase(Locale.ENGLISH), handler.getResult(rs,
name));
}
list.add(row);
}
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/mapping/ResultMap.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/mapping/ResultMap.java?rev=940108&r1=940107&r2=940108&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/mapping/ResultMap.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/mapping/ResultMap.java
Sat May 1 20:53:51 2010
@@ -46,12 +46,12 @@ public class ResultMap {
resultMap.hasNestedResultMaps = resultMap.hasNestedResultMaps ||
resultMapping.getNestedResultMapId() != null;
final String column = resultMapping.getColumn();
if (column != null) {
- resultMap.mappedColumns.add(column.toUpperCase());
+ resultMap.mappedColumns.add(column.toUpperCase(Locale.ENGLISH));
} else if (resultMapping.isCompositeResult()) {
for (ResultMapping compositeResultMapping :
resultMapping.getComposites()) {
final String compositeColumn = compositeResultMapping.getColumn();
if (compositeColumn != null) {
- resultMap.mappedColumns.add(compositeColumn.toUpperCase());
+
resultMap.mappedColumns.add(compositeColumn.toUpperCase(Locale.ENGLISH));
}
}
}
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/metadata/Database.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/metadata/Database.java?rev=940108&r1=940107&r2=940108&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/metadata/Database.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/metadata/Database.java
Sat May 1 20:53:51 2010
@@ -1,6 +1,7 @@
package org.apache.ibatis.metadata;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
public class Database {
@@ -24,11 +25,11 @@ public class Database {
}
public void addTable(Table table) {
- tables.put(table.getName().toUpperCase(), table);
+ tables.put(table.getName().toUpperCase(Locale.ENGLISH), table);
}
public Table getTable(String name) {
- return (Table) tables.get(name.toUpperCase());
+ return (Table) tables.get(name.toUpperCase(Locale.ENGLISH));
}
public String[] getTableNames() {
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/metadata/Table.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/metadata/Table.java?rev=940108&r1=940107&r2=940108&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/metadata/Table.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/metadata/Table.java
Sat May 1 20:53:51 2010
@@ -1,6 +1,7 @@
package org.apache.ibatis.metadata;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
public class Table {
@@ -35,11 +36,11 @@ public class Table {
}
public void addColumn(Column col) {
- columns.put(col.getName().toUpperCase(), col);
+ columns.put(col.getName().toUpperCase(Locale.ENGLISH), col);
}
public Column getColumn(String name) {
- return (Column) columns.get(name.toUpperCase());
+ return (Column) columns.get(name.toUpperCase(Locale.ENGLISH));
}
public String[] getColumnNames() {
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/reflection/Reflector.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/reflection/Reflector.java?rev=940108&r1=940107&r2=940108&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/reflection/Reflector.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/reflection/Reflector.java
Sat May 1 20:53:51 2010
@@ -39,10 +39,10 @@ public class Reflector {
readablePropertyNames = getMethods.keySet().toArray(new
String[getMethods.keySet().size()]);
writeablePropertyNames = setMethods.keySet().toArray(new
String[setMethods.keySet().size()]);
for (String propName : readablePropertyNames) {
- caseInsensitivePropertyMap.put(propName.toUpperCase(), propName);
+ caseInsensitivePropertyMap.put(propName.toUpperCase(Locale.ENGLISH),
propName);
}
for (String propName : writeablePropertyNames) {
- caseInsensitivePropertyMap.put(propName.toUpperCase(), propName);
+ caseInsensitivePropertyMap.put(propName.toUpperCase(Locale.ENGLISH),
propName);
}
}
@@ -377,7 +377,7 @@ public class Reflector {
}
public String findPropertyName(String name) {
- return caseInsensitivePropertyMap.get(name.toUpperCase());
+ return caseInsensitivePropertyMap.get(name.toUpperCase(Locale.ENGLISH));
}
/**
