Eclipse Plugin Updates

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/IntrospectedTable.java

@@ -735,7 +735,7 @@ protected void calculateJavaClientAttributes() {
         }
         setMyBatisDynamicSqlSupportType(sb.toString());
 
-        if(stringHasValue(tableConfiguration.getDynamicSqlTableObjectName())) {
+        if (stringHasValue(tableConfiguration.getDynamicSqlTableObjectName())) {
             setMyBatisDynamicSQLTableObjectName(tableConfiguration.getDynamicSqlTableObjectName());
         } else {
             setMyBatisDynamicSQLTableObjectName(fullyQualifiedTable.getDomainObjectName());

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/MyBatisGenerator.java

@@ -68,7 +68,7 @@ public class MyBatisGenerator {
     private final List<GeneratedKotlinFile> generatedKotlinFiles = new ArrayList<>();
 
     /**
-     * Any kind of generated file generated by plugin methods contextGenerateAdditionalFiles
+     * Any kind of generated file generated by plugin methods contextGenerateAdditionalFiles.
      */
     private final List<GeneratedFile> otherGeneratedFiles = new ArrayList<>();
 

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/Plugin.java

@@ -221,8 +221,6 @@ default boolean clientGenerated(Interface interfaze, IntrospectedTable introspec
     /**
      * This method is no longer called.
      *
-     * @deprecated this method is no longer called
-     *
      * @param method
      *     the generated count method
      * @param interfaze
@@ -233,6 +231,7 @@ default boolean clientGenerated(Interface interfaze, IntrospectedTable introspec
      *         method should be ignored. In the case of multiple plugins, the
      *         first plugin returning false will disable the calling of further
      *         plugins.
+     * @deprecated this method is no longer called
      */
     @Deprecated
     default boolean clientBasicCountMethodGenerated(Method method, Interface interfaze,
@@ -243,8 +242,6 @@ default boolean clientBasicCountMethodGenerated(Method method, Interface interfa
     /**
      * This method is no longer called.
      *
-     * @deprecated this method is no longer called
-     *
      * @param kotlinFunction
      *     the generated function
      * @param kotlinFile
@@ -255,6 +252,7 @@ default boolean clientBasicCountMethodGenerated(Method method, Interface interfa
      *         method should be ignored. In the case of multiple plugins, the
      *         first plugin returning false will disable the calling of further
      *         plugins.
+     * @deprecated this method is no longer called
      */
     @Deprecated
     default boolean clientBasicCountMethodGenerated(KotlinFunction kotlinFunction, KotlinFile kotlinFile,
@@ -265,7 +263,6 @@ default boolean clientBasicCountMethodGenerated(KotlinFunction kotlinFunction, K
     /**
      * This method is no longer called.
      *
-     * @deprecated No longer called
      * @param method
      *     the generated delete method
      * @param interfaze
@@ -276,6 +273,7 @@ default boolean clientBasicCountMethodGenerated(KotlinFunction kotlinFunction, K
      *         method should be ignored. In the case of multiple plugins, the
      *         first plugin returning false will disable the calling of further
      *         plugins.
+     * @deprecated No longer called
      */
     @Deprecated
     default boolean clientBasicDeleteMethodGenerated(Method method, Interface interfaze,
@@ -286,7 +284,6 @@ default boolean clientBasicDeleteMethodGenerated(Method method, Interface interf
     /**
      * This method is no longer called.
      *
-     * @deprecated No longer called
      * @param kotlinFunction
      *     the generated delete function
      * @param kotlinFile
@@ -297,6 +294,7 @@ default boolean clientBasicDeleteMethodGenerated(Method method, Interface interf
      *         method should be ignored. In the case of multiple plugins, the
      *         first plugin returning false will disable the calling of further
      *         plugins.
+     * @deprecated No longer called
      */
     @Deprecated
     default boolean clientBasicDeleteMethodGenerated(KotlinFunction kotlinFunction, KotlinFile kotlinFile,
@@ -391,7 +389,6 @@ default boolean clientBasicInsertMultipleMethodGenerated(KotlinFunction kotlinFu
     /**
      * This method is no longer called.
      *
-     * @deprecated this method is no longer called
      * @param method
      *     the generated insert method
      * @param interfaze
@@ -402,6 +399,7 @@ default boolean clientBasicInsertMultipleMethodGenerated(KotlinFunction kotlinFu
      *         method should be ignored. In the case of multiple plugins, the
      *         first plugin returning false will disable the calling of further
      *         plugins.
+     * @deprecated this method is no longer called
      */
     @Deprecated
     default boolean clientBasicInsertMultipleHelperMethodGenerated(Method method, Interface interfaze,
@@ -412,12 +410,11 @@ default boolean clientBasicInsertMultipleHelperMethodGenerated(Method method, In
     /**
      * Unused legacy method.
      *
-     * @deprecated this method is not longer called
-     *
      * @param kotlinFunction generated function
      * @param kotlinFile generated file
      * @param introspectedTable introspected table
      * @return true
+     * @deprecated this method is no longer called
      */
     @Deprecated
     default boolean clientBasicInsertMultipleHelperMethodGenerated(KotlinFunction kotlinFunction, KotlinFile kotlinFile,
@@ -478,7 +475,6 @@ default boolean clientBasicSelectOneMethodGenerated(KotlinFunction kotlinFunctio
     /**
      * This method is no longer called.
      *
-     * @deprecated no longer called
      * @param method
      *     the generated update method
      * @param interfaze
@@ -489,6 +485,7 @@ default boolean clientBasicSelectOneMethodGenerated(KotlinFunction kotlinFunctio
      *         method should be ignored. In the case of multiple plugins, the
      *         first plugin returning false will disable the calling of further
      *         plugins.
+     * @deprecated no longer called
      */
     @Deprecated
     default boolean clientBasicUpdateMethodGenerated(Method method, Interface interfaze,
@@ -499,7 +496,6 @@ default boolean clientBasicUpdateMethodGenerated(Method method, Interface interf
     /**
      * This method is no longer called.
      *
-     * @deprecated no longer called
      * @param kotlinFunction
      *     the generated update function
      * @param kotlinFile
@@ -510,6 +506,7 @@ default boolean clientBasicUpdateMethodGenerated(Method method, Interface interf
      *         method should be ignored. In the case of multiple plugins, the
      *         first plugin returning false will disable the calling of further
      *         plugins.
+     * @deprecated no longer called
      */
     @Deprecated
     default boolean clientBasicUpdateMethodGenerated(KotlinFunction kotlinFunction, KotlinFile kotlinFile,
@@ -1998,8 +1995,6 @@ default boolean dynamicSqlSupportGenerated(KotlinFile kotlinFile, KotlinType out
     /**
      * This method is no longer called.
      *
-     * @deprecated this method is no longer called
-     *
      * @param extensionsFile
      *     the partially generated file
      * @param introspectedTable
@@ -2008,6 +2003,8 @@ default boolean dynamicSqlSupportGenerated(KotlinFile kotlinFile, KotlinType out
      *         file should be ignored. In the case of multiple plugins, the
      *         first plugin returning false will disable the calling of further
      *         plugins.
+     *
+     * @deprecated this method is no longer called
      */
     @Deprecated
     default boolean mapperExtensionsGenerated(KotlinFile extensionsFile, IntrospectedTable introspectedTable) {

core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/dynamic/sql/DynamicSqlSupportClassGenerator.java

@@ -168,7 +168,8 @@ private String calculateInnerInitializationString(IntrospectedColumn column, Ful
         }
 
 
-        if (StringUtility.isTrue(column.getProperties().getProperty(PropertyRegistry.COLUMN_OVERRIDE_FORCE_JAVA_TYPE))) {
+        if (StringUtility.isTrue(
+                column.getProperties().getProperty(PropertyRegistry.COLUMN_OVERRIDE_FORCE_JAVA_TYPE))) {
             initializationString.append(".withJavaType("); //$NON-NLS-1$
             initializationString.append(javaType.getShortName());
             initializationString.append(".class)"); //$NON-NLS-1$

eclipse/org.mybatis.generator.core/META-INF/MANIFEST.MF

@@ -45,5 +45,5 @@ Export-Package: org.mybatis.generator.ant,
  org.mybatis.generator.runtime.kotlin,
  org.mybatis.generator.runtime.kotlin.elements
 Automatic-Module-Name: org.mybatis.generator.core
-Import-Package: org.apache.tools.ant;version="1.10.1";resolution:=optional,
- org.apache.tools.ant.types;version="1.10.1";resolution:=optional
+Import-Package: org.apache.tools.ant;version="1.10.5";resolution:=optional,
+ org.apache.tools.ant.types;version="1.10.5";resolution:=optional

eclipse/org.mybatis.generator.core/build.properties

@@ -1,3 +1,20 @@
+#
+#    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
+#
+#       https://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.
+#
+#
+
 source.. = src/main/java/,\
            src/main/resources/
 output.. = target/classes/

eclipse/org.mybatis.generator.core/copySource.xml

@@ -1,3 +1,21 @@
+<!--
+
+       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
+
+          https://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.
+
+
+-->
 <project default="refresh" basedir=".">
 
   <target name="clean">

eclipse/org.mybatis.generator.core/customBuildCallbacks.xml

@@ -1,4 +1,21 @@
-<!-- ===================================================================== -->
+<!--
+
+       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
+
+          https://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.
+
+
+-->
 <!-- Custom targets called from a project's generated build.xml            -->
 <!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
 <!-- ===================================================================== -->

eclipse/org.mybatis.generator.core/license.txt

@@ -0,0 +1,14 @@
+   Copyright ${license.git.copyrightYears} 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
+
+      https://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.
+

eclipse/org.mybatis.generator.core/pom.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+       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
+
+          https://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.
+
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -19,6 +37,19 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>com.mycila</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <configuration>
+          <licenseSets>
+            <licenseSet>
+              <excludes>
+                <exclude>src/**</exclude>
+              </excludes>
+            </licenseSet>
+          </licenseSets>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>

eclipse/org.mybatis.generator.core/src/main/readme.txt

@@ -1,3 +1,20 @@
+====
+       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
+
+          https://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.
+
+====
+
 This folder exists as a place holder for the core Java code.  During the
 Maven (Tycho) build, the source for the generator will be copied into
 this folder.  We do this so we can generate a source bundle in Eclipse.

eclipse/org.mybatis.generator.eclipse.core.tests/META-INF/MANIFEST.MF

@@ -3,13 +3,16 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Tests for MyBatis Generator Eclipse Core Support
 Bundle-SymbolicName: org.mybatis.generator.eclipse.core.tests
 Bundle-Version: 1.4.1.qualifier
-Fragment-Host: org.mybatis.generator.eclipse.core;bundle-version="1.3.6"
+Fragment-Host: org.mybatis.generator.eclipse.core;bundle-version="1.4.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="4.12.0",
- org.mybatis.generator.eclipse.tests.harness;bundle-version="1.4.0"
+Require-Bundle: org.mybatis.generator.eclipse.tests.harness;bundle-version="1.4.1",
+ org.hamcrest.core;bundle-version="1.3.0",
+ org.junit.jupiter.api;bundle-version="5.3.1",
+ org.junit;bundle-version="4.12.0"
 Automatic-Module-Name: org.mybatis.generator.eclipse.core.tests
 Export-Package: org.mybatis.generator.eclipse.core.tests,
  org.mybatis.generator.eclipse.core.tests.callback,
  org.mybatis.generator.eclipse.core.tests.merge,
  org.mybatis.generator.eclipse.core.tests.merge.resources,
  org.mybatis.generator.eclipse.core.tests.merge.support
+Bundle-Vendor: mybatis.org

eclipse/org.mybatis.generator.eclipse.core.tests/build.properties

@@ -1,3 +1,20 @@
+#
+#    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
+#
+#       https://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.
+#
+#
+
 source.. = src/
 output.. = target/classes/
 bin.includes = META-INF/,\

eclipse/org.mybatis.generator.eclipse.core.tests/license.txt

@@ -0,0 +1,14 @@
+   Copyright ${license.git.copyrightYears} 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
+
+      https://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.
+