Author: cbegin
Date: Mon May 25 04:56:35 2009
New Revision: 778277
URL: http://svn.apache.org/viewvc?rev=778277&view=rev
Log:
renamed some builder classes
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseBuilder.java
- copied, changed from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BulderException.java
- copied, changed from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceBuilder.java
- copied, changed from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
- copied, changed from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java
- copied, changed from r778275,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java
- copied, changed from r778190,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
- copied, changed from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java
Removed:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java
Modified:
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/builder/SequentialMapperBuilder.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.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/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java
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=778277&r1=778276&r2=778277&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
Mon May 25 04:56:35 2009
@@ -1,6 +1,6 @@
package org.apache.ibatis.binding;
-import org.apache.ibatis.builder.annotation.MapperAnnotationParser;
+import org.apache.ibatis.builder.annotation.MapperAnnotationBuilder;
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.session.SqlSession;
@@ -38,7 +38,7 @@
// It's important that the type is added before the parser is run
// otherwise the binding may automatically be attempted by the
// mapper parser. If the type is already known, it won't try.
- MapperAnnotationParser parser = new MapperAnnotationParser(config, type);
+ MapperAnnotationBuilder parser = new MapperAnnotationBuilder(config, type);
parser.parse();
}
}
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseBuilder.java
(from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseBuilder.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseBuilder.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java&r1=778077&r2=778277&rev=778277&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseBuilder.java
Mon May 25 04:56:35 2009
@@ -3,12 +3,12 @@
import org.apache.ibatis.mapping.*;
import org.apache.ibatis.type.*;
-public abstract class BaseParser {
+public abstract class BaseBuilder {
protected final Configuration configuration;
protected final TypeAliasRegistry typeAliasRegistry;
protected final TypeHandlerRegistry typeHandlerRegistry;
- public BaseParser(Configuration configuration) {
+ public BaseBuilder(Configuration configuration) {
this.configuration = configuration;
this.typeAliasRegistry = this.configuration.getTypeAliasRegistry();
this.typeHandlerRegistry = this.configuration.getTypeHandlerRegistry();
@@ -35,7 +35,7 @@
try {
return JdbcType.valueOf(resolveAlias(alias));
} catch (IllegalArgumentException e) {
- throw new ParserException("Error resolving JdbcType. Cause: " + e, e);
+ throw new BulderException("Error resolving JdbcType. Cause: " + e, e);
}
}
@@ -44,7 +44,7 @@
try {
return ResultSetType.valueOf(resolveAlias(alias));
} catch (IllegalArgumentException e) {
- throw new ParserException("Error resolving ResultSetType. Cause: " + e,
e);
+ throw new BulderException("Error resolving ResultSetType. Cause: " + e,
e);
}
}
@@ -53,7 +53,7 @@
try {
return ParameterMode.valueOf(resolveAlias(alias));
} catch (IllegalArgumentException e) {
- throw new ParserException("Error resolving ParameterMode. Cause: " + e,
e);
+ throw new BulderException("Error resolving ParameterMode. Cause: " + e,
e);
}
}
@@ -62,7 +62,7 @@
try {
return Class.forName(resolveAlias(alias));
} catch (ClassNotFoundException e) {
- throw new ParserException("Error resolving class . Cause: " + e, e);
+ throw new BulderException("Error resolving class . Cause: " + e, e);
}
}
@@ -72,7 +72,7 @@
Class type = resolveClass(alias);
return type.newInstance();
} catch (Exception e) {
- throw new ParserException("Error instantiating class. Cause: " + e, e);
+ throw new BulderException("Error instantiating class. Cause: " + e, e);
}
}
@@ -81,7 +81,7 @@
try {
return type.newInstance();
} catch (Exception e) {
- throw new ParserException("Error instantiating class. Cause: " + e, e);
+ throw new BulderException("Error instantiating class. Cause: " + e, e);
}
}
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BulderException.java
(from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BulderException.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BulderException.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java&r1=778077&r2=778277&rev=778277&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BulderException.java
Mon May 25 04:56:35 2009
@@ -2,21 +2,21 @@
import org.apache.ibatis.exceptions.IbatisException;
-public class ParserException extends IbatisException {
+public class BulderException extends IbatisException {
- public ParserException() {
+ public BulderException() {
super();
}
- public ParserException(String message) {
+ public BulderException(String message) {
super(message);
}
- public ParserException(String message, Throwable cause) {
+ public BulderException(String message, Throwable cause) {
super(message, cause);
}
- public ParserException(Throwable cause) {
+ public BulderException(Throwable cause) {
super(cause);
}
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SequentialMapperBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SequentialMapperBuilder.java?rev=778277&r1=778276&r2=778277&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SequentialMapperBuilder.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SequentialMapperBuilder.java
Mon May 25 04:56:35 2009
@@ -11,7 +11,7 @@
import java.util.*;
-public class SequentialMapperBuilder extends BaseParser {
+public class SequentialMapperBuilder extends BaseBuilder {
private String namespace;
private String resource;
@@ -42,17 +42,17 @@
this.namespace = namespace;
}
if (this.namespace == null) {
- throw new ParserException("The mapper element requires a namespace
attribute to be specified.");
+ throw new BulderException("The mapper element requires a namespace
attribute to be specified.");
}
}
public void cacheRef(String namespace) {
if (namespace == null) {
- throw new ParserException("cache-ref element requires a namespace
attribute.");
+ throw new BulderException("cache-ref element requires a namespace
attribute.");
}
cache = configuration.getCache(namespace);
if (cache == null) {
- throw new ParserException("No cache for namespace '" + namespace + "'
could be found.");
+ throw new BulderException("No cache for namespace '" + namespace + "'
could be found.");
}
}
@@ -336,7 +336,7 @@
javaType = metaResultType.getSetterType(property);
}
if (javaType == null) {
- throw new ParserException("Could not determine javaType for result.
Specify property or javaType attribute.");
+ throw new BulderException("Could not determine javaType for result.
Specify property or javaType attribute.");
}
return javaType;
}
@@ -347,7 +347,7 @@
javaType = metaResultType.getGetterType(property);
}
if (javaType == null) {
- throw new ParserException("Could not determine javaType for result.
Specify property or javaType attribute.");
+ throw new BulderException("Could not determine javaType for result.
Specify property or javaType attribute.");
}
return javaType;
}
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceBuilder.java
(from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceBuilder.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceBuilder.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java&r1=778077&r2=778277&rev=778277&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceBuilder.java
Mon May 25 04:56:35 2009
@@ -7,9 +7,9 @@
import java.util.*;
-public class SqlSourceParser extends BaseParser {
+public class SqlSourceBuilder extends BaseBuilder {
- public SqlSourceParser(Configuration configuration) {
+ public SqlSourceBuilder(Configuration configuration) {
super(configuration);
}
@@ -20,7 +20,7 @@
return new StaticSqlSource(sql, handler.getParameterMappings());
}
- private static class ParameterMappingTokenHandler extends BaseParser
implements GenericTokenParser.TokenHandler {
+ private static class ParameterMappingTokenHandler extends BaseBuilder
implements GenericTokenParser.TokenHandler {
private List<ParameterMapping> parameterMappings = new
ArrayList<ParameterMapping>();
private Class parameterType;
@@ -71,7 +71,7 @@
builder.typeHandler((TypeHandler) resolveInstance(value));
}
} else {
- throw new ParserException("Improper inline parameter map format.
Should be: #{propName,attr1=val1,attr2=val2}");
+ throw new BulderException("Improper inline parameter map format.
Should be: #{propName,attr1=val1,attr2=val2}");
}
}
return builder.build();
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
(from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java&r1=778077&r2=778277&rev=778277&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
Mon May 25 04:56:35 2009
@@ -3,7 +3,7 @@
import org.apache.ibatis.annotations.*;
import org.apache.ibatis.binding.BindingException;
import org.apache.ibatis.builder.*;
-import org.apache.ibatis.builder.xml.XMLMapperParser;
+import org.apache.ibatis.builder.xml.XMLMapperBuilder;
import org.apache.ibatis.executor.keygen.*;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.mapping.*;
@@ -14,12 +14,12 @@
import java.lang.reflect.*;
import java.util.*;
-public class MapperAnnotationParser {
+public class MapperAnnotationBuilder {
private SequentialMapperBuilder sequentialBuilder;
private Class type;
- public MapperAnnotationParser(Configuration config, Class type) {
+ public MapperAnnotationBuilder(Configuration config, Class type) {
String resource = type.getName().replace('.', '/') + ".java (best guess)";
this.sequentialBuilder = new SequentialMapperBuilder(config, resource);
this.type = type;
@@ -46,7 +46,7 @@
// ignore, resource is not required
}
if (xmlReader != null) {
- XMLMapperParser xmlParser = new XMLMapperParser(xmlReader,
sequentialBuilder.getConfiguration(), xmlResource, type.getName());
+ XMLMapperBuilder xmlParser = new XMLMapperBuilder(xmlReader,
sequentialBuilder.getConfiguration(), xmlResource, type.getName());
xmlParser.parse();
}
}
@@ -228,7 +228,7 @@
sql.append(fragment);
sql.append(" ");
}
- SqlSourceParser parser = new
SqlSourceParser(sequentialBuilder.getConfiguration());
+ SqlSourceBuilder parser = new
SqlSourceBuilder(sequentialBuilder.getConfiguration());
return parser.parse(sql.toString(), getParameterType(method));
} else if (sqlProviderAnnotationType != null) {
Annotation sqlProviderAnnotation =
method.getAnnotation(sqlProviderAnnotationType);
@@ -236,7 +236,7 @@
}
return null;
} catch (Exception e) {
- throw new ParserException("Could not find value method on SQL
annotation. Cause: " + e, e);
+ throw new BulderException("Could not find value method on SQL
annotation. Cause: " + e, e);
}
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java?rev=778277&r1=778276&r2=778277&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java
Mon May 25 04:56:35 2009
@@ -7,14 +7,14 @@
public class ProviderSqlSource implements SqlSource {
- private SqlSourceParser sqlSourceParser;
+ private SqlSourceBuilder sqlSourceParser;
private Class providerType;
private Method providerMethod;
private boolean providerTakesParameterObject;
public ProviderSqlSource(Configuration config, Object provider) {
try {
- this.sqlSourceParser = new SqlSourceParser(config);
+ this.sqlSourceParser = new SqlSourceBuilder(config);
this.providerType = (Class)
provider.getClass().getMethod("type").invoke(provider);
String providerMethod = (String)
provider.getClass().getMethod("method").invoke(provider);
@@ -28,7 +28,7 @@
}
}
} catch (Exception e) {
- throw new ParserException("Error creating SqlSource for SqlProvider.
Cause: " + e, e);
+ throw new BulderException("Error creating SqlSource for SqlProvider.
Cause: " + e, e);
}
}
@@ -48,7 +48,7 @@
Class parameterType = parameterObject == null ? Object.class :
parameterObject.getClass();
return sqlSourceParser.parse(sql, parameterType);
} catch (Exception e) {
- throw new ParserException("Error invoking SqlProvider method ("
+ throw new BulderException("Error invoking SqlProvider method ("
+ providerType.getName() + "." + providerMethod.getName()
+ "). Cause: " + e, e);
}
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java
(from r778275,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java&r1=778275&r2=778277&rev=778277&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java
Mon May 25 04:56:35 2009
@@ -14,23 +14,21 @@
import java.io.Reader;
import java.util.*;
-public class XMLMapperConfigParser extends BaseParser {
+public class XMLConfigBuilder extends BaseBuilder {
private boolean parsed;
-
private XPathParser parser;
-
private String environment;
- public XMLMapperConfigParser(Reader reader) {
+ public XMLConfigBuilder(Reader reader) {
this(reader, null, null);
}
- public XMLMapperConfigParser(Reader reader, String environment) {
+ public XMLConfigBuilder(Reader reader, String environment) {
this(reader, environment, null);
}
- public XMLMapperConfigParser(Reader reader, String environment, Properties
props) {
+ public XMLConfigBuilder(Reader reader, String environment, Properties props)
{
super(new Configuration());
ErrorContext.instance().resource("SQL Mapper Configuration");
this.configuration.setVariables(props);
@@ -41,23 +39,26 @@
public Configuration parse() {
if (parsed) {
- throw new ParserException("Each MapperConfigParser can only be used
once.");
+ throw new BulderException("Each MapperConfigParser can only be used
once.");
}
parsed = true;
+ parseConfiguration(parser.evalNode("/configuration"));
+ return configuration;
+ }
+
+ private void parseConfiguration(XNode root) {
try {
- typeAliasesElement(parser.evalNode("/configuration/typeAliases"));
- pluginElement(parser.evalNode("/configuration/plugins"));
- objectFactoryElement(parser.evalNode("/configuration/objectFactory"));
- propertiesElement(parser.evalNode("/configuration/properties"));
- settingsElement(parser.evalNode("/configuration/settings"));
- environmentsElement(parser.evalNode("/configuration/environments"));
- typeHandlerElement(parser.evalNode("/configuration/typeHandlers"));
- mapperElement(parser.evalNode("/configuration/mappers"));
+ typeAliasesElement(root.evalNode("typeAliases"));
+ pluginElement(root.evalNode("plugins"));
+ objectFactoryElement(root.evalNode("objectFactory"));
+ propertiesElement(root.evalNode("properties"));
+ settingsElement(root.evalNode("settings"));
+ environmentsElement(root.evalNode("environments"));
+ typeHandlerElement(root.evalNode("typeHandlers"));
+ mapperElement(root.evalNode("mappers"));
} catch (Exception e) {
- throw new RuntimeException("Description. Cause: " + e, e);
+ throw new BulderException("Error parsing SQL Mapper Configuration.
Cause: " + e, e);
}
-
- return configuration;
}
private void typeAliasesElement(XNode parent) {
@@ -92,7 +93,7 @@
String resource = context.getStringAttribute("resource");
String url = context.getStringAttribute("url");
if (resource != null && url != null) {
- throw new ParserException("The properties element cannot specify both a
URL and a resource based property file reference. Please specify one or the
other.");
+ throw new BulderException("The properties element cannot specify both a
URL and a resource based property file reference. Please specify one or the
other.");
}
if (resource != null) {
defaults.putAll(Resources.getResourceAsProperties(resource));
@@ -113,7 +114,7 @@
for (Map.Entry entry : props.entrySet()) {
MetaClass metaConfig = MetaClass.forClass(Configuration.class);
if (!metaConfig.hasSetter((String) entry.getKey())) {
- throw new ParserException("The setting " + entry.getKey() + " is not
known. Make sure you spelled it correctly (case sensitive).");
+ throw new BulderException("The setting " + entry.getKey() + " is not
known. Make sure you spelled it correctly (case sensitive).");
}
}
configuration.setCacheEnabled(booleanValueOf(props.getProperty("cacheEnabled"),
true));
@@ -184,24 +185,24 @@
if (resource != null && url == null) {
ErrorContext.instance().resource(resource);
reader = Resources.getResourceAsReader(resource);
- XMLMapperParser mapperParser = new XMLMapperParser(reader,
configuration, resource);
+ XMLMapperBuilder mapperParser = new XMLMapperBuilder(reader,
configuration, resource);
mapperParser.parse();
} else if (url != null && resource == null) {
ErrorContext.instance().resource(url);
reader = Resources.getUrlAsReader(url);
- XMLMapperParser mapperParser = new XMLMapperParser(reader,
configuration, url);
+ XMLMapperBuilder mapperParser = new XMLMapperBuilder(reader,
configuration, url);
mapperParser.parse();
} else {
- throw new ParserException("A mapper element may only specify a url or
resource, but not both.");
+ throw new BulderException("A mapper element may only specify a url or
resource, but not both.");
}
}
}
private boolean isSpecifiedEnvironment(String id) {
if (environment == null) {
- throw new ParserException("No environment specified.");
+ throw new BulderException("No environment specified.");
} else if (id == null) {
- throw new ParserException("Environment requires an id attribute.");
+ throw new BulderException("Environment requires an id attribute.");
} else if (environment.equals(id)) {
return true;
}
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java
(from r778190,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java&r1=778190&r2=778277&rev=778277&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java
Mon May 25 04:56:35 2009
@@ -9,7 +9,7 @@
import java.io.Reader;
import java.util.*;
-public class XMLMapperParser extends BaseParser {
+public class XMLMapperBuilder extends BaseBuilder {
private Reader reader;
private NodeEventParser parser;
@@ -17,12 +17,12 @@
private Map<String, XNode> sqlFragments = new HashMap<String, XNode>();
- public XMLMapperParser(Reader reader, Configuration configuration, String
resource, String namespace) {
+ public XMLMapperBuilder(Reader reader, Configuration configuration, String
resource, String namespace) {
this(reader, configuration, resource);
this.sequentialBuilder.namespace(namespace);
}
- public XMLMapperParser(Reader reader, Configuration configuration, String
resource) {
+ public XMLMapperBuilder(Reader reader, Configuration configuration, String
resource) {
super(configuration);
this.sequentialBuilder = new SequentialMapperBuilder(configuration,
resource);
this.reader = reader;
@@ -211,7 +211,7 @@
}
private void buildStatementFromContext(XNode context) {
- final XMLStatementParser statementParser = new
XMLStatementParser(configuration, sequentialBuilder, this);
+ final XMLStatementBuilder statementParser = new
XMLStatementBuilder(configuration, sequentialBuilder, this);
statementParser.parseStatementNode(context);
}
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
(from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java&r1=778077&r2=778277&rev=778277&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
Mon May 25 04:56:35 2009
@@ -9,12 +9,12 @@
import java.util.*;
-public class XMLStatementParser extends BaseParser {
+public class XMLStatementBuilder extends BaseBuilder {
private SequentialMapperBuilder sequentialBuilder;
- private XMLMapperParser xmlMapperParser;
+ private XMLMapperBuilder xmlMapperParser;
- public XMLStatementParser(Configuration configuration,
SequentialMapperBuilder sequentialBuilder, XMLMapperParser xmlMapperParser) {
+ public XMLStatementBuilder(Configuration configuration,
SequentialMapperBuilder sequentialBuilder, XMLMapperBuilder xmlMapperParser) {
super(configuration);
this.sequentialBuilder = sequentialBuilder;
this.xmlMapperParser = xmlMapperParser;
@@ -73,7 +73,7 @@
} else {
NodeHandler handler = nodeHandlers.get(nodeName);
if (handler == null) {
- throw new ParserException("Unknown element <" + nodeName + "> in SQL
statement.");
+ throw new BulderException("Unknown element <" + nodeName + "> in SQL
statement.");
}
handler.handleNode(child, contents);
@@ -146,7 +146,7 @@
String nsrefid = sequentialBuilder.applyNamespace(refid);
includeNode = xmlMapperParser.getSqlFragment(nsrefid);
if (includeNode == null) {
- throw new ParserException("Could not find SQL statement to include
with refid '" + refid + "'");
+ throw new BulderException("Could not find SQL statement to include
with refid '" + refid + "'");
}
}
MixedSqlNode mixedSqlNode = new MixedSqlNode(contents(includeNode));
@@ -246,7 +246,7 @@
if (defaultSqlNodes.size() == 1) {
defaultSqlNode = defaultSqlNodes.get(0);
} else if (defaultSqlNodes.size() > 1) {
- throw new ParserException("Too many default (otherwise) elements in
choose statement.");
+ throw new BulderException("Too many default (otherwise) elements in
choose statement.");
}
return defaultSqlNode;
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java?rev=778277&r1=778276&r2=778277&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java
Mon May 25 04:56:35 2009
@@ -1,6 +1,6 @@
package org.apache.ibatis.builder.xml.dynamic;
-import org.apache.ibatis.builder.SqlSourceParser;
+import org.apache.ibatis.builder.SqlSourceBuilder;
import org.apache.ibatis.mapping.*;
public class DynamicSqlSource implements SqlSource {
@@ -16,7 +16,7 @@
public BoundSql getBoundSql(Object parameterObject) {
DynamicContext context = new DynamicContext(parameterObject);
rootSqlNode.apply(context);
- SqlSourceParser sqlSourceParser = new SqlSourceParser(configuration);
+ SqlSourceBuilder sqlSourceParser = new SqlSourceBuilder(configuration);
Class parameterType = parameterObject == null ? Object.class :
parameterObject.getClass();
SqlSource sqlSource = sqlSourceParser.parse(context.getSql(),
parameterType);
return sqlSource.getBoundSql(parameterObject);
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java?rev=778277&r1=778276&r2=778277&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java
Mon May 25 04:56:35 2009
@@ -1,6 +1,6 @@
package org.apache.ibatis.builder.xml.dynamic;
-import org.apache.ibatis.builder.ParserException;
+import org.apache.ibatis.builder.BulderException;
import org.apache.ibatis.ognl.*;
import java.math.BigDecimal;
@@ -15,7 +15,7 @@
if (value instanceof Number) return !new
BigDecimal(String.valueOf(value)).equals(BigDecimal.ZERO);
return value != null;
} catch (OgnlException e) {
- throw new ParserException("Error evaluating expression '"+expression+"'.
Cause: " + e, e);
+ throw new BulderException("Error evaluating expression '"+expression+"'.
Cause: " + e, e);
}
}
@@ -24,9 +24,9 @@
Object value = Ognl.getValue(expression, parameterObject);
if (value instanceof Iterable) return (Iterable) value;
if (value.getClass().isArray()) return Arrays.asList((Object[])value);
- throw new ParserException("Error evaluating expression '"+expression+"'.
Return value ("+value+") was not iterable.");
+ throw new BulderException("Error evaluating expression '"+expression+"'.
Return value ("+value+") was not iterable.");
} catch (OgnlException e) {
- throw new ParserException("Error evaluating expression '"+expression+"'.
Cause: " + e, e);
+ throw new BulderException("Error evaluating expression '"+expression+"'.
Cause: " + e, e);
}
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java?rev=778277&r1=778276&r2=778277&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java
Mon May 25 04:56:35 2009
@@ -1,6 +1,6 @@
package org.apache.ibatis.parsing;
-import org.apache.ibatis.builder.ParserException;
+import org.apache.ibatis.builder.BulderException;
import org.w3c.dom.*;
import org.xml.sax.*;
@@ -92,7 +92,7 @@
try {
return xpath.evaluate(expression, root, returnType);
} catch (Exception e) {
- throw new ParserException("Error evaluating XPath. Cause: " + e, e);
+ throw new BulderException("Error evaluating XPath. Cause: " + e, e);
}
}
@@ -123,7 +123,7 @@
});
return builder.parse(new InputSource(reader));
} catch (Exception e) {
- throw new ParserException("Error creating document instance. Cause: " +
e, e);
+ throw new BulderException("Error creating document instance. 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=778277&r1=778276&r2=778277&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
Mon May 25 04:56:35 2009
@@ -1,6 +1,6 @@
package org.apache.ibatis.session;
-import org.apache.ibatis.builder.xml.XMLMapperConfigParser;
+import org.apache.ibatis.builder.xml.XMLConfigBuilder;
import org.apache.ibatis.exceptions.ExceptionFactory;
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.session.defaults.DefaultSqlSessionFactory;
@@ -24,7 +24,7 @@
public SqlSessionFactory build(Reader reader, String environment, Properties
props) {
try {
- XMLMapperConfigParser parser = new XMLMapperConfigParser(reader,
environment, props);
+ XMLConfigBuilder parser = new XMLConfigBuilder(reader, environment,
props);
Configuration config = parser.parse();
return new DefaultSqlSessionFactory(config);
} catch (Exception 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=778277&r1=778276&r2=778277&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
Mon May 25 04:56:35 2009
@@ -1,7 +1,7 @@
package org.apache.ibatis.exceptions;
import org.apache.ibatis.binding.BindingException;
-import org.apache.ibatis.builder.ParserException;
+import org.apache.ibatis.builder.BulderException;
import org.apache.ibatis.cache.CacheException;
import org.apache.ibatis.datasource.DataSourceException;
import org.apache.ibatis.executor.ExecutorException;
@@ -41,7 +41,7 @@
LogException.class,
MigrationException.class,
ParsingException.class,
- ParserException.class,
+ BulderException.class,
PluginException.class,
ReflectionException.class,
IbatisException.class,
