Merge branch 'refs/heads/master' into case-in-order-by

# Conflicts:
#	src/main/resources/org/mybatis/dynamic/sql/util/messages.properties

Author: jeffgbutler

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 This log will detail notable changes to MyBatis Dynamic SQL. Full details are available on the GitHub milestone pages.
 
+## Release 2.0.0 - Unreleased
+
+Significant changes:
+
+- The library now requires Java 17
+- Deprecated code from prior releases is removed
+
 ## Release 1.5.2 - June 3, 2024
 
 This is a small maintenance release with the following changes:

README.md

@@ -80,4 +80,4 @@ The library test cases provide several complete examples of using the library in
 
 ## Requirements
 
-The library has no dependencies.  Java 8 or higher is required.
+The library has no dependencies.  Version 2.x requires Java 17. Version 1.x requires Java 8.

pom.xml

@@ -21,12 +21,12 @@
   <parent>
     <groupId>org.mybatis</groupId>
     <artifactId>mybatis-parent</artifactId>
-    <version>44</version>
+    <version>45</version>
   </parent>
 
   <groupId>org.mybatis.dynamic-sql</groupId>
   <artifactId>mybatis-dynamic-sql</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
 
   <name>MyBatis Dynamic SQL</name>
   <description>MyBatis framework for generating dynamic SQL</description>
@@ -57,7 +57,7 @@
 
   <properties>
     <java.version>17</java.version>
-    <java.release.version>8</java.release.version>
+    <java.release.version>17</java.release.version>
     <junit.jupiter.version>5.10.3</junit.jupiter.version>
     <spring.batch.version>5.1.2</spring.batch.version>
 
@@ -74,7 +74,7 @@
     <sonar.tests>src/test/java,src/test/kotlin</sonar.tests>
 
     <kotlin.code.style>official</kotlin.code.style>
-    <test.containers.version>1.20.0</test.containers.version>
+    <test.containers.version>1.20.1</test.containers.version>
     <osgi.export>org.mybatis.dynamic.sql.*;version=${project.version};-noimport:=true</osgi.export>
 
     <!-- Reproducible Builds -->
@@ -168,7 +168,7 @@
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>
-      <version>2.2</version>
+      <version>3.0</version>
       <scope>test</scope>
     </dependency>
 

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

@@ -32,7 +32,7 @@ protected AliasableSqlTable(String tableName, Supplier<T> constructor) {
     public T withAlias(String alias) {
         T newTable = constructor.get();
         ((AliasableSqlTable<T>) newTable).tableAlias = alias;
-        newTable.nameSupplier = nameSupplier;
+        newTable.tableName = tableName;
         return newTable;
     }
 
@@ -48,7 +48,7 @@ public T withName(String name) {
         Objects.requireNonNull(name);
         T newTable = constructor.get();
         ((AliasableSqlTable<T>) newTable).tableAlias = tableAlias;
-        newTable.nameSupplier = () -> name;
+        newTable.tableName = name;
         return newTable;
     }
 

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

@@ -17,11 +17,8 @@
 
 import java.util.Optional;
 
-import org.mybatis.dynamic.sql.exception.DynamicSqlException;
 import org.mybatis.dynamic.sql.render.RenderingContext;
-import org.mybatis.dynamic.sql.render.TableAliasCalculator;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
-import org.mybatis.dynamic.sql.util.Messages;
 
 /**
  * Describes attributes of columns that are necessary for rendering if the column is not expected to
@@ -59,25 +56,7 @@ public interface BasicColumn {
      * @return a rendered SQL fragment and, optionally, parameters associated with the fragment
      * @since 1.5.1
      */
-    default FragmentAndParameters render(RenderingContext renderingContext) {
-        // the default implementation ensures compatibility with prior releases. When the
-        // deprecated renderWithTableAlias method is removed, this function can become purely abstract.
-        // Also remove the method tableAliasCalculator() from RenderingContext.
-        return FragmentAndParameters.fromFragment(renderWithTableAlias(renderingContext.tableAliasCalculator()));
-    }
-
-    /**
-     * Returns the name of the item aliased with a table name if appropriate.
-     * For example, "a.foo".  This is appropriate for where clauses and order by clauses.
-     *
-     * @param tableAliasCalculator the table alias calculator for the current renderer
-     * @return the item name with the table alias applied
-     * @deprecated Please replace this method by overriding the more general "render" method
-     */
-    @Deprecated
-    default String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
-        throw new DynamicSqlException(Messages.getString("ERROR.36"));  //$NON-NLS-1$
-    }
+    FragmentAndParameters render(RenderingContext renderingContext);
 
     /**
      * Utility method to make it easier to build column lists for methods that require an

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

@@ -18,93 +18,19 @@
 import java.sql.JDBCType;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.Supplier;
 
 import org.jetbrains.annotations.NotNull;
 
 public class SqlTable implements TableExpression {
 
-    protected Supplier<String> nameSupplier;
+    protected String tableName;
 
     protected SqlTable(String tableName) {
-        Objects.requireNonNull(tableName);
-
-        this.nameSupplier = () -> tableName;
-    }
-
-    /**
-     * Creates an SqlTable whose name can be changed at runtime.
-     *
-     * @param tableNameSupplier table name supplier
-     * @deprecated please use {@link AliasableSqlTable} if you need to change the table name at runtime
-     */
-    @Deprecated
-    protected SqlTable(Supplier<String> tableNameSupplier) {
-        Objects.requireNonNull(tableNameSupplier);
-
-        this.nameSupplier = tableNameSupplier;
-    }
-
-    /**
-     * Creates an SqlTable whose name can be changed at runtime.
-     *
-     * @param schemaSupplier schema supplier
-     * @param tableName table name
-     * @deprecated please use {@link AliasableSqlTable} if you need to change the table name at runtime
-     */
-    @Deprecated
-    protected SqlTable(Supplier<Optional<String>> schemaSupplier, String tableName) {
-        this(Optional::empty, schemaSupplier, tableName);
-    }
-
-    /**
-     * Creates an SqlTable whose name can be changed at runtime.
-     *
-     * @param catalogSupplier catalog supplier
-     * @param schemaSupplier schema supplier
-     * @param tableName table name
-     * @deprecated please use {@link AliasableSqlTable} if you need to change the table name at runtime
-     */
-    @Deprecated
-    protected SqlTable(Supplier<Optional<String>> catalogSupplier, Supplier<Optional<String>> schemaSupplier,
-            String tableName) {
-        Objects.requireNonNull(catalogSupplier);
-        Objects.requireNonNull(schemaSupplier);
-        Objects.requireNonNull(tableName);
-
-        this.nameSupplier = () -> compose(catalogSupplier, schemaSupplier, tableName);
-    }
-
-    private String compose(Supplier<Optional<String>> catalogSupplier, Supplier<Optional<String>> schemaSupplier,
-            String tableName) {
-        return catalogSupplier.get().map(c -> compose(c, schemaSupplier, tableName))
-                .orElseGet(() -> compose(schemaSupplier, tableName));
-    }
-
-    private String compose(String catalog, Supplier<Optional<String>> schemaSupplier, String tableName) {
-        return schemaSupplier.get().map(s -> composeCatalogSchemaAndTable(catalog, s, tableName))
-                .orElseGet(() -> composeCatalogAndTable(catalog, tableName));
-    }
-
-    private String compose(Supplier<Optional<String>> schemaSupplier, String tableName) {
-        return schemaSupplier.get().map(s -> composeSchemaAndTable(s, tableName))
-                .orElse(tableName);
-    }
-
-    private String composeCatalogAndTable(String catalog, String tableName) {
-        return catalog + ".." + tableName; //$NON-NLS-1$
-    }
-
-    private String composeSchemaAndTable(String schema, String tableName) {
-        return schema + "." + tableName; //$NON-NLS-1$
-    }
-
-    private String composeCatalogSchemaAndTable(String catalog, String schema, String tableName) {
-        return catalog + "." + schema + "." + tableName; //$NON-NLS-1$ //$NON-NLS-2$
+        this.tableName = Objects.requireNonNull(tableName);
     }
 
