Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,12 @@ private TypeHandler<?> getSmartHandler(Type type, JdbcType jdbcType) {
if (type instanceof Class) {
Class<?> clazz = (Class<?>) type;
if (Enum.class.isAssignableFrom(clazz)) {
Class<?> enumClass = clazz.isAnonymousClass() ? clazz.getSuperclass() : clazz;
// In Java, enum constants with a body are anonymous classes (isAnonymousClass() == true).
// In Kotlin, enum constants with an overridden method are NOT anonymous (isAnonymousClass() == false),
// but their superclass is still the enum type. Check both cases to correctly resolve the enum class.
Class<?> enumClass = (clazz.isAnonymousClass()
|| (clazz.getSuperclass() != null && clazz.getSuperclass().isEnum()))
? clazz.getSuperclass() : clazz;
TypeHandler<?> enumHandler = getInstance(enumClass, defaultEnumTypeHandler);
register(new Type[] { enumClass }, new JdbcType[] { jdbcType }, enumHandler);
return enumHandler;
Expand All @@ -331,6 +336,10 @@ private Map<JdbcType, TypeHandler<?>> getJdbcHandlerMap(Type type) {
Class<?> clazz = (Class<?>) type;
if (!Enum.class.isAssignableFrom(clazz)) {
jdbcHandlerMap = getJdbcHandlerMapForSuperclass(clazz);
} else if (clazz.getSuperclass() != null && clazz.getSuperclass().isEnum()) {
// Handle Kotlin-style enum constants whose body creates a subclass but isAnonymousClass() == false.
// Fall through to parent enum class to find the registered handler.
jdbcHandlerMap = typeHandlerMap.get(clazz.getSuperclass());
}
}
typeHandlerMap.put(type, jdbcHandlerMap == null ? NULL_TYPE_HANDLER_MAP : jdbcHandlerMap);
Expand Down