Skip to content

Commit c524574

Browse files
committed
Change filed name to 'config' for prevent dupricateing with parent class property
See gh-1551
1 parent 52e4358 commit c524574

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/main/java/org/apache/ibatis/type/UnknownTypeHandler.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
public class UnknownTypeHandler extends BaseTypeHandler<Object> {
3434

3535
private static final ObjectTypeHandler OBJECT_TYPE_HANDLER = new ObjectTypeHandler();
36-
private final Configuration configuration;
36+
// TODO Rename to 'configuration' after removing the 'configuration' property(deprecated property) on parent class
37+
private final Configuration config;
3738
private final Supplier<TypeHandlerRegistry> typeHandlerRegistrySupplier;
3839

3940
/**
@@ -43,7 +44,7 @@ public class UnknownTypeHandler extends BaseTypeHandler<Object> {
4344
* @since 3.5.4
4445
*/
4546
public UnknownTypeHandler(Configuration configuration) {
46-
this.configuration = configuration;
47+
this.config = configuration;
4748
this.typeHandlerRegistrySupplier = configuration::getTypeHandlerRegistry;
4849
}
4950

@@ -55,7 +56,7 @@ public UnknownTypeHandler(Configuration configuration) {
5556
*/
5657
@Deprecated
5758
public UnknownTypeHandler(TypeHandlerRegistry typeHandlerRegistry) {
58-
this.configuration = new Configuration();
59+
this.config = new Configuration();
5960
this.typeHandlerRegistrySupplier = () -> typeHandlerRegistry;
6061
}
6162

@@ -109,7 +110,7 @@ private TypeHandler<?> resolveTypeHandler(ResultSet rs, String column) {
109110
columnIndexLookup = new HashMap<>();
110111
ResultSetMetaData rsmd = rs.getMetaData();
111112
int count = rsmd.getColumnCount();
112-
boolean useColumnLabel = configuration.isUseColumnLabel();
113+
boolean useColumnLabel = config.isUseColumnLabel();
113114
for (int i = 1; i <= count; i++) {
114115
String name = useColumnLabel ? rsmd.getColumnLabel(i) : rsmd.getColumnName(i);
115116
columnIndexLookup.put(name,i);

0 commit comments

Comments
 (0)