Skip to content

Commit 5f7fe30

Browse files
committed
replaced AIE with ISE when CGLIB is not in the classpath
1 parent f8ddba3 commit 5f7fe30

File tree

1 file changed

+24
-10
lines changed

1 file changed

+24
-10
lines changed

src/main/java/org/apache/ibatis/session/Configuration.java

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
package org.apache.ibatis.session;
22

3+
import java.util.Collection;
4+
import java.util.HashMap;
5+
import java.util.HashSet;
6+
import java.util.List;
7+
import java.util.Map;
8+
import java.util.Properties;
9+
import java.util.Set;
10+
import java.util.concurrent.ConcurrentHashMap;
11+
import java.util.concurrent.ConcurrentMap;
12+
313
import org.apache.ibatis.binding.MapperRegistry;
414
import org.apache.ibatis.builder.MapperBuilderAssistant;
515
import org.apache.ibatis.builder.xml.XMLStatementBuilder;
@@ -12,36 +22,40 @@
1222
import org.apache.ibatis.datasource.jndi.JndiDataSourceFactory;
1323
import org.apache.ibatis.datasource.pooled.PooledDataSourceFactory;
1424
import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory;
15-
import org.apache.ibatis.executor.*;
25+
import org.apache.ibatis.executor.BatchExecutor;
26+
import org.apache.ibatis.executor.CachingExecutor;
27+
import org.apache.ibatis.executor.Executor;
28+
import org.apache.ibatis.executor.ReuseExecutor;
29+
import org.apache.ibatis.executor.SimpleExecutor;
1630
import org.apache.ibatis.executor.keygen.KeyGenerator;
1731
import org.apache.ibatis.executor.parameter.DefaultParameterHandler;
1832
import org.apache.ibatis.executor.parameter.ParameterHandler;
33+
import org.apache.ibatis.executor.resultset.FastResultSetHandler;
1934
import org.apache.ibatis.executor.resultset.NestedResultSetHandler;
2035
import org.apache.ibatis.executor.resultset.ResultSetHandler;
21-
import org.apache.ibatis.executor.resultset.FastResultSetHandler;
2236
import org.apache.ibatis.executor.statement.RoutingStatementHandler;
2337
import org.apache.ibatis.executor.statement.StatementHandler;
2438
import org.apache.ibatis.io.ResolverUtil;
2539
import org.apache.ibatis.io.Resources;
26-
import org.apache.ibatis.mapping.*;
40+
import org.apache.ibatis.mapping.BoundSql;
41+
import org.apache.ibatis.mapping.Environment;
42+
import org.apache.ibatis.mapping.MappedStatement;
43+
import org.apache.ibatis.mapping.ParameterMap;
44+
import org.apache.ibatis.mapping.ResultMap;
2745
import org.apache.ibatis.parsing.XNode;
2846
import org.apache.ibatis.plugin.Interceptor;
2947
import org.apache.ibatis.plugin.InterceptorChain;
48+
import org.apache.ibatis.reflection.MetaObject;
3049
import org.apache.ibatis.reflection.factory.DefaultObjectFactory;
3150
import org.apache.ibatis.reflection.factory.ObjectFactory;
32-
import org.apache.ibatis.reflection.wrapper.ObjectWrapperFactory;
3351
import org.apache.ibatis.reflection.wrapper.DefaultObjectWrapperFactory;
34-
import org.apache.ibatis.reflection.MetaObject;
52+
import org.apache.ibatis.reflection.wrapper.ObjectWrapperFactory;
3553
import org.apache.ibatis.transaction.Transaction;
3654
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
3755
import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
3856
import org.apache.ibatis.type.TypeAliasRegistry;
3957
import org.apache.ibatis.type.TypeHandlerRegistry;
4058

41-
import java.util.*;
42-
import java.util.concurrent.ConcurrentMap;
43-
import java.util.concurrent.ConcurrentHashMap;
44-
4559
public class Configuration {
4660

4761
protected Environment environment;
@@ -136,7 +150,7 @@ public void setLazyLoadingEnabled(boolean lazyLoadingEnabled) {
136150
try {
137151
Resources.classForName("net.sf.cglib.proxy.Enhancer");
138152
} catch (Throwable e) {
139-
throw new IllegalArgumentException("Cannot enable lazy loading because CGLIB is not available. Add CGLIB to your classpath.", e);
153+
throw new IllegalStateException("Cannot enable lazy loading because CGLIB is not available. Add CGLIB to your classpath.", e);
140154
}
141155
}
142156
this.lazyLoadingEnabled = lazyLoadingEnabled;

0 commit comments

Comments
 (0)