From 856ede4597bb953c34fada7eac06856eeec5434d Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 4 Nov 2023 14:09:24 -0400 Subject: [PATCH] [ci] Some source formatting --- .../generator/ant/AntProgressCallback.java | 3 ++- .../mybatis/generator/api/CompositePlugin.java | 1 - .../mybatis/generator/api/ConnectionFactory.java | 4 +++- .../org/mybatis/generator/api/GeneratedFile.java | 3 ++- .../mybatis/generator/api/IntrospectedTable.java | 1 - .../org/mybatis/generator/api/JavaFormatter.java | 1 - .../mybatis/generator/api/KotlinFormatter.java | 1 - .../mybatis/generator/api/MyBatisGenerator.java | 5 +++-- .../java/org/mybatis/generator/api/Plugin.java | 2 +- .../org/mybatis/generator/api/PluginAdapter.java | 4 ++-- .../org/mybatis/generator/api/ShellCallback.java | 2 ++ .../generator/api/VerboseProgressCallback.java | 1 - .../org/mybatis/generator/api/XmlFormatter.java | 1 - .../generator/api/dom/DefaultJavaFormatter.java | 4 +--- .../api/dom/DefaultKotlinFormatter.java | 4 +--- .../generator/api/dom/DefaultXmlFormatter.java | 4 +--- .../api/dom/java/FullyQualifiedJavaType.java | 12 ++++++------ .../generator/api/dom/java/InnerClass.java | 3 +-- .../generator/api/dom/java/InnerEnum.java | 3 +-- .../generator/api/dom/java/JavaDomUtils.java | 16 +++++++++------- .../api/dom/java/JavaReservedWords.java | 1 - .../api/dom/java/render/RenderingUtilities.java | 3 ++- .../dom/kotlin/JavaToKotlinTypeConverter.java | 4 ++-- .../generator/api/dom/kotlin/KotlinType.java | 1 + .../kotlin/render/KotlinRenderingUtilities.java | 3 ++- .../codegen/AbstractJavaClientGenerator.java | 1 - .../codegen/AbstractKotlinGenerator.java | 2 +- .../mybatis/generator/codegen/RootClassInfo.java | 2 +- .../IntrospectedTableMyBatis3SimpleImpl.java | 8 +++----- .../codegen/mybatis3/ListUtilities.java | 1 - .../mybatis3/MyBatis3FormattingUtilities.java | 13 ++++++++----- .../mybatis3/javamapper/JavaMapperGenerator.java | 5 ++--- .../javamapper/MixedClientGenerator.java | 1 - .../javamapper/SimpleJavaClientGenerator.java | 2 +- .../AbstractJavaMapperMethodGenerator.java | 13 ++++++------- .../elements/DeleteByExampleMethodGenerator.java | 3 +-- .../elements/SelectAllMethodGenerator.java | 4 +--- ...rUpdateByExampleWithBLOBsMethodGenerator.java | 4 ++-- ...dateByExampleWithoutBLOBsMethodGenerator.java | 3 +-- .../elements/AbstractXmlElementGenerator.java | 1 + ...ectByExampleWithoutBLOBsElementGenerator.java | 3 +-- .../mybatis/generator/config/MergeConstants.java | 2 -- .../org/mybatis/generator/config/ModelType.java | 3 +-- .../generator/config/PropertyRegistry.java | 4 ++-- .../config/xml/ConfigurationParser.java | 1 + .../generator/config/xml/ParserErrorHandler.java | 9 +++------ .../generator/exception/ShellException.java | 3 +-- .../mybatis/generator/internal/DomWriter.java | 2 +- .../internal/JDBCConnectionFactory.java | 3 ++- .../generator/internal/PluginAggregator.java | 1 - .../generator/internal/XmlFileMergerJaxp.java | 4 +++- .../generator/internal/db/ActualTableName.java | 1 - .../generator/internal/db/DatabaseDialects.java | 1 + .../generator/internal/db/SqlReservedWords.java | 1 - .../internal/rules/ConditionalModelRules.java | 1 - .../generator/internal/rules/FlatModelRules.java | 1 - .../internal/rules/HierarchicalModelRules.java | 1 - .../generator/internal/rules/RulesDelegate.java | 2 -- .../internal/util/ClassloaderUtility.java | 1 - .../generator/internal/util/JavaBeansUtil.java | 1 + .../generator/internal/util/StringUtility.java | 8 +++++--- .../internal/util/messages/Messages.java | 6 ++---- .../generator/logging/AbstractLogFactory.java | 1 - .../mybatis/generator/logging/LogFactory.java | 4 ++-- .../generator/plugins/IgnoreViewsPlugin.java | 4 ++-- .../generator/plugins/MapperConfigPlugin.java | 1 - .../plugins/RenameExampleClassPlugin.java | 2 -- .../generator/plugins/SerializablePlugin.java | 1 - .../plugins/UnmergeableXmlMappersPlugin.java | 1 - .../plugins/VirtualPrimaryKeyPlugin.java | 1 - .../plugins/dsql/DisableDeletePlugin.java | 1 - .../plugins/dsql/DisableInsertPlugin.java | 1 - .../plugins/dsql/DisableUpdatePlugin.java | 1 - .../generator/plugins/dsql/ReadOnlyPlugin.java | 1 - .../dynamic/sql/DynamicSqlModelGenerator.java | 1 - .../elements/InsertMultipleMethodGenerator.java | 2 +- .../generator/JavaCodeGenerationTest.java | 6 +++--- .../generator/KotlinCodeGenerationTest.java | 1 - .../org/mybatis/generator/SqlScriptRunner.java | 3 +-- .../mybatis/generator/XmlCodeGenerationTest.java | 2 +- .../api/dom/java/FullyQualifiedJavaTypeTest.java | 1 - .../sqlprovider/MethodLineReaderTest.java | 4 ++-- .../generator/config/xml/PropertyParserTest.java | 2 +- .../generator/internal/XmlFileMergerTest.java | 1 - .../internal/util/JavaBeansUtilTest.java | 1 - .../generator/maven/MavenProgressCallback.java | 1 - .../generator/maven/MavenShellCallback.java | 4 ++-- .../generator/maven/MyBatisGeneratorMojo.java | 1 - .../src/main/java/mbg/test/common/BaseClass.java | 2 +- .../src/main/java/mbg/test/common/FirstName.java | 3 +-- .../src/main/java/mbg/test/common/MyTime.java | 1 - .../mbg/domtest/GenerateTestSourceFiles.java | 4 ++-- .../generators/fieldtype1/Test1Generator.java | 2 +- .../interfaze/SimpleInterfaceGenerator.java | 1 - .../test/mb3/common/FirstNameTypeHandler.java | 5 ++--- .../mbg/test/mb3/common/MyTimeTypeHandler.java | 5 ++--- .../main/java/mbg/test/mb3/common/TestEnum.java | 1 - .../java/mbg/test/mb3/dsql/AbstractTest.java | 1 - .../java/mbg/test/mb3/dsql/DynamicSqlTest.java | 3 +-- .../mbg/test/mb3/dsql/UpdateByExampleTest.java | 2 -- .../AbstractAnnotatedMiscellaneousTest.java | 2 +- .../dsql/miscellaneous/MiscellaneousTest.java | 5 ++--- .../test/mb3/common/FirstNameTypeHandler.java | 5 ++--- .../mbg/test/mb3/common/MyTimeTypeHandler.java | 5 ++--- .../main/java/mbg/test/mb3/common/TestEnum.java | 1 - .../src/test/java/mbg/test/mb3/AbstractTest.java | 1 - .../conditional/ConditionalJava5Test.java | 1 - .../conditional/UpdateByExampleTest.java | 2 -- .../test/mb3/annotated/flat/FlatJava5Test.java | 1 - .../mb3/annotated/flat/UpdateByExampleTest.java | 2 -- .../hierarchical/HierarchicalJava5Test.java | 1 - .../hierarchical/UpdateByExampleTest.java | 2 -- .../immutable/HierarchicalJava5Test.java | 1 - .../immutable/UpdateByExampleTest.java | 2 -- .../AbstractAnnotatedMiscellaneousTest.java | 2 +- .../miscellaneous/MiscellaneousTest.java | 5 ++--- .../mb3/conditional/ConditionalJava5Test.java | 1 - .../mb3/conditional/UpdateByExampleTest.java | 2 -- .../immutable/ConditionalJava5Test.java | 1 - .../immutable/UpdateByExampleTest.java | 2 -- .../java/mbg/test/mb3/flat/FlatJava5Test.java | 1 - .../mbg/test/mb3/flat/UpdateByExampleTest.java | 2 -- .../mb3/hierarchical/HierarchicalJava5Test.java | 1 - .../mb3/hierarchical/UpdateByExampleTest.java | 2 -- .../immutable/HierarchicalJava5Test.java | 1 - .../immutable/UpdateByExampleTest.java | 2 -- .../mb3/miscellaneous/MiscellaneousTest.java | 5 ++--- .../mixed/conditional/ConditionalJava5Test.java | 1 - .../mixed/conditional/UpdateByExampleTest.java | 2 -- .../mbg/test/mb3/mixed/flat/FlatJava5Test.java | 1 - .../test/mb3/mixed/flat/UpdateByExampleTest.java | 2 -- .../hierarchical/HierarchicalJava5Test.java | 1 - .../mixed/hierarchical/UpdateByExampleTest.java | 2 -- .../immutable/HierarchicalJava5Test.java | 1 - .../immutable/UpdateByExampleTest.java | 2 -- .../mixed/miscellaneous/MiscellaneousTest.java | 1 - .../java/mbg/test/mb3/simple/SimpleTest.java | 1 - .../mb3/simpleannotated/SimpleAnnotatedTest.java | 1 - 138 files changed, 131 insertions(+), 230 deletions(-) diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/ant/AntProgressCallback.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/ant/AntProgressCallback.java index 68db02078f..876e9341b6 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/ant/AntProgressCallback.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/ant/AntProgressCallback.java @@ -43,7 +43,8 @@ public AntProgressCallback(Task task, boolean verbose) { this.verbose = verbose; } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.mybatis.generator.internal.NullProgressCallback#startTask(java.lang.String) */ @Override diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/CompositePlugin.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/CompositePlugin.java index 332ae95faf..1f28b73af3 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/CompositePlugin.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/CompositePlugin.java @@ -39,7 +39,6 @@ * subsequent plugin is called. * * @author Jeff Butler - * */ public abstract class CompositePlugin implements Plugin { private final List plugins = new ArrayList<>(); diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/ConnectionFactory.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/ConnectionFactory.java index f2738b263f..05a8212abb 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/ConnectionFactory.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/ConnectionFactory.java @@ -27,7 +27,9 @@ public interface ConnectionFactory { * The generator will close the connection. * * @return the connection - * @throws SQLException if there is some error obtaining the connection + * + * @throws SQLException + * if there is some error obtaining the connection */ Connection getConnection() throws SQLException; diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/GeneratedFile.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/GeneratedFile.java index 674f14e2d9..451d7a155f 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/GeneratedFile.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/GeneratedFile.java @@ -65,7 +65,8 @@ public String getTargetProject() { */ public abstract String getTargetPackage(); - /* (non-Javadoc) + /* + * (non-Javadoc) * @see java.lang.Object#toString() */ @Override diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/IntrospectedTable.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/IntrospectedTable.java index 12aa0937a1..66b03e798e 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/IntrospectedTable.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/IntrospectedTable.java @@ -50,7 +50,6 @@ * the actual code generation methods left unimplemented. * * @author Jeff Butler - * */ public abstract class IntrospectedTable { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/JavaFormatter.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/JavaFormatter.java index e40dc979f7..4de0db7f99 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/JavaFormatter.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/JavaFormatter.java @@ -28,7 +28,6 @@ * be passed into the class through the use of properties in the Context. * * @author Jeff Butler - * */ public interface JavaFormatter { void setContext(Context context); diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/KotlinFormatter.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/KotlinFormatter.java index 14bba7874e..2ca0371579 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/KotlinFormatter.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/KotlinFormatter.java @@ -28,7 +28,6 @@ * be passed into the class through the use of properties in the Context. * * @author Jeff Butler - * */ public interface KotlinFormatter { void setContext(Context context); diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/MyBatisGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/MyBatisGenerator.java index c5afaa102d..5e5850d328 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/MyBatisGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/MyBatisGenerator.java @@ -42,7 +42,6 @@ /** * This class is the main interface to MyBatis generator. A typical execution of the tool involves these steps: - * *
    *
  1. Create a Configuration object. The Configuration can be the result of a parsing the XML configuration file, or it * can be created solely in Java.
    2. @@ -51,11 +50,13 @@ *
