Use dumb if-else instead of reflection

Also slightly loosen the validation and it is now possible to mix provider and non-provider annotations if the databaseIds are different. See the new tests.
mnisummer · May 5, 2020 · 4aba814 · 4aba814
1 parent b165e81
commit 4aba814
Show file tree

Hide file tree

Showing 13 changed files with 195 additions and 272 deletions.
diff --git a/src/main/java/org/apache/ibatis/annotations/Delete.java b/src/main/java/org/apache/ibatis/annotations/Delete.java
@@ -15,9 +15,6 @@
  */
 package org.apache.ibatis.annotations;
 
-import org.apache.ibatis.builder.annotation.StatementAnnotationMetadata;
-import org.apache.ibatis.mapping.SqlCommandType;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
@@ -44,7 +41,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 @Repeatable(Delete.List.class)
-@StatementAnnotationMetadata(commandType = SqlCommandType.DELETE)
 public @interface Delete {
   /**
    * Returns an SQL for deleting record(s).
@@ -67,7 +63,6 @@
   @Documented
   @Retention(RetentionPolicy.RUNTIME)
   @Target(ElementType.METHOD)
-  @StatementAnnotationMetadata(commandType = SqlCommandType.DELETE)
   @interface List {
     Delete[] value();
   }

diff --git a/src/main/java/org/apache/ibatis/annotations/DeleteProvider.java b/src/main/java/org/apache/ibatis/annotations/DeleteProvider.java
@@ -15,9 +15,6 @@
  */
 package org.apache.ibatis.annotations;
 
-import org.apache.ibatis.builder.annotation.StatementAnnotationMetadata;
-import org.apache.ibatis.mapping.SqlCommandType;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
@@ -52,7 +49,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 @Repeatable(DeleteProvider.List.class)
-@StatementAnnotationMetadata(commandType = SqlCommandType.DELETE)
 public @interface DeleteProvider {
 
   /**
@@ -111,7 +107,6 @@
   @Documented
   @Retention(RetentionPolicy.RUNTIME)
   @Target(ElementType.METHOD)
-  @StatementAnnotationMetadata(commandType = SqlCommandType.DELETE)
   @interface List {
     DeleteProvider[] value();
   }

diff --git a/src/main/java/org/apache/ibatis/annotations/Insert.java b/src/main/java/org/apache/ibatis/annotations/Insert.java
@@ -15,9 +15,6 @@
  */
 package org.apache.ibatis.annotations;
 
-import org.apache.ibatis.builder.annotation.StatementAnnotationMetadata;
-import org.apache.ibatis.mapping.SqlCommandType;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
@@ -44,7 +41,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 @Repeatable(Insert.List.class)
-@StatementAnnotationMetadata(commandType = SqlCommandType.INSERT)
 public @interface Insert {
   /**
    * Returns an SQL for inserting record(s).
@@ -67,7 +63,6 @@
   @Documented
   @Retention(RetentionPolicy.RUNTIME)
   @Target(ElementType.METHOD)
-  @StatementAnnotationMetadata(commandType = SqlCommandType.INSERT)
   @interface List {
     Insert[] value();
   }

diff --git a/src/main/java/org/apache/ibatis/annotations/InsertProvider.java b/src/main/java/org/apache/ibatis/annotations/InsertProvider.java
@@ -15,9 +15,6 @@
  */
 package org.apache.ibatis.annotations;
 
-import org.apache.ibatis.builder.annotation.StatementAnnotationMetadata;
-import org.apache.ibatis.mapping.SqlCommandType;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
@@ -52,7 +49,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 @Repeatable(InsertProvider.List.class)
-@StatementAnnotationMetadata(commandType = SqlCommandType.INSERT)
 public @interface InsertProvider {
 
   /**
@@ -111,7 +107,6 @@
   @Documented
   @Retention(RetentionPolicy.RUNTIME)
   @Target(ElementType.METHOD)
-  @StatementAnnotationMetadata(commandType = SqlCommandType.INSERT)
   @interface List {
     InsertProvider[] value();
   }

diff --git a/src/main/java/org/apache/ibatis/annotations/Select.java b/src/main/java/org/apache/ibatis/annotations/Select.java
@@ -15,9 +15,6 @@
  */
 package org.apache.ibatis.annotations;
 
-import org.apache.ibatis.builder.annotation.StatementAnnotationMetadata;
-import org.apache.ibatis.mapping.SqlCommandType;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
@@ -44,7 +41,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 @Repeatable(Select.List.class)
-@StatementAnnotationMetadata(commandType = SqlCommandType.SELECT)
 public @interface Select {
   /**
    * Returns an SQL for retrieving record(s).
@@ -67,7 +63,6 @@
   @Documented
   @Retention(RetentionPolicy.RUNTIME)
   @Target(ElementType.METHOD)
-  @StatementAnnotationMetadata(commandType = SqlCommandType.SELECT)
   @interface List {
     Select[] value();
   }

diff --git a/src/main/java/org/apache/ibatis/annotations/SelectProvider.java b/src/main/java/org/apache/ibatis/annotations/SelectProvider.java
@@ -15,9 +15,6 @@
  */
 package org.apache.ibatis.annotations;
 
-import org.apache.ibatis.builder.annotation.StatementAnnotationMetadata;
-import org.apache.ibatis.mapping.SqlCommandType;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
@@ -52,7 +49,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 @Repeatable(SelectProvider.List.class)
-@StatementAnnotationMetadata(commandType = SqlCommandType.SELECT)
 public @interface SelectProvider {
 
   /**
@@ -111,7 +107,6 @@
   @Documented
   @Retention(RetentionPolicy.RUNTIME)
   @Target(ElementType.METHOD)
-  @StatementAnnotationMetadata(commandType = SqlCommandType.SELECT)
   @interface List {
     SelectProvider[] value();
   }

diff --git a/src/main/java/org/apache/ibatis/annotations/Update.java b/src/main/java/org/apache/ibatis/annotations/Update.java
@@ -15,9 +15,6 @@
  */
 package org.apache.ibatis.annotations;
 
-import org.apache.ibatis.builder.annotation.StatementAnnotationMetadata;
-import org.apache.ibatis.mapping.SqlCommandType;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
@@ -44,7 +41,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 @Repeatable(Update.List.class)
-@StatementAnnotationMetadata(commandType = SqlCommandType.UPDATE)
 public @interface Update {
   /**
    * Returns an SQL for updating record(s).
@@ -67,7 +63,6 @@
   @Documented
   @Retention(RetentionPolicy.RUNTIME)
   @Target(ElementType.METHOD)
-  @StatementAnnotationMetadata(commandType = SqlCommandType.UPDATE)
   @interface List {
     Update[] value();
   }

diff --git a/src/main/java/org/apache/ibatis/annotations/UpdateProvider.java b/src/main/java/org/apache/ibatis/annotations/UpdateProvider.java
@@ -15,9 +15,6 @@
  */
 package org.apache.ibatis.annotations;
 
-import org.apache.ibatis.builder.annotation.StatementAnnotationMetadata;
-import org.apache.ibatis.mapping.SqlCommandType;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
@@ -52,7 +49,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 @Repeatable(UpdateProvider.List.class)
-@StatementAnnotationMetadata(commandType = SqlCommandType.UPDATE)
 public @interface UpdateProvider {
 
   /**
@@ -111,7 +107,6 @@
   @Documented
   @Retention(RetentionPolicy.RUNTIME)
   @Target(ElementType.METHOD)
-  @StatementAnnotationMetadata(commandType = SqlCommandType.UPDATE)
   @interface List {
     UpdateProvider[] value();
   }