Author: cbegin
Date: Wed May 6 02:03:54 2009
New Revision: 772029
URL: http://svn.apache.org/viewvc?rev=772029&view=rev
Log:
renamed usages of MapperConfigurator
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/annotation/MapperAnnotationParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/XMLMapperParser.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/annotation/MapperAnnotationParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/annotation/MapperAnnotationParser.java?rev=772029&r1=772028&r2=772029&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/annotation/MapperAnnotationParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/annotation/MapperAnnotationParser.java
Wed May 6 02:03:54 2009
@@ -16,18 +16,18 @@
public class MapperAnnotationParser {
- private SequentialMapperBuilder configurator;
+ private SequentialMapperBuilder sequentialBuilder;
private Class type;
public MapperAnnotationParser(Configuration config, Class type) {
String resource = type.getName().replace('.', '/') + ".java (best guess)";
- this.configurator = new SequentialMapperBuilder(config, resource);
+ this.sequentialBuilder = new SequentialMapperBuilder(config, resource);
this.type = type;
}
public void parse() {
loadXmlResource();
- configurator.namespace(type.getName());
+ sequentialBuilder.namespace(type.getName());
parseCache();
parseCacheRef();
Method[] methods = type.getMethods();
@@ -46,7 +46,7 @@
// ignore, resource is not required
}
if (xmlReader != null) {
- XMLMapperParser xmlParser = new XMLMapperParser(xmlReader,
configurator.getConfiguration(), xmlResource, type.getName());
+ XMLMapperParser xmlParser = new XMLMapperParser(xmlReader,
sequentialBuilder.getConfiguration(), xmlResource, type.getName());
xmlParser.parse();
}
}
@@ -54,14 +54,14 @@
private void parseCache() {
CacheDomain cacheDomain = (CacheDomain)
type.getAnnotation(CacheDomain.class);
if (cacheDomain != null) {
- configurator.cache(cacheDomain.implementation(), cacheDomain.eviction(),
cacheDomain.flushInterval(), cacheDomain.size(), !cacheDomain.readWrite(),
null);
+ sequentialBuilder.cache(cacheDomain.implementation(),
cacheDomain.eviction(), cacheDomain.flushInterval(), cacheDomain.size(),
!cacheDomain.readWrite(), null);
}
}
private void parseCacheRef() {
CacheDomainRef cacheDomainRef = (CacheDomainRef)
type.getAnnotation(CacheDomainRef.class);
if (cacheDomainRef != null) {
- configurator.cacheRef(cacheDomainRef.value().getName());
+ sequentialBuilder.cacheRef(cacheDomainRef.value().getName());
}
}
@@ -90,11 +90,11 @@
private void applyResultMap(String resultMapId, Class returnType, Arg[]
args, Result[] results, TypeDiscriminator discriminator) {
applyNestedResultMaps(resultMapId, returnType, results);
- configurator.resultMapStart(resultMapId, returnType, null);
+ sequentialBuilder.resultMapStart(resultMapId, returnType, null);
applyConstructorArgs(args);
applyResults(resultMapId, results);
applyDiscriminator(resultMapId, discriminator);
- configurator.resultMapEnd();
+ sequentialBuilder.resultMapEnd();
createDiscriminatorResultMaps(resultMapId, discriminator);
}
@@ -104,13 +104,13 @@
String value = c.value();
Class type = c.type();
String caseResultMapId = resultMapId + "-" + value;
- configurator.resultMapStart(caseResultMapId, type, resultMapId);
+ sequentialBuilder.resultMapStart(caseResultMapId, type, resultMapId);
for (Result result : c.results()) {
List<ResultFlag> flags = new ArrayList<ResultFlag>();
if (result.id()) {
flags.add(ResultFlag.ID);
}
- configurator.resultMapping(
+ sequentialBuilder.resultMapping(
result.property(),
result.column(),
result.javaType() == void.class ? null : result.javaType(),
@@ -120,7 +120,7 @@
result.typeHandler() == void.class ? null : result.typeHandler(),
flags);
}
- configurator.resultMapEnd();
+ sequentialBuilder.resultMapEnd();
}
}
}
@@ -133,13 +133,13 @@
Class typeHandler = discriminator.typeHandler() == void.class ? null :
discriminator.typeHandler();
Case[] cases = discriminator.cases();
- configurator.resultMapDiscriminatorStart(column, javaType, jdbcType,
typeHandler);
+ sequentialBuilder.resultMapDiscriminatorStart(column, javaType,
jdbcType, typeHandler);
for (Case c : cases) {
String value = c.value();
String caseResultMapId = resultMapId + "-" + value;
- configurator.resultMapDiscriminatorCase(value, caseResultMapId);
+ sequentialBuilder.resultMapDiscriminatorCase(value, caseResultMapId);
}
- configurator.resultMapDiscriminatorEnd();
+ sequentialBuilder.resultMapDiscriminatorEnd();
}
}
@@ -183,7 +183,7 @@
statementType = options.statementType();
resultSetType = options.resultSetType();
}
- configurator.statement(
+ sequentialBuilder.statement(
mappedStatementId,
sqlSource,
fetchSize,
@@ -243,11 +243,11 @@
sql.append(fragment);
sql.append(" ");
}
- SqlSourceParser parser = new
SqlSourceParser(configurator.getConfiguration());
+ SqlSourceParser parser = new
SqlSourceParser(sequentialBuilder.getConfiguration());
return parser.parse(sql.toString());
} else if (sqlProviderAnnotationType != null) {
Annotation sqlProviderAnnotation =
method.getAnnotation(sqlProviderAnnotationType);
- return new ProviderSqlSource(configurator.getConfiguration(),
sqlProviderAnnotation);
+ return new ProviderSqlSource(sequentialBuilder.getConfiguration(),
sqlProviderAnnotation);
}
return null;
} catch (Exception e) {
@@ -280,7 +280,7 @@
for (Result result : results) {
ArrayList<ResultFlag> flags = new ArrayList<ResultFlag>();
if (result.id()) flags.add(ResultFlag.ID);
- configurator.resultMapping(
+ sequentialBuilder.resultMapping(
result.property(),
result.column(),
result.javaType() == void.class ? null : result.javaType(),
@@ -315,7 +315,7 @@
ArrayList<ResultFlag> flags = new ArrayList<ResultFlag>();
flags.add(ResultFlag.CONSTRUCTOR);
if (arg.id()) flags.add(ResultFlag.ID);
- configurator.resultMapping(
+ sequentialBuilder.resultMapping(
null,
arg.column(),
arg.javaType() == void.class ? null : arg.javaType(),
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/XMLMapperParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/XMLMapperParser.java?rev=772029&r1=772028&r2=772029&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/XMLMapperParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/XMLMapperParser.java
Wed May 6 02:03:54 2009
@@ -12,16 +12,16 @@
protected Reader reader;
protected NodeletParser parser;
- protected SequentialMapperBuilder mapperConfigurator;
+ protected SequentialMapperBuilder sequentialBuilder;
public XMLMapperParser(Reader reader, Configuration configuration, String
resource, String namespace) {
this(reader, configuration, resource);
- this.mapperConfigurator.namespace(namespace);
+ this.sequentialBuilder.namespace(namespace);
}
public XMLMapperParser(Reader reader, Configuration configuration, String
resource) {
super(configuration);
- this.mapperConfigurator = new SequentialMapperBuilder(configuration,
resource);
+ this.sequentialBuilder = new SequentialMapperBuilder(configuration,
resource);
this.reader = reader;
this.parser = new NodeletParser();
this.parser.addNodeletHandler(this);
@@ -44,13 +44,13 @@
@Nodelet("/mapper")
public void configurationElement(NodeletContext context) throws Exception {
String namespace = context.getStringAttribute("namespace");
- mapperConfigurator.namespace(namespace);
+ sequentialBuilder.namespace(namespace);
}
// <cache type="LRU" flushInterval="3600000" size="1000" readOnly="false" />
@Nodelet("/mapper/cache-ref")
public void cacheRefElement(NodeletContext context) throws Exception {
- mapperConfigurator.cacheRef(context.getStringAttribute("namespace"));
+ sequentialBuilder.cacheRef(context.getStringAttribute("namespace"));
}
// <cache type="LRU" flushInterval="3600000" size="1000" readOnly="false" />
@@ -66,7 +66,7 @@
Integer size = context.getIntAttribute("size");
boolean readOnly = context.getBooleanAttribute("readOnly", false);
Properties props = context.getChildrenAsProperties();
- mapperConfigurator.cache(typeClass, evictionClass, flushInterval, size,
readOnly, props);
+ sequentialBuilder.cache(typeClass, evictionClass, flushInterval, size,
readOnly, props);
}
// <parameterMap id="" type="">
@@ -75,7 +75,7 @@
String id = context.getStringAttribute("id");
String type = context.getStringAttribute("type");
Class parameterClass = resolveClass(type);
- mapperConfigurator.parameterMapStart(id, parameterClass);
+ sequentialBuilder.parameterMapStart(id, parameterClass);
}
// <parameterMap id="" type="">
@@ -93,13 +93,13 @@
Class javaTypeClass = resolveClass(javaType);
JdbcType jdbcTypeEnum = resolveJdbcType(jdbcType);
Class typeHandlerClass = resolveClass(typeHandler);
- mapperConfigurator.parameterMapping(property, javaTypeClass, jdbcTypeEnum,
resultMap, modeEnum, typeHandlerClass, numericScale);
+ sequentialBuilder.parameterMapping(property, javaTypeClass, jdbcTypeEnum,
resultMap, modeEnum, typeHandlerClass, numericScale);
}
// </parameterMap>
@Nodelet("/mapper/parameterMap/end()")
public void parameterMapClosingElement(NodeletContext context) throws
Exception {
- mapperConfigurator.parameterMapEnd();
+ sequentialBuilder.parameterMapEnd();
}
// <resultMap id="" type="" extends="">
@@ -109,7 +109,7 @@
String type = context.getStringAttribute("type");
String extend = context.getStringAttribute("extends");
Class typeClass = resolveClass(type);
- mapperConfigurator.resultMapStart(id, typeClass, extend);
+ sequentialBuilder.resultMapStart(id, typeClass, extend);
}
// <constructor>
@@ -174,7 +174,7 @@
Class javaTypeClass = resolveClass(javaType);
Class typeHandlerClass = resolveClass(typeHandler);
JdbcType jdbcTypeEnum = resolveJdbcType(jdbcType);
- mapperConfigurator.resultMapDiscriminatorStart(column, javaTypeClass,
jdbcTypeEnum, typeHandlerClass);
+ sequentialBuilder.resultMapDiscriminatorStart(column, javaTypeClass,
jdbcTypeEnum, typeHandlerClass);
}
// <discriminator column="" javaType="" jdbcType="">
@@ -183,19 +183,19 @@
public void resultMapDiscriminatorCaseElement(NodeletContext context) throws
Exception {
String value = context.getStringAttribute("value");
String resultMap = context.getStringAttribute("resultMap");
- mapperConfigurator.resultMapDiscriminatorCase(value, resultMap);
+ sequentialBuilder.resultMapDiscriminatorCase(value, resultMap);
}
// </discriminator>
@Nodelet("/mapper/resultMap/discriminator/end()")
public void resultMapDiscriminatorClosingElement(NodeletContext context)
throws Exception {
- mapperConfigurator.resultMapDiscriminatorEnd();
+ sequentialBuilder.resultMapDiscriminatorEnd();
}
// </resultMap>
@Nodelet("/mapper/resultMap/end()")
public void resultMapClosingElement(NodeletContext context) throws Exception
{
- mapperConfigurator.resultMapEnd();
+ sequentialBuilder.resultMapEnd();
}
// <select ...>
@@ -251,7 +251,7 @@
String resultSetType = context.getStringAttribute("resultSetType");
ResultSetType resultSetTypeEnum = resolveResultSetType(resultSetType);
SqlSource sqlSource = new SqlSourceParser(configuration).parse(sql);
- mapperConfigurator.statement(id, sqlSource, fetchSize, timeout,
parameterMap, parameterTypeClass,
+ sequentialBuilder.statement(id, sqlSource, fetchSize, timeout,
parameterMap, parameterTypeClass,
resultMap, resultTypeClass, resultSetTypeEnum, isSelect, flushCache,
useCache, statementType);
}
@@ -267,11 +267,11 @@
Class javaTypeClass = resolveClass(javaType);
Class typeHandlerClass = resolveClass(typeHandler);
JdbcType jdbcTypeEnum = resolveJdbcType(jdbcType);
- mapperConfigurator.resultMapping(property, column, javaTypeClass,
jdbcTypeEnum, nestedSelect, nestedResultMap, typeHandlerClass, flags);
+ sequentialBuilder.resultMapping(property, column, javaTypeClass,
jdbcTypeEnum, nestedSelect, nestedResultMap, typeHandlerClass, flags);
}
private void bindMapperForNamespace() {
- String namespace = mapperConfigurator.getNamespace();
+ String namespace = sequentialBuilder.getNamespace();
if (namespace != null) {
Class boundType = null;
try {
