From 7dbbd04acf6dfcb116645ec888a891d47898e884 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 21 Apr 2025 17:18:36 -0400
Subject: [PATCH 1/2] Update copyright dates / formatting

---
 .mvn/settings.xml                                            | 2 +-
 pom.xml                                                      | 2 +-
 .../scripting/freemarker/FreeMarkerLanguageDriverConfig.java | 5 ++---
 .../mybatis/scripting/freemarker/FreeMarkerSqlSource.java    | 2 +-
 .../org/mybatis/scripting/freemarker/ParamObjectAdapter.java | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.mvn/settings.xml b/.mvn/settings.xml
index aa67251..a69548b 100644
--- a/.mvn/settings.xml
+++ b/.mvn/settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2024 the original author or authors.
+       Copyright 2015-2025 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
index 6058e7b..0927ef3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2024 the original author or authors.
+       Copyright 2015-2025 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriverConfig.java b/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriverConfig.java
index 0390383..1688db0 100644
--- a/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriverConfig.java
+++ b/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriverConfig.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2015-2023 the original author or authors.
+ *    Copyright 2015-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -387,8 +387,7 @@ private static void override(FreeMarkerLanguageDriverConfig config, Properties p
     MetaObject metaObject = MetaObject.forObject(config, new DefaultObjectFactory(), new DefaultObjectWrapperFactory(),
         new DefaultReflectorFactory());
     properties.forEach((key, value) -> {
-      String propertyPath = WordUtils
-          .uncapitalize(WordUtils.capitalize(Objects.toString(key), '-').replace("-", ""));
+      String propertyPath = WordUtils.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);
diff --git a/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java b/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java
index 3224101..96f5cb0 100644
--- a/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java
+++ b/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2015-2023 the original author or authors.
+ *    Copyright 2015-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/mybatis/scripting/freemarker/ParamObjectAdapter.java b/src/main/java/org/mybatis/scripting/freemarker/ParamObjectAdapter.java
index 2fdfe93..3571391 100644
--- a/src/main/java/org/mybatis/scripting/freemarker/ParamObjectAdapter.java
+++ b/src/main/java/org/mybatis/scripting/freemarker/ParamObjectAdapter.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2015-2022 the original author or authors.
+ *    Copyright 2015-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

From 98a162d40b8509672847c7f591db0faf6032f5f1 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 21 Apr 2025 17:15:31 -0400
Subject: [PATCH 2/2] Use 'list' rather than 'arraylist' object type

---
 .../mybatis/scripting/freemarker/FreeMarkerSqlSource.java | 3 ++-
 .../mybatis/scripting/freemarker/ParamObjectAdapter.java  | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java b/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java
index 96f5cb0..e57ae87 100644
--- a/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java
+++ b/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java
@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.builder.SqlSourceBuilder;
@@ -74,7 +75,7 @@ public BoundSql getBoundSql(Object parameterObject) {
     // Add to passed parameterObject our predefined directive - MyBatisParamDirective
     // It will be available as "p" inside templates
     Object dataContext;
-    ArrayList generatedParams = new ArrayList<>();
+    List generatedParams = new ArrayList<>();
     if (parameterObject != null) {
       if (parameterObject instanceof Map) {
         HashMap<String, Object> map = new HashMap<>((Map<String, Object>) parameterObject);
diff --git a/src/main/java/org/mybatis/scripting/freemarker/ParamObjectAdapter.java b/src/main/java/org/mybatis/scripting/freemarker/ParamObjectAdapter.java
index 3571391..ae26059 100644
--- a/src/main/java/org/mybatis/scripting/freemarker/ParamObjectAdapter.java
+++ b/src/main/java/org/mybatis/scripting/freemarker/ParamObjectAdapter.java
@@ -15,8 +15,8 @@
  */
 package org.mybatis.scripting.freemarker;
 
-import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 import freemarker.ext.beans.BeanModel;
 import freemarker.ext.beans.BeansWrapperBuilder;
@@ -33,10 +33,10 @@
  */
 public class ParamObjectAdapter implements TemplateHashModel {
   private final BeanModel beanModel;
-  private final ArrayList generatedParams;
+  private final List generatedParams;
   private HashMap<String, TemplateModel> additionalParams;
 
-  public ParamObjectAdapter(Object paramObject, ArrayList generatedParams, Version incompatibleImprovementsVersion) {
+  public ParamObjectAdapter(Object paramObject, List generatedParams, Version incompatibleImprovementsVersion) {
     beanModel = new BeanModel(paramObject, new BeansWrapperBuilder(incompatibleImprovementsVersion).build());
     this.generatedParams = generatedParams;
   }
@@ -52,7 +52,7 @@ public void putAdditionalParam(String key, TemplateModel value) {
     additionalParams.put(key, value);
   }
 
-  public ArrayList getGeneratedParams() {
+  public List getGeneratedParams() {
     return generatedParams;
   }