Author: cbegin
Date: Mon Sep 28 04:54:24 2009
New Revision: 819453
URL: http://svn.apache.org/viewvc?rev=819453&view=rev
Log:
Deleted old result set handler... no point in looking back (mind you, we always
can with SVN anyway! :-)
Added:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
- copied, changed from r817021,
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java
Removed:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DiscriminatorHandler.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NestedResultSetHandler.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NestedSelectHandler.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/Reference.java
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/PlatformType.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/wrapper/MapWrapper.java
Copied:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
(from r817021,
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java)
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java?p2=ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java&p1=ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java&r1=817021&r2=819453&rev=819453&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
Mon Sep 28 04:54:24 2009
@@ -21,7 +21,7 @@
import java.util.*;
import java.sql.*;
-public class NewResultSetHandler implements ResultSetHandler {
+public class DefaultResultSetHandler implements ResultSetHandler {
private final Executor executor;
private final Configuration configuration;
@@ -36,7 +36,7 @@
private final Map rowValueCache = new HashMap();
private static final CacheKey NULL_ROW_KEY = new CacheKey();
- public NewResultSetHandler(Executor executor, MappedStatement
mappedStatement, ParameterHandler parameterHandler, ResultHandler
resultHandler, BoundSql boundSql, int offset, int limit) {
+ public DefaultResultSetHandler(Executor executor, MappedStatement
mappedStatement, ParameterHandler parameterHandler, ResultHandler
resultHandler, BoundSql boundSql, int offset, int limit) {
this.executor = executor;
this.configuration = mappedStatement.getConfiguration();
this.mappedStatement = mappedStatement;
@@ -535,4 +535,4 @@
}
}
-}
+}
\ No newline at end of file
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/PlatformType.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/PlatformType.java?rev=819453&r1=819452&r2=819453&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/PlatformType.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/PlatformType.java
Mon Sep 28 04:54:24 2009
@@ -3,7 +3,7 @@
import java.math.BigDecimal;
import java.util.*;
-public class PlatformType implements Map {
+public class PlatformType {
private static final Set<Class> platformTypes = new HashSet<Class>() {
{
@@ -34,95 +34,8 @@
}
};
- private Object key;
- private Object value;
-
public static boolean isPlatformType(Class type) {
return platformTypes.contains(type);
}
- public int size() {
- return 1;
- }
-
- public boolean isEmpty() {
- return key == null && value == null;
- }
-
- public boolean containsKey(Object other) {
- return key == null ? other == null : key.equals(other);
- }
-
- public boolean containsValue(Object other) {
- return value == null ? other == null : value.equals(other);
- }
-
- public Object get(Object key) {
- return value;
- }
-
- public Object put(Object key, Object value) {
- Object old = this.value;
- this.key = key;
- this.value = value;
- return old;
- }
-
- public Object remove(Object key) {
- Object old = this.value;
- this.key = null;
- this.value = null;
- return old;
- }
-
- public void putAll(Map t) {
- for (Map.Entry e : (Set<Map.Entry>) t.entrySet()) {
- this.key = e.getKey();
- this.value = e.getValue();
- }
- }
-
- public void clear() {
- this.key = null;
- this.value = null;
- }
-
- public Set keySet() {
- return new HashSet() {
- {
- add(key);
- }
- };
- }
-
- public Collection values() {
- return new ArrayList() {
- {
- add(value);
- }
- };
- }
-
- public Set entrySet() {
- final Map.Entry entry = new Map.Entry() {
- public Object getKey() {
- return key;
- }
-
- public Object getValue() {
- return value;
- }
-
- public Object setValue(Object v) {
- Object old = value;
- value = v;
- return old;
- }
- };
- return new HashSet() {
- {
- add(entry);
- }
- };
- }
}
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java?rev=819453&r1=819452&r2=819453&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
Mon Sep 28 04:54:24 2009
@@ -173,8 +173,7 @@
}
public ResultSetHandler newResultSetHandler(Executor executor,
MappedStatement mappedStatement, int rowOffset, int rowLimit, ParameterHandler
parameterHandler, ResultHandler resultHandler, BoundSql boundSql) {
- //ResultSetHandler resultSetHandler = new
DefaultResultSetHandler(executor, mappedStatement, parameterHandler,
resultHandler, boundSql, rowOffset, rowLimit);
- ResultSetHandler resultSetHandler = new NewResultSetHandler(executor,
mappedStatement, parameterHandler, resultHandler, boundSql, rowOffset,
rowLimit);
+ ResultSetHandler resultSetHandler = new DefaultResultSetHandler(executor,
mappedStatement, parameterHandler, resultHandler, boundSql, rowOffset,
rowLimit);
resultSetHandler = (ResultSetHandler)
interceptorChain.pluginAll(resultSetHandler);
return resultSetHandler;
}
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/wrapper/MapWrapper.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/wrapper/MapWrapper.java?rev=819453&r1=819452&r2=819453&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/wrapper/MapWrapper.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/wrapper/MapWrapper.java
Mon Sep 28 04:54:24 2009
@@ -39,11 +39,23 @@
public String findProperty(String name) {
updateKeyArray();
- final int index = Arrays.binarySearch(keyArray, name, new Comparator() {
- public int compare(Object o1, Object o2) {
- return
((String)o1).toLowerCase().compareTo(((String)o2).toLowerCase());
- }
- });
+ final int index = -1;
+ if (name != null) {
+ Arrays.binarySearch(keyArray, name, new Comparator() {
+ public int compare(Object o1, Object o2) {
+ if (o1 == o2) {
+ return 0;
+ } else if (o1 == null && o2 == null) {
+ return 0;
+ } else if (o1 == null) {
+ return -1;
+ } else if (o2 == null) {
+ return 1;
+ }
+ return
((String)o1).toLowerCase().compareTo(((String)o2).toLowerCase());
+ }
+ });
+ }
if (index > -1) {
return (String)keyArray[index];
}
