From 87b0c5c1e2644050e5461122151d0e4f867b3bd5 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 21 Apr 2025 17:09:03 -0400 Subject: [PATCH 1/2] Replace 'replaceAll' with 'replace' as its not regex --- .../scripting/freemarker/FreeMarkerLanguageDriverConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriverConfig.java b/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriverConfig.java index 82fe8ec..0390383 100644 --- a/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriverConfig.java +++ b/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriverConfig.java @@ -388,7 +388,7 @@ private static void override(FreeMarkerLanguageDriverConfig config, Properties p new DefaultReflectorFactory()); properties.forEach((key, value) -> { String propertyPath = WordUtils - .uncapitalize(WordUtils.capitalize(Objects.toString(key), '-').replaceAll("-", "")); + .uncapitalize(WordUtils.capitalize(Objects.toString(key), '-').replace("-", "")); Optional.ofNullable(value).ifPresent(v -> { Object convertedValue = TYPE_CONVERTERS.get(metaObject.getSetterType(propertyPath)).apply(value.toString()); metaObject.setValue(propertyPath, convertedValue); From 97df2544eddd9be8207794158034d802548caf67 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 21 Apr 2025 17:09:21 -0400 Subject: [PATCH 2/2] Use diamond operator --- .../org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java b/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java index 3b2fb4f..3224101 100644 --- a/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java +++ b/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java @@ -118,7 +118,7 @@ public BoundSql getBoundSql(Object parameterObject) { // Pass retrieved SQL into MyBatis engine, it will substitute prepared-statements parameters SqlSourceBuilder sqlSourceParser = new SqlSourceBuilder(configuration); Class parameterType1 = parameterObject == null ? Object.class : parameterObject.getClass(); - SqlSource sqlSource = sqlSourceParser.parse(sql, parameterType1, new HashMap()); + SqlSource sqlSource = sqlSourceParser.parse(sql, parameterType1, new HashMap<>()); return sqlSource.getBoundSql(parameterObject); } }