* * @author Jeff Butler + * * @see org.mybatis.generator.config.xml.ConfigurationParser */ public class MyBatisGenerator { - private static final ProgressCallback NULL_PROGRESS_CALLBACK = new ProgressCallback() {}; + private static final ProgressCallback NULL_PROGRESS_CALLBACK = new ProgressCallback() { + }; private final Configuration configuration; diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/Plugin.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/Plugin.java index 9d449a4f2c..17aa33e903 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/Plugin.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/Plugin.java @@ -67,8 +67,8 @@ * implementations, these methods may not be called. * * @author Jeff Butler - * @see PluginAdapter * + * @see PluginAdapter */ public interface Plugin { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/PluginAdapter.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/PluginAdapter.java index 750661fea8..d48bc19a89 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/PluginAdapter.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/PluginAdapter.java @@ -26,13 +26,13 @@ * must perform validation. * * @author Jeff Butler - * */ public abstract class PluginAdapter implements Plugin { protected Context context; protected final Properties properties = new Properties(); - protected PluginAdapter() {} + protected PluginAdapter() { + } @Override public void setContext(Context context) { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/ShellCallback.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/ShellCallback.java index 33cf3184d3..32241a7b59 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/ShellCallback.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/ShellCallback.java @@ -52,7 +52,9 @@ public interface ShellCallback { * the target project * @param targetPackage * the target package + * * @return the directory (must exist) + * * @throws ShellException * if the project/package cannot be resolved into a directory on the file system. In this case, the * generator will not save the file it is currently working on. The generator will add the exception diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/VerboseProgressCallback.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/VerboseProgressCallback.java index dfc34ec40a..acd6e60b8a 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/VerboseProgressCallback.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/VerboseProgressCallback.java @@ -19,7 +19,6 @@ * A slightly more verbose progress callback. * * @author Jeff Butler - * */ public class VerboseProgressCallback implements ProgressCallback { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/XmlFormatter.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/XmlFormatter.java index 380f9480bd..68989ee26b 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/XmlFormatter.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/XmlFormatter.java @@ -28,7 +28,6 @@ * be passed into the class through the use of properties in the Context. * * @author Jeff Butler - * */ public interface XmlFormatter { void setContext(Context context); diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/DefaultJavaFormatter.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/DefaultJavaFormatter.java index 9470b1ae7a..fb8b169890 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/DefaultJavaFormatter.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/DefaultJavaFormatter.java @@ -27,11 +27,9 @@ import org.mybatis.generator.config.Context; /** - * This class is the default formatter for generated Java. This class will use the - * built in DOM renderers. + * This class is the default formatter for generated Java. This class will use the built in DOM renderers. * * @author Jeff Butler - * */ public class DefaultJavaFormatter implements JavaFormatter, CompilationUnitVisitor { protected Context context; diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/DefaultKotlinFormatter.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/DefaultKotlinFormatter.java index b901b66d01..f33c780f1b 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/DefaultKotlinFormatter.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/DefaultKotlinFormatter.java @@ -21,11 +21,9 @@ import org.mybatis.generator.config.Context; /** - * This class is the default formatter for generated Kotlin. This class will use the - * built in DOM renderers. + * This class is the default formatter for generated Kotlin. This class will use the built in DOM renderers. * * @author Jeff Butler - * */ public class DefaultKotlinFormatter implements KotlinFormatter { protected Context context; diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/DefaultXmlFormatter.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/DefaultXmlFormatter.java index 0331556e2e..a488805eac 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/DefaultXmlFormatter.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/DefaultXmlFormatter.java @@ -21,11 +21,9 @@ import org.mybatis.generator.config.Context; /** - * This class is the default formatter for generated XML. This class will use the - * built in document renderer. + * This class is the default formatter for generated XML. This class will use the built in document renderer. * * @author Jeff Butler - * */ public class DefaultXmlFormatter implements XmlFormatter { protected Context context; diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/FullyQualifiedJavaType.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/FullyQualifiedJavaType.java index cb5f73950b..0e268e642d 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/FullyQualifiedJavaType.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/FullyQualifiedJavaType.java @@ -22,8 +22,7 @@ import java.util.List; import java.util.StringTokenizer; -public class FullyQualifiedJavaType implements - Comparable { +public class FullyQualifiedJavaType implements Comparable { private static final String JAVA_LANG = "java.lang"; //$NON-NLS-1$ @@ -335,11 +334,11 @@ private void parse(String fullTypeSpecification) { if (spec.startsWith("extends ")) { //$NON-NLS-1$ boundedWildcard = true; extendsBoundedWildcard = true; - spec = spec.substring(8); // "extends ".length() + spec = spec.substring(8); // "extends ".length() } else if (spec.startsWith("super ")) { //$NON-NLS-1$ boundedWildcard = true; extendsBoundedWildcard = false; - spec = spec.substring(6); // "super ".length() + spec = spec.substring(6); // "super ".length() } else { boundedWildcard = false; } @@ -359,8 +358,8 @@ private void parse(String fullTypeSpecification) { } // this is far from a perfect test for detecting arrays, but is close - // enough for most cases. It will not detect an improperly specified - // array type like byte], but it will detect byte[] and byte[ ] + // enough for most cases. It will not detect an improperly specified + // array type like byte], but it will detect byte[] and byte[ ] // which are both valid isArray = fullTypeSpecification.endsWith("]"); //$NON-NLS-1$ } @@ -478,6 +477,7 @@ private void genericParse(String genericSpecification) { * * @param baseQualifiedName * the base qualified name + * * @return the package */ private static String getPackage(String baseQualifiedName) { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/InnerClass.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/InnerClass.java index 6093d44cff..1423452503 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/InnerClass.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/InnerClass.java @@ -20,8 +20,7 @@ import java.util.Optional; /** - * This class encapsulates the idea of an inner class - it has methods that make - * it easy to generate inner classes. + * This class encapsulates the idea of an inner class - it has methods that make it easy to generate inner classes. * * @author Jeff Butler */ diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/InnerEnum.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/InnerEnum.java index 3651593c3a..5b1d86e4dc 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/InnerEnum.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/InnerEnum.java @@ -19,8 +19,7 @@ import java.util.List; /** - * This class encapsulates the idea of an inner enum - it has methods that make - * it easy to generate inner enum. + * This class encapsulates the idea of an inner enum - it has methods that make it easy to generate inner enum. * * @author Jeff Butler */ diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/JavaDomUtils.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/JavaDomUtils.java index 20134cfb2d..6543029964 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/JavaDomUtils.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/JavaDomUtils.java @@ -18,16 +18,18 @@ import java.util.stream.Collectors; public class JavaDomUtils { - private JavaDomUtils() {} + private JavaDomUtils() { + } /** - * Calculates type names for writing into generated Java. We try to - * use short names wherever possible. If the type requires an import, - * but has not been imported, then we need to use the fully qualified - * type name. + * Calculates type names for writing into generated Java. We try to use short names wherever possible. If the type + * requires an import, but has not been imported, then we need to use the fully qualified type name. + * + * @param compilationUnit + * the compilation unit being written + * @param fqjt + * the type in question * - * @param compilationUnit the compilation unit being written - * @param fqjt the type in question * @return the full type name */ public static String calculateTypeName(CompilationUnit compilationUnit, FullyQualifiedJavaType fqjt) { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/JavaReservedWords.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/JavaReservedWords.java index c8fcb8e698..366b52bbe5 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/JavaReservedWords.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/JavaReservedWords.java @@ -23,7 +23,6 @@ * This class contains a list of Java reserved words. * * @author Jeff Butler - * */ public class JavaReservedWords { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/render/RenderingUtilities.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/render/RenderingUtilities.java index f1f65e6cde..0ba5290219 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/render/RenderingUtilities.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/java/render/RenderingUtilities.java @@ -38,7 +38,8 @@ import org.mybatis.generator.internal.util.CustomCollectors; public class RenderingUtilities { - private RenderingUtilities() {} + private RenderingUtilities() { + } public static final String JAVA_INDENT = " "; //$NON-NLS-1$ private static final TypeParameterRenderer typeParameterRenderer = new TypeParameterRenderer(); diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/JavaToKotlinTypeConverter.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/JavaToKotlinTypeConverter.java index 33a3991c54..2e93b426e2 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/JavaToKotlinTypeConverter.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/JavaToKotlinTypeConverter.java @@ -27,10 +27,10 @@ * classes as those Java types have replacements in Kotlin. * * @author Jeff Butler - * */ public class JavaToKotlinTypeConverter { - private JavaToKotlinTypeConverter() {} + private JavaToKotlinTypeConverter() { + } private static final Map typeMap = new HashMap<>(); diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/KotlinType.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/KotlinType.java index 2cf70015b6..35225fc85c 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/KotlinType.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/KotlinType.java @@ -92,6 +92,7 @@ public static Builder newObject(String name) { public static Builder newCompanionObject() { return new Builder(Type.COMPANION_OBJECT, DEFAULT_COMPANION_OBJECT_NAME); } + public static Builder newCompanionObject(String name) { return new Builder(Type.COMPANION_OBJECT, name); } diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/render/KotlinRenderingUtilities.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/render/KotlinRenderingUtilities.java index 3520526fd3..7c0f13f5d4 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/render/KotlinRenderingUtilities.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/render/KotlinRenderingUtilities.java @@ -22,7 +22,8 @@ public class KotlinRenderingUtilities { - private KotlinRenderingUtilities() {} + private KotlinRenderingUtilities() { + } public static final String KOTLIN_INDENT = " "; //$NON-NLS-1$ diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/AbstractJavaClientGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/AbstractJavaClientGenerator.java index b79a6a709e..0f96a1c217 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/AbstractJavaClientGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/AbstractJavaClientGenerator.java @@ -22,7 +22,6 @@ * annotations does not need matching XML. * * @author Jeff Butler - * */ public abstract class AbstractJavaClientGenerator extends AbstractJavaGenerator { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/AbstractKotlinGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/AbstractKotlinGenerator.java index 951b13051f..e397a5f7fb 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/AbstractKotlinGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/AbstractKotlinGenerator.java @@ -33,7 +33,7 @@ public String getProject() { return project; } - public List listOf(KotlinFile...kotlinFiles) { + public List listOf(KotlinFile... kotlinFiles) { return Arrays.asList(kotlinFiles); } } diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/RootClassInfo.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/RootClassInfo.java index 78b0846946..b3e4d978a6 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/RootClassInfo.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/RootClassInfo.java @@ -31,8 +31,8 @@ /** * Holds information about a class (uses the JavaBeans Introspector to find properties). - * @author Jeff Butler * + * @author Jeff Butler */ public class RootClassInfo { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/IntrospectedTableMyBatis3SimpleImpl.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/IntrospectedTableMyBatis3SimpleImpl.java index b395e3f414..0fe69c6efe 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/IntrospectedTableMyBatis3SimpleImpl.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/IntrospectedTableMyBatis3SimpleImpl.java @@ -27,11 +27,10 @@ import org.mybatis.generator.internal.ObjectFactory; /** - * Introspected table implementation for generating simple MyBatis3 artifacts (no "by example" methods, - * flat model, etc.) + * Introspected table implementation for generating simple MyBatis3 artifacts (no "by example" methods, flat model, + * etc.) * * @author Jeff Butler - * */ public class IntrospectedTableMyBatis3SimpleImpl extends IntrospectedTableMyBatis3Impl { public IntrospectedTableMyBatis3SimpleImpl() { @@ -39,8 +38,7 @@ public IntrospectedTableMyBatis3SimpleImpl() { } @Override - protected void calculateXmlMapperGenerator(AbstractJavaClientGenerator javaClientGenerator, - List warnings, + protected void calculateXmlMapperGenerator(AbstractJavaClientGenerator javaClientGenerator, List warnings, ProgressCallback progressCallback) { if (javaClientGenerator == null) { if (context.getSqlMapGeneratorConfiguration() != null) { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/ListUtilities.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/ListUtilities.java index 85736e19fb..c831c8d120 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/ListUtilities.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/ListUtilities.java @@ -28,7 +28,6 @@ *

If a column is identity, it should not be referenced on an insert method. * * @author Jeff Butler - * */ public class ListUtilities { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/MyBatis3FormattingUtilities.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/MyBatis3FormattingUtilities.java index a38a283906..3a2dcca4e3 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/MyBatis3FormattingUtilities.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/MyBatis3FormattingUtilities.java @@ -49,11 +49,12 @@ public static String getParameterClause(IntrospectedColumn introspectedColumn, S } /** - * The phrase to use in a select list. If there is a table alias, the value will be - * "alias.columnName as alias_columnName" + * The phrase to use in a select list. If there is a table alias, the value will be "alias.columnName as + * alias_columnName" * * @param introspectedColumn * the introspected column + * * @return the proper phrase */ public static String getSelectListPhrase(IntrospectedColumn introspectedColumn) { @@ -101,12 +102,13 @@ public static String getAliasedEscapedColumnName(IntrospectedColumn introspected * The aliased column name for a select statement generated by the example clauses. This is not appropriate for * selects in SqlMaps because the column is not escaped for MyBatis. If there is a table alias, the value will be * alias.columnName. - * - *

This method is used in the Example classes and the returned value will be in a Java string. - * So we need to escape double quotes if they are the delimiters. + *

+ * This method is used in the Example classes and the returned value will be in a Java string. So we need to escape + * double quotes if they are the delimiters. * * @param introspectedColumn * the introspected column + * * @return the aliased column name */ public static String getAliasedActualColumnName(IntrospectedColumn introspectedColumn) { @@ -135,6 +137,7 @@ public static String getAliasedActualColumnName(IntrospectedColumn introspectedC * * @param introspectedColumn * the introspected column + * * @return the renamed column name */ public static String getRenamedColumnNameForResultMap(IntrospectedColumn introspectedColumn) { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/JavaMapperGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/JavaMapperGenerator.java index 5c9e3f6f84..a259183d27 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/JavaMapperGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/JavaMapperGenerator.java @@ -200,15 +200,14 @@ protected void addUpdateByPrimaryKeyWithBLOBsMethod(Interface interfaze) { } protected void addUpdateByPrimaryKeyWithoutBLOBsMethod(Interface interfaze) { - if (introspectedTable.getRules() - .generateUpdateByPrimaryKeyWithoutBLOBs()) { + if (introspectedTable.getRules().generateUpdateByPrimaryKeyWithoutBLOBs()) { AbstractJavaMapperMethodGenerator methodGenerator = new UpdateByPrimaryKeyWithoutBLOBsMethodGenerator(); initializeAndExecuteGenerator(methodGenerator, interfaze); } } protected void initializeAndExecuteGenerator(AbstractJavaMapperMethodGenerator methodGenerator, - Interface interfaze) { + Interface interfaze) { methodGenerator.setContext(context); methodGenerator.setIntrospectedTable(introspectedTable); methodGenerator.setProgressCallback(progressCallback); diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/MixedClientGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/MixedClientGenerator.java index cb1d3c6aec..42ee89b051 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/MixedClientGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/MixedClientGenerator.java @@ -30,7 +30,6 @@ * methods that don't require SQL provider support. * * @author Jeff Butler - * */ public class MixedClientGenerator extends JavaMapperGenerator { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/SimpleJavaClientGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/SimpleJavaClientGenerator.java index 51ac979965..58c218339d 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/SimpleJavaClientGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/SimpleJavaClientGenerator.java @@ -124,7 +124,7 @@ protected void addUpdateByPrimaryKeyMethod(Interface interfaze) { } protected void initializeAndExecuteGenerator(AbstractJavaMapperMethodGenerator methodGenerator, - Interface interfaze) { + Interface interfaze) { methodGenerator.setContext(context); methodGenerator.setIntrospectedTable(introspectedTable); methodGenerator.setProgressCallback(progressCallback); diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/AbstractJavaMapperMethodGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/AbstractJavaMapperMethodGenerator.java index 3c2275304c..ca3d5ce8bc 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/AbstractJavaMapperMethodGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/AbstractJavaMapperMethodGenerator.java @@ -123,7 +123,7 @@ private Set buildGeneratedKeyImportsIfRequired(Generated } private Set buildGeneratedKeyImports(GeneratedKey gk, - IntrospectedColumn introspectedColumn) { + IntrospectedColumn introspectedColumn) { Set answer = new HashSet<>(); if (gk.isJdbcStandard()) { answer.add(new FullyQualifiedJavaType("org.apache.ibatis.annotations.Options")); //$NON-NLS-1$ @@ -225,7 +225,7 @@ protected List buildUpdateByPrimaryKeyAnnotations(List importedTypes) { + Set importedTypes) { if (!isSimple && introspectedTable.getRules().generatePrimaryKeyClass()) { FullyQualifiedJavaType type = new FullyQualifiedJavaType(introspectedTable.getPrimaryKeyType()); importedTypes.add(type); @@ -234,8 +234,7 @@ protected void addPrimaryKeyMethodParameters(boolean isSimple, Method method, // no primary key class - fields are in the base class // if more than one PK field, then we need to annotate the // parameters for MyBatis3 - List introspectedColumns = introspectedTable - .getPrimaryKeyColumns(); + List introspectedColumns = introspectedTable.getPrimaryKeyColumns(); boolean annotate = introspectedColumns.size() > 1; if (annotate) { importedTypes.add(new FullyQualifiedJavaType("org.apache.ibatis.annotations.Param")); //$NON-NLS-1$ @@ -258,7 +257,7 @@ protected void addPrimaryKeyMethodParameters(boolean isSimple, Method method, } protected void addAnnotatedResults(Interface interfaze, Method method, - List nonPrimaryKeyColumns) { + List nonPrimaryKeyColumns) { if (introspectedTable.isConstructorBased()) { method.addAnnotation("@ConstructorArgs({"); //$NON-NLS-1$ @@ -302,7 +301,7 @@ protected void addAnnotatedResults(Interface interfaze, Method method, } protected Method buildBasicUpdateByExampleMethod(String statementId, FullyQualifiedJavaType parameterType, - Set importedTypes) { + Set importedTypes) { Method method = new Method(statementId); method.setVisibility(JavaVisibility.PUBLIC); method.setAbstract(true); @@ -313,7 +312,7 @@ protected Method buildBasicUpdateByExampleMethod(String statementId, FullyQualif importedTypes.add(parameterType); FullyQualifiedJavaType exampleType = new FullyQualifiedJavaType(introspectedTable.getExampleType()); - method.addParameter(new Parameter(exampleType,"example", "@Param(\"example\")")); //$NON-NLS-1$ //$NON-NLS-2$ + method.addParameter(new Parameter(exampleType, "example", "@Param(\"example\")")); //$NON-NLS-1$ //$NON-NLS-2$ importedTypes.add(exampleType); importedTypes.add(new FullyQualifiedJavaType("org.apache.ibatis.annotations.Param")); //$NON-NLS-1$ diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/DeleteByExampleMethodGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/DeleteByExampleMethodGenerator.java index efa7cca317..617cf167ec 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/DeleteByExampleMethodGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/DeleteByExampleMethodGenerator.java @@ -46,8 +46,7 @@ public void addInterfaceElements(Interface interfaze) { addMapperAnnotations(method); - if (context.getPlugins().clientDeleteByExampleMethodGenerated( - method, interfaze, introspectedTable)) { + if (context.getPlugins().clientDeleteByExampleMethodGenerated(method, interfaze, introspectedTable)) { addExtraImports(interfaze); interfaze.addImportedTypes(importedTypes); interfaze.addMethod(method); diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/SelectAllMethodGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/SelectAllMethodGenerator.java index e4f27f4a14..c32a4f657d 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/SelectAllMethodGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/SelectAllMethodGenerator.java @@ -27,7 +27,6 @@ * The selectAll method is only generated by the Mybatis3Simple runtime. * * @author Jeff Butler - * */ public class SelectAllMethodGenerator extends AbstractJavaMapperMethodGenerator { @@ -44,8 +43,7 @@ public void addInterfaceElements(Interface interfaze) { method.setVisibility(JavaVisibility.PUBLIC); method.setAbstract(true); - FullyQualifiedJavaType returnType = FullyQualifiedJavaType - .getNewListInstance(); + FullyQualifiedJavaType returnType = FullyQualifiedJavaType.getNewListInstance(); FullyQualifiedJavaType listType; listType = new FullyQualifiedJavaType(introspectedTable.getBaseRecordType()); diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/sqlprovider/ProviderUpdateByExampleWithBLOBsMethodGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/sqlprovider/ProviderUpdateByExampleWithBLOBsMethodGenerator.java index 177bb44ac9..ae898f4e83 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/sqlprovider/ProviderUpdateByExampleWithBLOBsMethodGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/sqlprovider/ProviderUpdateByExampleWithBLOBsMethodGenerator.java @@ -21,8 +21,8 @@ import org.mybatis.generator.api.dom.java.Method; import org.mybatis.generator.api.dom.java.TopLevelClass; -public class ProviderUpdateByExampleWithBLOBsMethodGenerator extends - ProviderUpdateByExampleWithoutBLOBsMethodGenerator { +public class ProviderUpdateByExampleWithBLOBsMethodGenerator + extends ProviderUpdateByExampleWithoutBLOBsMethodGenerator { @Override public String getMethodName() { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/sqlprovider/ProviderUpdateByExampleWithoutBLOBsMethodGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/sqlprovider/ProviderUpdateByExampleWithoutBLOBsMethodGenerator.java index e03e753a41..a796545406 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/sqlprovider/ProviderUpdateByExampleWithoutBLOBsMethodGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/sqlprovider/ProviderUpdateByExampleWithoutBLOBsMethodGenerator.java @@ -55,8 +55,7 @@ public void addClassElements(TopLevelClass topLevelClass) { sb.insert(2, "row."); //$NON-NLS-1$ method.addBodyLine(String.format("sql.SET(\"%s = %s\");", //$NON-NLS-1$ - escapeStringForJava(getAliasedEscapedColumnName(introspectedColumn)), - sb)); + escapeStringForJava(getAliasedEscapedColumnName(introspectedColumn)), sb)); } method.addBodyLine(""); //$NON-NLS-1$ diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/xmlmapper/elements/AbstractXmlElementGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/xmlmapper/elements/AbstractXmlElementGenerator.java index 585b2f67e2..384d22abfb 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/xmlmapper/elements/AbstractXmlElementGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/xmlmapper/elements/AbstractXmlElementGenerator.java @@ -47,6 +47,7 @@ protected AbstractXmlElementGenerator() { * the column related to the select key statement * @param generatedKey * the generated key for the current table + * * @return the selectKey element */ protected XmlElement getSelectKey(IntrospectedColumn introspectedColumn, diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/xmlmapper/elements/SelectByExampleWithoutBLOBsElementGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/xmlmapper/elements/SelectByExampleWithoutBLOBsElementGenerator.java index 29c18444c3..a2003dcb08 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/xmlmapper/elements/SelectByExampleWithoutBLOBsElementGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/xmlmapper/elements/SelectByExampleWithoutBLOBsElementGenerator.java @@ -21,8 +21,7 @@ import org.mybatis.generator.api.dom.xml.TextElement; import org.mybatis.generator.api.dom.xml.XmlElement; -public class SelectByExampleWithoutBLOBsElementGenerator extends - AbstractXmlElementGenerator { +public class SelectByExampleWithoutBLOBsElementGenerator extends AbstractXmlElementGenerator { public SelectByExampleWithoutBLOBsElementGenerator() { super(); diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/MergeConstants.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/MergeConstants.java index c2cd98a4be..490c4a1332 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/MergeConstants.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/MergeConstants.java @@ -21,13 +21,11 @@ * This class holds constants useful in the XML and Java merging operations. * * @author Jeff Butler - * */ public class MergeConstants { /** * Utility class - no instances. - * */ private MergeConstants() { } diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/ModelType.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/ModelType.java index e746fe7b0a..055522fe21 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/ModelType.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/ModelType.java @@ -41,8 +41,7 @@ public static ModelType getModelType(String type) { } else if (CONDITIONAL.type.equalsIgnoreCase(type)) { return CONDITIONAL; } else { - throw new RuntimeException(getString( - "RuntimeError.13", type)); //$NON-NLS-1$ + throw new RuntimeException(getString("RuntimeError.13", type)); //$NON-NLS-1$ } } } diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/PropertyRegistry.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/PropertyRegistry.java index 9d4f541ce8..f792a05eab 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/PropertyRegistry.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/PropertyRegistry.java @@ -21,10 +21,10 @@ * properties, and helps to avoid spelling errors. * * @author Jeff Butler - * */ public class PropertyRegistry { - private PropertyRegistry() {} + private PropertyRegistry() { + } public static final String ANY_ENABLE_SUB_PACKAGES = "enableSubPackages"; //$NON-NLS-1$ diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/xml/ConfigurationParser.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/xml/ConfigurationParser.java index e1da8ec947..04d8ff98b9 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/xml/ConfigurationParser.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/xml/ConfigurationParser.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; + import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/xml/ParserErrorHandler.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/xml/ParserErrorHandler.java index ec308d6d20..07e9be0245 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/xml/ParserErrorHandler.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/xml/ParserErrorHandler.java @@ -37,21 +37,18 @@ public ParserErrorHandler(List warnings, List errors) { @Override public void warning(SAXParseException exception) { warnings.add(getString("Warning.7", //$NON-NLS-1$ - Integer.toString(exception.getLineNumber()), exception - .getMessage())); + Integer.toString(exception.getLineNumber()), exception.getMessage())); } @Override public void error(SAXParseException exception) { errors.add(getString("RuntimeError.4", //$NON-NLS-1$ - Integer.toString(exception.getLineNumber()), exception - .getMessage())); + Integer.toString(exception.getLineNumber()), exception.getMessage())); } @Override public void fatalError(SAXParseException exception) { errors.add(getString("RuntimeError.4", //$NON-NLS-1$ - Integer.toString(exception.getLineNumber()), exception - .getMessage())); + Integer.toString(exception.getLineNumber()), exception.getMessage())); } } diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/exception/ShellException.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/exception/ShellException.java index f66063cea5..1676f41afa 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/exception/ShellException.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/exception/ShellException.java @@ -16,8 +16,7 @@ package org.mybatis.generator.exception; /** - * This class is used by the ShellCallback methods to denote unrecoverable - * errors. + * This class is used by the ShellCallback methods to denote unrecoverable errors. * * @author Jeff Butler */ diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/DomWriter.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/DomWriter.java index b23d75377b..8cf99eb04b 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/DomWriter.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/DomWriter.java @@ -325,7 +325,7 @@ protected void write(EntityReference node) { protected void write(CDATASection node) { printWriter.print(" * - * * @author Jeff Butler - * */ public class RulesDelegate implements Rules { protected final Rules rules; diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/ClassloaderUtility.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/ClassloaderUtility.java index 0de12f97b2..0d8e19c68c 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/ClassloaderUtility.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/ClassloaderUtility.java @@ -32,7 +32,6 @@ * This class holds methods useful for constructing custom classloaders. * * @author Jeff Butler - * */ public class ClassloaderUtility { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/JavaBeansUtil.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/JavaBeansUtil.java index 2fcfe9311e..ee23cfd6ef 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/JavaBeansUtil.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/JavaBeansUtil.java @@ -74,6 +74,7 @@ public static String getGetterMethodName(String property, * * @param property * the property + * * @return the setter method name */ public static String getSetterMethodName(String property) { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/StringUtility.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/StringUtility.java index 4cc52001ab..8142773731 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/StringUtility.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/StringUtility.java @@ -104,10 +104,12 @@ public static boolean stringContainsSQLWildcard(String s) { } /** - * Given an input string, tokenize on the commas and trim all token. - * Returns an empty set if the input string is null. + * Given an input string, tokenize on the commas and trim all token. Returns an empty set if the input string is + * null. + * + * @param in + * strong to tokenize. * - * @param in strong to tokenize. * @return Set of tokens */ public static Set tokenize(String in) { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/messages/Messages.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/messages/Messages.java index 4b83028820..da9e1cb329 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/messages/Messages.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/util/messages/Messages.java @@ -22,8 +22,7 @@ public class Messages { private static final String BUNDLE_NAME = "org.mybatis.generator.internal.util.messages.messages"; //$NON-NLS-1$ - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); + private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); private Messages() { } @@ -52,8 +51,7 @@ public static String getString(String key, String parm1, String parm2) { } } - public static String getString(String key, String parm1, String parm2, - String parm3) { + public static String getString(String key, String parm1, String parm2, String parm3) { try { return MessageFormat.format(RESOURCE_BUNDLE.getString(key), parm1, parm2, parm3); } catch (MissingResourceException e) { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/AbstractLogFactory.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/AbstractLogFactory.java index 8610037d86..1428fef251 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/AbstractLogFactory.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/AbstractLogFactory.java @@ -19,7 +19,6 @@ * Defines the interface for creating Log implementations. * * @author Jeff Butler - * */ public interface AbstractLogFactory { Log getLog(Class targetClass); diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/LogFactory.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/LogFactory.java index dcbd1af19f..2eb69e379a 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/LogFactory.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/LogFactory.java @@ -27,7 +27,6 @@ * Factory for creating loggers. * * @author Jeff Butler - * */ public class LogFactory { private static AbstractLogFactory theFactory; @@ -41,7 +40,8 @@ public class LogFactory { tryImplementation(new NoLoggingLogFactory()); } - private LogFactory() {} + private LogFactory() { + } public static Log getLog(Class clazz) { try { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/IgnoreViewsPlugin.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/IgnoreViewsPlugin.java index 8d218cbefe..7ee898a10b 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/IgnoreViewsPlugin.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/IgnoreViewsPlugin.java @@ -15,11 +15,11 @@ */ package org.mybatis.generator.plugins; +import java.util.List; + import org.mybatis.generator.api.IntrospectedTable; import org.mybatis.generator.api.PluginAdapter; -import java.util.List; - /** * This plugin will cause any table of type "VIEW" in a context to be ignored. */ diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/MapperConfigPlugin.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/MapperConfigPlugin.java index e4e7fda213..f249c7d285 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/MapperConfigPlugin.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/MapperConfigPlugin.java @@ -53,7 +53,6 @@ * element. * * @author Jeff Butler - * */ public class MapperConfigPlugin extends PluginAdapter { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/RenameExampleClassPlugin.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/RenameExampleClassPlugin.java index 543f45192a..cb662c1993 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/RenameExampleClassPlugin.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/RenameExampleClassPlugin.java @@ -48,9 +48,7 @@ *

Criteria
* * - * * @author Jeff Butler - * */ public class RenameExampleClassPlugin extends PluginAdapter { private String replaceString; diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/SerializablePlugin.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/SerializablePlugin.java index 5be9d0d7db..cca9a24467 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/SerializablePlugin.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/SerializablePlugin.java @@ -39,7 +39,6 @@ * attempt to do any versioning of classes. * * @author Jeff Butler - * */ public class SerializablePlugin extends PluginAdapter { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/UnmergeableXmlMappersPlugin.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/UnmergeableXmlMappersPlugin.java index d8abbf5fe1..cfefb0f48c 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/UnmergeableXmlMappersPlugin.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/UnmergeableXmlMappersPlugin.java @@ -28,7 +28,6 @@ *

This can be useful when comments are disabled so the normal XML merge won't work. * * @author Jeff Butler - * */ public class UnmergeableXmlMappersPlugin extends PluginAdapter { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/VirtualPrimaryKeyPlugin.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/VirtualPrimaryKeyPlugin.java index 077dcfa68e..814499e975 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/VirtualPrimaryKeyPlugin.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/VirtualPrimaryKeyPlugin.java @@ -31,7 +31,6 @@ *

<property name="virtualKeyColumns" value="ID1,ID2"> * * @author Jeff Butler - * */ public class VirtualPrimaryKeyPlugin extends PluginAdapter { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/DisableDeletePlugin.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/DisableDeletePlugin.java index 0a27e9eb04..f6a7f9856c 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/DisableDeletePlugin.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/DisableDeletePlugin.java @@ -28,7 +28,6 @@ * Disables all delete methods in the MyBatis3DynamicSQL and MyBatis3Kotlin runtimes. * * @author Jeff Butler - * */ public class DisableDeletePlugin extends PluginAdapter { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/DisableInsertPlugin.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/DisableInsertPlugin.java index 02fef8859e..86206ef6c8 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/DisableInsertPlugin.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/DisableInsertPlugin.java @@ -28,7 +28,6 @@ * Disables all insert methods in the MyBatis3DynamicSQL and MyBatis3Kotlin runtimes. * * @author Jeff Butler - * */ public class DisableInsertPlugin extends PluginAdapter { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/DisableUpdatePlugin.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/DisableUpdatePlugin.java index 0203ab2845..f67d043ec7 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/DisableUpdatePlugin.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/DisableUpdatePlugin.java @@ -28,7 +28,6 @@ * Disables all update methods in the MyBatis3DynamicSQL and MyBatis3Kotlin runtimes. * * @author Jeff Butler - * */ public class DisableUpdatePlugin extends PluginAdapter { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/ReadOnlyPlugin.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/ReadOnlyPlugin.java index 0c8ce841af..81a522f025 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/ReadOnlyPlugin.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/plugins/dsql/ReadOnlyPlugin.java @@ -23,7 +23,6 @@ * Disables delete, insert, delete, and update methods in the MyBatisDynamicSQLV2 runtime. * * @author Jeff Butler - * */ public class ReadOnlyPlugin extends CompositePlugin { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/dynamic/sql/DynamicSqlModelGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/dynamic/sql/DynamicSqlModelGenerator.java index c81af4699a..42773383e3 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/dynamic/sql/DynamicSqlModelGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/dynamic/sql/DynamicSqlModelGenerator.java @@ -42,7 +42,6 @@ * It does not support the immutable model, or constructor based attributes. * * @author Jeff Butler - * */ public class DynamicSqlModelGenerator extends AbstractJavaGenerator { diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/dynamic/sql/elements/InsertMultipleMethodGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/dynamic/sql/elements/InsertMultipleMethodGenerator.java index dd9fa49c36..f3c3e66224 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/dynamic/sql/elements/InsertMultipleMethodGenerator.java +++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/dynamic/sql/elements/InsertMultipleMethodGenerator.java @@ -64,7 +64,7 @@ public MethodAndImports generateMethodAndImports() { } method.addBodyLine("return " + methodName + "(this::insertMultiple, records, " //$NON-NLS-1$ //$NON-NLS-2$ - + tableFieldName //$NON-NLS-1$ + + tableFieldName // $NON-NLS-1$ + ", c ->"); //$NON-NLS-1$ List columns = diff --git a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/JavaCodeGenerationTest.java b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/JavaCodeGenerationTest.java index 571f56897b..3f982c65f1 100644 --- a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/JavaCodeGenerationTest.java +++ b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/JavaCodeGenerationTest.java @@ -17,6 +17,9 @@ import static org.junit.jupiter.api.Assertions.*; +import com.github.javaparser.ParseProblemException; +import com.github.javaparser.StaticJavaParser; + import java.io.ByteArrayInputStream; import java.util.ArrayList; import java.util.List; @@ -30,9 +33,6 @@ import org.mybatis.generator.config.xml.ConfigurationParser; import org.mybatis.generator.internal.DefaultShellCallback; -import com.github.javaparser.ParseProblemException; -import com.github.javaparser.StaticJavaParser; - class JavaCodeGenerationTest { @ParameterizedTest diff --git a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/KotlinCodeGenerationTest.java b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/KotlinCodeGenerationTest.java index 518218f122..db83ac5ac7 100644 --- a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/KotlinCodeGenerationTest.java +++ b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/KotlinCodeGenerationTest.java @@ -35,7 +35,6 @@ * test coverage as it mimics the code paths executed by the integration test. * * @author Jeff Butler - * */ class KotlinCodeGenerationTest { diff --git a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/SqlScriptRunner.java b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/SqlScriptRunner.java index dd387bfa34..ac8aab7396 100644 --- a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/SqlScriptRunner.java +++ b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/SqlScriptRunner.java @@ -27,8 +27,7 @@ import java.sql.Statement; /** - * This class is used to execute an SQL script before a code generation - * run. + * This class is used to execute an SQL script before a code generation run. * * @author Jeff Butler */ diff --git a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/XmlCodeGenerationTest.java b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/XmlCodeGenerationTest.java index f465c6f529..62cd496284 100644 --- a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/XmlCodeGenerationTest.java +++ b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/XmlCodeGenerationTest.java @@ -82,7 +82,7 @@ static class TestEntityResolver implements EntityResolver { @Override public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { - // just return an empty string. this should stop the parser from trying to access the network + // just return an empty string. this should stop the parser from trying to access the network return new InputSource(new ByteArrayInputStream("".getBytes())); } } diff --git a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/api/dom/java/FullyQualifiedJavaTypeTest.java b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/api/dom/java/FullyQualifiedJavaTypeTest.java index 1e36a41e4c..ae61eaf73e 100644 --- a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/api/dom/java/FullyQualifiedJavaTypeTest.java +++ b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/api/dom/java/FullyQualifiedJavaTypeTest.java @@ -23,7 +23,6 @@ /** * @author Jeff Butler - * */ class FullyQualifiedJavaTypeTest { diff --git a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/sqlprovider/MethodLineReaderTest.java b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/sqlprovider/MethodLineReaderTest.java index aa224c133a..6ecf9eed05 100644 --- a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/sqlprovider/MethodLineReaderTest.java +++ b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/sqlprovider/MethodLineReaderTest.java @@ -17,10 +17,10 @@ import static org.junit.jupiter.api.Assertions.*; -import org.junit.jupiter.api.Test; - import java.util.List; +import org.junit.jupiter.api.Test; + class MethodLineReaderTest { @Test diff --git a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/config/xml/PropertyParserTest.java b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/config/xml/PropertyParserTest.java index 254667ff71..e1f1012252 100644 --- a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/config/xml/PropertyParserTest.java +++ b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/config/xml/PropertyParserTest.java @@ -31,7 +31,7 @@ class PropertyParserTest { @DisplayName("Testing MyBatisGeneratorConfigurationParser.parsePropertyTokens(String token)") @ParameterizedTest(name = "{index} => properties:''{0}'', token:''{1}'', expected:''{2}''") @MethodSource("parsePropertyTokensTestSource") - void parsePropertyTokensTest(Properties prop, String token, String expected){ + void parsePropertyTokensTest(Properties prop, String token, String expected) { MyBatisGeneratorConfigurationParser parser = new MyBatisGeneratorConfigurationParser(prop); String result = parser.parsePropertyTokens(token); assertThat(result).isEqualTo(expected); diff --git a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/internal/XmlFileMergerTest.java b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/internal/XmlFileMergerTest.java index 2150a5cd7e..3eb879cc4f 100644 --- a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/internal/XmlFileMergerTest.java +++ b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/internal/XmlFileMergerTest.java @@ -38,7 +38,6 @@ * after running through the XML merger. * * @author Jeff Butler - * */ class XmlFileMergerTest { diff --git a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/internal/util/JavaBeansUtilTest.java b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/internal/util/JavaBeansUtilTest.java index bb8d806df0..6d96134bf7 100644 --- a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/internal/util/JavaBeansUtilTest.java +++ b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/internal/util/JavaBeansUtilTest.java @@ -25,7 +25,6 @@ /** * @author Jeff Butler - * */ class JavaBeansUtilTest { diff --git a/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MavenProgressCallback.java b/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MavenProgressCallback.java index e44b0571a3..03705fbbae 100644 --- a/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MavenProgressCallback.java +++ b/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MavenProgressCallback.java @@ -22,7 +22,6 @@ * This callback logs progress messages with the Maven logger. * * @author Jeff Butler - * */ public class MavenProgressCallback implements ProgressCallback { diff --git a/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MavenShellCallback.java b/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MavenShellCallback.java index 8dce59b952..ba63bb2969 100644 --- a/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MavenShellCallback.java +++ b/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MavenShellCallback.java @@ -15,13 +15,13 @@ */ package org.mybatis.generator.maven; +import static org.mybatis.generator.internal.util.messages.Messages.getString; + import java.io.File; import org.mybatis.generator.exception.ShellException; import org.mybatis.generator.internal.DefaultShellCallback; -import static org.mybatis.generator.internal.util.messages.Messages.getString; - /** * Shell callback that calculates the Maven output directory. * diff --git a/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MyBatisGeneratorMojo.java b/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MyBatisGeneratorMojo.java index 34f9dc783b..c466b7077f 100644 --- a/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MyBatisGeneratorMojo.java +++ b/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MyBatisGeneratorMojo.java @@ -54,7 +54,6 @@ public class MyBatisGeneratorMojo extends AbstractMojo { /** * Maven Project. - * */ @Parameter(property = "project", required = true, readonly = true) private MavenProject project; diff --git a/core/mybatis-generator-systests-common/src/main/java/mbg/test/common/BaseClass.java b/core/mybatis-generator-systests-common/src/main/java/mbg/test/common/BaseClass.java index d4bcbb01f5..59251ed904 100644 --- a/core/mybatis-generator-systests-common/src/main/java/mbg/test/common/BaseClass.java +++ b/core/mybatis-generator-systests-common/src/main/java/mbg/test/common/BaseClass.java @@ -29,7 +29,7 @@ public BaseClass() { } // these methods are final so that an error will be generated - // if the extended class tries to overwrite them. This + // if the extended class tries to overwrite them. This // will break the build as the generator should // see a duplicate property. public final String getLastname() { diff --git a/core/mybatis-generator-systests-common/src/main/java/mbg/test/common/FirstName.java b/core/mybatis-generator-systests-common/src/main/java/mbg/test/common/FirstName.java index 5a211a1fb0..3ed17c4a0f 100644 --- a/core/mybatis-generator-systests-common/src/main/java/mbg/test/common/FirstName.java +++ b/core/mybatis-generator-systests-common/src/main/java/mbg/test/common/FirstName.java @@ -17,7 +17,6 @@ /** * @author Jeff Butler - * */ public class FirstName { @@ -44,7 +43,7 @@ public boolean equals(Object arg0) { return false; } - return value.equals(((FirstName)arg0).getValue()); + return value.equals(((FirstName) arg0).getValue()); } @Override diff --git a/core/mybatis-generator-systests-common/src/main/java/mbg/test/common/MyTime.java b/core/mybatis-generator-systests-common/src/main/java/mbg/test/common/MyTime.java index ff20918d5d..6dfb84d322 100644 --- a/core/mybatis-generator-systests-common/src/main/java/mbg/test/common/MyTime.java +++ b/core/mybatis-generator-systests-common/src/main/java/mbg/test/common/MyTime.java @@ -17,7 +17,6 @@ /** * @author Jeff Butler - * */ public class MyTime { private int hours; diff --git a/core/mybatis-generator-systests-domtests/src/main/java/mbg/domtest/GenerateTestSourceFiles.java b/core/mybatis-generator-systests-domtests/src/main/java/mbg/domtest/GenerateTestSourceFiles.java index 482ffa3eee..4aa57c66dd 100644 --- a/core/mybatis-generator-systests-domtests/src/main/java/mbg/domtest/GenerateTestSourceFiles.java +++ b/core/mybatis-generator-systests-domtests/src/main/java/mbg/domtest/GenerateTestSourceFiles.java @@ -32,7 +32,7 @@ public class GenerateTestSourceFiles { - public static void main (String[] args) { + public static void main(String[] args) { if (args.length < 1 || !StringUtility.stringHasValue(args[0])) { throw new RuntimeException("This class requres one argument which is the location of the output directory"); } @@ -73,7 +73,7 @@ private void run(File outputDirectory) throws IOException, ReflectiveOperationEx cus.addAll(generator.generate()); } - for (CompilationUnit cu: cus) { + for (CompilationUnit cu : cus) { writeCompilationUnit(outputDirectory, cu); } } diff --git a/core/mybatis-generator-systests-domtests/src/main/java/mbg/domtest/generators/fieldtype1/Test1Generator.java b/core/mybatis-generator-systests-domtests/src/main/java/mbg/domtest/generators/fieldtype1/Test1Generator.java index e1ab329d2a..b164b1d0f1 100644 --- a/core/mybatis-generator-systests-domtests/src/main/java/mbg/domtest/generators/fieldtype1/Test1Generator.java +++ b/core/mybatis-generator-systests-domtests/src/main/java/mbg/domtest/generators/fieldtype1/Test1Generator.java @@ -34,7 +34,7 @@ * in code generation when the type is not explicitly imported. * */ -//@IgnoreDomTest("Ignore until changes for issue #63 are committed") +// @IgnoreDomTest("Ignore until changes for issue #63 are committed") public class Test1Generator implements CompilationUnitGenerator { private static final String BASE_PACKAGE = "mbg.domtest.generators.fieldtype1.output"; diff --git a/core/mybatis-generator-systests-domtests/src/main/java/mbg/domtest/generators/simple/interfaze/SimpleInterfaceGenerator.java b/core/mybatis-generator-systests-domtests/src/main/java/mbg/domtest/generators/simple/interfaze/SimpleInterfaceGenerator.java index 4800daec03..8732757012 100644 --- a/core/mybatis-generator-systests-domtests/src/main/java/mbg/domtest/generators/simple/interfaze/SimpleInterfaceGenerator.java +++ b/core/mybatis-generator-systests-domtests/src/main/java/mbg/domtest/generators/simple/interfaze/SimpleInterfaceGenerator.java @@ -28,7 +28,6 @@ /** * This generator generates a simple interface and implementing class in different packages. - * */ public class SimpleInterfaceGenerator implements CompilationUnitGenerator { diff --git a/core/mybatis-generator-systests-mybatis3-java8/src/main/java/mbg/test/mb3/common/FirstNameTypeHandler.java b/core/mybatis-generator-systests-mybatis3-java8/src/main/java/mbg/test/mb3/common/FirstNameTypeHandler.java index be0eb03c13..97ed1e18fe 100644 --- a/core/mybatis-generator-systests-mybatis3-java8/src/main/java/mbg/test/mb3/common/FirstNameTypeHandler.java +++ b/core/mybatis-generator-systests-mybatis3-java8/src/main/java/mbg/test/mb3/common/FirstNameTypeHandler.java @@ -20,14 +20,13 @@ import java.sql.ResultSet; import java.sql.SQLException; -import mbg.test.common.FirstName; - import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.TypeHandler; +import mbg.test.common.FirstName; + /** * @author Jeff Butler - * */ public class FirstNameTypeHandler implements TypeHandler { diff --git a/core/mybatis-generator-systests-mybatis3-java8/src/main/java/mbg/test/mb3/common/MyTimeTypeHandler.java b/core/mybatis-generator-systests-mybatis3-java8/src/main/java/mbg/test/mb3/common/MyTimeTypeHandler.java index 776e2cdeca..e47baaa560 100644 --- a/core/mybatis-generator-systests-mybatis3-java8/src/main/java/mbg/test/mb3/common/MyTimeTypeHandler.java +++ b/core/mybatis-generator-systests-mybatis3-java8/src/main/java/mbg/test/mb3/common/MyTimeTypeHandler.java @@ -22,14 +22,13 @@ import java.sql.Time; import java.util.Calendar; -import mbg.test.common.MyTime; - import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.TypeHandler; +import mbg.test.common.MyTime; + /** * @author Jeff Butler - * */ public class MyTimeTypeHandler implements TypeHandler { diff --git a/core/mybatis-generator-systests-mybatis3-java8/src/main/java/mbg/test/mb3/common/TestEnum.java b/core/mybatis-generator-systests-mybatis3-java8/src/main/java/mbg/test/mb3/common/TestEnum.java index dd195ef7dc..2a0434a2f2 100644 --- a/core/mybatis-generator-systests-mybatis3-java8/src/main/java/mbg/test/mb3/common/TestEnum.java +++ b/core/mybatis-generator-systests-mybatis3-java8/src/main/java/mbg/test/mb3/common/TestEnum.java @@ -17,7 +17,6 @@ /** * @author Jeff Butler - * */ public enum TestEnum { FRED, diff --git a/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/AbstractTest.java b/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/AbstractTest.java index 2a00c8cb13..a96714c1f5 100644 --- a/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/AbstractTest.java +++ b/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/AbstractTest.java @@ -37,7 +37,6 @@ /** * @author Jeff Butler - * */ public abstract class AbstractTest { diff --git a/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/DynamicSqlTest.java b/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/DynamicSqlTest.java index e196cfd62d..fee55507d2 100644 --- a/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/DynamicSqlTest.java +++ b/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/DynamicSqlTest.java @@ -40,7 +40,6 @@ import java.util.List; import java.util.Optional; -import mbg.test.mb3.generated.dsql.mapper.mbgtest.sub.TranslationMapper; import org.apache.ibatis.session.SqlSession; import org.junit.jupiter.api.Test; import org.mybatis.dynamic.sql.select.CountDSLCompleter; @@ -54,6 +53,7 @@ import mbg.test.mb3.generated.dsql.mapper.PkfieldsblobsMapper; import mbg.test.mb3.generated.dsql.mapper.PkonlyMapper; import mbg.test.mb3.generated.dsql.mapper.mbgtest.IdMapper; +import mbg.test.mb3.generated.dsql.mapper.mbgtest.sub.TranslationMapper; import mbg.test.mb3.generated.dsql.model.AwfulTable; import mbg.test.mb3.generated.dsql.model.Fieldsblobs; import mbg.test.mb3.generated.dsql.model.Fieldsonly; @@ -66,7 +66,6 @@ /** * @author Jeff Butler - * */ public class DynamicSqlTest extends AbstractTest { diff --git a/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/UpdateByExampleTest.java index 73920f8f5e..f40295b175 100644 --- a/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/UpdateByExampleTest.java @@ -48,9 +48,7 @@ import mbg.test.mb3.generated.dsql.model.Pkonly; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractTest { diff --git a/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/miscellaneous/AbstractAnnotatedMiscellaneousTest.java b/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/miscellaneous/AbstractAnnotatedMiscellaneousTest.java index 2a4c3f4b13..5dd7423012 100644 --- a/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/miscellaneous/AbstractAnnotatedMiscellaneousTest.java +++ b/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/miscellaneous/AbstractAnnotatedMiscellaneousTest.java @@ -17,7 +17,6 @@ import static mbg.test.common.util.TestUtilities.createDatabase; -import mbg.test.mb3.generated.dsql.miscellaneous.mapper.EnumordinaltestMapper; import org.apache.ibatis.datasource.unpooled.UnpooledDataSource; import org.apache.ibatis.mapping.Environment; import org.apache.ibatis.session.Configuration; @@ -26,6 +25,7 @@ import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory; import org.junit.jupiter.api.BeforeEach; +import mbg.test.mb3.generated.dsql.miscellaneous.mapper.EnumordinaltestMapper; import mbg.test.mb3.generated.dsql.miscellaneous.mapper.EnumtestMapper; import mbg.test.mb3.generated.dsql.miscellaneous.mapper.GeneratedalwaystestMapper; import mbg.test.mb3.generated.dsql.miscellaneous.mapper.GeneratedalwaystestnoupdatesMapper; diff --git a/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/miscellaneous/MiscellaneousTest.java b/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/miscellaneous/MiscellaneousTest.java index 5725db2750..473b8d54eb 100644 --- a/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/miscellaneous/MiscellaneousTest.java +++ b/core/mybatis-generator-systests-mybatis3-java8/src/test/java/mbg/test/mb3/dsql/miscellaneous/MiscellaneousTest.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Optional; -import mbg.test.mb3.generated.dsql.miscellaneous.mapper.EnumordinaltestMapper; -import mbg.test.mb3.generated.dsql.miscellaneous.model.Enumordinaltest; import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.SqlSession; import org.junit.jupiter.api.Test; @@ -39,16 +37,17 @@ import mbg.test.common.FirstName; import mbg.test.common.MyTime; import mbg.test.mb3.common.TestEnum; +import mbg.test.mb3.generated.dsql.miscellaneous.mapper.EnumordinaltestMapper; import mbg.test.mb3.generated.dsql.miscellaneous.mapper.EnumtestMapper; import mbg.test.mb3.generated.dsql.miscellaneous.mapper.MyObjectMapper; import mbg.test.mb3.generated.dsql.miscellaneous.mapper.RegexrenameMapper; +import mbg.test.mb3.generated.dsql.miscellaneous.model.Enumordinaltest; import mbg.test.mb3.generated.dsql.miscellaneous.model.Enumtest; import mbg.test.mb3.generated.dsql.miscellaneous.model.MyObject; import mbg.test.mb3.generated.dsql.miscellaneous.model.Regexrename; /** * @author Jeff Butler - * */ public class MiscellaneousTest extends AbstractAnnotatedMiscellaneousTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/main/java/mbg/test/mb3/common/FirstNameTypeHandler.java b/core/mybatis-generator-systests-mybatis3/src/main/java/mbg/test/mb3/common/FirstNameTypeHandler.java index be0eb03c13..97ed1e18fe 100644 --- a/core/mybatis-generator-systests-mybatis3/src/main/java/mbg/test/mb3/common/FirstNameTypeHandler.java +++ b/core/mybatis-generator-systests-mybatis3/src/main/java/mbg/test/mb3/common/FirstNameTypeHandler.java @@ -20,14 +20,13 @@ import java.sql.ResultSet; import java.sql.SQLException; -import mbg.test.common.FirstName; - import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.TypeHandler; +import mbg.test.common.FirstName; + /** * @author Jeff Butler - * */ public class FirstNameTypeHandler implements TypeHandler { diff --git a/core/mybatis-generator-systests-mybatis3/src/main/java/mbg/test/mb3/common/MyTimeTypeHandler.java b/core/mybatis-generator-systests-mybatis3/src/main/java/mbg/test/mb3/common/MyTimeTypeHandler.java index 776e2cdeca..e47baaa560 100644 --- a/core/mybatis-generator-systests-mybatis3/src/main/java/mbg/test/mb3/common/MyTimeTypeHandler.java +++ b/core/mybatis-generator-systests-mybatis3/src/main/java/mbg/test/mb3/common/MyTimeTypeHandler.java @@ -22,14 +22,13 @@ import java.sql.Time; import java.util.Calendar; -import mbg.test.common.MyTime; - import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.TypeHandler; +import mbg.test.common.MyTime; + /** * @author Jeff Butler - * */ public class MyTimeTypeHandler implements TypeHandler { diff --git a/core/mybatis-generator-systests-mybatis3/src/main/java/mbg/test/mb3/common/TestEnum.java b/core/mybatis-generator-systests-mybatis3/src/main/java/mbg/test/mb3/common/TestEnum.java index dd195ef7dc..2a0434a2f2 100644 --- a/core/mybatis-generator-systests-mybatis3/src/main/java/mbg/test/mb3/common/TestEnum.java +++ b/core/mybatis-generator-systests-mybatis3/src/main/java/mbg/test/mb3/common/TestEnum.java @@ -17,7 +17,6 @@ /** * @author Jeff Butler - * */ public enum TestEnum { FRED, diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/AbstractTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/AbstractTest.java index d09eeec4e8..7951efd4bd 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/AbstractTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/AbstractTest.java @@ -26,7 +26,6 @@ /** * @author Jeff Butler - * */ public abstract class AbstractTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/conditional/ConditionalJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/conditional/ConditionalJava5Test.java index 6acf7f7862..d1ddf4f169 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/conditional/ConditionalJava5Test.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/conditional/ConditionalJava5Test.java @@ -57,7 +57,6 @@ /** * @author Jeff Butler - * */ public class ConditionalJava5Test extends AbstractAnnotatedConditionalTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/conditional/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/conditional/UpdateByExampleTest.java index 8c4f70a498..a424f90e17 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/conditional/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/conditional/UpdateByExampleTest.java @@ -47,9 +47,7 @@ import mbg.test.mb3.generated.annotated.conditional.model.PkonlyKey; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractAnnotatedConditionalTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/FlatJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/FlatJava5Test.java index 432ff6218e..6e23278c1c 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/FlatJava5Test.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/FlatJava5Test.java @@ -54,7 +54,6 @@ /** * @author Jeff Butler - * */ public class FlatJava5Test extends AbstractAnnotatedFlatTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/UpdateByExampleTest.java index 30ec6acc96..95123e2462 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/UpdateByExampleTest.java @@ -47,9 +47,7 @@ import mbg.test.mb3.generated.annotated.flat.model.subpackage.FieldsonlyExample; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractAnnotatedFlatTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/HierarchicalJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/HierarchicalJava5Test.java index 9ce799b762..f292056b5e 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/HierarchicalJava5Test.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/HierarchicalJava5Test.java @@ -59,7 +59,6 @@ /** * @author Jeff Butler - * */ public class HierarchicalJava5Test extends AbstractAnnotatedHierarchicalTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/UpdateByExampleTest.java index 7678946040..d8e64fc46c 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/UpdateByExampleTest.java @@ -50,9 +50,7 @@ import mbg.test.mb3.generated.annotated.hierarchical.model.PkonlyKey; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractAnnotatedHierarchicalTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/immutable/HierarchicalJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/immutable/HierarchicalJava5Test.java index fabbc6c80b..e581772319 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/immutable/HierarchicalJava5Test.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/immutable/HierarchicalJava5Test.java @@ -55,7 +55,6 @@ /** * @author Jeff Butler - * */ public class HierarchicalJava5Test extends AbstractAnnotatedHierarchicalImmutableTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/immutable/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/immutable/UpdateByExampleTest.java index e36cd787cb..3fad15ba66 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/immutable/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/hierarchical/immutable/UpdateByExampleTest.java @@ -47,9 +47,7 @@ import mbg.test.mb3.generated.annotated.hierarchical.Immutable.Model.PkonlyKey; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractAnnotatedHierarchicalImmutableTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/miscellaneous/AbstractAnnotatedMiscellaneousTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/miscellaneous/AbstractAnnotatedMiscellaneousTest.java index 6d26759d8f..09b1721653 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/miscellaneous/AbstractAnnotatedMiscellaneousTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/miscellaneous/AbstractAnnotatedMiscellaneousTest.java @@ -15,10 +15,10 @@ */ package mbg.test.mb3.annotated.miscellaneous; -import mbg.test.mb3.generated.annotated.miscellaneous.mapper.EnumordinaltestMapper; import org.junit.jupiter.api.BeforeEach; import mbg.test.mb3.AbstractTest; +import mbg.test.mb3.generated.annotated.miscellaneous.mapper.EnumordinaltestMapper; import mbg.test.mb3.generated.annotated.miscellaneous.mapper.EnumtestMapper; import mbg.test.mb3.generated.annotated.miscellaneous.mapper.GeneratedalwaystestMapper; import mbg.test.mb3.generated.annotated.miscellaneous.mapper.GeneratedalwaystestnoupdatesMapper; diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/miscellaneous/MiscellaneousTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/miscellaneous/MiscellaneousTest.java index 8ba8f481ce..846e4d12bd 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/miscellaneous/MiscellaneousTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/miscellaneous/MiscellaneousTest.java @@ -22,17 +22,17 @@ import java.util.Date; import java.util.List; -import mbg.test.mb3.generated.annotated.miscellaneous.mapper.EnumordinaltestMapper; -import mbg.test.mb3.generated.annotated.miscellaneous.model.Enumordinaltest; import org.apache.ibatis.session.SqlSession; import org.junit.jupiter.api.Test; import mbg.test.common.FirstName; import mbg.test.common.MyTime; import mbg.test.mb3.common.TestEnum; +import mbg.test.mb3.generated.annotated.miscellaneous.mapper.EnumordinaltestMapper; import mbg.test.mb3.generated.annotated.miscellaneous.mapper.EnumtestMapper; import mbg.test.mb3.generated.annotated.miscellaneous.mapper.MyObjectMapper; import mbg.test.mb3.generated.annotated.miscellaneous.mapper.RegexrenameMapper; +import mbg.test.mb3.generated.annotated.miscellaneous.model.Enumordinaltest; import mbg.test.mb3.generated.annotated.miscellaneous.model.Enumtest; import mbg.test.mb3.generated.annotated.miscellaneous.model.MyObject; import mbg.test.mb3.generated.annotated.miscellaneous.model.MyObjectCriteria; @@ -41,7 +41,6 @@ /** * @author Jeff Butler - * */ public class MiscellaneousTest extends AbstractAnnotatedMiscellaneousTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/ConditionalJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/ConditionalJava5Test.java index 285ddd4074..5d433c29ee 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/ConditionalJava5Test.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/ConditionalJava5Test.java @@ -57,7 +57,6 @@ /** * @author Jeff Butler - * */ public class ConditionalJava5Test extends AbstractConditionalTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/UpdateByExampleTest.java index 5da6d10762..3345fcc9d6 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/UpdateByExampleTest.java @@ -47,9 +47,7 @@ import mbg.test.mb3.generated.conditional.model.PkonlyKey; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractConditionalTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/immutable/ConditionalJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/immutable/ConditionalJava5Test.java index c1248f527c..d857cef0eb 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/immutable/ConditionalJava5Test.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/immutable/ConditionalJava5Test.java @@ -53,7 +53,6 @@ /** * @author Jeff Butler - * */ public class ConditionalJava5Test extends AbstractConditionalImmutableTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/immutable/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/immutable/UpdateByExampleTest.java index 11d1b4a27f..dfe5c9da41 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/immutable/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/conditional/immutable/UpdateByExampleTest.java @@ -45,9 +45,7 @@ import mbg.test.mb3.generated.conditional.immutable.model.PkonlyKey; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractConditionalImmutableTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/flat/FlatJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/flat/FlatJava5Test.java index a7a236fdfb..f84228ed54 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/flat/FlatJava5Test.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/flat/FlatJava5Test.java @@ -54,7 +54,6 @@ /** * @author Jeff Butler - * */ public class FlatJava5Test extends AbstractFlatTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/flat/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/flat/UpdateByExampleTest.java index 28fd6e31a6..fa7c378e74 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/flat/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/flat/UpdateByExampleTest.java @@ -47,9 +47,7 @@ import mbg.test.mb3.generated.flat.model.subpackage.FieldsonlyExample; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractFlatTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/HierarchicalJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/HierarchicalJava5Test.java index ed4c07bc48..803a527bc3 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/HierarchicalJava5Test.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/HierarchicalJava5Test.java @@ -59,7 +59,6 @@ /** * @author Jeff Butler - * */ public class HierarchicalJava5Test extends AbstractHierarchicalTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/UpdateByExampleTest.java index 9099efcba2..5d222a1003 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/UpdateByExampleTest.java @@ -50,9 +50,7 @@ import mbg.test.mb3.generated.hierarchical.model.subpackage.FieldsOnlyEntityExample; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractHierarchicalTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/immutable/HierarchicalJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/immutable/HierarchicalJava5Test.java index 917aa6e468..0829b18370 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/immutable/HierarchicalJava5Test.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/immutable/HierarchicalJava5Test.java @@ -55,7 +55,6 @@ /** * @author Jeff Butler - * */ public class HierarchicalJava5Test extends AbstractHierarchicalImmutableTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/immutable/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/immutable/UpdateByExampleTest.java index a153429d09..1d5c0abfb3 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/immutable/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/hierarchical/immutable/UpdateByExampleTest.java @@ -47,9 +47,7 @@ import mbg.test.mb3.generated.hierarchical.immutable.model.PkonlyKey; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractHierarchicalImmutableTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/miscellaneous/MiscellaneousTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/miscellaneous/MiscellaneousTest.java index 5893401864..b0501b025b 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/miscellaneous/MiscellaneousTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/miscellaneous/MiscellaneousTest.java @@ -28,17 +28,17 @@ import java.util.Date; import java.util.List; -import mbg.test.mb3.generated.miscellaneous.mapper.EnumordinaltestMapper; -import mbg.test.mb3.generated.miscellaneous.model.Enumordinaltest; import org.apache.ibatis.session.SqlSession; import org.junit.jupiter.api.Test; import mbg.test.common.FirstName; import mbg.test.common.MyTime; import mbg.test.mb3.common.TestEnum; +import mbg.test.mb3.generated.miscellaneous.mapper.EnumordinaltestMapper; import mbg.test.mb3.generated.miscellaneous.mapper.EnumtestMapper; import mbg.test.mb3.generated.miscellaneous.mapper.MyMapper; import mbg.test.mb3.generated.miscellaneous.mapper.RegexrenameMapper; +import mbg.test.mb3.generated.miscellaneous.model.Enumordinaltest; import mbg.test.mb3.generated.miscellaneous.model.Enumtest; import mbg.test.mb3.generated.miscellaneous.model.MyObject; import mbg.test.mb3.generated.miscellaneous.model.MyObjectCriteria; @@ -49,7 +49,6 @@ /** * @author Jeff Butler - * */ public class MiscellaneousTest extends AbstractMiscellaneousTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/conditional/ConditionalJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/conditional/ConditionalJava5Test.java index 85c2678048..b1581c0990 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/conditional/ConditionalJava5Test.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/conditional/ConditionalJava5Test.java @@ -57,7 +57,6 @@ /** * @author Jeff Butler - * */ public class ConditionalJava5Test extends AbstractMixedConditionalTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/conditional/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/conditional/UpdateByExampleTest.java index eb5d0208fb..3cda9a7f44 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/conditional/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/conditional/UpdateByExampleTest.java @@ -47,9 +47,7 @@ import mbg.test.mb3.generated.mixed.conditional.model.PkonlyKey; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractMixedConditionalTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/flat/FlatJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/flat/FlatJava5Test.java index e9f1f070c5..5518412704 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/flat/FlatJava5Test.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/flat/FlatJava5Test.java @@ -54,7 +54,6 @@ /** * @author Jeff Butler - * */ public class FlatJava5Test extends AbstractMixedFlatTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/flat/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/flat/UpdateByExampleTest.java index 2d5e820569..5322960d0e 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/flat/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/flat/UpdateByExampleTest.java @@ -47,9 +47,7 @@ import mbg.test.mb3.generated.mixed.flat.model.PkonlyExample; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractMixedFlatTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/HierarchicalJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/HierarchicalJava5Test.java index bfab7dd547..14a152679c 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/HierarchicalJava5Test.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/HierarchicalJava5Test.java @@ -59,7 +59,6 @@ /** * @author Jeff Butler - * */ public class HierarchicalJava5Test extends AbstractMixedHierarchicalTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/UpdateByExampleTest.java index effd88c93f..7fcc2023b7 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/UpdateByExampleTest.java @@ -50,9 +50,7 @@ import mbg.test.mb3.generated.mixed.hierarchical.model.PkonlyKey; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractMixedHierarchicalTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/immutable/HierarchicalJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/immutable/HierarchicalJava5Test.java index cbc28ab239..ee675db2d5 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/immutable/HierarchicalJava5Test.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/immutable/HierarchicalJava5Test.java @@ -55,7 +55,6 @@ /** * @author Jeff Butler - * */ public class HierarchicalJava5Test extends AbstractMixedHierarchicalImmutableTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/immutable/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/immutable/UpdateByExampleTest.java index 31f91f0119..b3576c1229 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/immutable/UpdateByExampleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/hierarchical/immutable/UpdateByExampleTest.java @@ -47,9 +47,7 @@ import mbg.test.mb3.generated.mixed.hierarchical.Immutable.Model.PkonlyKey; /** - * * @author Jeff Butler - * */ public class UpdateByExampleTest extends AbstractMixedHierarchicalImmutableTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/miscellaneous/MiscellaneousTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/miscellaneous/MiscellaneousTest.java index 8cc7fecd44..cf09b880e8 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/miscellaneous/MiscellaneousTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/mixed/miscellaneous/MiscellaneousTest.java @@ -39,7 +39,6 @@ /** * @author Jeff Butler - * */ public class MiscellaneousTest extends AbstractMixedMiscellaneousTest { diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/simple/SimpleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/simple/SimpleTest.java index aa4edf6e0d..0db0dba8c0 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/simple/SimpleTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/simple/SimpleTest.java @@ -89,7 +89,6 @@ record = new AwfulTable(); } } - @Test public void testPKFieldsInsert() { SqlSession sqlSession = sqlSessionFactory.openSession(); diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/simpleannotated/SimpleAnnotatedTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/simpleannotated/SimpleAnnotatedTest.java index 2496a3ff65..baa8e0f0b7 100644 --- a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/simpleannotated/SimpleAnnotatedTest.java +++ b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/simpleannotated/SimpleAnnotatedTest.java @@ -85,7 +85,6 @@ record = new AwfulTable(); } } - @Test public void testPKFieldsInsert() { try (SqlSession sqlSession = sqlSessionFactory.openSession()) {