Minor refactoring.

Author: harawata

src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java

@@ -159,10 +159,7 @@ private Entry<String, KeyAssigner> getAssignerForParamMap(Configuration config,
     int firstDot = keyProperty.indexOf('.');
     if (firstDot == -1) {
       if (singleParam) {
-        // Assume 'keyProperty' to be a property of the single param.
-        String singleParamName = nameOfSingleParam(paramMap);
-        String argParamName = omitParamName ? null : singleParamName;
-        return entry(singleParamName, new KeyAssigner(config, rsmd, columnPosition, argParamName, keyProperty));
+        return getAssignerForSingleParam(config, rsmd, columnPosition, paramMap, keyProperty, omitParamName);
       }
       throw new ExecutorException("Could not determine which parameter to assign generated keys to. "
           + "Note that when there are multiple parameters, 'keyProperty' must include the parameter name (e.g. 'param.id'). "
@@ -175,10 +172,7 @@ private Entry<String, KeyAssigner> getAssignerForParamMap(Configuration config,
       String argKeyProperty = keyProperty.substring(firstDot + 1);
       return entry(paramName, new KeyAssigner(config, rsmd, columnPosition, argParamName, argKeyProperty));
     } else if (singleParam) {
-      // Assume 'keyProperty' to be a property of the single param.
-      String singleParamName = nameOfSingleParam(paramMap);
-      String argParamName = omitParamName ? null : singleParamName;
-      return entry(singleParamName, new KeyAssigner(config, rsmd, columnPosition, argParamName, keyProperty));
+      return getAssignerForSingleParam(config, rsmd, columnPosition, paramMap, keyProperty, omitParamName);
     } else {
       throw new ExecutorException("Could not find parameter '" + paramName + "'. "
           + "Note that when there are multiple parameters, 'keyProperty' must include the parameter name (e.g. 'param.id'). "
@@ -187,6 +181,14 @@ private Entry<String, KeyAssigner> getAssignerForParamMap(Configuration config,
     }
   }
 
+  private Entry<String, KeyAssigner> getAssignerForSingleParam(Configuration config, ResultSetMetaData rsmd,
+      int columnPosition, Map<String, ?> paramMap, String keyProperty, boolean omitParamName) {
+    // Assume 'keyProperty' to be a property of the single param.
+    String singleParamName = nameOfSingleParam(paramMap);
+    String argParamName = omitParamName ? null : singleParamName;
+    return entry(singleParamName, new KeyAssigner(config, rsmd, columnPosition, argParamName, keyProperty));
+  }
+
   private static String nameOfSingleParam(Map<String, ?> paramMap) {
     // There is virtually one parameter, so any key works.
     return paramMap.keySet().iterator().next();
@@ -208,13 +210,13 @@ private static <K, V> Entry<K, V> entry(K key, V value) {
   }
 
   private class KeyAssigner {
-    protected final Configuration configuration;
-    protected final ResultSetMetaData rsmd;
-    protected final TypeHandlerRegistry typeHandlerRegistry;
-    protected final int columnPosition;
-    protected final String paramName;
-    protected final String propertyName;
-    protected TypeHandler<?> typeHandler;
+    private final Configuration configuration;
+    private final ResultSetMetaData rsmd;
+    private final TypeHandlerRegistry typeHandlerRegistry;
+    private final int columnPosition;
+    private final String paramName;
+    private final String propertyName;
+    private TypeHandler<?> typeHandler;
 
     protected KeyAssigner(Configuration configuration, ResultSetMetaData rsmd, int columnPosition, String paramName,
         String propertyName) {