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/06/10 09:45:30 UTC
svn commit: r545853 - in
/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine:
builder/xml/SqlMapConfigParser.java conifg/SqlMapConfiguration.java
Author: cbegin
Date: Sun Jun 10 00:45:29 2007
New Revision: 545853
URL: http://svn.apache.org/viewvc?view=rev&rev=545853
Log:
Renamed and reorganized some methods
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.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/SqlMapConfigParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java?view=diff&rev=545853&r1=545852&r2=545853
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java Sun Jun 10 00:45:29 2007
@@ -144,7 +144,7 @@
javaType = state.getConfig().getTypeHandlerFactory().resolveAlias(javaType);
callback = state.getConfig().getTypeHandlerFactory().resolveAlias(callback);
- state.getConfig().addTypeHandler(Resources.classForName(javaType), jdbcType, Resources.instantiate(callback));
+ state.getConfig().newTypeHandler(Resources.classForName(javaType), jdbcType, Resources.instantiate(callback));
}
});
}
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=545853&r1=545852&r2=545853
==============================================================================
--- 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 Sun Jun 10 00:45:29 2007
@@ -56,49 +56,6 @@
return delegate;
}
- //
- // Utility Methods
- //
-
- TypeHandler resolveTypeHandler(TypeHandlerFactory typeHandlerFactory, Class clazz, String propertyName, Class javaType, String jdbcType) {
- return resolveTypeHandler(typeHandlerFactory, clazz, propertyName, javaType, jdbcType, false);
- }
-
- TypeHandler resolveTypeHandler(TypeHandlerFactory typeHandlerFactory, Class clazz, String propertyName, Class javaType, String jdbcType, boolean useSetterToResolve) {
- TypeHandler handler;
- if (clazz == null) {
- // Unknown
- handler = typeHandlerFactory.getUnkownTypeHandler();
- } else if (DomTypeMarker.class.isAssignableFrom(clazz)) {
- // DOM
- handler = typeHandlerFactory.getTypeHandler(String.class, jdbcType);
- } else if (java.util.Map.class.isAssignableFrom(clazz)) {
- // Map
- if (javaType == null) {
- handler = typeHandlerFactory.getUnkownTypeHandler(); //BUG 1012591 - typeHandlerFactory.getTypeHandler(java.lang.Object.class, jdbcType);
- } else {
- handler = typeHandlerFactory.getTypeHandler(javaType, jdbcType);
- }
- } else if (typeHandlerFactory.getTypeHandler(clazz, jdbcType) != null) {
- // Primitive
- handler = typeHandlerFactory.getTypeHandler(clazz, jdbcType);
- } else {
- // JavaBean
- if (javaType == null) {
- if (useSetterToResolve) {
- Class type = PROBE.getPropertyTypeForSetter(clazz, propertyName);
- handler = typeHandlerFactory.getTypeHandler(type, jdbcType);
- } else {
- Class type = PROBE.getPropertyTypeForGetter(clazz, propertyName);
- handler = typeHandlerFactory.getTypeHandler(type, jdbcType);
- }
- } else {
- handler = typeHandlerFactory.getTypeHandler(javaType, jdbcType);
- }
- }
- return handler;
- }
-
public void setClassInfoCacheEnabled (boolean classInfoCacheEnabled) {
errorContext.setActivity("setting class info cache enabled/disabled");
ClassInfo.setCacheEnabled(classInfoCacheEnabled);
@@ -141,7 +98,15 @@
}
}
- public void addTypeHandler(Class javaType, String jdbcType, Object callback) {
+ public void setTransactionManager(TransactionManager txManager) {
+ delegate.setTxManager(txManager);
+ }
+
+ public void setResultObjectFactory(ResultObjectFactory rof) {
+ delegate.setResultObjectFactory(rof);
+ }
+
+ public void newTypeHandler(Class javaType, String jdbcType, Object callback) {
try {
errorContext.setActivity("building a building custom type handler");
TypeHandlerFactory typeHandlerFactory = client.getDelegate().getTypeHandlerFactory();
@@ -166,14 +131,6 @@
errorContext.setObjectId(null);
}
- public void setTransactionManager(TransactionManager txManager) {
- delegate.setTxManager(txManager);
- }
-
- public void setResultObjectFactory(ResultObjectFactory rof) {
- delegate.setResultObjectFactory(rof);
- }
-
public ParameterMapConfig newParameterMapConfig(String id, String parameterClassName) {
return new ParameterMapConfig(this, id, parameterClassName);
}
@@ -190,6 +147,50 @@
return new MappedStatementConfig(this, id, statement, processor, parameterMapName, parameterClassName, resultMapName, additionalResultMapNames, resultClassName, additionalResultClasses, cacheModelName, resultSetType, fetchSize, allowRemapping, timeout, defaultStatementTimeout, xmlResultName);
}
+ public void finalizeSqlMapConfig() {
+ wireUpCacheModels();
+ bindResultMapDiscriminators();
+ }
+
+ TypeHandler resolveTypeHandler(TypeHandlerFactory typeHandlerFactory, Class clazz, String propertyName, Class javaType, String jdbcType) {
+ return resolveTypeHandler(typeHandlerFactory, clazz, propertyName, javaType, jdbcType, false);
+ }
+
+ TypeHandler resolveTypeHandler(TypeHandlerFactory typeHandlerFactory, Class clazz, String propertyName, Class javaType, String jdbcType, boolean useSetterToResolve) {
+ TypeHandler handler;
+ if (clazz == null) {
+ // Unknown
+ handler = typeHandlerFactory.getUnkownTypeHandler();
+ } else if (DomTypeMarker.class.isAssignableFrom(clazz)) {
+ // DOM
+ handler = typeHandlerFactory.getTypeHandler(String.class, jdbcType);
+ } else if (java.util.Map.class.isAssignableFrom(clazz)) {
+ // Map
+ if (javaType == null) {
+ handler = typeHandlerFactory.getUnkownTypeHandler(); //BUG 1012591 - typeHandlerFactory.getTypeHandler(java.lang.Object.class, jdbcType);
+ } else {
+ handler = typeHandlerFactory.getTypeHandler(javaType, jdbcType);
+ }
+ } else if (typeHandlerFactory.getTypeHandler(clazz, jdbcType) != null) {
+ // Primitive
+ handler = typeHandlerFactory.getTypeHandler(clazz, jdbcType);
+ } else {
+ // JavaBean
+ if (javaType == null) {
+ if (useSetterToResolve) {
+ Class type = PROBE.getPropertyTypeForSetter(clazz, propertyName);
+ handler = typeHandlerFactory.getTypeHandler(type, jdbcType);
+ } else {
+ Class type = PROBE.getPropertyTypeForGetter(clazz, propertyName);
+ handler = typeHandlerFactory.getTypeHandler(type, jdbcType);
+ }
+ } else {
+ handler = typeHandlerFactory.getTypeHandler(javaType, jdbcType);
+ }
+ }
+ return handler;
+ }
+
private void registerDefaultTypeAliases() {
// TRANSACTION ALIASES
typeHandlerFactory.putTypeAlias("JDBC", JdbcTransactionConfig.class.getName());
@@ -213,11 +214,6 @@
typeHandlerFactory.putTypeAlias("domCollection", DomCollectionTypeMarker.class.getName());
typeHandlerFactory.putTypeAlias("xml", XmlTypeMarker.class.getName());
typeHandlerFactory.putTypeAlias("xmlCollection", XmlCollectionTypeMarker.class.getName());
- }
-
- public void finalizeSqlMapConfig() {
- wireUpCacheModels();
- bindResultMapDiscriminators();
}
private void wireUpCacheModels() {