fix a @param and :param bug

Author: Jarvis Song

spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/support/MybatisSimpleQueryMapperBuilder.java

@@ -1,7 +1,9 @@
 package org.springframework.data.mybatis.repository.support;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mybatis.repository.query.InvalidMybatisQueryMethodException;
@@ -18,7 +20,6 @@
 
 import org.apache.ibatis.mapping.SqlCommandType;
 import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.type.TypeHandler;
 
 public class MybatisSimpleQueryMapperBuilder extends MybatisMapperBuildAssistant {
 
@@ -81,21 +82,33 @@ else if (SELECT_ALL_FROM.matcher(sql).matches()) {
 		if (!CollectionUtils.isEmpty(stringQuery.getParameterBindings())) {
 			for (ParameterBinding parameterBinding : stringQuery.getParameterBindings()) {
 
-				String replace, bindName;
-
-				MybatisParameter mp = method.getParameters()
-						.getBindableParameter(parameterBinding.getRequiredPosition() - 1);
-
-				Class<? extends TypeHandler<?>> typeHandler = mp
-						.getSpecifiedTypeHandler();
+				String replace, bindName, typeHandler = null;
 
 				if (StringUtils.hasText(parameterBinding.getName())) {
 					replace = ":" + parameterBinding.getName();
 					bindName = parameterBinding.getName();
+
+					Stream<MybatisParameter> stream = method.getParameters()
+							.getBindableParameters().get();
+					Optional<MybatisParameter> first = stream
+							.filter(mp -> bindName.equals(mp.getName().orElse(null)))
+							.findFirst();
+					if (first.isPresent()) {
+						MybatisParameter mp = first.get();
+						if (null != mp.getSpecifiedTypeHandler()) {
+							typeHandler = mp.getSpecifiedTypeHandler().getName();
+						}
+					}
+
 				}
 				else {
+					MybatisParameter mp = method.getParameters().getBindableParameter(
+							parameterBinding.getRequiredPosition() - 1);
 					replace = "?" + parameterBinding.getPosition();
 					bindName = mp.getName().orElse("__p" + mp.getIndex());
+					if (null != mp.getSpecifiedTypeHandler()) {
+						typeHandler = mp.getSpecifiedTypeHandler().getName();
+					}
 				}
 
 				if (parameterBinding instanceof InParameterBinding) {
@@ -104,8 +117,7 @@ else if (SELECT_ALL_FROM.matcher(sql).matches()) {
 									+ bindName
 									+ "\" open=\"(\" separator=\",\" close=\")\">#{__item"
 									+ (null != typeHandler
-											? (",typeHandler=" + typeHandler.getName())
-											: "")
+											? (",typeHandler=" + typeHandler) : "")
 									+ "}</foreach>");
 
 					continue;
@@ -139,11 +151,9 @@ else if (SELECT_ALL_FROM.matcher(sql).matches()) {
 
 				}
 
-				sql = sql.replace(replace,
-						"#{" + bindName
-								+ (null != typeHandler
-										? (",typeHandler=" + typeHandler.getName()) : "")
-								+ "}");
+				sql = sql.replace(replace, "#{" + bindName
+						+ (null != typeHandler ? (",typeHandler=" + typeHandler) : "")
+						+ "}");
 
 			}
 

spring-data-mybatis/src/test/java/org/springframework/data/mybatis/repository/sample/UserRepository.java

@@ -64,8 +64,8 @@ List<User> findByEmailAddressAndLastnameOrFirstname(String emailAddress,
 
 	@Transactional
 	@Modifying
-	@Query("update ds_user set lastname = ?1")
-	void renameAllUsersTo(String lastname);
+	@Query("update ds_user set lastname=:lastname")
+	void renameAllUsersTo(@Param("lastname") String lastname);
 
 	List<User> findByFirstnameOrLastname(@Param("lastname") String lastname,
 			@Param("firstname") String firstname);