From 6425753f43ced00648cd5ab1324cfcb53db526d9 Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Tue, 8 Mar 2022 13:39:27 -0500
Subject: [PATCH 1/3] Documentation Updates

---
 core/mybatis-generator-core/pom.xml           |  7 +-
 core/mybatis-generator-core/src/site/site.xml |  5 +-
 .../xhtml/generatedobjects/dynamicSql.xhtml   |  8 +-
 .../generatedobjects/dynamicSqlKotlin.xhtml   | 49 ++++++------
 .../src/site/xhtml/reference/building.xhtml   |  8 +-
 .../src/site/xhtml/reference/logging.xhtml    | 75 +++++++++++--------
 .../site/xhtml/running/runningWithMaven.xhtml |  2 +-
 .../src/test/resources/log4j.properties       | 30 --------
 .../src/test/resources/logback.xml            | 28 +++++++
 .../src/main/resources/log4j.properties       | 32 --------
 10 files changed, 112 insertions(+), 132 deletions(-)
 delete mode 100644 core/mybatis-generator-core/src/test/resources/log4j.properties
 create mode 100644 core/mybatis-generator-core/src/test/resources/logback.xml
 delete mode 100644 core/mybatis-generator-systests-mybatis3/src/main/resources/log4j.properties

diff --git a/core/mybatis-generator-core/pom.xml b/core/mybatis-generator-core/pom.xml
index d616fc7427..836107a506 100644
--- a/core/mybatis-generator-core/pom.xml
+++ b/core/mybatis-generator-core/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2021 the original author or authors.
+       Copyright 2006-2022 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.
@@ -182,6 +182,11 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
diff --git a/core/mybatis-generator-core/src/site/site.xml b/core/mybatis-generator-core/src/site/site.xml
index 46fa1193ea..65b82ec718 100644
--- a/core/mybatis-generator-core/src/site/site.xml
+++ b/core/mybatis-generator-core/src/site/site.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2020 the original author or authors.
+       Copyright 2006-2022 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.
@@ -64,7 +64,7 @@
         <item href="configreference/table.html" name="&amp;lt;table&amp;gt;" />
       </item>
       <item href="generatedobjects/results.html" name="Using the Generated Objects" collapse="true" >
-        <item href="generatedobjects/dynamicSqlV2.html" name="MyBatis Dynamic SQL Usage Notes" />
+        <item href="generatedobjects/dynamicSql.html" name="MyBatis Dynamic SQL Usage Notes" />
         <item href="generatedobjects/dynamicSqlKotlin.html" name="MyBatis Dynamic SQL with Kotlin Usage Notes" />
         <item href="generatedobjects/legacy.html" name="Legacy Generators">
           <item href="generatedobjects/javamodel.html" name="Java Model Objects" />
@@ -73,7 +73,6 @@
           <item href="generatedobjects/exampleClassUsage.html" name="Example Class Usage Notes" />
           <item href="generatedobjects/extendingExampleClass.html" name="Extending the Example Classes" />
         </item>
-        <item href="generatedobjects/dynamicSqlV1.html" name="MyBatis Dynamic SQL Usage Notes - V1 (Deprecated)" />
       </item>
       <item href="usage/intro.html" name="Database Specific Information" collapse="true" >
         <item href="usage/db2.html" name="DB2" />
diff --git a/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSql.xhtml b/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSql.xhtml
index 0b29c49c55..2cce19d6a5 100644
--- a/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSql.xhtml
+++ b/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSql.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2021 the original author or authors.
+       Copyright 2006-2022 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.
@@ -46,7 +46,7 @@ about how the library works.</p>
   <li>Model classes are always generated in the "flat" model meaning there is no separate primary key class or BLOBs class</li>
   <li>Java 8 or higher is required</li>
   <li>MyBatis 3.4.2 or higher is required</li>
-  <li>MyBatis Dynamic SQL 1.1.3 or higher is required</li>
+  <li>MyBatis Dynamic SQL 1.3.1 or higher is required</li>
 </ul>
 
 <h2>Format of the "Support" classes</h2>
