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 2008/12/01 04:45:26 UTC
svn commit: r721957 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src:
main/java/org/apache/ibatis/api/ main/java/org/apache/ibatis/api/defaults/
main/java/org/apache/ibatis/builder/ test/java/org/apache/ibatis/builder/
Author: cbegin
Date: Sun Nov 30 19:45:25 2008
New Revision: 721957
URL: http://svn.apache.org/viewvc?rev=721957&view=rev
Log:
added new opensession options, and renamed SqlMapper to SqlSessionFactory
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactory.java
- copied, changed from r721781, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlMapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSessionFactory.java
- copied, changed from r721781, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlMapper.java
Removed:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlMapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlMapper.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlMapperBuilder.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/SqlMapperBuilderTest.java
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactory.java (from r721781, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlMapper.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactory.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlMapper.java&r1=721781&r2=721957&rev=721957&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlMapper.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactory.java Sun Nov 30 19:45:25 2008
@@ -1,17 +1,16 @@
package org.apache.ibatis.api;
-import org.apache.ibatis.mapping.Configuration;
+import org.apache.ibatis.mapping.*;
import java.sql.Connection;
-public interface SqlMapper {
+public interface SqlSessionFactory {
SqlSession openSession();
-
SqlSession openSession(boolean autoCommit);
-
+ SqlSession openSession(ExecutorType execType);
SqlSession openSession(Connection connection);
-
+ SqlSession openSession(Connection connection, ExecutorType execType);
Configuration getConfiguration();
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java?rev=721957&r1=721956&r2=721957&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java Sun Nov 30 19:45:25 2008
@@ -12,15 +12,12 @@
public class DefaultSqlSession implements SqlSession {
- private boolean commitRequired;
-
private Configuration configuration;
private Executor executor;
public DefaultSqlSession(Configuration configuration, Executor executor) {
this.configuration = configuration;
this.executor = executor;
- this.commitRequired = false;
}
public List selectList(String statement) {
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSessionFactory.java (from r721781, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlMapper.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSessionFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSessionFactory.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlMapper.java&r1=721781&r2=721957&rev=721957&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlMapper.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSessionFactory.java Sun Nov 30 19:45:25 2008
@@ -1,10 +1,9 @@
package org.apache.ibatis.api.defaults;
-import org.apache.ibatis.api.SqlMapper;
+import org.apache.ibatis.api.SqlSessionFactory;
import org.apache.ibatis.api.SqlSession;
import org.apache.ibatis.api.exceptions.ExceptionFactory;
-import org.apache.ibatis.mapping.Configuration;
-import org.apache.ibatis.mapping.Environment;
+import org.apache.ibatis.mapping.*;
import org.apache.ibatis.transaction.TransactionFactory;
import org.apache.ibatis.transaction.Transaction;
import org.apache.ibatis.executor.Executor;
@@ -13,14 +12,14 @@
import java.sql.Connection;
import java.sql.SQLException;
-public class DefaultSqlMapper implements SqlMapper {
+public class DefaultSqlSessionFactory implements SqlSessionFactory {
private final Configuration configuration;
private Environment environment;
private DataSource dataSource;
private TransactionFactory transactionFactory;
- public DefaultSqlMapper(Configuration configuration) {
+ public DefaultSqlSessionFactory(Configuration configuration) {
this.configuration = configuration;
this.environment = configuration.getEnvironment();
this.dataSource = environment.getDataSource();
@@ -28,14 +27,22 @@
}
public SqlSession openSession() {
- return openSession(false);
+ return openSession(false, configuration.getDefaultExecutorType());
}
public SqlSession openSession(boolean autoCommit) {
+ return openSession(autoCommit, configuration.getDefaultExecutorType());
+ }
+
+ public SqlSession openSession(ExecutorType execType) {
+ return openSession(false, execType);
+ }
+
+ public SqlSession openSession(boolean autoCommit, ExecutorType execType) {
try {
Connection connection = dataSource.getConnection();
Transaction tx = transactionFactory.newTransaction(connection, autoCommit);
- Executor executor = configuration.newExecutor(tx);
+ Executor executor = configuration.newExecutor(tx,execType);
return new DefaultSqlSession(configuration, executor);
} catch (SQLException e) {
throw ExceptionFactory.wrapSQLException("Error opening session. Cause: " + e, e);
@@ -43,6 +50,10 @@
}
public SqlSession openSession(Connection connection) {
+ return openSession(connection, configuration.getDefaultExecutorType());
+ }
+
+ public SqlSession openSession(Connection connection, ExecutorType execType) {
boolean autoCommit;
try {
autoCommit = connection.getAutoCommit();
@@ -52,7 +63,7 @@
autoCommit = true;
}
Transaction tx = transactionFactory.newTransaction(connection, autoCommit);
- Executor executor = configuration.newExecutor(tx);
+ Executor executor = configuration.newExecutor(tx, execType);
return new DefaultSqlSession(configuration, executor);
}
@@ -61,5 +72,7 @@
}
+
+
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlMapperBuilder.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlMapperBuilder.java?rev=721957&r1=721956&r2=721957&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlMapperBuilder.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlMapperBuilder.java Sun Nov 30 19:45:25 2008
@@ -1,26 +1,26 @@
package org.apache.ibatis.builder;
import org.apache.ibatis.mapping.Configuration;
-import org.apache.ibatis.api.defaults.DefaultSqlMapper;
-import org.apache.ibatis.api.SqlMapper;
+import org.apache.ibatis.api.defaults.DefaultSqlSessionFactory;
+import org.apache.ibatis.api.SqlSessionFactory;
import java.io.Reader;
import java.util.Properties;
public class SqlMapperBuilder {
- public SqlMapper build(Reader reader) {
+ public SqlSessionFactory build(Reader reader) {
return build(reader,null,null);
}
- public SqlMapper build(Reader reader, String environment) {
+ public SqlSessionFactory build(Reader reader, String environment) {
return build(reader,environment,null);
}
- public SqlMapper build(Reader reader, String environment, Properties props) {
+ public SqlSessionFactory build(Reader reader, String environment, Properties props) {
MapperConfigParser parser = new MapperConfigParser(reader,environment,props);
Configuration config = parser.parse();
- return new DefaultSqlMapper(config);
+ return new DefaultSqlSessionFactory(config);
}
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/SqlMapperBuilderTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/SqlMapperBuilderTest.java?rev=721957&r1=721956&r2=721957&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/SqlMapperBuilderTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/SqlMapperBuilderTest.java Sun Nov 30 19:45:25 2008
@@ -11,7 +11,7 @@
import domain.blog.Author;
public class SqlMapperBuilderTest extends BaseDataTest {
- private static SqlMapper sqlMapper;
+ private static SqlSessionFactory sqlMapper;
@BeforeClass
public static void setup() throws Exception {