Support only annotation type at 2nd argument on deprecated constructo…

…r of ProviderSqlSource See gh-1611
mybatis · Jul 22, 2019 · 4dbd30a · 4dbd30a
1 parent 4aa737f
commit 4dbd30a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 41 deletions.
diff --git a/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java b/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java
@@ -19,11 +19,9 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Lang;
-import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.builder.BuilderException;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.SqlSource;
@@ -63,15 +61,7 @@ public ProviderSqlSource(Configuration configuration, Object provider) {
    */
   @Deprecated
   public ProviderSqlSource(Configuration configuration, Object provider, Class<?> mapperType, Method mapperMethod) {
-    this(configuration, provider instanceof Annotation ? (Annotation) provider :
-        (Annotation) Proxy.newProxyInstance(SelectProvider.class.getClassLoader(), new Class<?>[]{SelectProvider.class},
-          (proxy, method, args) -> {
-            if (method.getName().equals("annotationType")) {
-              return SelectProvider.class;
-            }
-            return provider.getClass().getMethod(method.getName()).invoke(provider);
-          }),
-      mapperType, mapperMethod);
+    this(configuration, (Annotation) provider , mapperType, mapperMethod);
   }
 
   /**

diff --git a/src/test/java/org/apache/ibatis/submitted/sqlprovider/SqlProviderTest.java b/src/test/java/org/apache/ibatis/submitted/sqlprovider/SqlProviderTest.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.Reader;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -299,13 +300,13 @@ void methodOverload() throws NoSuchMethodException {
 
   @Test
   @SuppressWarnings("deprecation")
-  void notSqlProvider() {
+  void notSqlProvider() throws NoSuchMethodException {
+    Object testAnnotation = getClass().getDeclaredMethod("notSqlProvider").getAnnotation(Test.class);
     try {
-      new ProviderSqlSource(new Configuration(), new Object(), null, null);
+      new ProviderSqlSource(new Configuration(), testAnnotation);
       fail();
     } catch (BuilderException e) {
-      assertTrue(e.getMessage().contains("Error creating SqlSource for SqlProvider."));
-      assertTrue(e.getCause().getCause().getCause().getMessage().contains("java.lang.Object.type()"));
+      assertTrue(e.getMessage().contains("Error creating SqlSource for SqlProvider.  Cause: java.lang.NoSuchMethodException: org.junit.jupiter.api.Test.type()"));
     }
   }
 
@@ -650,15 +651,6 @@ void providerContextAndMap() {
     }
   }
 
-  @Test
-  @SuppressWarnings("deprecation")
-  void keepBackwardCompatibilityOnDeprecatedConstructor() throws NoSuchMethodException {
-    Class<?> mapperType = StaticMethodSqlProviderMapper.class;
-    Method mapperMethod = mapperType.getMethod("noArgument");
-    ProviderSqlSource sqlSource = new ProviderSqlSource(new Configuration(), new SqlProviderConfig(), mapperType, mapperMethod);
-    assertEquals("SELECT 1", sqlSource.getBoundSql(null).getSql());
-  }
-
   @Test
   @SuppressWarnings("deprecation")
   void keepBackwardCompatibilityOnDeprecatedConstructorWithAnnotation() throws NoSuchMethodException {
@@ -668,23 +660,6 @@ void keepBackwardCompatibilityOnDeprecatedConstructorWithAnnotation() throws NoS
     assertEquals("SELECT 1 FROM INFORMATION_SCHEMA.SYSTEM_USERS", sqlSource.getBoundSql(null).getSql());
   }
 
-  public static class SqlProviderConfig {
-    public Class<?> type() {
-      return SqlProvider.class;
-    }
-    public Class<?> value() {
-      return void.class;
-    }
-    public String method() {
-      return "provideSql";
-    }
-    public static class SqlProvider {
-      public static String provideSql() {
-        return "SELECT 1";
-      }
-    }
-  }
-
   public interface ErrorMapper {
     @SelectProvider(type = ErrorSqlBuilder.class, method = "methodNotFound")
     void methodNotFound();