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:56:04 UTC
svn commit: r514094 - in
/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine:
builder/xml/ conifg/
Author: cbegin
Date: Fri Mar 2 22:56:03 2007
New Revision: 514094
URL: http://svn.apache.org/viewvc?view=rev&rev=514094
Log:
Refactored signatures
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
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ParameterMapConfig.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/SqlMapConfiguration.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=514094&r1=514093&r2=514094
==============================================================================
--- 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:56:03 2007
@@ -170,9 +170,7 @@
String mode = childAttributes.getProperty("mode");
String callback = childAttributes.getProperty("typeHandler");
String numericScale = childAttributes.getProperty("numericScale");
-
- state.getParamConfig().addParameterMapping(callback, javaType, resultMap, propertyName, jdbcType, type, nullValue, mode, numericScale);
-
+ state.getParamConfig().addParameterMapping(propertyName, javaType, jdbcType, nullValue, mode, type, numericScale, callback, resultMap);
}
});
}
@@ -192,7 +190,7 @@
String extended = state.applyNamespace(attributes.getProperty("extends"));
String xmlName = attributes.getProperty("xmlName");
String groupBy = attributes.getProperty("groupBy");
- ResultMapConfig resultConf = state.getConfig().newResultMapConfig(id, resultClassName, xmlName, groupBy, extended);
+ ResultMapConfig resultConf = state.getConfig().newResultMapConfig(id, resultClassName, groupBy, extended, xmlName);
state.setResultConfig(resultConf);
}
});
@@ -209,7 +207,7 @@
String resultMapName = childAttributes.getProperty("resultMap");
String callback = childAttributes.getProperty("typeHandler");
- state.getResultConfig().addResultMapping(callback, javaType, propertyName, jdbcType, columnName, nullValue, statementName, resultMapName, columnIndex);
+ state.getResultConfig().addResultMapping(propertyName, columnName, columnIndex, javaType, jdbcType, nullValue, statementName, resultMapName, callback);
}
});
@@ -219,7 +217,7 @@
String value = childAttributes.getProperty("value");
String resultMap = childAttributes.getProperty("resultMap");
resultMap = state.applyNamespace(resultMap);
- state.getResultConfig().addSubMap(value, resultMap);
+ state.getResultConfig().addDiscriminatorSubMap(value, resultMap);
}
});
@@ -233,7 +231,7 @@
String columnIndex = childAttributes.getProperty("columnIndex");
String callback = childAttributes.getProperty("typeHandler");
- state.getResultConfig().setDiscriminator(callback, javaType, jdbcType, columnName, nullValue, columnIndex);
+ state.getResultConfig().setDiscriminator(columnName, columnIndex, javaType, jdbcType, nullValue, callback);
}
});
}
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=514094&r1=514093&r2=514094
==============================================================================
--- 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:56:03 2007
@@ -49,7 +49,7 @@
additionalResultClasses = state.getAllButFirstToken(resultClassName);
resultClassName = state.getFirstToken(resultClassName);
}
- MappedStatementConfig statementConf = state.getConfig().newMappedStatementConfig(new XMLSqlSource(state, node), statement, id, resultMapName, additionalResultMapNames, parameterMapName, resultSetType, fetchSize, parameterClassName, resultClassName, additionalResultClasses, allowRemapping, xmlResultName, timeout, cacheModelName);
+ MappedStatementConfig statementConf = state.getConfig().newMappedStatementConfig(id, statement, new XMLSqlSource(state, node), parameterMapName, parameterClassName, resultMapName, additionalResultMapNames, resultClassName, additionalResultClasses, resultSetType, fetchSize, allowRemapping, timeout, cacheModelName, xmlResultName);
findAndParseSelectKey(node, statementConf);
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java?view=diff&rev=514094&r1=514093&r2=514094
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java Fri Mar 2 22:56:03 2007
@@ -35,7 +35,7 @@
private MappedStatement mappedStatement;
private MappedStatement rootStatement;
- MappedStatementConfig(SqlMapConfiguration config, SqlSource processor, GeneralStatement statement, String id, String resultMapName, String[] additionalResultMapNames, String parameterMapName, String resultSetType, String fetchSize, String parameterClassName, String resultClassName, String[] additionalResultClasses, String allowRemapping, String xmlResultName, String timeout, String cacheModelName) {
+ MappedStatementConfig(SqlMapConfiguration config, String id, GeneralStatement statement, SqlSource processor, String parameterMapName, String parameterClassName, String resultMapName, String[] additionalResultMapNames, String resultClassName, String[] additionalResultClasses, String cacheModelName, String resultSetType, String fetchSize, String allowRemapping, String timeout, String xmlResultName) {
this.errorContext = config.getErrorContext();
this.client = config.getClient();
this.delegate = client.getDelegate();
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ParameterMapConfig.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ParameterMapConfig.java?view=diff&rev=514094&r1=514093&r2=514094
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ParameterMapConfig.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ParameterMapConfig.java Fri Mar 2 22:56:03 2007
@@ -45,21 +45,21 @@
this.parameterMappingList = new ArrayList();
}
- public void addParameterMapping(String callback, String javaType, String resultMap, String propertyName, String jdbcType, String type, String nullValue, String mode, String numericScale) {
- callback = typeHandlerFactory.resolveAlias(callback);
+ public void addParameterMapping(String propertyName, String javaType, String jdbcType, String nullValue, String mode, String outParamType, String numericScale, String typeHandlerCallback, String resultMap) {
+ typeHandlerCallback = typeHandlerFactory.resolveAlias(typeHandlerCallback);
javaType = typeHandlerFactory.resolveAlias(javaType);
errorContext.setObjectId(propertyName + " mapping of the " + parameterMap.getId() + " parameter map");
TypeHandler handler;
- if (callback != null) {
- errorContext.setMoreInfo("Check the parameter mapping typeHandler attribute '" + callback + "' (must be a TypeHandler or TypeHandlerCallback implementation).");
+ if (typeHandlerCallback != null) {
+ errorContext.setMoreInfo("Check the parameter mapping typeHandler attribute '" + typeHandlerCallback + "' (must be a TypeHandler or TypeHandlerCallback implementation).");
try {
- Object impl = Resources.instantiate(callback);
+ Object impl = Resources.instantiate(typeHandlerCallback);
if (impl instanceof TypeHandlerCallback) {
handler = new CustomTypeHandler((TypeHandlerCallback) impl);
} else if (impl instanceof TypeHandler) {
handler = (TypeHandler) impl;
} else {
- throw new RuntimeException("The class '" + callback + "' is not a valid implementation of TypeHandler or TypeHandlerCallback");
+ throw new RuntimeException("The class '" + typeHandlerCallback + "' is not a valid implementation of TypeHandler or TypeHandlerCallback");
}
} catch (Exception e) {
throw new RuntimeException("Error occurred during custom type handler configuration. Cause: " + e, e);
@@ -71,7 +71,7 @@
BasicParameterMapping mapping = new BasicParameterMapping();
mapping.setPropertyName(propertyName);
mapping.setJdbcTypeName(jdbcType);
- mapping.setTypeName(type);
+ mapping.setTypeName(outParamType);
mapping.setResultMapName(resultMap);
mapping.setNullValue(nullValue);
if (mode != null && mode.length() > 0) {
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java?view=diff&rev=514094&r1=514093&r2=514094
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java Fri Mar 2 22:56:03 2007
@@ -29,7 +29,7 @@
private int resultMappingIndex;
private Discriminator discriminator;
- ResultMapConfig(SqlMapConfiguration config, String id, String resultClassName, String xmlName, String groupBy, String extended) {
+ ResultMapConfig(SqlMapConfiguration config, String id, String resultClassName, String groupBy, String extended, String xmlName) {
this.config = config;
this.errorContext = config.getErrorContext();
this.client = config.getClient();
@@ -84,7 +84,7 @@
resultMappingIndex = resultMappingList.size();
}
- public void setDiscriminator(String callback, String javaType, String jdbcType, String columnName, String nullValue, String columnIndex) {
+ public void setDiscriminator(String columnName, String columnIndex, String javaType, String jdbcType, String nullValue, String callback) {
callback = typeHandlerFactory.resolveAlias(callback);
javaType = typeHandlerFactory.resolveAlias(javaType);
TypeHandler handler;
@@ -124,14 +124,14 @@
discriminator = new Discriminator(delegate, mapping);
}
- public void addSubMap(String value, String resultMap) {
+ public void addDiscriminatorSubMap(String value, String resultMap) {
if (discriminator == null) {
throw new RuntimeException("The discriminator is null, but somehow a subMap was reached. This is a bug.");
}
discriminator.addSubMap(value, resultMap);
}
- public void addResultMapping(String callback, String javaType, String propertyName, String jdbcType, String columnName, String nullValue, String statementName, String resultMapName, String columnIndex) {
+ public void addResultMapping(String propertyName, String columnName, String columnIndex, String javaType, String jdbcType, String nullValue, String statementName, String resultMapName, String callback) {
callback = typeHandlerFactory.resolveAlias(callback);
javaType = typeHandlerFactory.resolveAlias(javaType);
errorContext.setObjectId(propertyName + " mapping of the " + resultMap.getId() + " result map");
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/SqlMapConfiguration.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/SqlMapConfiguration.java?view=diff&rev=514094&r1=514093&r2=514094
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/SqlMapConfiguration.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/SqlMapConfiguration.java Fri Mar 2 22:56:03 2007
@@ -280,16 +280,16 @@
return new ParameterMapConfig(this, id, parameterClassName);
}
- public ResultMapConfig newResultMapConfig(String id, String resultClassName, String xmlName, String groupBy, String extended) {
- return new ResultMapConfig(this, id, resultClassName, xmlName, groupBy, extended);
+ public ResultMapConfig newResultMapConfig(String id, String resultClassName, String groupBy, String extended, String xmlName) {
+ return new ResultMapConfig(this, id, resultClassName, groupBy, extended, xmlName);
}
public CacheModelConfig newCacheModelConfig(String id, String type, Boolean readOnly, Boolean serialize) {
return new CacheModelConfig(this, id, type, readOnly, serialize);
}
- public MappedStatementConfig newMappedStatementConfig(SqlSource processor, GeneralStatement statement, String id, String resultMapName, String[] additionalResultMapNames, String parameterMapName, String resultSetType, String fetchSize, String parameterClassName, String resultClassName, String[] additionalResultClasses, String allowRemapping, String xmlResultName, String timeout, String cacheModelName) {
- return new MappedStatementConfig(this, processor, statement, id, resultMapName, additionalResultMapNames, parameterMapName, resultSetType, fetchSize, parameterClassName, resultClassName, additionalResultClasses, allowRemapping, xmlResultName, timeout, cacheModelName);
+ public MappedStatementConfig newMappedStatementConfig(String id, GeneralStatement statement, SqlSource processor, String parameterMapName, String parameterClassName, String resultMapName, String[] additionalResultMapNames, String resultClassName, String[] additionalResultClasses, String resultSetType, String fetchSize, String allowRemapping, String timeout, String cacheModelName, String xmlResultName) {
+ return new MappedStatementConfig(this, id, statement, processor, parameterMapName, parameterClassName, resultMapName, additionalResultMapNames, resultClassName, additionalResultClasses, cacheModelName, resultSetType, fetchSize, allowRemapping, timeout, xmlResultName);
}
private void registerDefaultTypeAliases() {