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 2007/03/03 07:18:25 UTC
svn commit: r514089 - in
/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml:
SqlMapParser.java SqlStatementParser.java
Author: cbegin
Date: Fri Mar 2 22:18:25 2007
New Revision: 514089
URL: http://svn.apache.org/viewvc?view=rev&rev=514089
Log:
Cleaned up statement parser
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java?view=diff&rev=514089&r1=514088&r2=514089
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java Fri Mar 2 22:18:25 2007
@@ -5,7 +5,6 @@
import com.ibatis.common.xml.NodeletParser;
import com.ibatis.common.xml.NodeletUtils;
import com.ibatis.sqlmap.client.SqlMapException;
-import com.ibatis.sqlmap.engine.cache.CacheModel;
import com.ibatis.sqlmap.engine.mapping.statement.*;
import com.ibatis.sqlmap.engine.conifg.ParameterMapConfig;
import com.ibatis.sqlmap.engine.conifg.ResultMapConfig;
@@ -18,14 +17,19 @@
public class SqlMapParser {
- private final NodeletParser parser = new NodeletParser();
- private XmlParserState state = new XmlParserState();
+ private final NodeletParser parser;
+ private XmlParserState state;
+ private SqlStatementParser statementParser;
+
+ public SqlMapParser(XmlParserState state) {
+ this.parser = new NodeletParser();
+ this.state = state;
- public SqlMapParser(XmlParserState config) {
- this.state = config;
parser.setValidation(true);
parser.setEntityResolver(new SqlMapClasspathEntityResolver());
+ statementParser = new SqlStatementParser(this.state);
+
addSqlMapNodelets();
addSqlNodelets();
addTypeAliasNodelets();
@@ -237,41 +241,34 @@
protected void addStatementNodelets() {
parser.addNodelet("/sqlMap/statement", new Nodelet() {
public void process(Node node) throws Exception {
- MappedStatement statement = new SqlStatementParser(state).parseGeneralStatement(node, new GeneralStatement());
- state.getConfig().getDelegate().addMappedStatement(statement);
+ statementParser.parseGeneralStatement(node, new GeneralStatement());
}
});
parser.addNodelet("/sqlMap/insert", new Nodelet() {
public void process(Node node) throws Exception {
- MappedStatement statement = new SqlStatementParser(state).parseGeneralStatement(node, new InsertStatement());
- state.getConfig().getDelegate().addMappedStatement(statement);
+ statementParser.parseGeneralStatement(node, new InsertStatement());
}
});
parser.addNodelet("/sqlMap/update", new Nodelet() {
public void process(Node node) throws Exception {
- MappedStatement statement = new SqlStatementParser(state).parseGeneralStatement(node, new UpdateStatement());
- state.getConfig().getDelegate().addMappedStatement(statement);
+ statementParser.parseGeneralStatement(node, new UpdateStatement());
}
});
parser.addNodelet("/sqlMap/delete", new Nodelet() {
public void process(Node node) throws Exception {
- MappedStatement statement = new SqlStatementParser(state).parseGeneralStatement(node, new DeleteStatement());
- state.getConfig().getDelegate().addMappedStatement(statement);
+ statementParser.parseGeneralStatement(node, new DeleteStatement());
}
});
parser.addNodelet("/sqlMap/select", new Nodelet() {
public void process(Node node) throws Exception {
- MappedStatement statement = new SqlStatementParser(state).parseGeneralStatement(node, new SelectStatement());
- state.getConfig().getDelegate().addMappedStatement(statement);
+ statementParser.parseGeneralStatement(node, new SelectStatement());
}
});
parser.addNodelet("/sqlMap/procedure", new Nodelet() {
public void process(Node node) throws Exception {
- MappedStatement statement = new SqlStatementParser(state).parseGeneralStatement(node, new ProcedureStatement());
- state.getConfig().getDelegate().addMappedStatement(statement);
+ statementParser.parseGeneralStatement(node, new ProcedureStatement());
}
});
}
-
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java?view=diff&rev=514089&r1=514088&r2=514089
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java Fri Mar 2 22:18:25 2007
@@ -15,7 +15,7 @@
this.state = config;
}
- public MappedStatement parseGeneralStatement(Node node, GeneralStatement statement) {
+ public void parseGeneralStatement(Node node, GeneralStatement statement) {
// get attributes
Properties attributes = NodeletUtils.parseAttributes(node, state.getGlobalProps());
@@ -53,7 +53,7 @@
findAndParseSelectKey(node, statementConf);
- return statementConf.getMappedStatement();
+ statementConf.saveMappedStatement();
}
private void findAndParseSelectKey(Node node, MappedStatementConfig config) {