Merge pull request #1434 from jeffgbutler/sonar-nags

jeffgbutler · web-flow · commit 345d7f9d2654 · 2026-01-31T21:52:39.000-05:00
Fix a Few Sonar Nags
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/GenerationEngine.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/GenerationEngine.java
@@ -45,7 +45,7 @@ protected GenerationEngine(Builder builder) {
         // items in the configuration.
         runtimes = builder.introspectedTables.stream().map(introspectedTable -> {
             AbstractRuntime.AbstractRuntimeBuilder<?> runtimeBuilder = ObjectFactory.createInternalObject(
-                    contextValues.runtimeBuilderClassName(), AbstractRuntime.AbstractRuntimeBuilder.class);
+                    contextValues.runtimeBuilderClassName());
             return runtimeBuilder
                     .withIntrospectedTable(introspectedTable)
                     .withContext(context)
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
@@ -74,7 +74,7 @@ private RootClassInfo(String className, List<String> warnings) {
         }
 
         try {
-            Class<?> clazz = ObjectFactory.externalClassForName(nameWithoutGenerics, Class.class);
+            Class<?> clazz = ObjectFactory.externalClassForName(nameWithoutGenerics);
             BeanInfo bi = Introspector.getBeanInfo(clazz);
             propertyDescriptors = bi.getPropertyDescriptors();
         } catch (Exception e) {
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
@@ -54,5 +54,5 @@ public static boolean commentContainsTag(String comment) {
                 .anyMatch(comment::contains);
     }
 
-    public static String DO_NOT_DELETE_DURING_MERGE = "do_not_delete_during_merge"; //$NON-NLS-1$
+    public static final String DO_NOT_DELETE_DURING_MERGE = "do_not_delete_during_merge"; //$NON-NLS-1$
 }
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/GenericConnectionFactory.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/GenericConnectionFactory.java
@@ -65,7 +65,7 @@ private Driver getDriver() {
         Driver driver;
 
         try {
-            Class<Driver> clazz = ObjectFactory.externalClassForName(Objects.requireNonNull(driverClass), Driver.class);
+            Class<Driver> clazz = ObjectFactory.externalClassForName(Objects.requireNonNull(driverClass));
             driver = clazz.getConstructor().newInstance();
         } catch (Exception e) {
             throw new InternalException(getString("RuntimeError.8"), e); //$NON-NLS-1$
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/JDBCConnectionFactory.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/JDBCConnectionFactory.java
@@ -70,7 +70,7 @@ private Driver getDriver() {
         Driver driver;
 
         try {
-            Class<Driver> clazz = ObjectFactory.externalClassForName(config.getDriverClass(), Driver.class);
+            Class<Driver> clazz = ObjectFactory.externalClassForName(config.getDriverClass());
             driver = clazz.getConstructor().newInstance();
         } catch (Exception e) {
             throw new InternalException(getString("RuntimeError.8"), e); //$NON-NLS-1$
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/ObjectFactory.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/ObjectFactory.java
@@ -95,7 +95,7 @@ public static synchronized void addExternalClassLoader(ClassLoader classLoader)
      *             the class not found exception
      */
     @SuppressWarnings("unchecked")
-    public static <T> Class<T> externalClassForName(String type, Class<T> t) throws ClassNotFoundException {
+    public static <T> Class<T> externalClassForName(String type) throws ClassNotFoundException {
         Class<T> clazz;
 
         for (ClassLoader classLoader : externalClassLoaders) {
@@ -107,14 +107,14 @@ public static <T> Class<T> externalClassForName(String type, Class<T> t) throws
             }
         }
 
-        return internalClassForName(type, t);
+        return internalClassForName(type);
     }
 
-    public static <T> T createExternalObject(String type, Class<T> t) {
+    public static <T> T createExternalObject(String type) {
         T answer;
 
         try {
-            Class<T> clazz = externalClassForName(type, t);
+            Class<T> clazz = externalClassForName(type);
             answer = clazz.getConstructor().newInstance();
         } catch (Exception e) {
             throw new InternalException(getString("RuntimeError.6", type), e); //$NON-NLS-1$
@@ -124,7 +124,7 @@ public static <T> T createExternalObject(String type, Class<T> t) {
     }
 
     @SuppressWarnings("unchecked")
-    public static <T> Class<T> internalClassForName(String type, Class<T> t) throws ClassNotFoundException {
+    public static <T> Class<T> internalClassForName(String type) throws ClassNotFoundException {
         Class<?> clazz = null;
 
         try {
@@ -161,11 +161,11 @@ public static Optional<URL> getResource(String resource) {
         return Optional.ofNullable(url);
     }
 
-    public static <T> T createInternalObject(String type, Class<T> t) {
+    public static <T> T createInternalObject(String type) {
         T answer;
 
         try {
-            Class<T> clazz = internalClassForName(type, t);
+            Class<T> clazz = internalClassForName(type);
             answer = clazz.getConstructor().newInstance();
         } catch (Exception e) {
             throw new InternalException(getString("RuntimeError.6", type), e); //$NON-NLS-1$
@@ -179,7 +179,7 @@ public static JavaTypeResolver createJavaTypeResolver(Context context, List<Stri
                 .map(JavaTypeResolverConfiguration::getImplementationType)
                 .orElse(Defaults.DEFAULT_JAVA_TYPE_RESOLVER);
 
-        JavaTypeResolver answer = createInternalObject(type, JavaTypeResolver.class);
+        JavaTypeResolver answer = createInternalObject(type);
         answer.setWarnings(warnings);
 
         context.getJavaTypeResolverConfiguration()
@@ -192,7 +192,7 @@ public static JavaTypeResolver createJavaTypeResolver(Context context, List<Stri
 
     public static Plugin createPlugin(Context context, PluginConfiguration pluginConfiguration,
                                       CommentGenerator commentGenerator) {
-        Plugin plugin = createInternalObject(pluginConfiguration.getConfigurationType().orElseThrow(), Plugin.class);
+        Plugin plugin = createInternalObject(pluginConfiguration.getConfigurationType().orElseThrow());
         plugin.setContext(context);
         plugin.setProperties(pluginConfiguration.getProperties());
         plugin.setCommentGenerator(commentGenerator);
@@ -206,7 +206,7 @@ public static CommentGenerator createCommentGenerator(Context context) {
                 .map(CommentGeneratorConfiguration::getImplementationType)
                 .orElse(Defaults.DEFAULT_COMMENT_GENERATOR);
 
-        answer = createInternalObject(type, CommentGenerator.class);
+        answer = createInternalObject(type);
 
         context.getCommentGeneratorConfiguration()
                 .ifPresent(c -> answer.addConfigurationProperties(c.getProperties()));
@@ -219,7 +219,7 @@ public static ConnectionFactory createConnectionFactory(ConnectionFactoryConfigu
 
         String type = config.getImplementationType();
 
-        answer = createInternalObject(type, ConnectionFactory.class);
+        answer = createInternalObject(type);
         answer.addConfigurationProperties(config.getProperties());
 
         return answer;
@@ -231,7 +231,7 @@ public static JavaFormatter createJavaFormatter(Context context) {
             type = Defaults.DEFAULT_JAVA_FORMATTER;
         }
 
-        JavaFormatter answer = createInternalObject(type, JavaFormatter.class);
+        JavaFormatter answer = createInternalObject(type);
 
         answer.setContext(context);
 
@@ -244,7 +244,7 @@ public static KotlinFormatter createKotlinFormatter(Context context) {
             type = Defaults.DEFAULT_KOTLIN_FORMATTER;
         }
 
-        KotlinFormatter answer = createInternalObject(type, KotlinFormatter.class);
+        KotlinFormatter answer = createInternalObject(type);
 
         answer.setContext(context);
 
@@ -257,7 +257,7 @@ public static XmlFormatter createXmlFormatter(Context context) {
             type = Defaults.DEFAULT_XML_FORMATTER;
         }
 
-        XmlFormatter answer = createInternalObject(type, XmlFormatter.class);
+        XmlFormatter answer = createInternalObject(type);
 
         answer.setContext(context);
 
@@ -266,7 +266,7 @@ public static XmlFormatter createXmlFormatter(Context context) {
 
     public static IntrospectedColumn createIntrospectedColumn(Context context) {
         String type = context.getIntrospectedColumnImpl().orElse(IntrospectedColumn.class.getName());
-        IntrospectedColumn answer = createInternalObject(type, IntrospectedColumn.class);
+        IntrospectedColumn answer = createInternalObject(type);
         answer.setContext(context);
 
         return answer;
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/db/DatabaseIntrospector.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/internal/db/DatabaseIntrospector.java
@@ -296,20 +296,18 @@ private void calculateExtraColumnInformation(TableConfiguration tc, Map<ActualTa
 
     private void calculateIdentityColumns(TableConfiguration tc,
                                           Map<ActualTableName, List<IntrospectedColumn>> columns) {
-        tc.getGeneratedKey().ifPresent(gk -> {
-            columns.values().stream()
-                    .flatMap(List::stream)
-                    .filter(introspectedColumn -> isMatchedColumn(introspectedColumn, gk))
-                    .forEach(introspectedColumn -> {
-                        if (gk.isIdentity() || gk.isJdbcStandard()) {
-                            introspectedColumn.setIdentity(true);
-                            introspectedColumn.setSequenceColumn(false);
-                        } else {
-                            introspectedColumn.setIdentity(false);
-                            introspectedColumn.setSequenceColumn(true);
-                        }
-                    });
-        });
+        tc.getGeneratedKey().ifPresent(gk -> columns.values().stream()
+                .flatMap(List::stream)
+                .filter(introspectedColumn -> isMatchedColumn(introspectedColumn, gk))
+                .forEach(introspectedColumn -> {
+                    if (gk.isIdentity() || gk.isJdbcStandard()) {
+                        introspectedColumn.setIdentity(true);
+                        introspectedColumn.setSequenceColumn(false);
+                    } else {
+                        introspectedColumn.setIdentity(false);
+                        introspectedColumn.setSequenceColumn(true);
+                    }
+                }));
     }
 
     private boolean isMatchedColumn(IntrospectedColumn introspectedColumn, GeneratedKey gk) {
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/mybatis3/LegacyJavaRuntime.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/mybatis3/LegacyJavaRuntime.java
@@ -77,9 +77,7 @@ protected void calculateClientGenerator() {
 
     private <T extends AbstractJavaGenerator.AbstractJavaGeneratorBuilder<T>>
             AbstractJavaGenerator buildClientGenerator(String builderType) {
-        @SuppressWarnings("unchecked")
-        T builder = (T) ObjectFactory.createInternalObject(builderType,
-                AbstractJavaGenerator.AbstractJavaGeneratorBuilder.class);
+        T builder = ObjectFactory.createInternalObject(builderType);
 
         return initializeSubBuilder(builder)
                 .withProject(getClientProject().orElseThrow(() ->
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/mybatis3/javamapper/elements/annotated/AnnotatedUpdateByPrimaryKeyWithoutBLOBsMethodGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/mybatis3/javamapper/elements/annotated/AnnotatedUpdateByPrimaryKeyWithoutBLOBsMethodGenerator.java
@@ -48,6 +48,7 @@ protected Builder getThis() {
             return this;
         }
 
+        @Override
         public AnnotatedUpdateByPrimaryKeyWithoutBLOBsMethodGenerator build() {
             return new AnnotatedUpdateByPrimaryKeyWithoutBLOBsMethodGenerator(this);
         }
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
@@ -86,7 +86,9 @@ static List<GeneratedJavaFile> generateJavaFiles(String configFile) throws Excep
     }
 
     static void createDatabase() throws Exception {
-        SqlScriptRunner scriptRunner = new SqlScriptRunner(JavaCodeGenerationTest.class.getResourceAsStream("/scripts/CreateDB.sql"), "org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:aname", "sa", "");
+        SqlScriptRunner scriptRunner =
+                new SqlScriptRunner(JavaCodeGenerationTest.class.getResourceAsStream("/scripts/CreateDB.sql"),
+                        "org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:aname", "sa", "");
         scriptRunner.executeScript();
     }
 }
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
@@ -18,7 +18,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/api/FullyQualifiedTableTest.java b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/api/FullyQualifiedTableTest.java
@@ -17,33 +17,45 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.Test;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mybatis.generator.config.DomainObjectRenamingRule;
 
 class FullyQualifiedTableTest {
 
-    @Test
-    void testNormalCase() {
+    @ParameterizedTest
+    @MethodSource("variants")
+    void testIt(FullyQualifiedTable fullyQualifiedTable, String expectedName) {
+        assertThat(fullyQualifiedTable.getDomainObjectName()).isEqualTo(expectedName);
+    }
+
+    static Stream<Arguments> variants() {
+        return Stream.of(testNormalCase(), testNormalCaseWithPrefix(), testRenamingRule(), testRenamingRule2(),
+                testRenamingRuleNoUnderscore(), testRenamingRuleNoUnderscore2());
+    }
+
+    static Arguments testNormalCase() {
         FullyQualifiedTable fqt = new FullyQualifiedTable.Builder()
                 .withIntrospectedSchema("myschema")
                 .withIntrospectedTableName("mytable")
                 .build();
 
-        assertThat(fqt.getDomainObjectName()).isEqualTo("Mytable");
+        return Arguments.argumentSet("normalCase", fqt, "Mytable");
     }
 
-    @Test
-    void testNormalCaseWithPrefix() {
+    static Arguments testNormalCaseWithPrefix() {
         FullyQualifiedTable fqt = new FullyQualifiedTable.Builder()
                 .withIntrospectedSchema("myschema")
                 .withIntrospectedTableName("sys_mytable")
                 .build();
 
-        assertThat(fqt.getDomainObjectName()).isEqualTo("SysMytable");
+        return Arguments.argumentSet("normalCaseWithPrefix", fqt, "SysMytable");
     }
 
-    @Test
-    void testRenamingRule() {
+    static Arguments testRenamingRule() {
         DomainObjectRenamingRule renamingRule = new DomainObjectRenamingRule("^Sys", "");
 
         FullyQualifiedTable fqt = new FullyQualifiedTable.Builder()
@@ -52,35 +64,32 @@ void testRenamingRule() {
                 .withDomainObjectRenamingRule(renamingRule)
                 .build();
 
-        assertThat(fqt.getDomainObjectName()).isEqualTo("Mytable");
+        return Arguments.argumentSet("renamingRule", fqt, "Mytable");
     }
 
-    @Test
-    void testRenamingRule2() {
+    static Arguments testRenamingRule2() {
         DomainObjectRenamingRule renamingRule = new DomainObjectRenamingRule("^Sys", "");
         FullyQualifiedTable fqt = new FullyQualifiedTable.Builder()
                 .withIntrospectedSchema("myschema")
                 .withIntrospectedTableName("sys_my_table")
                 .withDomainObjectRenamingRule(renamingRule)
                 .build();
 
-        assertThat(fqt.getDomainObjectName()).isEqualTo("MyTable");
+        return Arguments.argumentSet("renamingRule2", fqt, "MyTable");
     }
 
-    @Test
-    void testRenamingRuleNoUnderscore() {
+    static Arguments testRenamingRuleNoUnderscore() {
         DomainObjectRenamingRule renamingRule = new DomainObjectRenamingRule("^Sys", "");
         FullyQualifiedTable fqt = new FullyQualifiedTable.Builder()
                 .withIntrospectedSchema("myschema")
                 .withIntrospectedTableName("sysmytable")
                 .withDomainObjectRenamingRule(renamingRule)
                 .build();
 
-        assertThat(fqt.getDomainObjectName()).isEqualTo("Mytable");
+        return Arguments.argumentSet("renamingRuleNoUnderscore", fqt, "Mytable");
     }
 
-    @Test
-    void testRenamingRuleNoUnderscore2() {
+    static Arguments testRenamingRuleNoUnderscore2() {
         DomainObjectRenamingRule renamingRule = new DomainObjectRenamingRule("^Sys", "");
 
         FullyQualifiedTable fqt = new FullyQualifiedTable.Builder()
@@ -89,6 +98,6 @@ void testRenamingRuleNoUnderscore2() {
                 .withDomainObjectRenamingRule(renamingRule)
                 .build();
 
-        assertThat(fqt.getDomainObjectName()).isEqualTo("MyTable");
+        return Arguments.argumentSet("renamingRuleNoUnderscore2", fqt, "MyTable");
     }
 }
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
diff --git a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/api/dom/kotlin/FullyQualifiedKotlinTypeTest.java b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/api/dom/kotlin/FullyQualifiedKotlinTypeTest.java
diff --git a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/api/dom/kotlin/JavaToKotlinTypeConverterTest.java b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/api/dom/kotlin/JavaToKotlinTypeConverterTest.java
diff --git a/core/mybatis-generator-core/src/test/java/org/mybatis/generator/internal/util/StringUtilityTest.java b/core/mybatis-generator-core/src/test/java/org/mybatis/generator/internal/util/StringUtilityTest.java
diff --git a/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/SqlScriptRunner.java b/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/SqlScriptRunner.java

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ private RootClassInfo(String className, List<String> warnings) {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`try {`
`77`		`- Class<?> clazz = ObjectFactory.externalClassForName(nameWithoutGenerics, Class.class);`
	`77`	`+ Class<?> clazz = ObjectFactory.externalClassForName(nameWithoutGenerics);`
`78`	`78`	`BeanInfo bi = Introspector.getBeanInfo(clazz);`
`79`	`79`	`propertyDescriptors = bi.getPropertyDescriptors();`
`80`	`80`	`} catch (Exception e) {`
Original file line number	Diff line number	Diff line change
`@@ -54,5 +54,5 @@ public static boolean commentContainsTag(String comment) {`
`54`	`54`	`.anyMatch(comment::contains);`
`55`	`55`	`}`
`56`	`56`
`57`		`- public static String DO_NOT_DELETE_DURING_MERGE = "do_not_delete_during_merge"; //$NON-NLS-1$`
	`57`	`+ public static final String DO_NOT_DELETE_DURING_MERGE = "do_not_delete_during_merge"; //$NON-NLS-1$`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ protected Builder getThis() {`
`48`	`48`	`return this;`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ @Override`
`51`	`52`	`public AnnotatedUpdateByPrimaryKeyWithoutBLOBsMethodGenerator build() {`
`52`	`53`	`return new AnnotatedUpdateByPrimaryKeyWithoutBLOBsMethodGenerator(this);`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,9 @@ static List<GeneratedJavaFile> generateJavaFiles(String configFile) throws Excep`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`static void createDatabase() throws Exception {`
`89`		`- SqlScriptRunner scriptRunner = new SqlScriptRunner(JavaCodeGenerationTest.class.getResourceAsStream("/scripts/CreateDB.sql"), "org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:aname", "sa", "");`
	`89`	`+ SqlScriptRunner scriptRunner =`
	`90`	`+ new SqlScriptRunner(JavaCodeGenerationTest.class.getResourceAsStream("/scripts/CreateDB.sql"),`
	`91`	`+ "org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:aname", "sa", "");`
`90`	`92`	`scriptRunner.executeScript();`
`91`	`93`	`}`
`92`	`94`	`}`