remove generated methods during merger

chuntungho · Jun 5, 2019 · 1d23f64 · 1d23f64
1 parent dab4f2c
commit 1d23f64
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/src/main/java/com/chuntung/plugin/mybatisbuilder/generator/GeneratorToolWrapper.java b/src/main/java/com/chuntung/plugin/mybatisbuilder/generator/GeneratorToolWrapper.java
@@ -176,7 +176,7 @@ public static List<String> runWithConfigurationFile(String path) throws IOExcept
         List<String> warnings = new ArrayList<>();
         ConfigurationParser parser = new ConfigurationParser(warnings);
         Configuration configuration = parser.parseConfiguration(new File(path));
-        ShellCallback shellCallback = new DefaultShellCallback(true);
+        ShellCallback shellCallback = new CustomShellCallback(true);
         MyBatisGenerator generator = new MyBatisGenerator(configuration, shellCallback, warnings);
         ProgressCallback processCallback = new NullProgressCallback();
         generator.generate(processCallback);

diff --git a/src/main/java/com/chuntung/plugin/mybatisbuilder/generator/callback/CustomShellCallback.java b/src/main/java/com/chuntung/plugin/mybatisbuilder/generator/callback/CustomShellCallback.java
@@ -10,6 +10,8 @@
 import com.github.javaparser.ast.ImportDeclaration;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.body.MethodDeclaration;
+import com.github.javaparser.ast.body.TypeDeclaration;
+import org.mybatis.generator.config.MergeConstants;
 import org.mybatis.generator.exception.ShellException;
 import org.mybatis.generator.internal.DefaultShellCallback;
 
@@ -63,22 +65,30 @@ public String mergeJavaFile(String newFileSource,
     }
 
     public String mergerFile(CompilationUnit newCompilationUnit, CompilationUnit oldCompilationUnit) {
-        NodeList<ImportDeclaration> newImports = newCompilationUnit.getImports();
         NodeList<ImportDeclaration> oldImports = oldCompilationUnit.getImports();
+        NodeList<ImportDeclaration> newImports = newCompilationUnit.getImports();
 
         LinkedHashSet<ImportDeclaration> customImportSet = new LinkedHashSet<>(oldImports);
         customImportSet.removeAll(newImports);
         for (ImportDeclaration importDeclaration : customImportSet) {
             newCompilationUnit.addImport(importDeclaration);
         }
 
-        List<MethodDeclaration> newMethods = newCompilationUnit.getTypes().get(0).getMethods();
-        List<MethodDeclaration> oldMethods = oldCompilationUnit.getTypes().get(0).getMethods();
+        List<MethodDeclaration> oldMethods = oldCompilationUnit.getType(0).getMethods();
+        TypeDeclaration<?> typeDeclaration = newCompilationUnit.getType(0);
+        List<MethodDeclaration> newMethods = typeDeclaration.getMethods();
 
         LinkedHashSet<MethodDeclaration> customMethodSet = new LinkedHashSet<>(oldMethods);
         customMethodSet.removeAll(newMethods);
         for (MethodDeclaration methodDeclaration : customMethodSet) {
-            newCompilationUnit.getType(0).addMember(methodDeclaration);
+            if (methodDeclaration.getComment().isPresent()) {
+                if (methodDeclaration.getComment().get().getContent().contains(MergeConstants.NEW_ELEMENT_TAG)) {
+                    // skip generated methods
+                    continue;
+                }
+            }
+
+            typeDeclaration.addMember(methodDeclaration);
         }
 
         return newCompilationUnit.toString();

diff --git a/src/test/java/com/chuntung/plugin/mybatisbuilder/generator/GeneratorToolWrapperTest.java b/src/test/java/com/chuntung/plugin/mybatisbuilder/generator/GeneratorToolWrapperTest.java
@@ -41,7 +41,7 @@ public void generate() {
 
         TableInfo tableInfo = new TableInfo();
         tableInfo.setTableName("actions");
-        tableInfo.setDomainName("Action");
+        tableInfo.setDomainName("gene.Action");
         param.setSelectedTables(Arrays.asList(tableInfo));
 
         GeneratorToolWrapper tool = new GeneratorToolWrapper(param);

diff --git a/src/test/resources/generator-config.xml b/src/test/resources/generator-config.xml
@@ -5,14 +5,18 @@
 
 <generatorConfiguration>
   <context id="test" targetRuntime="MyBatis3">
+    <commentGenerator type="com.chuntung.plugin.mybatisbuilder.generator.CustomCommentGenerator">
+      <property name="addDatabaseRemark" value="true"/>
+    </commentGenerator>
+
     <jdbcConnection driverClass="org.sqlite.JDBC"
         connectionURL="jdbc:sqlite:/Users/tonyho/Downloads/ghost.db"
         userId=""
         password="">
     </jdbcConnection>
 
     <javaTypeResolver >
-      <property name="forceBigDecimals" value="false" />
+      <property name="forceBigDecimals" value="true" />
     </javaTypeResolver>
 
 	<javaModelGenerator targetPackage="mybatisbuilder.example.model" targetProject="./src/test/java">
@@ -28,7 +32,7 @@
       <property name="enableSubPackages" value="true" />
     </javaClientGenerator>
 
-    <table tableName="actions" domainObjectName="gen.Action"
+    <table tableName="clients" domainObjectName="gene.Client"
            enableSelectByExample="true"
            enableUpdateByExample="false"
            enableCountByExample="false"