You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2009/10/10 07:45:13 UTC
svn commit: r823796 [2/6] - in /ibatis/java/ibatis-3/trunk/ibatis-3-core/src:
main/java/org/apache/ibatis/annotations/
main/java/org/apache/ibatis/binding/ main/java/org/apache/ibatis/builder/
main/java/org/apache/ibatis/builder/annotation/ main/java/o...
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java Sat Oct 10 05:45:06 2009
@@ -6,7 +6,7 @@
public class ForEachSqlNode implements SqlNode {
public static final String ITEM_PREFIX = "__frch_";
-
+
private ExpressionEvaluator evaluator;
private String collectionExpression;
private SqlNode contents;
@@ -29,7 +29,7 @@
public boolean apply(DynamicContext context) {
Map<String, Object> bindings = context.getBindings();
- final Iterable iterable = evaluator.evaluateIterable(collectionExpression, bindings);
+ final Iterable iterable = evaluator.evaluateIterable(collectionExpression, bindings);
boolean first = true;
applyOpen(context);
int i = 0;
@@ -47,7 +47,7 @@
applyItem(context, o, uniqueNumber);
applyIndex(context, i);
contents.apply(new FilteredDynamicContext(context, item, uniqueNumber));
- first = !((PrefixedContext)context).isPrefixApplied();
+ first = !((PrefixedContext) context).isPrefixApplied();
context = oldContext;
i++;
}
@@ -64,7 +64,7 @@
private void applyItem(DynamicContext context, Object o, int i) {
if (item != null) {
context.bind(item, o);
- context.bind(itemizeItem(item,i), o);
+ context.bind(itemizeItem(item, i), o);
}
}
@@ -83,7 +83,7 @@
private static String itemizeItem(String item, int i) {
return new StringBuilder(ITEM_PREFIX).append(item).append("_").append(i).toString();
}
-
+
private static class FilteredDynamicContext extends DynamicContext {
private DynamicContext delegate;
private int index;
@@ -111,14 +111,14 @@
public void appendSql(String sql) {
GenericTokenParser parser = new GenericTokenParser("#{", "}", new GenericTokenParser.TokenHandler() {
public String handleToken(String content) {
- String newContent = content.replaceFirst(item, itemizeItem(item,index));
+ String newContent = content.replaceFirst(item, itemizeItem(item, index));
return new StringBuilder("#{").append(newContent).append("}").toString();
}
});
delegate.appendSql(parser.parse(sql));
}
-
+
@Override
public int getUniqueNumber() {
return delegate.getUniqueNumber();
@@ -131,7 +131,8 @@
private DynamicContext delegate;
private String prefix;
private boolean prefixApplied;
- public PrefixedContext (DynamicContext delegate, String prefix) {
+
+ public PrefixedContext(DynamicContext delegate, String prefix) {
super(null);
this.delegate = delegate;
this.prefix = prefix;
@@ -145,9 +146,11 @@
public Map<String, Object> getBindings() {
return delegate.getBindings();
}
+
public void bind(String name, Object value) {
delegate.bind(name, value);
}
+
public void appendSql(String sql) {
if (!prefixApplied && sql != null && sql.trim().length() > 0) {
delegate.appendSql(prefix);
@@ -155,9 +158,11 @@
}
delegate.appendSql(sql);
}
+
public String getSql() {
return delegate.getSql();
}
+
public int getUniqueNumber() {
return delegate.getUniqueNumber();
}
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java Sat Oct 10 05:45:06 2009
@@ -22,7 +22,7 @@
private DynamicContext context;
- public BindingTokenParser (DynamicContext context) {
+ public BindingTokenParser(DynamicContext context) {
this.context = context;
}
@@ -31,7 +31,7 @@
Object value = Ognl.getValue(content, context.getBindings());
return String.valueOf(value);
} catch (OgnlException e) {
- throw new BuilderException("Error evaluating expression '"+content+"'. Cause: " + e, e);
+ throw new BuilderException("Error evaluating expression '" + content + "'. Cause: " + e, e);
}
}
}
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TrimSqlNode.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TrimSqlNode.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TrimSqlNode.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TrimSqlNode.java Sat Oct 10 05:45:06 2009
@@ -28,10 +28,12 @@
private List<String> parseOverrides(String overrides) {
if (overrides != null) {
final StringTokenizer parser = new StringTokenizer(overrides, "|", false);
- return new ArrayList<String>() {{
+ return new ArrayList<String>() {
+ {
while (parser.hasMoreTokens()) {
add(parser.nextToken().toUpperCase());
- }}
+ }
+ }
};
}
return Collections.EMPTY_LIST;
@@ -51,7 +53,7 @@
this.sqlBuffer = new StringBuilder();
}
- public void applyAll(){
+ public void applyAll() {
sqlBuffer = new StringBuilder(sqlBuffer.toString().trim());
String trimmedUppercaseSql = sqlBuffer.toString().toUpperCase();
if (trimmedUppercaseSql.length() > 0) {
@@ -91,8 +93,8 @@
}
}
if (prefix != null) {
- sql.insert(0," ");
- sql.insert(0,prefix);
+ sql.insert(0, " ");
+ sql.insert(0, prefix);
}
}
}
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheKey.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheKey.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheKey.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheKey.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.cache;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
public class CacheKey {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/TransactionalCacheManager.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/TransactionalCacheManager.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/TransactionalCacheManager.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/TransactionalCacheManager.java Sat Oct 10 05:45:06 2009
@@ -2,7 +2,8 @@
import org.apache.ibatis.cache.decorators.TransactionalCache;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
public class TransactionalCacheManager {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LoggingCache.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LoggingCache.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LoggingCache.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LoggingCache.java Sat Oct 10 05:45:06 2009
@@ -1,7 +1,8 @@
package org.apache.ibatis.cache.decorators;
import org.apache.ibatis.cache.Cache;
-import org.apache.ibatis.logging.*;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
import java.util.concurrent.locks.ReadWriteLock;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java Sat Oct 10 05:45:06 2009
@@ -2,7 +2,8 @@
import org.apache.ibatis.cache.Cache;
-import java.util.*;
+import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.concurrent.locks.ReadWriteLock;
/**
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.cache.decorators;
-import org.apache.ibatis.cache.*;
+import org.apache.ibatis.cache.Cache;
+import org.apache.ibatis.cache.CacheException;
import java.io.*;
import java.util.concurrent.locks.ReadWriteLock;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java Sat Oct 10 05:45:06 2009
@@ -2,7 +2,8 @@
import org.apache.ibatis.cache.Cache;
-import java.lang.ref.*;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
import java.util.LinkedList;
import java.util.concurrent.locks.ReadWriteLock;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/TransactionalCache.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/TransactionalCache.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/TransactionalCache.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/TransactionalCache.java Sat Oct 10 05:45:06 2009
@@ -2,7 +2,8 @@
import org.apache.ibatis.cache.Cache;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
import java.util.concurrent.locks.ReadWriteLock;
public class TransactionalCache implements Cache {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java Sat Oct 10 05:45:06 2009
@@ -2,7 +2,8 @@
import org.apache.ibatis.cache.Cache;
-import java.lang.ref.*;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
import java.util.LinkedList;
import java.util.concurrent.locks.ReadWriteLock;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/PerpetualCache.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/PerpetualCache.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/PerpetualCache.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/PerpetualCache.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,13 @@
package org.apache.ibatis.cache.impl;
-import org.apache.ibatis.cache.*;
+import org.apache.ibatis.cache.Cache;
+import org.apache.ibatis.cache.CacheException;
-import java.util.*;
-import java.util.concurrent.locks.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
public class PerpetualCache implements Cache {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,16 @@
package org.apache.ibatis.datasource.jndi;
-import org.apache.ibatis.datasource.*;
+import org.apache.ibatis.datasource.DataSourceException;
+import org.apache.ibatis.datasource.DataSourceFactory;
-import javax.naming.*;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.sql.DataSource;
-import java.util.*;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
public class JndiDataSourceFactory implements DataSourceFactory {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.datasource.pooled;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
public class PoolState {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java Sat Oct 10 05:45:06 2009
@@ -3,7 +3,9 @@
import org.apache.ibatis.datasource.DataSourceException;
import org.apache.ibatis.reflection.ExceptionUtil;
-import java.lang.reflect.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
import java.sql.Connection;
class PooledConnection implements InvocationHandler {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java Sat Oct 10 05:45:06 2009
@@ -1,7 +1,8 @@
package org.apache.ibatis.datasource.pooled;
import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
-import org.apache.ibatis.logging.*;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
import javax.sql.DataSource;
import java.io.PrintWriter;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.datasource.unpooled;
-import org.apache.ibatis.datasource.*;
+import org.apache.ibatis.datasource.DataSourceException;
+import org.apache.ibatis.datasource.DataSourceFactory;
import org.apache.ibatis.reflection.MetaObject;
import javax.sql.DataSource;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java Sat Oct 10 05:45:06 2009
@@ -2,15 +2,18 @@
import org.apache.ibatis.cache.CacheKey;
import org.apache.ibatis.cache.impl.PerpetualCache;
-import org.apache.ibatis.session.ResultHandler;
-import org.apache.ibatis.mapping.*;
+import static org.apache.ibatis.executor.ExecutionPlaceholder.EXECUTION_PLACEHOLDER;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
import org.apache.ibatis.transaction.Transaction;
import org.apache.ibatis.type.TypeHandlerRegistry;
-import static org.apache.ibatis.executor.ExecutionPlaceholder.*;
-import org.apache.ibatis.session.RowBounds;
-import java.sql.*;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.*;
public abstract class BaseExecutor implements Executor {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BatchExecutor.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BatchExecutor.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BatchExecutor.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BatchExecutor.java Sat Oct 10 05:45:06 2009
@@ -1,15 +1,21 @@
package org.apache.ibatis.executor;
-import org.apache.ibatis.executor.keygen.*;
-import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
+import org.apache.ibatis.executor.keygen.KeyGenerator;
import org.apache.ibatis.executor.statement.StatementHandler;
-import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
import org.apache.ibatis.transaction.Transaction;
-import java.sql.*;
-import java.util.*;
+import java.sql.BatchUpdateException;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
public class BatchExecutor extends BaseExecutor {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/CachingExecutor.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/CachingExecutor.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/CachingExecutor.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/CachingExecutor.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,12 @@
package org.apache.ibatis.executor;
-import org.apache.ibatis.cache.*;
-import org.apache.ibatis.session.ResultHandler;
-import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.cache.Cache;
+import org.apache.ibatis.cache.CacheKey;
+import org.apache.ibatis.cache.TransactionalCacheManager;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
import org.apache.ibatis.transaction.Transaction;
import java.sql.SQLException;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/Executor.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/Executor.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/Executor.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/Executor.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,10 @@
package org.apache.ibatis.executor;
import org.apache.ibatis.cache.CacheKey;
-import org.apache.ibatis.session.ResultHandler;
-import org.apache.ibatis.session.RowBounds;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
import org.apache.ibatis.transaction.Transaction;
import java.sql.SQLException;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ReuseExecutor.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ReuseExecutor.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ReuseExecutor.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ReuseExecutor.java Sat Oct 10 05:45:06 2009
@@ -1,14 +1,20 @@
package org.apache.ibatis.executor;
-import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.executor.statement.StatementHandler;
-import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
import org.apache.ibatis.transaction.Transaction;
-import java.sql.*;
-import java.util.*;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
public class ReuseExecutor extends BaseExecutor {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/SimpleExecutor.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/SimpleExecutor.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/SimpleExecutor.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/SimpleExecutor.java Sat Oct 10 05:45:06 2009
@@ -1,14 +1,17 @@
package org.apache.ibatis.executor;
-import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.executor.statement.StatementHandler;
-import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
import org.apache.ibatis.transaction.Transaction;
-import java.sql.*;
-import java.util.*;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Collections;
+import java.util.List;
public class SimpleExecutor extends BaseExecutor {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java Sat Oct 10 05:45:06 2009
@@ -1,12 +1,16 @@
package org.apache.ibatis.executor.keygen;
-import org.apache.ibatis.executor.*;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.executor.ExecutorException;
+import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.reflection.MetaObject;
-import org.apache.ibatis.type.*;
import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.type.TypeHandlerRegistry;
-import java.sql.*;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.Statement;
public class Jdbc3KeyGenerator implements KeyGenerator {
@@ -22,7 +26,7 @@
final MetaObject metaParam = MetaObject.forObject(parameter);
if (keyProperty != null && metaParam.hasSetter(keyProperty)) {
Class keyPropertyType = metaParam.getSetterType(keyProperty);
- TypeHandler th = typeHandlerRegistry.getTypeHandler(keyPropertyType);
+ TypeHandler th = typeHandlerRegistry.getTypeHandler(keyPropertyType);
if (th != null) {
ResultSet rs = stmt.getGeneratedKeys();
try {
@@ -31,8 +35,8 @@
if (colCount > 0) {
String colName = rsmd.getColumnName(1);
while (rs.next()) {
- Object value = th.getResult(rs,colName);
- metaParam.setValue(keyProperty,value);
+ Object value = th.getResult(rs, colName);
+ metaParam.setValue(keyProperty, value);
}
}
} finally {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java Sat Oct 10 05:45:06 2009
@@ -1,11 +1,12 @@
package org.apache.ibatis.executor.keygen;
-import org.apache.ibatis.executor.*;
-import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.session.ExecutorType;
-import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.executor.ExecutorException;
+import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.RowBounds;
import java.sql.Statement;
import java.util.List;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java Sat Oct 10 05:45:06 2009
@@ -1,20 +1,25 @@
package org.apache.ibatis.executor.loader;
-import org.apache.ibatis.executor.*;
-import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.session.ExecutorType;
-import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.executor.ExecutorException;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
+import org.apache.ibatis.logging.jdbc.ConnectionLogger;
import org.apache.ibatis.mapping.Environment;
-import org.apache.ibatis.transaction.TransactionFactory;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.RowBounds;
import org.apache.ibatis.transaction.Transaction;
-import org.apache.ibatis.logging.jdbc.ConnectionLogger;
-import org.apache.ibatis.logging.*;
+import org.apache.ibatis.transaction.TransactionFactory;
import javax.sql.DataSource;
-import java.sql.SQLException;
import java.sql.Connection;
-import java.util.*;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
public class ResultLoader {
@@ -74,9 +79,11 @@
private Executor newExecutor() throws SQLException {
Environment environment = configuration.getEnvironment();
- if (environment == null) throw new ExecutorException("ResultLoader could not load lazily. Environment was not configured.");
+ if (environment == null)
+ throw new ExecutorException("ResultLoader could not load lazily. Environment was not configured.");
TransactionFactory txFactory = environment.getTransactionFactory();
- if (txFactory == null) throw new ExecutorException("ResultLoader could not load lazily. Transaction Factory was not configured.");
+ if (txFactory == null)
+ throw new ExecutorException("ResultLoader could not load lazily. Transaction Factory was not configured.");
DataSource ds = environment.getDataSource();
if (ds == null) throw new ExecutorException("ResultLoader could not load lazily. DataSource was not configured.");
Connection conn = ds.getConnection();
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderRegistry.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderRegistry.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderRegistry.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderRegistry.java Sat Oct 10 05:45:06 2009
@@ -4,7 +4,8 @@
import java.io.Serializable;
import java.sql.SQLException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
public class ResultLoaderRegistry implements Serializable {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultObjectProxy.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultObjectProxy.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultObjectProxy.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultObjectProxy.java Sat Oct 10 05:45:06 2009
@@ -1,7 +1,8 @@
package org.apache.ibatis.executor.loader;
-import net.sf.cglib.proxy.*;
-import org.apache.ibatis.reflection.*;
+import net.sf.cglib.proxy.Enhancer;
+import net.sf.cglib.proxy.InvocationHandler;
+import org.apache.ibatis.reflection.ExceptionUtil;
import org.apache.ibatis.reflection.property.PropertyNamer;
import org.apache.ibatis.type.TypeHandlerRegistry;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/DefaultParameterHandler.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/DefaultParameterHandler.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/DefaultParameterHandler.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/DefaultParameterHandler.java Sat Oct 10 05:45:06 2009
@@ -1,13 +1,19 @@
package org.apache.ibatis.executor.parameter;
-import org.apache.ibatis.executor.*;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.builder.xml.dynamic.ForEachSqlNode;
+import org.apache.ibatis.executor.ErrorContext;
+import org.apache.ibatis.executor.ExecutorException;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.mapping.ParameterMode;
import org.apache.ibatis.reflection.MetaObject;
import org.apache.ibatis.reflection.property.PropertyTokenizer;
-import org.apache.ibatis.type.*;
-import org.apache.ibatis.builder.xml.dynamic.ForEachSqlNode;
+import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.type.TypeHandlerRegistry;
-import java.sql.*;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
import java.util.List;
public class DefaultParameterHandler implements ParameterHandler {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/ParameterHandler.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/ParameterHandler.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/ParameterHandler.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/ParameterHandler.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.executor.parameter;
-import java.sql.*;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
public interface ParameterHandler {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultContext.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultContext.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultContext.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultContext.java Sat Oct 10 05:45:06 2009
@@ -4,7 +4,7 @@
public class DefaultResultContext implements ResultContext {
-private Object resultObject;
+ private Object resultObject;
private int resultCount;
private boolean stopped;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultHandler.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultHandler.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultHandler.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultHandler.java Sat Oct 10 05:45:06 2009
@@ -1,9 +1,10 @@
package org.apache.ibatis.executor.result;
-import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.session.ResultContext;
+import org.apache.ibatis.session.ResultHandler;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
public class DefaultResultHandler implements ResultHandler {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.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?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java Sat Oct 10 05:45:06 2009
@@ -1,26 +1,26 @@
package org.apache.ibatis.executor.resultset;
-import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.type.TypeHandler;
-import org.apache.ibatis.type.TypeHandlerRegistry;
-import org.apache.ibatis.reflection.factory.ObjectFactory;
-import org.apache.ibatis.reflection.MetaObject;
-import org.apache.ibatis.reflection.MetaClass;
-import org.apache.ibatis.executor.ExecutorException;
+import org.apache.ibatis.cache.CacheKey;
import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.executor.ExecutorException;
import org.apache.ibatis.executor.loader.ResultLoader;
import org.apache.ibatis.executor.loader.ResultLoaderRegistry;
import org.apache.ibatis.executor.loader.ResultObjectProxy;
import org.apache.ibatis.executor.parameter.ParameterHandler;
+import org.apache.ibatis.executor.result.DefaultResultContext;
import org.apache.ibatis.executor.result.DefaultResultHandler;
+import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.reflection.MetaClass;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.factory.ObjectFactory;
+import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.session.ResultHandler;
-import org.apache.ibatis.executor.result.DefaultResultContext;
-import org.apache.ibatis.cache.CacheKey;
import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.type.TypeHandlerRegistry;
-import java.util.*;
import java.sql.*;
+import java.util.*;
public class DefaultResultSetHandler implements ResultSetHandler {
@@ -34,8 +34,8 @@
private final TypeHandlerRegistry typeHandlerRegistry;
private final ObjectFactory objectFactory;
- private final Map<CacheKey,Set<CacheKey>> localRowValueCaches;
- private final Map<CacheKey,Object> globalRowValueCache;
+ private final Map<CacheKey, Set<CacheKey>> localRowValueCaches;
+ private final Map<CacheKey, Object> globalRowValueCache;
public DefaultResultSetHandler(Executor executor, MappedStatement mappedStatement, ParameterHandler parameterHandler, ResultHandler resultHandler, BoundSql boundSql, RowBounds rowBounds) {
this.executor = executor;
@@ -47,8 +47,8 @@
this.typeHandlerRegistry = configuration.getTypeHandlerRegistry();
this.objectFactory = configuration.getObjectFactory();
this.resultHandler = resultHandler;
- this.localRowValueCaches = new HashMap<CacheKey,Set<CacheKey>>();
- this.globalRowValueCache = new HashMap<CacheKey,Object>();
+ this.localRowValueCaches = new HashMap<CacheKey, Set<CacheKey>>();
+ this.globalRowValueCache = new HashMap<CacheKey, Object>();
}
//
@@ -439,7 +439,7 @@
final CacheKey parentRowKey = createRowKey(resultMap, rs);
final CacheKey rowKey = createRowKey(nestedResultMap, rs);
final Set<CacheKey> localRowValueCache = getRowValueCache(parentRowKey);
- final boolean knownValue = localRowValueCache .contains(rowKey);
+ final boolean knownValue = localRowValueCache.contains(rowKey);
localRowValueCache.add(rowKey);
Object rowValue = getRowValue(rs, nestedResultMap, rowKey);
@@ -466,7 +466,7 @@
Set<CacheKey> cache = localRowValueCaches.get(rowKey);
if (cache == null) {
cache = new HashSet<CacheKey>();
- localRowValueCaches.put(rowKey,cache);
+ localRowValueCaches.put(rowKey, cache);
}
return cache;
}
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/ResultSetHandler.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/ResultSetHandler.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/ResultSetHandler.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/ResultSetHandler.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,8 @@
package org.apache.ibatis.executor.resultset;
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.List;
public interface ResultSetHandler {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java Sat Oct 10 05:45:06 2009
@@ -1,18 +1,23 @@
package org.apache.ibatis.executor.statement;
-import org.apache.ibatis.executor.*;
+import org.apache.ibatis.executor.ErrorContext;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.executor.ExecutorException;
import org.apache.ibatis.executor.keygen.SelectKeyGenerator;
import org.apache.ibatis.executor.parameter.ParameterHandler;
-import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.executor.resultset.ResultSetHandler;
-import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.reflection.factory.ObjectFactory;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.factory.ObjectFactory;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
import org.apache.ibatis.type.TypeHandlerRegistry;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
public abstract class BaseStatementHandler implements StatementHandler {
@@ -102,16 +107,16 @@
}
- protected void rebindGeneratedKey(){
+ protected void rebindGeneratedKey() {
if (boundSql.getParameterObject() != null) {
String keyStatementName = mappedStatement.getId() + SelectKeyGenerator.SELECT_KEY_SUFFIX;
- if(configuration.hasStatement(keyStatementName)) {
+ if (configuration.hasStatement(keyStatementName)) {
MappedStatement keyStatement = configuration.getMappedStatement(keyStatementName);
if (keyStatement != null) {
String keyProperty = keyStatement.getKeyProperty();
MetaObject metaParam = MetaObject.forObject(boundSql.getParameterObject());
if (keyProperty != null && metaParam.hasSetter(keyProperty) && metaParam.hasGetter(keyProperty)) {
- boundSql.setAdditionalParameter(keyProperty, metaParam.getValue(keyProperty));
+ boundSql.setAdditionalParameter(keyProperty, metaParam.getValue(keyProperty));
}
}
}
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/CallableStatementHandler.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/CallableStatementHandler.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/CallableStatementHandler.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/CallableStatementHandler.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,13 @@
package org.apache.ibatis.executor.statement;
-import org.apache.ibatis.executor.*;
-import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.executor.ExecutorException;
import org.apache.ibatis.executor.keygen.KeyGenerator;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.mapping.ParameterMode;
import org.apache.ibatis.session.ResultHandler;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.session.RowBounds;
import org.apache.ibatis.type.JdbcType;
import java.sql.*;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/PreparedStatementHandler.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/PreparedStatementHandler.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/PreparedStatementHandler.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/PreparedStatementHandler.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,11 @@
package org.apache.ibatis.executor.statement;
import org.apache.ibatis.executor.Executor;
-import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.executor.keygen.*;
-import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
+import org.apache.ibatis.executor.keygen.KeyGenerator;
import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
import java.sql.*;
import java.util.List;
@@ -52,7 +53,7 @@
public void parameterize(Statement statement)
throws SQLException {
- KeyGenerator keyGenerator = mappedStatement.getKeyGenerator();
+ KeyGenerator keyGenerator = mappedStatement.getKeyGenerator();
keyGenerator.processBefore(executor, mappedStatement, statement, boundSql.getParameterObject());
rebindGeneratedKey();
parameterHandler.setParameters((PreparedStatement) statement);
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/RoutingStatementHandler.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/RoutingStatementHandler.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/RoutingStatementHandler.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/RoutingStatementHandler.java Sat Oct 10 05:45:06 2009
@@ -1,12 +1,16 @@
package org.apache.ibatis.executor.statement;
-import org.apache.ibatis.executor.*;
-import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.executor.ExecutorException;
import org.apache.ibatis.executor.parameter.ParameterHandler;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.session.ResultHandler;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.session.RowBounds;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.List;
public class RoutingStatementHandler implements StatementHandler {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java Sat Oct 10 05:45:06 2009
@@ -1,12 +1,17 @@
package org.apache.ibatis.executor.statement;
import org.apache.ibatis.executor.Executor;
-import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.executor.keygen.*;
-import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
+import org.apache.ibatis.executor.keygen.KeyGenerator;
+import org.apache.ibatis.executor.keygen.SelectKeyGenerator;
import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.List;
public class SimpleStatementHandler extends BaseStatementHandler {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/StatementHandler.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/StatementHandler.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/StatementHandler.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/StatementHandler.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,12 @@
package org.apache.ibatis.executor.statement;
import org.apache.ibatis.executor.parameter.ParameterHandler;
-import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.session.ResultHandler;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.List;
public interface StatementHandler {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/io/Resources.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/io/Resources.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/io/Resources.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/io/Resources.java Sat Oct 10 05:45:06 2009
@@ -1,7 +1,8 @@
package org.apache.ibatis.io;
import java.io.*;
-import java.net.*;
+import java.net.URL;
+import java.net.URLConnection;
import java.nio.charset.Charset;
import java.util.Properties;
@@ -18,7 +19,8 @@
*/
private static Charset charset;
- Resources() {}
+ Resources() {
+ }
/**
* Returns the default classloader (may be null).
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/RuntimeSqlException.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/RuntimeSqlException.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/RuntimeSqlException.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/RuntimeSqlException.java Sat Oct 10 05:45:06 2009
@@ -17,5 +17,5 @@
public RuntimeSqlException(Throwable cause) {
super(cause);
}
-
+
}
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.jdbc;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
public class SelectBuilder {
private static final String AND = ") \nAND (";
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.jdbc;
-import org.apache.ibatis.type.*;
+import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.type.TypeHandlerRegistry;
import java.sql.*;
import java.util.*;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/commons/JakartaCommonsLoggingImpl.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/commons/JakartaCommonsLoggingImpl.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/commons/JakartaCommonsLoggingImpl.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/commons/JakartaCommonsLoggingImpl.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.logging.commons;
-import org.apache.commons.logging.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class JakartaCommonsLoggingImpl implements org.apache.ibatis.logging.Log {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java Sat Oct 10 05:45:06 2009
@@ -70,7 +70,7 @@
}
}
final String parameters = typeList.toString();
- return parameters.substring(1,parameters.length() - 1);
+ return parameters.substring(1, parameters.length() - 1);
}
protected String getColumnString() {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,15 @@
package org.apache.ibatis.logging.jdbc;
-import org.apache.ibatis.logging.*;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
import org.apache.ibatis.reflection.ExceptionUtil;
-import java.lang.reflect.*;
-import java.sql.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.Statement;
/**
* Connection proxy to add logging
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,15 @@
package org.apache.ibatis.logging.jdbc;
-import org.apache.ibatis.logging.*;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
import org.apache.ibatis.reflection.ExceptionUtil;
-import java.lang.reflect.*;
-import java.sql.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
/**
* PreparedStatement proxy to add logging
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java Sat Oct 10 05:45:06 2009
@@ -1,9 +1,12 @@
package org.apache.ibatis.logging.jdbc;
-import org.apache.ibatis.logging.*;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
import org.apache.ibatis.reflection.ExceptionUtil;
-import java.lang.reflect.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
@@ -27,7 +30,7 @@
try {
Object o = method.invoke(rs, params);
if ("next".equals(method.getName())) {
- if (((Boolean)o)) {
+ if (((Boolean) o)) {
ResultSetMetaData rsmd = rs.getMetaData();
final int columnCount = rsmd.getColumnCount();
if (log.isDebugEnabled()) {
@@ -49,7 +52,7 @@
private void printColumnHeaders(ResultSetMetaData rsmd, int columnCount) throws SQLException {
StringBuilder row = new StringBuilder();
row.append("<== Columns: ");
- for (int i=1; i <= columnCount; i++) {
+ for (int i = 1; i <= columnCount; i++) {
String colname = rsmd.getColumnName(i);
row.append(colname);
if (i != columnCount) row.append(", ");
@@ -60,7 +63,7 @@
private void printColumnValues(int columnCount) throws SQLException {
StringBuilder row = new StringBuilder();
row.append("<== Row: ");
- for (int i=1; i <= columnCount; i++) {
+ for (int i = 1; i <= columnCount; i++) {
String colname = rs.getString(i);
row.append(colname);
if (i != columnCount) row.append(", ");
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,14 @@
package org.apache.ibatis.logging.jdbc;
-import org.apache.ibatis.logging.*;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
import org.apache.ibatis.reflection.ExceptionUtil;
-import java.lang.reflect.*;
-import java.sql.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.sql.ResultSet;
+import java.sql.Statement;
/**
* Statement proxy to add logging
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdk14/Jdk14LoggingImpl.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdk14/Jdk14LoggingImpl.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdk14/Jdk14LoggingImpl.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdk14/Jdk14LoggingImpl.java Sat Oct 10 05:45:06 2009
@@ -2,7 +2,8 @@
import org.apache.ibatis.logging.Log;
-import java.util.logging.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
public class Jdk14LoggingImpl implements Log {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java Sat Oct 10 05:45:06 2009
@@ -2,23 +2,23 @@
import org.apache.ibatis.reflection.MetaObject;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
public class BoundSql {
private String sql;
private List<ParameterMapping> parameterMappings;
private Object parameterObject;
- private Map<String,Object> additionalParameters;
+ private Map<String, Object> additionalParameters;
private MetaObject metaParameters;
public BoundSql(String sql, List<ParameterMapping> parameterMappings, Object parameterObject) {
this.sql = sql;
this.parameterMappings = parameterMappings;
this.parameterObject = parameterObject;
- this.additionalParameters = new HashMap<String,Object>();
+ this.additionalParameters = new HashMap<String, Object>();
this.metaParameters = MetaObject.forObject(additionalParameters);
}
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/CacheBuilder.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/CacheBuilder.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/CacheBuilder.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/CacheBuilder.java Sat Oct 10 05:45:06 2009
@@ -1,12 +1,16 @@
package org.apache.ibatis.mapping;
-import org.apache.ibatis.cache.*;
+import org.apache.ibatis.cache.Cache;
+import org.apache.ibatis.cache.CacheException;
import org.apache.ibatis.cache.decorators.*;
import org.apache.ibatis.cache.impl.PerpetualCache;
import org.apache.ibatis.reflection.MetaObject;
import java.lang.reflect.Constructor;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
public class CacheBuilder {
private String id;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Discriminator.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Discriminator.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Discriminator.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Discriminator.java Sat Oct 10 05:45:06 2009
@@ -2,7 +2,8 @@
import org.apache.ibatis.session.Configuration;
-import java.util.*;
+import java.util.Collections;
+import java.util.Map;
public class Discriminator {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/MappedStatement.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/MappedStatement.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/MappedStatement.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/MappedStatement.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,14 @@
package org.apache.ibatis.mapping;
import org.apache.ibatis.cache.Cache;
-import org.apache.ibatis.executor.keygen.*;
+import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
+import org.apache.ibatis.executor.keygen.KeyGenerator;
+import org.apache.ibatis.executor.keygen.NoKeyGenerator;
import org.apache.ibatis.session.Configuration;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
public class MappedStatement {
@@ -98,7 +102,7 @@
return this;
}
- public Builder keyGenerator (KeyGenerator keyGenerator) {
+ public Builder keyGenerator(KeyGenerator keyGenerator) {
mappedStatement.keyGenerator = keyGenerator;
return this;
}
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMap.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMap.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMap.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMap.java Sat Oct 10 05:45:06 2009
@@ -2,7 +2,8 @@
import org.apache.ibatis.session.Configuration;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
public class ParameterMap {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMapping.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMapping.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMapping.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMapping.java Sat Oct 10 05:45:06 2009
@@ -1,7 +1,9 @@
package org.apache.ibatis.mapping;
-import org.apache.ibatis.type.*;
import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.type.TypeHandlerRegistry;
public class ParameterMapping {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ResultMapping.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ResultMapping.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ResultMapping.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ResultMapping.java Sat Oct 10 05:45:06 2009
@@ -1,9 +1,13 @@
package org.apache.ibatis.mapping;
-import org.apache.ibatis.type.*;
import org.apache.ibatis.session.Configuration;
-
-import java.util.*;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.type.TypeHandlerRegistry;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
public class ResultMapping {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/Database.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/Database.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/Database.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/Database.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.metadata;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
public class Database {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/DatabaseFactory.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/DatabaseFactory.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/DatabaseFactory.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/DatabaseFactory.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,9 @@
package org.apache.ibatis.metadata;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
public class DatabaseFactory {
private DatabaseFactory() {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/Table.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/Table.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/Table.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/Table.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.metadata;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
public class Table {
private String name;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java Sat Oct 10 05:45:06 2009
@@ -2,8 +2,12 @@
import org.apache.ibatis.migration.commands.*;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.PrintStream;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
public class CommandLine {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java Sat Oct 10 05:45:06 2009
@@ -2,7 +2,10 @@
import org.apache.ibatis.parsing.PropertyParser;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
import java.util.Properties;
public class MigrationReader extends Reader {
@@ -22,7 +25,7 @@
if (line.contains("@UNDO")) {
currentBuilder = undoBuilder;
}
- line = line.replace("--//","-- ");
+ line = line.replace("--//", "-- ");
}
currentBuilder.append(line);
currentBuilder.append("\n");
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java Sat Oct 10 05:45:06 2009
@@ -2,13 +2,16 @@
import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
import org.apache.ibatis.io.Resources;
-import org.apache.ibatis.jdbc.*;
-import org.apache.ibatis.migration.*;
+import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.jdbc.SqlRunner;
+import org.apache.ibatis.migration.Change;
+import org.apache.ibatis.migration.MigrationException;
import org.apache.ibatis.parsing.PropertyParser;
import java.io.*;
import java.math.BigDecimal;
-import java.net.*;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.*;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java Sat Oct 10 05:45:06 2009
@@ -1,9 +1,11 @@
package org.apache.ibatis.migration.commands;
import org.apache.ibatis.jdbc.ScriptRunner;
-import org.apache.ibatis.migration.*;
+import org.apache.ibatis.migration.MigrationException;
+import org.apache.ibatis.migration.MigrationReader;
-import java.io.*;
+import java.io.File;
+import java.io.FileReader;
public class BootstrapCommand extends BaseCommand {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java Sat Oct 10 05:45:06 2009
@@ -1,11 +1,18 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.jdbc.*;
-import org.apache.ibatis.migration.*;
+import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.jdbc.SqlRunner;
+import org.apache.ibatis.migration.Change;
+import org.apache.ibatis.migration.MigrationException;
+import org.apache.ibatis.migration.MigrationReader;
-import java.io.*;
+import java.io.File;
+import java.io.FileReader;
import java.sql.SQLException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
public class DownCommand extends BaseCommand {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/PendingCommand.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/PendingCommand.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/PendingCommand.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/PendingCommand.java Sat Oct 10 05:45:06 2009
@@ -1,39 +1,44 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.migration.*;
-import org.apache.ibatis.jdbc.*;
-
-import java.io.*;
-import java.util.*;
+import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.migration.Change;
+import org.apache.ibatis.migration.MigrationException;
+import org.apache.ibatis.migration.MigrationReader;
+
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
public class PendingCommand extends BaseCommand {
- public PendingCommand(File repository, String environment, boolean force) {
- super(repository, environment, force);
- }
+ public PendingCommand(File repository, String environment, boolean force) {
+ super(repository, environment, force);
+ }
- public void execute(String... params) {
- try {
- if (!changelogExists()) {
- throw new MigrationException("Change log doesn't exist, no migrations applied. Try running 'up' instead.");
- }
- List<Change> pending = getPendingChanges();
- out.println("WARNING: Running pending migrations out of order can create unexpected results.");
- for (Change change : pending) {
- out.println(horizontalLine("Applying: " + change.getFilename(), 80));
- ScriptRunner runner = getScriptRunner();
- try {
- runner.runScript(new MigrationReader(new FileReader(scriptFile(change.getFilename())), false, environmentProperties()));
- } finally {
- runner.closeConnection();
- }
- insertChangelog(change);
- out.println();
+ public void execute(String... params) {
+ try {
+ if (!changelogExists()) {
+ throw new MigrationException("Change log doesn't exist, no migrations applied. Try running 'up' instead.");
+ }
+ List<Change> pending = getPendingChanges();
+ out.println("WARNING: Running pending migrations out of order can create unexpected results.");
+ for (Change change : pending) {
+ out.println(horizontalLine("Applying: " + change.getFilename(), 80));
+ ScriptRunner runner = getScriptRunner();
+ try {
+ runner.runScript(new MigrationReader(new FileReader(scriptFile(change.getFilename())), false, environmentProperties()));
+ } finally {
+ runner.closeConnection();
}
- } catch (Exception e) {
- throw new MigrationException("Error executing command. Cause: " + e, e);
+ insertChangelog(change);
+ out.println();
}
+ } catch (Exception e) {
+ throw new MigrationException("Error executing command. Cause: " + e, e);
}
+ }
private List<Change> getPendingChanges() {
List<Change> pending = new ArrayList<Change>();
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/ScriptCommand.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/ScriptCommand.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/ScriptCommand.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/ScriptCommand.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,17 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.migration.*;
-
-import java.io.*;
+import org.apache.ibatis.migration.Change;
+import org.apache.ibatis.migration.MigrationException;
+import org.apache.ibatis.migration.MigrationReader;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
import java.math.BigDecimal;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+import java.util.StringTokenizer;
public class ScriptCommand extends BaseCommand {
@@ -44,7 +51,7 @@
out.print(new String(cbuf, 0, l - 1));
out.println();
out.println();
- out.println(undo?generateVersionDelete(change):generateVersionInsert(change));
+ out.println(undo ? generateVersionDelete(change) : generateVersionInsert(change));
out.println();
}
}