From 7e9d127a27a6f9234e46bfbdb28560c154a4ecf8 Mon Sep 17 00:00:00 2001
From: Kazuki Shimizu <kazuki43zoo@gmail.com>
Date: Sat, 26 Oct 2019 16:49:16 +0900
Subject: [PATCH] Change filed name to 'config' for prevent dupricateing with
 parent class property See gh-1551

---
 .../java/org/apache/ibatis/type/UnknownTypeHandler.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/ibatis/type/UnknownTypeHandler.java b/src/main/java/org/apache/ibatis/type/UnknownTypeHandler.java
index 303ddaa0220..257d23cdd3d 100644
--- a/src/main/java/org/apache/ibatis/type/UnknownTypeHandler.java
+++ b/src/main/java/org/apache/ibatis/type/UnknownTypeHandler.java
@@ -33,7 +33,8 @@
 public class UnknownTypeHandler extends BaseTypeHandler<Object> {
 
   private static final ObjectTypeHandler OBJECT_TYPE_HANDLER = new ObjectTypeHandler();
-  private final Configuration configuration;
+  // TODO Rename to 'configuration' after removing the 'configuration' property(deprecated property) on parent class
+  private final Configuration config;
   private final Supplier<TypeHandlerRegistry> typeHandlerRegistrySupplier;
 
   /**
@@ -43,7 +44,7 @@ public class UnknownTypeHandler extends BaseTypeHandler<Object> {
    * @since 3.5.4
    */
   public UnknownTypeHandler(Configuration configuration) {
-    this.configuration = configuration;
+    this.config = configuration;
     this.typeHandlerRegistrySupplier = configuration::getTypeHandlerRegistry;
   }
 
@@ -55,7 +56,7 @@ public UnknownTypeHandler(Configuration configuration) {
    */
   @Deprecated
   public UnknownTypeHandler(TypeHandlerRegistry typeHandlerRegistry) {
-    this.configuration = new Configuration();
+    this.config = new Configuration();
     this.typeHandlerRegistrySupplier = () -> typeHandlerRegistry;
   }
 
@@ -109,7 +110,7 @@ private TypeHandler<?> resolveTypeHandler(ResultSet rs, String column) {
       columnIndexLookup = new HashMap<>();
       ResultSetMetaData rsmd = rs.getMetaData();
       int count = rsmd.getColumnCount();
-      boolean useColumnLabel = configuration.isUseColumnLabel();
+      boolean useColumnLabel = config.isUseColumnLabel();
       for (int i = 1; i <= count; i++) {
         String name = useColumnLabel ? rsmd.getColumnLabel(i) : rsmd.getColumnName(i);
         columnIndexLookup.put(name,i);