@@ -69,12 +69,12 @@ public final class TableCodeDynamicSqlSupport {
     public static final SqlColumn&lt;Integer&gt; id = tableCode.id;
     public static final SqlColumn&lt;String&gt; description = tableCode.description;
 
-    public static final class TableCode extends SqlTable {
+    public static final class TableCode extends AliasableSqlTable&lt;TableCode&gt; {
         public final SqlColumn&lt;Integer&gt; id = column("ID", JDBCType.INTEGER);
         public final SqlColumn&lt;String&gt; description = column("DESCRIPTION", JDBCType.VARCHAR);
 
         public TableCode() {
-            super("MYSCHEMA.TABLE_CODE");
+            super("MYSCHEMA.TABLE_CODE", TableCode::new);
         }
     }
 }
diff --git a/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSqlKotlin.xhtml b/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSqlKotlin.xhtml
index 63d6d0da3c..dd92cfee89 100644
--- a/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSqlKotlin.xhtml
+++ b/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSqlKotlin.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2021 the original author or authors.
+       Copyright 2006-2022 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.
@@ -35,13 +35,13 @@ about how the library works. In particular, see the
 <h2>Generated Files</h2>
 <p>For each introspected table, the generator will generate four Kotlin files:</p>
 <ol>
-  <li>A Kotlin data class that represents a row in the table. By default the class will be named based
+  <li>A Kotlin data class that represents a row in the table. By default, the class will be named based
     on the table name</li>
   <li>A "support" class that includes a table definition and column definitions for the database table</li>
-  <li>A mapper interface with the basic MyBatis mapper methods</li>
-  <li>A mapper extensions file with extension methods that simplify and reuse the methods in the basic interface.
-  This is similar to the default interface methods generated in the other runtimes, but it is accomplished
-  with extension methods in Kotlin. </li>
+  <li>A mapper interface with the basic MyBatis mapper methods and extension methods that simplify reuse of the basic
+      mapper methods. This is similar to the default interface methods generated in the other runtimes, but it is accomplished
+      with extension methods in Kotlin.
+  </li>
 </ol>
 
 <p>Important notes about the generated objects:</p>
@@ -54,7 +54,7 @@ about how the library works. In particular, see the
   <li>Java 8 or higher is required</li>
   <li>Any recent version of Kotlin should work</li>
   <li>MyBatis 3.4.2 or higher is required</li>
-  <li>MyBatis Dynamic SQL 1.1.4 or higher is required</li>
+  <li>MyBatis Dynamic SQL 1.4.0 or higher is required</li>
 </ul>
 
 <h2>Format of the "Support" classes</h2>
@@ -69,7 +69,7 @@ will write.</p>
 package example
 
 import java.sql.JDBCType
-import org.mybatis.dynamic.sql.SqlTable
+import org.mybatis.dynamic.sql.AliasableSqlTable
 import org.mybatis.dynamic.sql.util.kotlin.elements.column
 
 object TableCodeDynamicSqlSupport {
@@ -77,7 +77,7 @@ object TableCodeDynamicSqlSupport {
     val id = tableCode.id
     val description = tableCode.description
 
-    class TableCode : SqlTable("MYSCHEMA.TABLE_CODE") {
+    class TableCode : AliasableSqlTable&lt;TableCode&gt;("MYSCHEMA.TABLE_CODE", ::TableCode) {
         val id = column&lt;Int&gt;(name = "ID", jdbcType = JDBCType.INTEGER)
         val description = column&lt;String&gt;(name = "DESCRIPTION", jdbcType = JDBCType.VARCHAR)
     }
@@ -137,16 +137,13 @@ import example.TableCodeDynamicSqlSupport.tableCode
 import example.TableCodeDynamicSqlSupport.description
 import example.TableCodeDynamicSqlSupport.id
 
-// import MyBatis Dynamic SQL where support
-import org.mybatis.dynamic.sql.SqlBuilder.*
-
 class SomeService {
 
     fun simpleWhere() {
         ...
         // Simple WHERE clause
         val records = mapper.select {
-            where(id, isEqualTo(3))
+            where { id isEqualTo 3 }
         }
         ...
     }
@@ -155,8 +152,8 @@ class SomeService {
         ...
         // Simple WHERE clause with OR
         val records = mapper.select {
-            where(id, isEqualTo(3))
-            or(description, isLike("f%"))
+            where { id isEqualTo 3 }
+            or { description isLike "f%" }
         }
         ...
     }
@@ -165,10 +162,11 @@ class SomeService {
         ...
         // complex WHERE and ORDER BY
         val records = mapper.select {
-            where(id, isLessThan(10)) {
-                and(description, isEqualTo("foo"))
+            where {
+                id isLessThan 10
+                and { description isEqualTo "foo" }
             }
-            or(description, isLike("b%"))
+            or { description isLike "b%" }
             orderBy(id.descending())
         }        
         ...
@@ -186,18 +184,15 @@ import example.TableCodeDynamicSqlSupport.tableCode
 import example.TableCodeDynamicSqlSupport.description
 import example.TableCodeDynamicSqlSupport.id
 
-// import MyBatis Dynamic SQL where support
-import org.mybatis.dynamic.sql.SqlBuilder.*
-
 class SomeService {
 
     fun simpleUpdate() {
         ...
         // Flexible update - no backing record needed
         val rows = mapper.update {
-            set(id).equalTo(1)
+            set(id) equalTo 1
             set(description).equalToNull()
-            where(id, isEqualTo(3))
+            where { id isEqualTo 3 }
         }
         ...
     }
@@ -207,8 +202,8 @@ class SomeService {
         // Update like the old updateByExample method
         val rows =  mapper.update {
             updateAllColumns(row)
-            where(id, isEqualTo(3))
-            or(description, isLike("f%"))
+            where { id isEqualTo 3 }
+            or { description isLike "f%" }
         }
         ...
     }
@@ -218,8 +213,8 @@ class SomeService {
         // Update like the old updateByExampleSelective method
         val rows =  mapper.update {
             updateSelectiveColumns(row)
-            where(id, isEqualTo(3))
-            or(description, isLike("f%"))
+            where { id isEqualTo 3 }
+            or { description isLike "f%" }
         }
         ...
     }
diff --git a/core/mybatis-generator-core/src/site/xhtml/reference/building.xhtml b/core/mybatis-generator-core/src/site/xhtml/reference/building.xhtml
index 6037c2e2a2..b2f59eb58d 100644
--- a/core/mybatis-generator-core/src/site/xhtml/reference/building.xhtml
+++ b/core/mybatis-generator-core/src/site/xhtml/reference/building.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2019 the original author or authors.
+       Copyright 2006-2022 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.
@@ -50,9 +50,9 @@ at GitHub then follow these steps:</p>
     <a target="_blank" href="https://github.com/mybatis/generator">
     https://github.com/mybatis/generator</a>
   </li>
-  <li>Open a command window in the directory where you checked out the source and
-      run the command <code>mvn clean install</code> - or any of the other Maven lifecycle commands.
-  </li>
+  <li>Open a command window in the directory where you checked out the source</li>
+  <li><code>cd core</code></li>
+  <li>Run the command <code>mvn clean install</code> - or any of the other Maven lifecycle commands.</li>
 </ol>
 
 
diff --git a/core/mybatis-generator-core/src/site/xhtml/reference/logging.xhtml b/core/mybatis-generator-core/src/site/xhtml/reference/logging.xhtml
index df62645d71..61a6604025 100644
--- a/core/mybatis-generator-core/src/site/xhtml/reference/logging.xhtml
+++ b/core/mybatis-generator-core/src/site/xhtml/reference/logging.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2016 the original author or authors.
+       Copyright 2006-2022 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.
@@ -47,20 +47,34 @@ to enable logging as well as asking MBG to be verbose with progress messages.
 This may generate a substantial output, but it will also give a very complete
 picture of what's happening internally during the MBG run.</p>
 
-<p>MBG will use Apache Log4J logging if Log4J is in the runtime classpath.
-See <a href="http://logging.apache.org/log4j/">http://logging.apache.org/log4j/</a>
-for more information about Log4J.  If Log4J is not in the runtime classpath,
-MBG will use standard Java logging.</p>
-<p>If for any reason you prefer to force the use of standard Java logging, even
-if Log4J is in the runtime classpath, you may specify the <code>-forceJavaLogging</code>
-command line argument, or specify the following line of code when running
-MBG from Java:</p>
-<p><code>org.mybatis.generator.logging.LogFactory.forceJavaLogging();</code></p>
-<p><b>Important:</b> You should specify the above line of code <i>before</i> any other MBG code.</p>
+<p>By default, MBG will use SLF4J logging if it is on the runtime classpath.
+See <a href="https://www.slf4j.org/">https://www.slf4j.org/</a>
+for more information about SLF4J.  If SLF4J is not in the runtime classpath,
+MBG will search for logging implementations in the following order:</p>
+<ol>
+    <li>SLF4J</li>
+    <li>Jakarta Commons Logging</li>
+    <li>Log4J V2</li>
+    <li>JDK Standard logging</li>
+</ol>
+<p>If for any reason you prefer to force the use of JDK standard logging, even
+if other implementations are on the runtime classpath, you may specify the command line
+options <code>-forceJavaLogging</code>.</p>
+<p>If you are running MBG from Java, you can also call one of the following methods to force a particular logging
+implementation:</p>
+<ul>
+    <li><code>org.mybatis.generator.logging.LogFactory.forceJavaLogging();</code></li>
+    <li><code>org.mybatis.generator.logging.LogFactory.forceSlf4jLogging();</code></li>
+    <li><code>org.mybatis.generator.logging.LogFactory.forceCommonsLogging();</code></li>
+    <li><code>org.mybatis.generator.logging.LogFactory.forceLog4j2Logging();</code></li>
+    <li><code>org.mybatis.generator.logging.LogFactory.forceNoLogging();</code></li>
+</ul>
+
+<p><b>Important:</b> You should call these methods <i>before</i> any other MBG code.</p>
 
 <h2>Supplying an Alternate Implementation</h2>
-<p>If you prefer to use a different logging implementation than Log4J or
-standard Java logging, you may supply an alternate implementation of the key logging
+<p>If you prefer to use a different logging implementation than one of the build in implementations,
+you may supply an alternate implementation of the key logging
 interfaces as follows:</p>
 <ol>
   <li>Create an implementation of the <code>org.mybatis.generator.logging.Log</code>
@@ -73,31 +87,32 @@ interfaces as follows:</p>
       and supplying an instance of your <code>AbstractLogFactory</code> implementation.</li>
 </ol>
 
-<h2>Configuring Log4J Logging</h2>
-<p>The following is a sample Log4J configuration file:</p>
+<h2>Configuring SLF4J Logging</h2>
+<p>The following is a sample Logback configuration file (Logback is the default implementation of SLF4J):</p>
 <pre>
-# Set root logger
-log4j.rootLogger=INFO, A1
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r %-5p %c - %m%n
-
-# MBG logging configuration...
-log4j.logger.org.mybatis.generator=DEBUG
+&lt;configuration&gt;
+  &lt;appender name="Console" class="ch.qos.logback.core.ConsoleAppender"&gt;
+    &lt;encoder&gt;
+      &lt;pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n&lt;/pattern&gt;
+    &lt;/encoder&gt;
+  &lt;/appender&gt;
+  &lt;logger name="org.mybatis.generator" level="debug" /&gt;
+  &lt;root level="error"&gt;
+    &lt;appender-ref ref="Console" /&gt;
+  &lt;/root&gt;
+&lt;/configuration&gt;
 </pre>
-<p>This file will instruct Log4J to write all MBG debug messages
+
+<p>This file will instruct SLF4J to write all MBG debug messages
 to the console.  To use this file:</p>
 <ol>
-  <li>Create a file called <code>log4j.properties</code> in the
+  <li>Create a file called <code>logback.xml</code> in the
       root of your runtime classpath</li>
   <li>Copy the above entries into the new file</li>
-  <li>Run MBG with the Log4J JAR file also in the runtime
-      classpath.</li>
+  <li>Run MBG with Logback classic as a dependency in your POM.</li>
 </ol>
 <p>You should see many log messages in the console.</p>
-<p>You may also configure Log4J in any of the other supported
+<p>You may also configure SLF4J in any of the other supported
 methods if you prefer.</p>
 
 <h2>Configuring Java Logging</h2>
diff --git a/core/mybatis-generator-core/src/site/xhtml/running/runningWithMaven.xhtml b/core/mybatis-generator-core/src/site/xhtml/running/runningWithMaven.xhtml
index 9cb6c5846e..afd0a49d02 100644
--- a/core/mybatis-generator-core/src/site/xhtml/running/runningWithMaven.xhtml
+++ b/core/mybatis-generator-core/src/site/xhtml/running/runningWithMaven.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2019 the original author or authors.
+       Copyright 2006-2022 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.
diff --git a/core/mybatis-generator-core/src/test/resources/log4j.properties b/core/mybatis-generator-core/src/test/resources/log4j.properties
deleted file mode 100644
index f3dc677637..0000000000
--- a/core/mybatis-generator-core/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#    Copyright 2006-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.
-#    You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-# log4j.properties for 
-
-# Set root category priority to ERROR and its only appender to LOGFILE.
-log4j.rootCategory=ERROR, CONSOLE
-
-#Spring Framework
-#log4j.logger.org.springframework=DEBUG
-#log4j.logger.org.springframework.orm=DEBUG
-#log4j.logger.org.springframework.transaction=DEBUG
-
-# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-d{HH:mm:ss} %-5p %60.60c %-25.25M %m%n
diff --git a/core/mybatis-generator-core/src/test/resources/logback.xml b/core/mybatis-generator-core/src/test/resources/logback.xml
new file mode 100644
index 0000000000..334c1edf76
--- /dev/null
+++ b/core/mybatis-generator-core/src/test/resources/logback.xml
@@ -0,0 +1,28 @@
+<!--
+
+       Copyright 2006-2022 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.
+       You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+       See the License for the specific language governing permissions and
+       limitations under the License.
+
+-->
+<configuration>
+  <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+  <logger name="org.mybatis.generator" level="debug" />
+  <root level="error">
+    <appender-ref ref="Console" />
+  </root>
+</configuration>
diff --git a/core/mybatis-generator-systests-mybatis3/src/main/resources/log4j.properties b/core/mybatis-generator-systests-mybatis3/src/main/resources/log4j.properties
deleted file mode 100644
index e14935d5f9..0000000000
--- a/core/mybatis-generator-systests-mybatis3/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#    Copyright 2006-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.
-#    You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-# log4j.properties for 
-
-# Set root category priority to ERROR and its only appender to LOGFILE.
-log4j.rootCategory=ERROR, CONSOLE
-
-#Spring Framework
-#log4j.logger.org.springframework=DEBUG
-#log4j.logger.org.springframework.orm=DEBUG
-#log4j.logger.org.springframework.transaction=DEBUG
-
-#log4j.logger.java.sql=DEBUG
-
-# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-d{HH:mm:ss} %-5p %60.60c %-25.25M %m%n

From daf3e68f2eeb1a8d4bf45d100afbbbbed552ba71 Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Tue, 8 Mar 2022 13:59:51 -0500
Subject: [PATCH 2/3] Documentation Updates

---
 .../xhtml/generatedobjects/dynamicSql.xhtml   | 15 ++++++-------
 .../generatedobjects/dynamicSqlKotlin.xhtml   | 21 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSql.xhtml b/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSql.xhtml
index 2cce19d6a5..ae0ed19f61 100644
--- a/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSql.xhtml
+++ b/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSql.xhtml
@@ -87,16 +87,17 @@ in either a direct or qualified manner - "id" or "tableCode.id".</p>
 <h2>Usage of the Mapper Classes</h2>
 <p>The following methods work the same as the other runtimes and we won't cover them here:</p>
 <ul>
-  <li>Delete by Primary Key</li>
-  <li>Insert - will insert nulls</li>
-  <li>insert selective - ignores null properties</li>
-  <li>Select by Primary Key</li>
-  <li>Update by Primary Key - will set null values</li>
-  <li>Update by Primary Key Selective - ignores null values</li>
+  <li>deleteByPrimaryKey</li>
+  <li>insert - insert a single row (will insert nulls)</li>
+  <li>insertMultiple - insert multiple rows (will insert nulls)</li>
+  <li>insertSelective - insert a single row and ignore null properties</li>
+  <li>selectByPrimaryKey</li>
+  <li>updateByPrimaryKey - will set null values</li>
+  <li>updateByPrimaryKey Selective - ignores null values</li>
 </ul>
 
 <p>There are no "by example" methods. Instead, there are general purpose methods that allow you to specify a
-where clause with a lambda.  The generator will create the following general:</p>
+  where clause with a lambda.  The generator will create the following general methods:</p>
 <ul>
   <li>count</li>
   <li>delete</li>
diff --git a/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSqlKotlin.xhtml b/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSqlKotlin.xhtml
index dd92cfee89..a17cc5d57b 100644
--- a/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSqlKotlin.xhtml
+++ b/core/mybatis-generator-core/src/site/xhtml/generatedobjects/dynamicSqlKotlin.xhtml
@@ -33,7 +33,7 @@ about how the library works. In particular, see the
 <a href="https://mybatis.org/mybatis-dynamic-sql/docs/kotlinMyBatis3.html">Kotlin Usage Page</a> for full details.</p>
 
 <h2>Generated Files</h2>
-<p>For each introspected table, the generator will generate four Kotlin files:</p>
+<p>For each introspected table, the generator will generate three Kotlin files:</p>
 <ol>
   <li>A Kotlin data class that represents a row in the table. By default, the class will be named based
     on the table name</li>
@@ -86,21 +86,22 @@ object TableCodeDynamicSqlSupport {
 
 <p>In your code you can import that table object and/or each generated column (Kotlin does not support a star "*" import in this case).
 With these imports you can refer to the fields
-in either a direct or qualified manner - "id" or "TableCode.id".</p>
+in either a direct or qualified manner - "id" or "tableCode.id".</p>
 
 <h2>Usage of the Mapper Classes</h2>
 <p>The following methods work the same as the other runtimes and we won't cover them here:</p>
 <ul>
-  <li>Delete by Primary Key</li>
-  <li>Insert - will insert nulls</li>
-  <li>insert selective - ignores null properties</li>
-  <li>Select by Primary Key</li>
-  <li>Update by Primary Key - will set null values</li>
-  <li>Update by Primary Key Selective - ignores null values</li>
+  <li>deleteByPrimaryKey</li>
+  <li>insert - insert a single row (will insert nulls)</li>
+  <li>insertMultiple - insert multiple rows (will insert nulls)</li>
+  <li>insertSelective - insert a single row and ignore null properties</li>
+  <li>selectByPrimaryKey</li>
+  <li>updateByPrimaryKey - will set null values</li>
+  <li>updateByPrimaryKey Selective - ignores null values</li>
 </ul>
 
 <p>There are no "by example" methods. Instead, there are general purpose methods that allow you to specify a
-where clause with a lambda.  The generator will create the following general:</p>
+where clause with a lambda.  The generator will create the following general methods:</p>
 <ul>
   <li>count</li>
   <li>delete</li>
@@ -133,7 +134,6 @@ complex where clauses, and "ORDER BY" phrases as shown below:</p>
 
 <pre>
 // import the generated "support" items...
-import example.TableCodeDynamicSqlSupport.tableCode
 import example.TableCodeDynamicSqlSupport.description
 import example.TableCodeDynamicSqlSupport.id
 
@@ -180,7 +180,6 @@ as well as updates that mimic the old updateByExample and updateByExampleSelecti
 
 <pre>
 // import the generated "support" items...
-import example.TableCodeDynamicSqlSupport.tableCode
 import example.TableCodeDynamicSqlSupport.description
 import example.TableCodeDynamicSqlSupport.id
 

From 26e57e39aae6c8e94281d086708d5c64a19967d3 Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Tue, 8 Mar 2022 15:06:56 -0500
Subject: [PATCH 3/3] Update Eclipse Docs

---
 eclipse/org.mybatis.generator.eclipse.doc/toc_javadoc.xml | 7 +++----
 eclipse/org.mybatis.generator.eclipse.doc/toc_mbgdoc.xml  | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/eclipse/org.mybatis.generator.eclipse.doc/toc_javadoc.xml b/eclipse/org.mybatis.generator.eclipse.doc/toc_javadoc.xml
index a57d678ac9..c90c8fe143 100644
--- a/eclipse/org.mybatis.generator.eclipse.doc/toc_javadoc.xml
+++ b/eclipse/org.mybatis.generator.eclipse.doc/toc_javadoc.xml
@@ -25,6 +25,8 @@
       <topic href="html/javadoc/org/mybatis/generator/api/dom/package-summary.html" label="org.mybatis.generator.api.dom" />
       <topic href="html/javadoc/org/mybatis/generator/api/dom/java/package-summary.html" label="org.mybatis.generator.api.dom.java" />
       <topic href="html/javadoc/org/mybatis/generator/api/dom/java/render/package-summary.html" label="org.mybatis.generator.api.dom.java.render" />
+      <topic href="html/javadoc/org/mybatis/generator/api/dom/kotlin/package-summary.html" label="org.mybatis.generator.api.dom.kotlin" />
+      <topic href="html/javadoc/org/mybatis/generator/api/dom/kotlin/render/package-summary.html" label="org.mybatis.generator.api.dom.kotlin.render" />
       <topic href="html/javadoc/org/mybatis/generator/api/dom/xml/package-summary.html" label="org.mybatis.generator.api.dom.xml" />
       <topic href="html/javadoc/org/mybatis/generator/api/dom/xml/render/package-summary.html" label="org.mybatis.generator.api.dom.xml.render" />
       <topic href="html/javadoc/org/mybatis/generator/codegen/package-summary.html" label="org.mybatis.generator.codegen" />
@@ -48,7 +50,6 @@
       <topic href="html/javadoc/org/mybatis/generator/logging/package-summary.html" label="org.mybatis.generator.logging" />
       <topic href="html/javadoc/org/mybatis/generator/logging/commons/package-summary.html" label="org.mybatis.generator.logging.commons" />
       <topic href="html/javadoc/org/mybatis/generator/logging/jdk14/package-summary.html" label="org.mybatis.generator.logging.jdk14" />
-      <topic href="html/javadoc/org/mybatis/generator/logging/log4j/package-summary.html" label="org.mybatis.generator.logging.log4j" />
       <topic href="html/javadoc/org/mybatis/generator/logging/log4j2/package-summary.html" label="org.mybatis.generator.logging.log4j2" />
       <topic href="html/javadoc/org/mybatis/generator/logging/nologging/package-summary.html" label="org.mybatis.generator.logging.nologging" />
       <topic href="html/javadoc/org/mybatis/generator/logging/slf4j/package-summary.html" label="org.mybatis.generator.logging.slf4j" />
@@ -56,8 +57,7 @@
       <topic href="html/javadoc/org/mybatis/generator/plugins/dsql/package-summary.html" label="org.mybatis.generator.plugins.dsql" />
       <topic href="html/javadoc/org/mybatis/generator/runtime/dynamic/sql/package-summary.html" label="org.mybatis.generator.runtime.dynamic.sql" />
       <topic href="html/javadoc/org/mybatis/generator/runtime/dynamic/sql/elements/package-summary.html" label="org.mybatis.generator.runtime.dynamic.sql.elements" />
-      <topic href="html/javadoc/org/mybatis/generator/runtime/dynamic/sql/elements/v1/package-summary.html" label="org.mybatis.generator.runtime.dynamic.sql.elements.v1" />
-      <topic href="html/javadoc/org/mybatis/generator/runtime/dynamic/sql/elements/v2/package-summary.html" label="org.mybatis.generator.runtime.dynamic.sql.elements.v2" />
+      <topic href="html/javadoc/org/mybatis/generator/runtime/dynamic/sql/elements/package-summary.html" label="org.mybatis.generator.runtime.dynamic.sql.elements" />
       <topic href="html/javadoc/org/mybatis/generator/runtime/kotlin/package-summary.html" label="org.mybatis.generator.runtime.kotlin" />
       <topic href="html/javadoc/org/mybatis/generator/runtime/kotlin/elements/package-summary.html" label="org.mybatis.generator.runtime.kotlin.elements" />
    </topic>
@@ -70,7 +70,6 @@
       <topic href="html/javadoc/org/mybatis/generator/eclipse/ui/ant/package-summary.html" label="org.mybatis.generator.eclipse.ui.ant" />
       <topic href="html/javadoc/org/mybatis/generator/eclipse/ui/ant/logging/package-summary.html" label="org.mybatis.generator.eclipse.ui.ant.logging" />
       <topic href="html/javadoc/org/mybatis/generator/eclipse/ui/ant/logging/commons/package-summary.html" label="org.mybatis.generator.eclipse.ui.ant.logging.commons" />
-      <topic href="html/javadoc/org/mybatis/generator/eclipse/ui/ant/logging/log4j/package-summary.html" label="org.mybatis.generator.eclipse.ui.ant.logging.log4j" />
       <topic href="html/javadoc/org/mybatis/generator/eclipse/ui/ant/logging/log4j2/package-summary.html" label="org.mybatis.generator.eclipse.ui.ant.logging.log4j2" />
       <topic href="html/javadoc/org/mybatis/generator/eclipse/ui/ant/logging/slf4j/package-summary.html" label="org.mybatis.generator.eclipse.ui.ant.logging.slf4j" />
       <topic href="html/javadoc/org/mybatis/generator/eclipse/ui/content/package-summary.html" label="org.mybatis.generator.eclipse.ui.content" />
diff --git a/eclipse/org.mybatis.generator.eclipse.doc/toc_mbgdoc.xml b/eclipse/org.mybatis.generator.eclipse.doc/toc_mbgdoc.xml
index b7915bb9a7..22a6edb38e 100644
--- a/eclipse/org.mybatis.generator.eclipse.doc/toc_mbgdoc.xml
+++ b/eclipse/org.mybatis.generator.eclipse.doc/toc_mbgdoc.xml
@@ -61,7 +61,7 @@
       <topic href="html/mbgdoc/configreference/table.html" label="&lt;table&gt;"/>
    </topic>
    <topic href="html/mbgdoc/generatedobjects/results.html" label="Using the Generated Objects">
-      <topic href="html/mbgdoc/generatedobjects/dynamicSqlV2.html" label="MyBatis Dynamic SQL Usage Notes"/>
+      <topic href="html/mbgdoc/generatedobjects/dynamicSql.html" label="MyBatis Dynamic SQL Usage Notes"/>
       <topic href="html/mbgdoc/generatedobjects/dynamicSqlKotlin.html" label="MyBatis Dynamic SQL with Kotlin Usage Notes"/>
       <topic href="html/mbgdoc/generatedobjects/legacy.html" label="Legacy Generators">
         <topic href="html/mbgdoc/generatedobjects/javamodel.html" label="Java Model Objects"/>
@@ -70,7 +70,6 @@
         <topic href="html/mbgdoc/generatedobjects/exampleClassUsage.html" label="Example Class Usage Notes"/>
         <topic href="html/mbgdoc/generatedobjects/extendingExampleClass.html" label="Extending the Example Classes"/>
       </topic>
-      <topic href="html/mbgdoc/generatedobjects/dynamicSqlV1.html" label="MyBatis Dynamic SQL Usage Notes - V1 (Deprecated)"/>
    </topic>
    <topic href="html/mbgdoc/usage/intro.html" label="Database Specific Information">
       <topic href="html/mbgdoc/usage/db2.html" label="DB2"/>