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/03/29 23:15:22 UTC
svn commit: r759784 - in /ibatis/trunk/java/ibatis-3:
ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/
ibatis-3-core/src/main/java/org/apache/ibatis/annotations/
ibatis-3-core/src/main/java/org/apache/ibatis/binding/
ibatis-3-core/src/ma...
Author: cbegin
Date: Sun Mar 29 21:15:19 2009
New Revision: 759784
URL: http://svn.apache.org/viewvc?rev=759784&view=rev
Log:
Reformatted code and optimized imports.
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Annotations.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperMethod.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperMethodType.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperProxy.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/DefaultParameterHandler.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/DefaultMemberAccess.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/MethodAccessor.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/NumericTypes.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/Ognl.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlOps.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlParserTokenManager.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlRuntime.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/PropertyAccessor.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/SimpleNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/DynamicSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperAnnotationParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ParameterMappingTokenHandler.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ProviderSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SqlSourceParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/StaticSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/DefaultObjectFactory.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSession.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSessionFactory.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Post.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/mappers/AuthorMapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/mappers/BlogMapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SelectBuilderTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactoryTest.java
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java Sun Mar 29 21:15:19 2009
@@ -3,10 +3,10 @@
import com.ibatis.sqlmap.engine.mapping.sql.SqlText;
import com.ibatis.sqlmap.engine.mapping.sql.dynamic.DynamicSql;
import com.ibatis.sqlmap.engine.mapping.sql.dynamic.elements.*;
+import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.mapping.SqlSource;
-import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.xml.NodeletContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -27,7 +27,7 @@
}
public BoundSql getBoundSql(Object parameterObject) {
- return new BoundSql(getSql(parameterObject),getParameterMappings(parameterObject));
+ return new BoundSql(getSql(parameterObject), getParameterMappings(parameterObject));
}
private List<ParameterMapping> getParameterMappings(Object parameterObject) {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java Sun Mar 29 21:15:19 2009
@@ -3,10 +3,10 @@
import com.ibatis.sqlmap.engine.mapping.sql.SqlText;
import com.ibatis.sqlmap.engine.mapping.sql.simple.SimpleDynamicSql;
import com.ibatis.sqlmap.engine.mapping.sql.statik.StaticSql;
+import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.mapping.SqlSource;
-import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.xml.NodeletContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Annotations.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Annotations.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Annotations.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Annotations.java Sun Mar 29 21:15:19 2009
@@ -2,11 +2,14 @@
import org.apache.ibatis.cache.decorators.LruCache;
import org.apache.ibatis.cache.impl.PerpetualCache;
-import org.apache.ibatis.type.JdbcType;
import org.apache.ibatis.mapping.ResultSetType;
import org.apache.ibatis.mapping.StatementType;
+import org.apache.ibatis.type.JdbcType;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
public class Annotations {
@@ -20,9 +23,13 @@
@Target(ElementType.METHOD)
public static @interface Arg {
boolean id() default false;
+
String column() default "";
+
Class javaType() default void.class;
+
JdbcType jdbcType() default JdbcType.UNDEFINED;
+
Class typeHandler() default void.class;
}
@@ -36,12 +43,19 @@
@Target(ElementType.METHOD)
public static @interface Result {
boolean id() default false;
+
String column() default "";
+
String property() default "";
+
Class javaType() default void.class;
+
JdbcType jdbcType() default JdbcType.UNDEFINED;
+
Class typeHandler() default void.class;
+
One one() default @One;
+
Many many() default @Many(javaType = void.class);
}
@@ -49,7 +63,9 @@
@Target(ElementType.METHOD)
public static @interface One {
String select() default "";
+
ConstructorArgs constructor() default @ConstructorArgs;
+
Results results() default @Results;
}
@@ -57,8 +73,11 @@
@Target(ElementType.METHOD)
public static @interface Many {
Class javaType();
+
String select() default "";
+
ConstructorArgs constructor() default @ConstructorArgs;
+
Results results() default @Results;
}
@@ -66,9 +85,13 @@
@Target(ElementType.TYPE)
public static @interface CacheDomain {
Class<? extends org.apache.ibatis.cache.Cache> implementation() default PerpetualCache.class;
+
Class<? extends org.apache.ibatis.cache.Cache> eviction() default LruCache.class;
+
long flushInterval() default 3600000;
+
int size() default 1000;
+
boolean readWrite() default true;
}
@@ -106,6 +129,7 @@
@Target(ElementType.METHOD)
public @interface InsertProvider {
Class type();
+
String method();
}
@@ -113,6 +137,7 @@
@Target(ElementType.METHOD)
public @interface UpdateProvider {
Class type();
+
String method();
}
@@ -120,6 +145,7 @@
@Target(ElementType.METHOD)
public @interface DeleteProvider {
Class type();
+
String method();
}
@@ -127,6 +153,7 @@
@Target(ElementType.METHOD)
public @interface SelectProvider {
Class type();
+
String method();
}
@@ -134,10 +161,15 @@
@Target(ElementType.METHOD)
public @interface Options {
boolean useCache() default true;
+
boolean flushCache() default false;
+
ResultSetType resultSetType() default ResultSetType.FORWARD_ONLY;
+
StatementType statementType() default StatementType.PREPARED;
+
int fetchSize() default -1;
+
int timeout() default -1;
}
@@ -145,9 +177,13 @@
@Target(ElementType.METHOD)
public @interface TypeDiscriminator {
String column();
+
Class javaType() default void.class;
+
JdbcType jdbcType() default JdbcType.UNDEFINED;
+
Class typeHandler() default void.class;
+
Case[] cases();
}
@@ -155,7 +191,9 @@
@Target(ElementType.METHOD)
public @interface Case {
String value();
+
Class type();
+
Result[] results() default {};
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperMethod.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperMethod.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperMethod.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperMethod.java Sun Mar 29 21:15:19 2009
@@ -1,8 +1,8 @@
package org.apache.ibatis.binding;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.Configuration;
+import org.apache.ibatis.session.SqlSession;
import java.lang.reflect.Method;
import java.sql.SQLException;
@@ -86,7 +86,7 @@
} else if (methodName.startsWith("select") || methodName.startsWith("find")) {
type = MapperMethodType.SELECT;
} else {
- throw new BindingException("Unkown execution method for: " + commandName);
+ throw new BindingException("Unkown execution method for: " + commandName);
}
}
@@ -94,7 +94,7 @@
try {
config.getMappedStatement(commandName);
} catch (Exception e) {
- throw new BindingException("Invalid bound statement (not found): " + commandName,e);
+ throw new BindingException("Invalid bound statement (not found): " + commandName, e);
}
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperMethodType.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperMethodType.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperMethodType.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperMethodType.java Sun Mar 29 21:15:19 2009
@@ -1,5 +1,5 @@
package org.apache.ibatis.binding;
public enum MapperMethodType {
- INSERT,UPDATE,DELETE,SELECT
+ INSERT, UPDATE, DELETE, SELECT
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperProxy.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperProxy.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperProxy.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperProxy.java Sun Mar 29 21:15:19 2009
@@ -1,11 +1,11 @@
package org.apache.ibatis.binding;
+import org.apache.ibatis.session.SqlSession;
+
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import org.apache.ibatis.session.SqlSession;
-
public class MapperProxy implements InvocationHandler {
private SqlSession sqlSession;
@@ -18,11 +18,11 @@
return new MapperMethod(method, sqlSession).execute(args);
}
- public static <T> T newMapperProxy (Class<T> mapperInterface, SqlSession sqlSession) {
+ public static <T> T newMapperProxy(Class<T> mapperInterface, SqlSession sqlSession) {
ClassLoader classLoader = mapperInterface.getClassLoader();
Class[] interfaces = new Class[]{mapperInterface};
MapperProxy proxy = new MapperProxy(sqlSession);
- return (T)Proxy.newProxyInstance(classLoader, interfaces, proxy);
+ return (T) Proxy.newProxyInstance(classLoader, interfaces, proxy);
}
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java Sun Mar 29 21:15:19 2009
@@ -1,10 +1,11 @@
package org.apache.ibatis.binding;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.parser.MapperAnnotationParser;
+import org.apache.ibatis.session.SqlSession;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
public class MapperRegistry {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java Sun Mar 29 21:15:19 2009
@@ -3,9 +3,9 @@
import org.apache.ibatis.cache.CacheKey;
import org.apache.ibatis.cache.impl.PerpetualCache;
import org.apache.ibatis.executor.result.ResultHandler;
+import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.mapping.ParameterMapping;
-import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.reflection.MetaObject;
import org.apache.ibatis.transaction.Transaction;
import org.apache.ibatis.type.TypeHandlerRegistry;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/DefaultParameterHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/DefaultParameterHandler.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/DefaultParameterHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/DefaultParameterHandler.java Sun Mar 29 21:15:19 2009
@@ -2,10 +2,10 @@
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.mapping.BoundSql;
import org.apache.ibatis.reflection.MetaObject;
import org.apache.ibatis.type.TypeHandler;
import org.apache.ibatis.type.TypeHandlerRegistry;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java Sun Mar 29 21:15:19 2009
@@ -186,7 +186,7 @@
// Automap remaining results
for (String key : autoMappings.keySet()) {
ResultMapping autoMapping = autoMappings.get(key);
- resultObject = processResult(rs, rm, autoMapping, lazyLoader, resultObject,foundValues);
+ resultObject = processResult(rs, rm, autoMapping, lazyLoader, resultObject, foundValues);
appliedResultMappings.add(autoMapping);
}
return resultObject;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java Sun Mar 29 21:15:19 2009
@@ -6,9 +6,9 @@
import org.apache.ibatis.executor.parameter.ParameterHandler;
import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.executor.resultset.ResultSetHandler;
+import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.reflection.ObjectFactory;
import org.apache.ibatis.type.TypeHandlerRegistry;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java Sun Mar 29 21:15:19 2009
@@ -97,7 +97,7 @@
String last = "________";
for (int i = 0, n = parts.size(); i < n; i++) {
String part = parts.get(i);
- if (i > 0 && !part.equals(AND) && !part.equals(OR)&& !last.equals(AND) && !last.equals(OR)) {
+ if (i > 0 && !part.equals(AND) && !part.equals(OR) && !last.equals(AND) && !last.equals(OR)) {
builder.append(conjunction);
}
builder.append(part);
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java Sun Mar 29 21:15:19 2009
@@ -19,5 +19,5 @@
public List<ParameterMapping> getParameterMappings() {
return parameterMappings;
}
-
+
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java Sun Mar 29 21:15:19 2009
@@ -1,10 +1,11 @@
package org.apache.ibatis.mapping;
+import org.apache.ibatis.binding.MapperRegistry;
import org.apache.ibatis.cache.Cache;
import org.apache.ibatis.cache.decorators.FifoCache;
import org.apache.ibatis.cache.decorators.LruCache;
-import org.apache.ibatis.cache.decorators.WeakCache;
import org.apache.ibatis.cache.decorators.SoftCache;
+import org.apache.ibatis.cache.decorators.WeakCache;
import org.apache.ibatis.cache.impl.PerpetualCache;
import org.apache.ibatis.datasource.jndi.JndiDataSourceFactory;
import org.apache.ibatis.datasource.pooled.PooledDataSourceFactory;
@@ -21,13 +22,12 @@
import org.apache.ibatis.plugin.InterceptorChain;
import org.apache.ibatis.reflection.DefaultObjectFactory;
import org.apache.ibatis.reflection.ObjectFactory;
+import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.transaction.Transaction;
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
import org.apache.ibatis.type.TypeAliasRegistry;
import org.apache.ibatis.type.TypeHandlerRegistry;
-import org.apache.ibatis.binding.MapperRegistry;
-import org.apache.ibatis.session.SqlSession;
import java.util.Collection;
import java.util.HashMap;
@@ -286,10 +286,10 @@
}
public <T> T getMapper(Class<T> type, SqlSession sqlSession) {
- return mapperRegistry.getMapper(type,sqlSession);
+ return mapperRegistry.getMapper(type, sqlSession);
}
- public boolean hasMapper (Class type) {
+ public boolean hasMapper(Class type) {
return mapperRegistry.hasMapper(type);
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/DefaultMemberAccess.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/DefaultMemberAccess.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/DefaultMemberAccess.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/DefaultMemberAccess.java Sun Mar 29 21:15:19 2009
@@ -136,5 +136,5 @@
}
}
return result;
- }
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/MethodAccessor.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/MethodAccessor.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/MethodAccessor.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/MethodAccessor.java Sun Mar 29 21:15:19 2009
@@ -63,5 +63,5 @@
* @throws MethodFailedException if there is an error calling the method
* @result result of calling the method
*/
- Object callMethod(Map context, Object target, String methodName, Object[] args ) throws MethodFailedException;
+ Object callMethod(Map context, Object target, String methodName, Object[] args) throws MethodFailedException;
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/NumericTypes.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/NumericTypes.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/NumericTypes.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/NumericTypes.java Sun Mar 29 21:15:19 2009
@@ -92,6 +92,6 @@
* constant: all tags less than this constant represent integers, and all tags
* greater than or equal to this constant represent reals. Of course, you must also
* check for NONNUMERIC, which means it is not a number at all.
- */
- int MIN_REAL_TYPE = FLOAT;
+ */
+ int MIN_REAL_TYPE = FLOAT;
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/Ognl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/Ognl.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/Ognl.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/Ognl.java Sun Mar 29 21:15:19 2009
@@ -550,22 +550,19 @@
public static boolean isSimpleNavigationChain(String expression, Map context) throws OgnlException {
return isSimpleNavigationChain(parseExpression(expression), context);
- }
+ }
- public static boolean isSimpleNavigationChain( Object tree ) throws OgnlException
- {
- return isSimpleNavigationChain(tree, createDefaultContext(null));
- }
+ public static boolean isSimpleNavigationChain(Object tree) throws OgnlException {
+ return isSimpleNavigationChain(tree, createDefaultContext(null));
+ }
- public static boolean isSimpleNavigationChain( String expression ) throws OgnlException
- {
- return isSimpleNavigationChain(parseExpression(expression), createDefaultContext(null));
- }
+ public static boolean isSimpleNavigationChain(String expression) throws OgnlException {
+ return isSimpleNavigationChain(parseExpression(expression), createDefaultContext(null));
+ }
- /**
- * You can't make one of these.
- */
- private Ognl()
- {
- }
+ /**
+ * You can't make one of these.
+ */
+ private Ognl() {
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlException.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlException.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlException.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlException.java Sun Mar 29 21:15:19 2009
@@ -146,8 +146,8 @@
if (reason != null) {
s.println("/-- Encapsulated exception ------------\\");
reason.printStackTrace(s);
- s.println("\\--------------------------------------/" );
- }
- }
+ s.println("\\--------------------------------------/");
+ }
}
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlOps.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlOps.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlOps.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlOps.java Sun Mar 29 21:15:19 2009
@@ -695,8 +695,10 @@
int type = getNumericType(value);
switch (type) {
case BIGDEC:
- case BIGINT: return bigIntValue(value).not();
- default: return newInteger( type, ~longValue(value) );
- }
+ case BIGINT:
+ return bigIntValue(value).not();
+ default:
+ return newInteger(type, ~longValue(value));
}
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlParserTokenManager.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlParserTokenManager.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlParserTokenManager.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlParserTokenManager.java Sun Mar 29 21:15:19 2009
@@ -1699,6 +1699,6 @@
break;
default:
break;
- }
-}
+ }
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlRuntime.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlRuntime.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlRuntime.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/OgnlRuntime.java Sun Mar 29 21:15:19 2009
@@ -1628,7 +1628,7 @@
}
public static ObjectArrayPool getObjectArrayPool() {
- return objectArrayPool;
- }
+ return objectArrayPool;
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/PropertyAccessor.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/PropertyAccessor.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/PropertyAccessor.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/PropertyAccessor.java Sun Mar 29 21:15:19 2009
@@ -72,5 +72,5 @@
* @param value the new value for the property
* @throws OgnlException if there is an error setting the property in the given object
*/
- void setProperty(Map context, Object target, Object name, Object value ) throws OgnlException;
+ void setProperty(Map context, Object target, Object name, Object value) throws OgnlException;
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/SimpleNode.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/SimpleNode.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/SimpleNode.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/SimpleNode.java Sun Mar 29 21:15:19 2009
@@ -318,5 +318,5 @@
this.children = newChildren;
}
- }
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/DynamicSqlSource.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/DynamicSqlSource.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/DynamicSqlSource.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/DynamicSqlSource.java Sun Mar 29 21:15:19 2009
@@ -1,10 +1,7 @@
package org.apache.ibatis.parser;
-import org.apache.ibatis.mapping.SqlSource;
-import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.mapping.BoundSql;
-
-import java.util.List;
+import org.apache.ibatis.mapping.SqlSource;
public class DynamicSqlSource implements SqlSource {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperAnnotationParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperAnnotationParser.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperAnnotationParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperAnnotationParser.java Sun Mar 29 21:15:19 2009
@@ -114,14 +114,14 @@
flags.add(ResultFlag.ID);
}
configurator.resultMapping(
- result.property(),
- result.column(),
- result.javaType() == void.class ? null : result.javaType(),
- result.jdbcType() == JdbcType.UNDEFINED ? null : result.jdbcType(),
- hasNestedSelect(result) ? nestedSelectId(result) : null,
- hasCollectionOrAssociation(result) ? nestedResultMapId(resultMapId, result) : null,
- result.typeHandler() == void.class ? null : result.typeHandler(),
- flags);
+ result.property(),
+ result.column(),
+ result.javaType() == void.class ? null : result.javaType(),
+ result.jdbcType() == JdbcType.UNDEFINED ? null : result.jdbcType(),
+ hasNestedSelect(result) ? nestedSelectId(result) : null,
+ hasCollectionOrAssociation(result) ? nestedResultMapId(resultMapId, result) : null,
+ result.typeHandler() == void.class ? null : result.typeHandler(),
+ flags);
}
configurator.resultMapEnd();
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ParameterMappingTokenHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ParameterMappingTokenHandler.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ParameterMappingTokenHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ParameterMappingTokenHandler.java Sun Mar 29 21:15:19 2009
@@ -1,58 +1,58 @@
package org.apache.ibatis.parser;
-import org.apache.ibatis.xml.GenericTokenParser;
-import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.mapping.Configuration;
+import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.xml.GenericTokenParser;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import java.util.StringTokenizer;
public class ParameterMappingTokenHandler extends BaseParser implements GenericTokenParser.TokenHandler {
- private List<ParameterMapping> parameterMappings = new ArrayList<ParameterMapping>();
+ private List<ParameterMapping> parameterMappings = new ArrayList<ParameterMapping>();
public ParameterMappingTokenHandler(Configuration configuration) {
super(configuration);
}
public List<ParameterMapping> getParameterMappings() {
- return parameterMappings;
- }
+ return parameterMappings;
+ }
- public String handleToken(String content) {
- parameterMappings.add(buildParameterMapping(content));
- return "?";
- }
+ public String handleToken(String content) {
+ parameterMappings.add(buildParameterMapping(content));
+ return "?";
+ }
- private ParameterMapping buildParameterMapping(String content) {
- StringTokenizer parameterMappingParts = new StringTokenizer(content, ", ");
- String property = parameterMappingParts.nextToken();
- ParameterMapping.Builder builder = new ParameterMapping.Builder(configuration, property, Object.class);
- while (parameterMappingParts.hasMoreTokens()) {
- String attribute = parameterMappingParts.nextToken();
- StringTokenizer attributeParts = new StringTokenizer(attribute, "=");
- if (attributeParts.countTokens() == 2) {
- String name = attributeParts.nextToken();
- String value = attributeParts.nextToken();
- if ("javaType".equals(name)) {
- builder.javaType(resolveClass(value));
- } else if ("jdbcType".equals(name)) {
- builder.jdbcType(resolveJdbcType(value));
- } else if ("mode".equals(name)) {
- builder.mode(resolveParameterMode(value));
- } else if ("numericScale".equals(name)) {
- builder.numericScale(Integer.valueOf(value));
- } else if ("resultMap".equals(name)) {
- builder.resultMapId(value);
- } else if ("typeHandler".equals(name)) {
- builder.typeHandler((TypeHandler) resolveInstance(value));
- }
- } else {
- throw new ParserException("Improper inline parameter map format. Should be: #{propName,attr1=val1,attr2=val2}");
+ private ParameterMapping buildParameterMapping(String content) {
+ StringTokenizer parameterMappingParts = new StringTokenizer(content, ", ");
+ String property = parameterMappingParts.nextToken();
+ ParameterMapping.Builder builder = new ParameterMapping.Builder(configuration, property, Object.class);
+ while (parameterMappingParts.hasMoreTokens()) {
+ String attribute = parameterMappingParts.nextToken();
+ StringTokenizer attributeParts = new StringTokenizer(attribute, "=");
+ if (attributeParts.countTokens() == 2) {
+ String name = attributeParts.nextToken();
+ String value = attributeParts.nextToken();
+ if ("javaType".equals(name)) {
+ builder.javaType(resolveClass(value));
+ } else if ("jdbcType".equals(name)) {
+ builder.jdbcType(resolveJdbcType(value));
+ } else if ("mode".equals(name)) {
+ builder.mode(resolveParameterMode(value));
+ } else if ("numericScale".equals(name)) {
+ builder.numericScale(Integer.valueOf(value));
+ } else if ("resultMap".equals(name)) {
+ builder.resultMapId(value);
+ } else if ("typeHandler".equals(name)) {
+ builder.typeHandler((TypeHandler) resolveInstance(value));
}
+ } else {
+ throw new ParserException("Improper inline parameter map format. Should be: #{propName,attr1=val1,attr2=val2}");
}
- return builder.build();
}
+ return builder.build();
}
+}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ProviderSqlSource.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ProviderSqlSource.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ProviderSqlSource.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ProviderSqlSource.java Sun Mar 29 21:15:19 2009
@@ -1,11 +1,10 @@
package org.apache.ibatis.parser;
+import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.mapping.SqlSource;
-import org.apache.ibatis.mapping.BoundSql;
import java.lang.reflect.Method;
-import java.util.List;
public class ProviderSqlSource implements SqlSource {
@@ -17,8 +16,9 @@
public ProviderSqlSource(Configuration config, Object provider) {
try {
this.sqlSourceParser = new SqlSourceParser(config);
- this.providerType = (Class)provider.getClass().getMethod("type").invoke(provider);
- String providerMethod = (String)provider.getClass().getMethod("method").invoke(provider);;
+ this.providerType = (Class) provider.getClass().getMethod("type").invoke(provider);
+ String providerMethod = (String) provider.getClass().getMethod("method").invoke(provider);
+ ;
for (Method m : providerType.getMethods()) {
if (providerMethod.equals(m.getName())) {
if (m.getParameterTypes().length < 2
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SqlSourceParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SqlSourceParser.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SqlSourceParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SqlSourceParser.java Sun Mar 29 21:15:19 2009
@@ -1,15 +1,9 @@
package org.apache.ibatis.parser;
import org.apache.ibatis.mapping.Configuration;
-import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.mapping.SqlSource;
-import org.apache.ibatis.type.TypeHandler;
import org.apache.ibatis.xml.GenericTokenParser;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
public class SqlSourceParser extends BaseParser {
public SqlSourceParser(Configuration configuration) {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/StaticSqlSource.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/StaticSqlSource.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/StaticSqlSource.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/StaticSqlSource.java Sun Mar 29 21:15:19 2009
@@ -1,8 +1,8 @@
package org.apache.ibatis.parser;
+import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.mapping.SqlSource;
-import org.apache.ibatis.mapping.BoundSql;
import java.util.List;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperParser.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperParser.java Sun Mar 29 21:15:19 2009
@@ -23,7 +23,7 @@
public XMLMapperParser(Reader reader, Configuration configuration, String resource) {
super(configuration);
- this.mapperConfigurator = new MapperConfigurator(configuration,resource);
+ this.mapperConfigurator = new MapperConfigurator(configuration, resource);
this.reader = reader;
this.parser = new NodeletParser();
this.parser.addNodeletHandler(this);
@@ -58,17 +58,17 @@
// <cache type="LRU" flushInterval="3600000" size="1000" readOnly="false" />
@Nodelet("/mapper/cache")
public void cacheElement(NodeletContext context) throws Exception {
- String type = context.getStringAttribute("type","PERPETUAL");
+ String type = context.getStringAttribute("type", "PERPETUAL");
type = typeAliasRegistry.resolveAlias(type);
Class typeClass = Class.forName(type);
- String eviction = context.getStringAttribute("eviction","LRU");
+ String eviction = context.getStringAttribute("eviction", "LRU");
eviction = typeAliasRegistry.resolveAlias(eviction);
Class evictionClass = Class.forName(eviction);
Long flushInterval = context.getLongAttribute("flushInterval");
Integer size = context.getIntAttribute("size");
boolean readOnly = context.getBooleanAttribute("readOnly", false);
Properties props = context.getChildrenAsProperties();
- mapperConfigurator.cache(typeClass,evictionClass,flushInterval,size,readOnly,props);
+ mapperConfigurator.cache(typeClass, evictionClass, flushInterval, size, readOnly, props);
}
// <parameterMap id="" type="">
@@ -77,7 +77,7 @@
String id = context.getStringAttribute("id");
String type = context.getStringAttribute("type");
Class parameterClass = resolveClass(type);
- mapperConfigurator.parameterMapStart(id,parameterClass);
+ mapperConfigurator.parameterMapStart(id, parameterClass);
}
// <parameterMap id="" type="">
@@ -95,7 +95,7 @@
Class javaTypeClass = resolveClass(javaType);
JdbcType jdbcTypeEnum = resolveJdbcType(jdbcType);
Class typeHandlerClass = resolveClass(typeHandler);
- mapperConfigurator.parameterMapping(property,javaTypeClass,jdbcTypeEnum,resultMap,modeEnum,typeHandlerClass,numericScale);
+ mapperConfigurator.parameterMapping(property, javaTypeClass, jdbcTypeEnum, resultMap, modeEnum, typeHandlerClass, numericScale);
}
// </parameterMap>
@@ -111,7 +111,7 @@
String type = context.getStringAttribute("type");
String extend = context.getStringAttribute("extends");
Class typeClass = resolveClass(type);
- mapperConfigurator.resultMapStart(id,typeClass,extend);
+ mapperConfigurator.resultMapStart(id, typeClass, extend);
}
// <constructor>
@@ -120,11 +120,11 @@
public void resultMapConstructorIdElement(NodeletContext context) throws Exception {
buildResultMappingFromContext(context,
new ArrayList<ResultFlag>() {
- {
- add(ResultFlag.CONSTRUCTOR);
- add(ResultFlag.ID);
- }
- });
+ {
+ add(ResultFlag.CONSTRUCTOR);
+ add(ResultFlag.ID);
+ }
+ });
}
// <constructor>
@@ -174,9 +174,9 @@
String jdbcType = context.getStringAttribute("jdbcType");
String typeHandler = context.getStringAttribute("typeHandler");
Class javaTypeClass = resolveClass(javaType);
- Class typeHandlerClass = resolveClass(typeHandler);
+ Class typeHandlerClass = resolveClass(typeHandler);
JdbcType jdbcTypeEnum = resolveJdbcType(jdbcType);
- mapperConfigurator.resultMapDiscriminatorStart(column,javaTypeClass,jdbcTypeEnum,typeHandlerClass);
+ mapperConfigurator.resultMapDiscriminatorStart(column, javaTypeClass, jdbcTypeEnum, typeHandlerClass);
}
// <discriminator column="" javaType="" jdbcType="">
@@ -185,7 +185,7 @@
public void resultMapDiscriminatorCaseElement(NodeletContext context) throws Exception {
String value = context.getStringAttribute("value");
String resultMap = context.getStringAttribute("resultMap");
- mapperConfigurator.resultMapDiscriminatorCase(value,resultMap);
+ mapperConfigurator.resultMapDiscriminatorCase(value, resultMap);
}
// </discriminator>
@@ -253,8 +253,8 @@
String resultSetType = context.getStringAttribute("resultSetType");
ResultSetType resultSetTypeEnum = resolveResultSetType(resultSetType);
SqlSource sqlSource = new SqlSourceParser(configuration).parse(sql);
- mapperConfigurator.statement(id,sqlSource,fetchSize,timeout,parameterMap, parameterTypeClass,
- resultMap, resultTypeClass,resultSetTypeEnum,isSelect,flushCache,useCache,statementType);
+ mapperConfigurator.statement(id, sqlSource, fetchSize, timeout, parameterMap, parameterTypeClass,
+ resultMap, resultTypeClass, resultSetTypeEnum, isSelect, flushCache, useCache, statementType);
}
@@ -267,9 +267,9 @@
String nestedResultMap = context.getStringAttribute("resultMap");
String typeHandler = context.getStringAttribute("typeHandler");
Class javaTypeClass = resolveClass(javaType);
- Class typeHandlerClass = resolveClass(typeHandler);
+ Class typeHandlerClass = resolveClass(typeHandler);
JdbcType jdbcTypeEnum = resolveJdbcType(jdbcType);
- mapperConfigurator.resultMapping(property,column,javaTypeClass,jdbcTypeEnum,nestedSelect,nestedResultMap,typeHandlerClass,flags);
+ mapperConfigurator.resultMapping(property, column, javaTypeClass, jdbcTypeEnum, nestedSelect, nestedResultMap, typeHandlerClass, flags);
}
private void bindMapperForNamespace() {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/DefaultObjectFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/DefaultObjectFactory.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/DefaultObjectFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/DefaultObjectFactory.java Sun Mar 29 21:15:19 2009
@@ -45,7 +45,7 @@
argValues.append(String.valueOf(argValue));
argValues.append(",");
}
- throw new ReflectionException("Error instantiating " + type + " with invalid types (" + argTypes + ") or values ("+argValues+"). Cause: " + e, e);
+ throw new ReflectionException("Error instantiating " + type + " with invalid types (" + argTypes + ") or values (" + argValues + "). Cause: " + e, e);
}
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java Sun Mar 29 21:15:19 2009
@@ -1,9 +1,9 @@
package org.apache.ibatis.session;
-import org.apache.ibatis.session.defaults.DefaultSqlSessionFactory;
import org.apache.ibatis.exceptions.ExceptionFactory;
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.parser.XMLMapperConfigParser;
+import org.apache.ibatis.session.defaults.DefaultSqlSessionFactory;
import java.io.Reader;
import java.util.Properties;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSession.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSession.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSession.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSession.java Sun Mar 29 21:15:19 2009
@@ -1,12 +1,12 @@
package org.apache.ibatis.session.defaults;
-import org.apache.ibatis.session.SessionException;
-import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.exceptions.ExceptionFactory;
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.session.SessionException;
+import org.apache.ibatis.session.SqlSession;
import java.util.List;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSessionFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSessionFactory.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSessionFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSessionFactory.java Sun Mar 29 21:15:19 2009
@@ -1,7 +1,5 @@
package org.apache.ibatis.session.defaults;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.exceptions.ExceptionFactory;
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.logging.Log;
@@ -10,6 +8,8 @@
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.mapping.Environment;
import org.apache.ibatis.mapping.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.transaction.Transaction;
import org.apache.ibatis.transaction.TransactionFactory;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Post.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Post.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Post.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Post.java Sun Mar 29 21:15:19 2009
@@ -1,6 +1,7 @@
package domain.blog;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
public class Post {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/mappers/AuthorMapper.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/mappers/AuthorMapper.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/mappers/AuthorMapper.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/mappers/AuthorMapper.java Sun Mar 29 21:15:19 2009
@@ -6,10 +6,14 @@
public interface AuthorMapper {
- List selectAllAuthors ();
+ List selectAllAuthors();
+
Author selectAuthor(int id);
+
void insertAuthor(Author author);
+
int deleteAuthor(int id);
+
int updateAuthor(Author author);
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/mappers/BlogMapper.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/mappers/BlogMapper.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/mappers/BlogMapper.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/mappers/BlogMapper.java Sun Mar 29 21:15:19 2009
@@ -1,12 +1,14 @@
package domain.blog.mappers;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
public interface BlogMapper {
List<Map> selectAllPosts(Object param);
+
List<Map> selectAllPosts(int offset, int limit);
+
List<Map> selectAllPosts(Object param, int offset, int limit);
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java Sun Mar 29 21:15:19 2009
@@ -1,11 +1,18 @@
package org.apache.ibatis.binding;
-import domain.blog.*;
-import org.apache.ibatis.session.*;
+import domain.blog.Author;
+import domain.blog.Blog;
+import domain.blog.DraftPost;
+import domain.blog.Post;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
import static org.junit.Assert.assertEquals;
-import org.junit.*;
+import org.junit.BeforeClass;
+import org.junit.Test;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
public class BindingTest {
private static SqlSessionFactory sqlSessionFactory;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java Sun Mar 29 21:15:19 2009
@@ -44,7 +44,7 @@
" PASSWORD as AUTHOR_PASSWORD,",
" EMAIL as AUTHOR_EMAIL,",
" BIO as AUTHOR_BIO," +
- " FAVOURITE_SECTION as AUTHOR_SECTION",
+ " FAVOURITE_SECTION as AUTHOR_SECTION",
"FROM AUTHOR WHERE ID = #{id}"})
Author selectAuthorConstructor(int id);
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java Sun Mar 29 21:15:19 2009
@@ -3,7 +3,8 @@
import domain.blog.*;
import static org.apache.ibatis.annotations.Annotations.*;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
@CacheDomain
public interface BoundBlogMapper {
@@ -39,22 +40,22 @@
@TypeDiscriminator(
column = "draft",
javaType = String.class,
- cases={@Case(value = "1", type = DraftPost.class)}
- )
+ cases = {@Case(value = "1", type = DraftPost.class)}
+ )
List<Post> selectPosts();
//======================================================
@Select("SELECT * FROM post ORDER BY id")
@Results({
- @Result(id = true,property = "id",column = "id" )
+ @Result(id = true, property = "id", column = "id")
})
@TypeDiscriminator(
column = "draft",
javaType = int.class,
- cases={@Case(value = "1", type = DraftPost.class,
- results = {@Result(id=true,property = "id",column="id")})}
- )
+ cases = {@Case(value = "1", type = DraftPost.class,
+ results = {@Result(id = true, property = "id", column = "id")})}
+ )
List<Post> selectPostsWithResultMap();
//======================================================
@@ -72,39 +73,39 @@
//======================================================
@Results({
- @Result(id=true,property="id",column="blog_id"),
- @Result(property="title",column="blog_title"),
- @Result(property="author", column="author_id", one = @One(
- results = @Results({
- @Result(id = true, property="id",column="author_id"),
- @Result(property="username",column="author_username"),
- @Result(property="email",column="author_email")
- }))),
- @Result(property="posts", column="post_id", many = @Many(
- javaType = Post.class,
- results = @Results({
- @Result(id = true, property="id",column="post_id"),
- @Result(property="subject",column="post_subject"),
- @Result(property="body",column="post_body"),
- @Result(property="section",column="post_section"),
- @Result(id = true, property="author.id",column="author_id"),
- @Result(property="author.username",column="author_username"),
- @Result(property="author.email",column="author_email"),
- @Result(property="createdOn",column="post_created_on")
- ,@Result(property="tags",column="tag_id",many = @Many(
- javaType = Tag.class,
- results = @Results({
- @Result(id = true, property="id",column="tag_id"),
- @Result(property="name",column="tag_name")
- })))
- ,@Result(property="comments",column="comment_id",many = @Many(
- javaType = Comment.class,
- results = @Results({
- @Result(id = true, property="id",column="comment_id"),
- @Result(property="name",column="comment_name"),
- @Result(property="comment",column="comment_text")
- })))
- })))
+ @Result(id = true, property = "id", column = "blog_id"),
+ @Result(property = "title", column = "blog_title"),
+ @Result(property = "author", column = "author_id", one = @One(
+ results = @Results({
+ @Result(id = true, property = "id", column = "author_id"),
+ @Result(property = "username", column = "author_username"),
+ @Result(property = "email", column = "author_email")
+ }))),
+ @Result(property = "posts", column = "post_id", many = @Many(
+ javaType = Post.class,
+ results = @Results({
+ @Result(id = true, property = "id", column = "post_id"),
+ @Result(property = "subject", column = "post_subject"),
+ @Result(property = "body", column = "post_body"),
+ @Result(property = "section", column = "post_section"),
+ @Result(id = true, property = "author.id", column = "author_id"),
+ @Result(property = "author.username", column = "author_username"),
+ @Result(property = "author.email", column = "author_email"),
+ @Result(property = "createdOn", column = "post_created_on")
+ , @Result(property = "tags", column = "tag_id", many = @Many(
+ javaType = Tag.class,
+ results = @Results({
+ @Result(id = true, property = "id", column = "tag_id"),
+ @Result(property = "name", column = "tag_name")
+ })))
+ , @Result(property = "comments", column = "comment_id", many = @Many(
+ javaType = Comment.class,
+ results = @Results({
+ @Result(id = true, property = "id", column = "comment_id"),
+ @Result(property = "name", column = "comment_name"),
+ @Result(property = "comment", column = "comment_text")
+ })))
+ })))
})
@Select("select" +
" B.id as blog_id," +
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.xml?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.xml (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.xml Sun Mar 29 21:15:19 2009
@@ -7,7 +7,7 @@
<mapper>
<select id="selectBlogsFromXML" resultType="domain.blog.Blog">
- SELECT * FROM blog
+ SELECT * FROM blog
</select>
</mapper>
\ No newline at end of file
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java Sun Mar 29 21:15:19 2009
@@ -1,11 +1,12 @@
package org.apache.ibatis.binding;
+import org.apache.ibatis.BaseDataTest;
+import org.apache.ibatis.mapping.Configuration;
+import org.apache.ibatis.mapping.Environment;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.session.defaults.DefaultSqlSessionFactory;
-import org.apache.ibatis.mapping.*;
import org.apache.ibatis.transaction.TransactionFactory;
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
-import org.apache.ibatis.BaseDataTest;
import javax.sql.DataSource;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java Sun Mar 29 21:15:19 2009
@@ -51,7 +51,7 @@
MockContext ctx = new MockContext(false);
ctx.bind(TEST_DATA_SOURCE, expectedDataSource);
-
+
InitialContext initCtx = new InitialContext(env);
initCtx.bind(TEST_INITIAL_CONTEXT, ctx);
} catch (NamingException e) {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java Sun Mar 29 21:15:19 2009
@@ -1,22 +1,22 @@
package org.apache.ibatis.exceptions;
-import org.junit.Test;
-import static org.junit.Assert.*;
import org.apache.ibatis.binding.BindingException;
-import org.apache.ibatis.executor.BatchExecutorException;
-import org.apache.ibatis.executor.ExecutorException;
import org.apache.ibatis.cache.CacheException;
import org.apache.ibatis.datasource.DataSourceException;
+import org.apache.ibatis.executor.ExecutorException;
import org.apache.ibatis.logging.LogException;
+import org.apache.ibatis.mapping.SqlMapperException;
import org.apache.ibatis.migration.MigrationException;
-import org.apache.ibatis.xml.NodeletException;
import org.apache.ibatis.parser.ParserException;
-import org.apache.ibatis.session.SessionException;
import org.apache.ibatis.plugin.PluginException;
import org.apache.ibatis.reflection.ReflectionException;
-import org.apache.ibatis.mapping.SqlMapperException;
+import org.apache.ibatis.session.SessionException;
import org.apache.ibatis.transaction.TransactionException;
import org.apache.ibatis.type.TypeException;
+import org.apache.ibatis.xml.NodeletException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
import java.lang.reflect.InvocationTargetException;
@@ -58,13 +58,13 @@
}
private void testExceptionConstructors(Class exceptionType) throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
- Exception e = (Exception)exceptionType.newInstance();
+ Exception e = (Exception) exceptionType.newInstance();
testThrowException(e);
- e = (Exception)exceptionType.getConstructor(String.class).newInstance(EXPECTED_MESSAGE);
+ e = (Exception) exceptionType.getConstructor(String.class).newInstance(EXPECTED_MESSAGE);
testThrowException(e);
- e = (Exception)exceptionType.getConstructor(String.class, Throwable.class).newInstance(EXPECTED_MESSAGE, EXPECTED_CAUSE);
+ e = (Exception) exceptionType.getConstructor(String.class, Throwable.class).newInstance(EXPECTED_MESSAGE, EXPECTED_CAUSE);
testThrowException(e);
- e = (Exception)exceptionType.getConstructor(Throwable.class).newInstance(EXPECTED_CAUSE);
+ e = (Exception) exceptionType.getConstructor(Throwable.class).newInstance(EXPECTED_CAUSE);
testThrowException(e);
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java Sun Mar 29 21:15:19 2009
@@ -8,9 +8,9 @@
import org.apache.ibatis.cache.decorators.SynchronizedCache;
import org.apache.ibatis.cache.impl.PerpetualCache;
import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.parser.StaticSqlSource;
import org.apache.ibatis.type.JdbcType;
import org.apache.ibatis.type.TypeHandlerRegistry;
-import org.apache.ibatis.parser.StaticSqlSource;
import java.util.*;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SelectBuilderTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SelectBuilderTest.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SelectBuilderTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SelectBuilderTest.java Sun Mar 29 21:15:19 2009
@@ -1,8 +1,8 @@
package org.apache.ibatis.jdbc;
-import org.junit.Test;
-import static org.junit.Assert.*;
import static org.apache.ibatis.jdbc.SelectBuilder.*;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
public class SelectBuilderTest {
@@ -10,39 +10,39 @@
public void shouldProduceExpectedSimpleSelectStatement() {
String expected =
"SELECT P.ID, P.USERNAME, P.PASSWORD, P.FIRST_NAME, P.LAST_NAME\n" +
- "FROM PERSON P\n" +
- "WHERE (P.ID like #id# AND P.FIRST_NAME like #firstName# AND P.LAST_NAME like #lastName#)\n" +
- "ORDER BY P.LAST_NAME";
- assertEquals(expected, example2("a","b","c"));
+ "FROM PERSON P\n" +
+ "WHERE (P.ID like #id# AND P.FIRST_NAME like #firstName# AND P.LAST_NAME like #lastName#)\n" +
+ "ORDER BY P.LAST_NAME";
+ assertEquals(expected, example2("a", "b", "c"));
}
@Test
public void shouldProduceExpectedSimpleSelectStatementMissingFirstParam() {
String expected =
"SELECT P.ID, P.USERNAME, P.PASSWORD, P.FIRST_NAME, P.LAST_NAME\n" +
- "FROM PERSON P\n" +
- "WHERE (P.FIRST_NAME like #firstName# AND P.LAST_NAME like #lastName#)\n" +
- "ORDER BY P.LAST_NAME";
- assertEquals(expected, example2(null,"b","c"));
+ "FROM PERSON P\n" +
+ "WHERE (P.FIRST_NAME like #firstName# AND P.LAST_NAME like #lastName#)\n" +
+ "ORDER BY P.LAST_NAME";
+ assertEquals(expected, example2(null, "b", "c"));
}
@Test
public void shouldProduceExpectedSimpleSelectStatementMissingFirstTwoParams() {
String expected =
"SELECT P.ID, P.USERNAME, P.PASSWORD, P.FIRST_NAME, P.LAST_NAME\n" +
- "FROM PERSON P\n" +
- "WHERE (P.LAST_NAME like #lastName#)\n" +
- "ORDER BY P.LAST_NAME";
- assertEquals(expected, example2(null,null,"c"));
+ "FROM PERSON P\n" +
+ "WHERE (P.LAST_NAME like #lastName#)\n" +
+ "ORDER BY P.LAST_NAME";
+ assertEquals(expected, example2(null, null, "c"));
}
@Test
public void shouldProduceExpectedSimpleSelectStatementMissingAllParams() {
String expected =
"SELECT P.ID, P.USERNAME, P.PASSWORD, P.FIRST_NAME, P.LAST_NAME\n" +
- "FROM PERSON P\n" +
- "ORDER BY P.LAST_NAME";
- assertEquals(expected, example2(null,null,null));
+ "FROM PERSON P\n" +
+ "ORDER BY P.LAST_NAME";
+ assertEquals(expected, example2(null, null, null));
}
@Test
@@ -98,5 +98,4 @@
}
-
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml Sun Mar 29 21:15:19 2009
@@ -9,7 +9,8 @@
<resultMap id="blogWithPosts" type="Blog">
<id property="id" column="id"/>
<result property="title" column="title"/>
- <association property="author" column="author_id" select="domain.blog.mappers.AuthorMapper.selectAuthorWithInlineParams"/>
+ <association property="author" column="author_id"
+ select="domain.blog.mappers.AuthorMapper.selectAuthorWithInlineParams"/>
<collection property="posts" column="id" select="selectPostsForBlog"/>
</resultMap>
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java Sun Mar 29 21:15:19 2009
@@ -1,6 +1,8 @@
package org.apache.ibatis.session;
import domain.blog.*;
+import domain.blog.mappers.AuthorMapper;
+import domain.blog.mappers.BlogMapper;
import org.apache.ibatis.BaseDataTest;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.mapping.Configuration;
@@ -12,9 +14,6 @@
import java.util.List;
import java.util.Map;
-import domain.blog.mappers.AuthorMapper;
-import domain.blog.mappers.BlogMapper;
-
public class SqlSessionTest extends BaseDataTest {
private static SqlSessionFactory sqlMapper;
@@ -267,7 +266,7 @@
} finally {
session.close();
}
- assertEquals (first, second);
+ assertEquals(first, second);
}
@Test
@@ -297,7 +296,7 @@
try {
AuthorMapper mapper = session.getMapper(AuthorMapper.class);
List authors = mapper.selectAllAuthors();
- assertEquals(2,authors.size());
+ assertEquals(2, authors.size());
} finally {
session.close();
}
@@ -309,7 +308,7 @@
try {
AuthorMapper mapper = session.getMapper(AuthorMapper.class);
Author author = mapper.selectAuthor(101);
- assertEquals(101,author.getId());
+ assertEquals(101, author.getId());
} finally {
session.close();
}
@@ -341,10 +340,10 @@
AuthorMapper mapper = session.getMapper(AuthorMapper.class);
int count = mapper.deleteAuthor(101);
assertEquals(1, count);
- try{
+ try {
mapper.selectAuthor(101);
fail("Expected exception.");
- } catch(Exception e) {
+ } catch (Exception e) {
assertEquals(SessionException.class, e.getClass());
}
} finally {
@@ -385,7 +384,7 @@
SqlSession session = sqlMapper.openSession();
try {
BlogMapper mapper = session.getMapper(BlogMapper.class);
- List<Map> posts = mapper.selectAllPosts(null,0,2);
+ List<Map> posts = mapper.selectAllPosts(null, 0, 2);
assertEquals(2, posts.size());
assertEquals(1, posts.get(0).get("ID"));
assertEquals(2, posts.get(1).get("ID"));
@@ -399,7 +398,7 @@
SqlSession session = sqlMapper.openSession();
try {
BlogMapper mapper = session.getMapper(BlogMapper.class);
- List<Map> posts = mapper.selectAllPosts(2,3);
+ List<Map> posts = mapper.selectAllPosts(2, 3);
assertEquals(3, posts.size());
assertEquals(3, posts.get(0).get("ID"));
assertEquals(4, posts.get(1).get("ID"));
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactoryTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactoryTest.java?rev=759784&r1=759783&r2=759784&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactoryTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactoryTest.java Sun Mar 29 21:15:19 2009
@@ -1,15 +1,15 @@
package org.apache.ibatis.transaction.managed;
-import static org.junit.Assert.*;
-import org.junit.Test;
-import org.apache.ibatis.transaction.TransactionFactory;
-import org.apache.ibatis.transaction.Transaction;
import org.apache.ibatis.BaseDataTest;
+import org.apache.ibatis.transaction.Transaction;
+import org.apache.ibatis.transaction.TransactionFactory;
import org.jmock.Mockery;
import org.jmock.lib.legacy.ClassImposteriser;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
-import java.util.Properties;
import java.sql.Connection;
+import java.util.Properties;
public class ManagedTransactionFactoryTest extends BaseDataTest {