-    public String tableNameAtRuntime() {
-        return nameSupplier.get();
+    public String tableName() {
+        return tableName;
     }
 
     public BasicColumn allColumns() {

src/main/java/org/mybatis/dynamic/sql/exception/DuplicateTableAliasException.java

@@ -43,6 +43,6 @@ public DuplicateTableAliasException(SqlTable table, String newAlias, String exis
     }
 
     private static String generateMessage(SqlTable table, String newAlias, String existingAlias) {
-        return Messages.getString("ERROR.1", table.tableNameAtRuntime(), newAlias, existingAlias); //$NON-NLS-1$
+        return Messages.getString("ERROR.1", table.tableName(), newAlias, existingAlias); //$NON-NLS-1$
     }
 }

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

@@ -21,24 +21,11 @@
 
 public class DefaultInsertStatementProvider<T> implements InsertStatementProvider<T> {
     private final String insertStatement;
-    // need to keep both row and record for now so we don't break
-    // old code. The MyBatis reflection utilities don't handle
-    // the case where the attribute name is different from the getter.
-    //
-    // MyBatis Generator version 1.4.1 (March 8, 2022) changed to use "row" instead of "record".
-    // Target March 2023 for removing "record" from MyBatis Dynamic SQL.
-    private final T record;
     private final T row;
 
     private DefaultInsertStatementProvider(Builder<T> builder) {
         insertStatement = Objects.requireNonNull(builder.insertStatement);
         row = Objects.requireNonNull(builder.row);
-        record = row;
-    }
-
-    @Override
-    public T getRecord() {
-        return record;
     }
 
     @Override

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

@@ -40,8 +40,7 @@ private GeneralInsertRenderer(Builder builder) {
     public GeneralInsertStatementProvider render() {
         FieldAndValueCollector collector = model.columnMappings()
                 .map(m -> m.accept(visitor))
-                .filter(Optional::isPresent)
-                .map(Optional::get)
+                .flatMap(Optional::stream)
                 .collect(FieldAndValueCollector.collect());
 
         Validator.assertFalse(collector.isEmpty(), "ERROR.9"); //$NON-NLS-1$

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

@@ -35,8 +35,7 @@ private InsertRenderer(Builder<T> builder) {
     public InsertStatementProvider<T> render() {
         FieldAndValueCollector collector = model.columnMappings()
                 .map(m -> m.accept(visitor))
-                .filter(Optional::isPresent)
-                .map(Optional::get)
+                .flatMap(Optional::stream)
                 .collect(FieldAndValueCollector.collect());
 
         Validator.assertFalse(collector.isEmpty(), "ERROR.10"); //$NON-NLS-1$