Related to #639. Added failing test case and possible fix.

Author: emacarron

src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java

@@ -80,7 +80,7 @@ private SqlSource createSqlSource(Object parameterObject) {
       String sql;
       if (parameterTypes.length == 0) {
         sql = (String) providerMethod.invoke(providerType.newInstance());
-      } else if (parameterTypes.length == 1) {
+      } else if (parameterTypes[0].isAssignableFrom(parameterObject.getClass())) {
         sql = (String) providerMethod.invoke(providerType.newInstance(), parameterObject);
       } else if (parameterObject instanceof Map) {
         @SuppressWarnings("unchecked")

src/main/java/org/apache/ibatis/builder/xml/XMLMapperEntityResolver.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2016 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

src/test/java/org/apache/ibatis/submitted/sqlprovider/Mapper.java

@@ -27,7 +27,7 @@ public interface Mapper {
 
   @SelectProvider(type = OurSqlBuilder.class, method = "buildGetUserQuery")
   User getUser(Integer userId);
-
+ 
   @SelectProvider(type = OurSqlBuilder.class, method = "buildGetAllUsersQuery")
   List<User> getAllUsers();
 
@@ -43,7 +43,10 @@ public interface Mapper {
   @SelectProvider(type = OurSqlBuilder.class, method = "buildGetUsersByNameUsingMap")
   List<User> getUsersByNameUsingMap(String name, String orderByColumn);
 
+  @SelectProvider(type = OurSqlBuilder.class, method = "buildGetUsersByNameWithParamNameAndOrderByQuery")
+  List<User> getUsersByNameWithParamNameAndOrderBy(@Param("name") String name, @Param("orderByColumn") String orderByColumn);
+
   @SelectProvider(type = OurSqlBuilder.class, method = "buildGetUsersByNameWithParamNameQuery")
-  List<User> getUsersByNameWithParamName(@Param("name") String name, @Param("orderByColumn") String orderByColumn);
+  List<User> getUsersByNameWithParamName(@Param("name") String name);
 
 }

src/test/java/org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java

@@ -101,7 +101,7 @@ public String buildGetUsersByNameUsingMap(Map<String, Object> params) {
     }}.toString();
   }
 
-  public String buildGetUsersByNameWithParamNameQuery(@Param("orderByColumn") final String orderByColumn, @Param("name") final String name) {
+  public String buildGetUsersByNameWithParamNameAndOrderByQuery(@Param("orderByColumn") final String orderByColumn, @Param("name") final String name) {
     return new SQL(){{
       SELECT("*");
       FROM("users");
@@ -112,6 +112,17 @@ public String buildGetUsersByNameWithParamNameQuery(@Param("orderByColumn") fina
     }}.toString();
   }
 
+  public String buildGetUsersByNameWithParamNameQuery(@Param("name") final String name) {
+    return new SQL(){{
+      SELECT("*");
+      FROM("users");
+      if (name != null) {
+        WHERE("name like #{name} || '%'");
+      }
+      ORDER_BY("id DESC");
+    }}.toString();
+  }
+
   public String buildGetUsersByNameWithParamNameQueryUsingMap(Map<String, Object> params) {
     final String name = String.class.cast(params.get("name"));
     final String orderByColumn = String.class.cast(params.get("orderByColumn"));

src/test/java/org/apache/ibatis/submitted/sqlprovider/SqlProviderTest.java

@@ -208,11 +208,11 @@ public void shouldGetUsersByNameUsingMap() {
 
   // Test for multiple parameter with @Param
   @Test
-  public void shouldGetUsersByNameWithParamName() {
+  public void shouldGetUsersByNameWithParamNameAndOrderBy() {
     SqlSession sqlSession = sqlSessionFactory.openSession();
     try {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
-      List<User> users = mapper.getUsersByNameWithParamName("User", "id DESC");
+      List<User> users = mapper.getUsersByNameWithParamNameAndOrderBy("User", "id DESC");
       assertEquals(4, users.size());
       assertEquals("User4", users.get(0).getName());
       assertEquals("User3", users.get(1).getName());
@@ -229,7 +229,7 @@ public void shouldGetUsersByNameWithParamNameUsingMap() {
     SqlSession sqlSession = sqlSessionFactory.openSession();
     try {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
-      List<User> users = mapper.getUsersByNameWithParamName("User", "id DESC");
+      List<User> users = mapper.getUsersByNameWithParamNameAndOrderBy("User", "id DESC");
       assertEquals(4, users.size());
       assertEquals("User4", users.get(0).getName());
       assertEquals("User3", users.get(1).getName());
@@ -240,6 +240,23 @@ public void shouldGetUsersByNameWithParamNameUsingMap() {
     }
   }
 
+  // Test for map with @Param
+  @Test
+  public void shouldGetUsersByNameWithParamName() {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      List<User> users = mapper.getUsersByNameWithParamName("User");
+      assertEquals(4, users.size());
+      assertEquals("User4", users.get(0).getName());
+      assertEquals("User3", users.get(1).getName());
+      assertEquals("User2", users.get(2).getName());
+      assertEquals("User1", users.get(3).getName());
+    } finally {
+      sqlSession.close();
+    }
+  }
+  
   @Test
   public void methodNotFound() throws NoSuchMethodException {
     expectedException.expect(BuilderException.class);