Merge remote-tracking branch 'origin/master'

Author: hewei

src/main/java/com/itfsw/mybatis/generator/plugins/MapperAnnotationPlugin.java

@@ -21,79 +21,53 @@
 import org.mybatis.generator.api.dom.java.FullyQualifiedJavaType;
 import org.mybatis.generator.api.dom.java.Interface;
 import org.mybatis.generator.api.dom.java.TopLevelClass;
-import org.mybatis.generator.internal.util.StringUtility;
 
-import java.util.*;
+import java.util.Map;
+import java.util.Properties;
 
 /**
  * ---------------------------------------------------------------------------
  *
  * ---------------------------------------------------------------------------
+ *
  * @author: hewei
  * @time:2019/7/9 14:30
  * ---------------------------------------------------------------------------
  */
 public class MapperAnnotationPlugin extends BasePlugin {
-    private final static Map<String, String> ANNOTATION_IMPORTS;
-
-    static {
-        ANNOTATION_IMPORTS = new HashMap<>();
-        ANNOTATION_IMPORTS.put("@Mapper", "org.apache.ibatis.annotations.Mapper");
-        ANNOTATION_IMPORTS.put("@Repository", "org.springframework.stereotype.Repository");
-    }
-
-    private List<String> annotations;
-
-    /**
-     * 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html
-     * @param introspectedTable
-     * @return
-     */
-    @Override
-    public void initialized(IntrospectedTable introspectedTable) {
-        super.initialized(introspectedTable);
 
-        this.annotations = new ArrayList<>();
-        Properties properties = this.getProperties();
-        boolean findMapper = false;
-        for (Object key : properties.keySet()) {
-            String annotation = key.toString().trim();
-            if (annotation.startsWith("@Mapper")) {
-                findMapper = true;
-            }
+	/**
+	 * 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html
+	 * @param introspectedTable
+	 * @return
+	 */
+	@Override
+	public void initialized(IntrospectedTable introspectedTable) {
+		super.initialized(introspectedTable);
+	}
 
-            if (StringUtility.isTrue(properties.getProperty(key.toString()))) {
-                this.annotations.add(annotation);
-            }
-        }
+	/**
+	 * 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html
+	 * @param interfaze
+	 * @param topLevelClass
+	 * @param introspectedTable
+	 * @return
+	 */
+	@Override
+	public boolean clientGenerated(Interface interfaze, TopLevelClass topLevelClass,
+			IntrospectedTable introspectedTable) {
 
-        if (!findMapper) {
-            this.annotations.add(0, "@Mapper");
-        }
-    }
+		Properties properties = getProperties();
+		String annotationName;
+		String annotationImport;
+		for (Map.Entry<Object, Object> prop : properties.entrySet()) {
+			annotationName = (String) prop.getKey();
+			annotationImport = (String) prop.getValue();
+			interfaze.addImportedType(new FullyQualifiedJavaType(annotationImport));
+			interfaze.addAnnotation(annotationName);
+		}
 
-    /**
-     * 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html
-     * @param interfaze
-     * @param topLevelClass
-     * @param introspectedTable
-     * @return
-     */
-    @Override
-    public boolean clientGenerated(Interface interfaze, TopLevelClass topLevelClass, IntrospectedTable introspectedTable) {
-        for (String annotation : this.annotations) {
-            if (annotation.equals("@Mapper")) {
-                if (introspectedTable.getTargetRuntime() == IntrospectedTable.TargetRuntime.MYBATIS3) {
-                    // don't need to do this for MYBATIS3_DSQL as that runtime already adds this annotation
-                    interfaze.addImportedType(new FullyQualifiedJavaType(ANNOTATION_IMPORTS.get(annotation)));
-                    interfaze.addAnnotation(annotation);
-                }
-            } else if (ANNOTATION_IMPORTS.get(annotation) != null) {
-                interfaze.addImportedType(new FullyQualifiedJavaType(ANNOTATION_IMPORTS.get(annotation)));
-                interfaze.addAnnotation(annotation);
-            }
-        }
+		return true;
+	}
 
-        return true;
-    }
 }