Sonar suggestions

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/AbstractListValueCondition.java

@@ -51,7 +51,7 @@ private <R> Collection<R> applyMapper(Function<? super T, ? extends R> mapper) {
 
     private Collection<T> applyFilter(Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate);
-        return values.stream().filter(predicate).collect(Collectors.toList());
+        return values.stream().filter(predicate).toList();
     }
 
     protected <S extends AbstractListValueCondition<T>> S filterSupport(Predicate<? super T> predicate,

src/main/java/org/mybatis/dynamic/sql/SortSpecification.java

@@ -42,7 +42,7 @@ public interface SortSpecification {
      * @deprecated Please replace this method by overriding the more general "renderForOrderBy" method. Target for
      *    removal in release 2.1
      */
-    @Deprecated
+    @Deprecated(since = "2.0", forRemoval = true)
     default String orderByName() {
         throw new DynamicSqlException(Messages.getString("ERROR.44")); //$NON-NLS-1$
     }
@@ -54,7 +54,7 @@ default String orderByName() {
      * @deprecated Please replace this method by overriding the more general "renderForOrderBy" method. Target for
      *    removal in release 2.1
      */
-    @Deprecated
+    @Deprecated(since = "2.0", forRemoval = true)
     default boolean isDescending() {
         throw new DynamicSqlException(Messages.getString("ERROR.44")); //$NON-NLS-1$
     }

src/main/java/org/mybatis/dynamic/sql/insert/render/BatchInsert.java

@@ -19,7 +19,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 public class BatchInsert<T> {
     private final String insertStatement;
@@ -38,7 +37,7 @@ private BatchInsert(Builder<T> builder) {
     public List<InsertStatementProvider<T>> insertStatements() {
         return records.stream()
                 .map(this::toInsertStatement)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private InsertStatementProvider<T> toInsertStatement(T row) {

src/main/java/org/mybatis/dynamic/sql/select/AbstractQueryExpressionDSL.java

@@ -23,7 +23,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.TableExpression;
@@ -196,7 +195,7 @@ protected Optional<JoinModel> buildJoinModel() {
 
         return Optional.of(JoinModel.of(joinSpecificationBuilders.stream()
                 .map(JoinSpecification.Builder::build)
-                .collect(Collectors.toList())));
+                        .toList()));
     }
 
     protected void addTableAlias(SqlTable table, String tableAlias) {

src/main/java/org/mybatis/dynamic/sql/select/SelectDSL.java

@@ -23,7 +23,6 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.BasicColumn;
@@ -143,7 +142,7 @@ public R build() {
     private List<QueryExpressionModel> buildModels() {
         return queryExpressions.stream()
                 .map(QueryExpressionDSL::buildModel)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private Optional<PagingModel> buildPagingModel() {

src/main/java/org/mybatis/dynamic/sql/update/render/UpdateRenderer.java

@@ -78,8 +78,8 @@ private FragmentAndParameters calculateUpdateStatementStart() {
 
     private FragmentAndParameters calculateSetPhrase() {
         List<Optional<FragmentAndParameters>> fragmentsAndParameters = updateModel.columnMappings()
-                        .map(m -> m.accept(visitor))
-                        .collect(Collectors.toList());
+                .map(m -> m.accept(visitor))
+                .toList();
 
         Validator.assertFalse(fragmentsAndParameters.stream().noneMatch(Optional::isPresent),
                 "ERROR.18"); //$NON-NLS-1$

src/main/java/org/mybatis/dynamic/sql/util/SqlProviderAdapter.java

@@ -17,7 +17,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
@@ -76,7 +75,7 @@ public String insertMultipleWithGeneratedKeys(Map<String, Object> parameterMap)
                 .map(Map.Entry::getValue)
                 .filter(String.class::isInstance)
                 .map(String.class::cast)
-                .collect(Collectors.toList());
+                .toList();
 
         if (entries.size() == 1) {
             return entries.get(0);

src/main/java/org/mybatis/dynamic/sql/util/mybatis3/CommonSelectMapper.java

@@ -20,7 +20,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import org.apache.ibatis.annotations.SelectProvider;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
@@ -110,7 +109,7 @@ default <R> List<R> selectMany(SelectStatementProvider selectStatement,
                                    Function<Map<String, Object>, R> rowMapper) {
         return selectManyMappedRows(selectStatement).stream()
                 .map(rowMapper)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /**

src/main/java/org/mybatis/dynamic/sql/util/spring/BatchInsertUtility.java

@@ -16,7 +16,6 @@
 package org.mybatis.dynamic.sql.util.spring;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.jdbc.core.namedparam.SqlParameterSourceUtils;
@@ -35,7 +34,7 @@ private BatchInsertUtility() {}
     public static <T> SqlParameterSource[] createBatch(List<T> rows) {
         List<RowHolder<T>> tt = rows.stream()
                 .map(RowHolder::new)
-                .collect(Collectors.toList());
+                .toList();
 
         return SqlParameterSourceUtils.createBatch(tt);
     }

src/main/java/org/mybatis/dynamic/sql/where/condition/IsInCaseInsensitiveWhenPresent.java

@@ -21,7 +21,6 @@
 import java.util.Objects;
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
-import java.util.stream.Collectors;
 
 import org.mybatis.dynamic.sql.AbstractListValueCondition;
 import org.mybatis.dynamic.sql.util.StringUtilities;
@@ -35,7 +34,7 @@ public static IsInCaseInsensitiveWhenPresent empty() {
     }
 
     protected IsInCaseInsensitiveWhenPresent(Collection<String> values) {
-        super(values.stream().filter(Objects::nonNull).collect(Collectors.toList()));
+        super(values.stream().filter(Objects::nonNull).toList());
     }
 
     @Override

src/main/java/org/mybatis/dynamic/sql/where/condition/IsInWhenPresent.java

@@ -21,7 +21,6 @@
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import org.mybatis.dynamic.sql.AbstractListValueCondition;
 
@@ -35,7 +34,7 @@ public static <T> IsInWhenPresent<T> empty() {
     }
 
     protected IsInWhenPresent(Collection<T> values) {
-        super(values.stream().filter(Objects::nonNull).collect(Collectors.toList()));
+        super(values.stream().filter(Objects::nonNull).toList());
     }
 
     @Override

src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotInCaseInsensitiveWhenPresent.java

@@ -21,7 +21,6 @@
 import java.util.Objects;
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
-import java.util.stream.Collectors;
 
 import org.mybatis.dynamic.sql.AbstractListValueCondition;
 import org.mybatis.dynamic.sql.util.StringUtilities;
@@ -35,7 +34,7 @@ public static IsNotInCaseInsensitiveWhenPresent empty() {
     }
 
     protected IsNotInCaseInsensitiveWhenPresent(Collection<String> values) {
-        super(values.stream().filter(Objects::nonNull).collect(Collectors.toList()));
+        super(values.stream().filter(Objects::nonNull).toList());
     }
 
     @Override

src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotInWhenPresent.java

@@ -21,7 +21,6 @@
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import org.mybatis.dynamic.sql.AbstractListValueCondition;
 
@@ -35,7 +34,7 @@ public static <T> IsNotInWhenPresent<T> empty() {
     }
 
     protected IsNotInWhenPresent(Collection<T> values) {
-        super(values.stream().filter(Objects::nonNull).collect(Collectors.toList()));
+        super(values.stream().filter(Objects::nonNull).toList());
     }
 
     @Override

src/main/java/org/mybatis/dynamic/sql/where/render/CriterionRenderer.java

@@ -136,7 +136,7 @@ private FragmentAndParameters renderExists(ExistsCriterion criterion) {
     private List<RenderedCriterion> renderSubCriteria(List<AndOrCriteriaGroup> subCriteria) {
         return subCriteria.stream().map(this::renderAndOrCriteriaGroup)
                 .flatMap(Optional::stream)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private Optional<RenderedCriterion> renderAndOrCriteriaGroup(AndOrCriteriaGroup criterion) {