Skip to content

Minor code cleanup #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 21, 2025
Merged

Minor code cleanup #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87b0c5c
Replace 'replaceAll' with 'replace' as its not regex
hazendaz Apr 21, 2025
97df254
Use diamond operator
hazendaz Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriverConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, Object>());
SqlSource sqlSource = sqlSourceParser.parse(sql, parameterType1, new HashMap<>());
return sqlSource.getBoundSql(parameterObject);
}
}