updates for latest Hibernate

Author: marschall

pom.xml

@@ -209,21 +209,21 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.3.14</version>
+        <version>5.3.15</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.oracle.database.jdbc</groupId>
         <artifactId>ojdbc-bom</artifactId>
-        <version>21.3.0.0</version>
+        <version>21.5.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-bom</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -275,7 +275,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.3.1</version>
+      <version>42.3.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -287,19 +287,19 @@
     <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>mssql-jdbc</artifactId>
-      <version>9.4.0.jre11</version>
+      <version>10.2.0.jre11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.firebirdsql.jdbc</groupId>
       <artifactId>jaybird</artifactId>
-      <version>4.0.4.java11</version>
+      <version>4.0.5.java11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mariadb.jdbc</groupId>
       <artifactId>mariadb-java-client</artifactId>
-      <version>2.7.4</version>
+      <version>3.0.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -394,7 +394,7 @@
   <properties>
     <project.reporting.outputEncoding>utf-8</project.reporting.outputEncoding>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <hibernate.version>6.0.0.Beta2</hibernate.version>
+    <hibernate.version>6.0.0.CR1</hibernate.version>
   </properties>
 
 </project>

src/main/java/com/github/marschall/hibernate/batchsequencegenerator/BatchSequenceGenerator.java

@@ -19,16 +19,18 @@
 import org.hibernate.MappingException;
 import org.hibernate.boot.model.relational.Database;
 import org.hibernate.boot.model.relational.QualifiedNameParser;
+import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.id.BulkInsertionCapableIdentifierGenerator;
-import org.hibernate.id.Configurable;
 import org.hibernate.id.IdentifierGenerationException;
 import org.hibernate.id.IdentifierGenerator;
 import org.hibernate.id.PersistentIdentifierGenerator;
 import org.hibernate.id.enhanced.DatabaseStructure;
+import org.hibernate.id.enhanced.NoopOptimizer;
+import org.hibernate.id.enhanced.Optimizer;
 import org.hibernate.id.enhanced.SequenceStructure;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.service.ServiceRegistry;
@@ -134,7 +136,7 @@
  * In theory any RDBMS that supports {@code WITH RECURSIVE} and
  * sequences is supported.
  */
-public class BatchSequenceGenerator implements BulkInsertionCapableIdentifierGenerator, PersistentIdentifierGenerator, Configurable {
+public class BatchSequenceGenerator implements BulkInsertionCapableIdentifierGenerator, PersistentIdentifierGenerator {
 
   /**
    * Indicates the name of the sequence to use, mandatory.
@@ -158,19 +160,21 @@ public class BatchSequenceGenerator implements BulkInsertionCapableIdentifierGen
   private IdentifierPool identifierPool;
   private IdentifierExtractor identifierExtractor;
   private DatabaseStructure databaseStructure;
+  private NoopOptimizer optimizer;
 
   @Override
-  public void configure(Type type, Properties params, ServiceRegistry serviceRegistry)
-          throws MappingException {
+  public void configure(Type type, Properties params, ServiceRegistry serviceRegistry) {
 
     JdbcEnvironment jdbcEnvironment = serviceRegistry.getService(JdbcEnvironment.class);
     Dialect dialect = jdbcEnvironment.getDialect();
     String sequenceName = determineSequenceName(params);
     this.fetchSize = determineFetchSize(params);
 
     this.select = buildSelect(sequenceName, dialect);
-    this.identifierExtractor = IdentifierExtractor.getIdentifierExtractor(type.getReturnedClass());
+    Class<?> returnedClass = type.getReturnedClass();
+    this.identifierExtractor = IdentifierExtractor.getIdentifierExtractor(returnedClass);
     this.identifierPool = IdentifierPool.empty();
+    this.optimizer = new NoopOptimizer(returnedClass, 1);
 
     this.databaseStructure = this.buildDatabaseStructure(type, sequenceName, jdbcEnvironment, params);
   }
@@ -255,12 +259,17 @@ public boolean supportsBulkInsertionIdentifierGeneration() {
   }
 
   @Override
-  public String determineBulkInsertionIdentifierGenerationSelectFragment(Dialect dialect) {
-    return dialect.getSequenceSupport().getSelectSequenceNextValString(this.getSequenceName());
+  public boolean supportsJdbcBatchInserts() {
+    return true;
+  }
+
+  @Override
+  public String determineBulkInsertionIdentifierGenerationSelectFragment(SqlStringGenerationContext context) {
+    return context.getDialect().getSequenceSupport().getSelectSequenceNextValString(this.getSequenceName());
   }
 
   @Override
-  public Serializable generate(SharedSessionContractImplementor session, Object object) throws HibernateException {
+  public Serializable generate(SharedSessionContractImplementor session, Object object) {
     this.lock.lock();
     try {
       if (this.identifierPool.isEmpty()) {
@@ -273,24 +282,12 @@ public Serializable generate(SharedSessionContractImplementor session, Object ob
   }
 
   @Override
-  public Object generatorKey() {
-    return this.getSequenceName();
+  public Optimizer getOptimizer() {
+    return this.optimizer;
   }
 
   private String getSequenceName() {
-    return this.databaseStructure.getName();
-  }
-
-  @Override
-  @Deprecated
-  public String[] sqlCreateStrings(Dialect dialect) {
-    return this.databaseStructure.sqlCreateStrings(dialect);
-  }
-
-  @Override
-  @Deprecated
-  public String[] sqlDropStrings(Dialect dialect) {
-    return this.databaseStructure.sqlDropStrings(dialect);
+    return this.databaseStructure.getPhysicalName().getObjectName().getCanonicalName();
   }
 
   @Override
@@ -355,55 +352,55 @@ Serializable next() {
    *
    * @see org.hibernate.id.IntegralDataTypeHolder
    */
-  enum IdentifierExtractor {
-
-    INTEGER_IDENTIFIER_EXTRACTOR {
-      @Override
-      Serializable extractIdentifier(ResultSet resultSet) throws SQLException {
-        int intValue = resultSet.getInt(1);
-        if (resultSet.wasNull()) {
-          throw new IdentifierGenerationException("sequence returned null");
-        }
-        return intValue;
+  @FunctionalInterface
+  interface IdentifierExtractor {
+
+    IdentifierExtractor SHORT_IDENTIFIER_EXTRACTOR = (ResultSet resultSet) -> {
+      short shortValue = resultSet.getShort(1);
+      if (resultSet.wasNull()) {
+        throw new IdentifierGenerationException("sequence returned null");
       }
-    },
-
-    LONG_IDENTIFIER_EXTRACTOR {
-      @Override
-      Serializable extractIdentifier(ResultSet resultSet) throws SQLException {
-        long longValue = resultSet.getLong(1);
-        if (resultSet.wasNull()) {
-          throw new IdentifierGenerationException("sequence returned null");
-        }
-        return longValue;
+      return shortValue;
+    };
+
+    IdentifierExtractor INTEGER_IDENTIFIER_EXTRACTOR = (ResultSet resultSet) -> {
+      int intValue = resultSet.getInt(1);
+      if (resultSet.wasNull()) {
+        throw new IdentifierGenerationException("sequence returned null");
       }
-    },
-
-    BIG_INTEGER_IDENTIFIER_EXTRACTOR {
-      @Override
-      Serializable extractIdentifier(ResultSet resultSet) throws SQLException {
-        BigDecimal bigDecimal = resultSet.getBigDecimal(1);
-        if (resultSet.wasNull()) {
-          throw new IdentifierGenerationException("sequence returned null");
-        }
-        return bigDecimal.setScale(0, RoundingMode.UNNECESSARY).toBigInteger();
+      return intValue;
+    };
+
+    IdentifierExtractor LONG_IDENTIFIER_EXTRACTOR = (ResultSet resultSet) -> {
+      long longValue = resultSet.getLong(1);
+      if (resultSet.wasNull()) {
+        throw new IdentifierGenerationException("sequence returned null");
       }
-    },
-
-    BIG_DECIMAL_IDENTIFIER_EXTRACTOR {
-      @Override
-      Serializable extractIdentifier(ResultSet resultSet) throws SQLException {
-        BigDecimal bigDecimal = resultSet.getBigDecimal(1);
-        if (resultSet.wasNull()) {
-          throw new IdentifierGenerationException("sequence returned null");
-        }
-        return bigDecimal;
+      return longValue;
+    };
+
+    IdentifierExtractor BIG_INTEGER_IDENTIFIER_EXTRACTOR  = (ResultSet resultSet) -> {
+      BigDecimal bigDecimal = resultSet.getBigDecimal(1);
+      if (resultSet.wasNull()) {
+        throw new IdentifierGenerationException("sequence returned null");
+      }
+      return bigDecimal.setScale(0, RoundingMode.UNNECESSARY).toBigInteger();
+    };
+
+    IdentifierExtractor BIG_DECIMAL_IDENTIFIER_EXTRACTOR  = (ResultSet resultSet) -> {
+      BigDecimal bigDecimal = resultSet.getBigDecimal(1);
+      if (resultSet.wasNull()) {
+        throw new IdentifierGenerationException("sequence returned null");
       }
+      return bigDecimal;
     };
 
-    abstract Serializable extractIdentifier(ResultSet resultSet) throws SQLException;
+    Serializable extractIdentifier(ResultSet resultSet) throws SQLException;
 
     static IdentifierExtractor getIdentifierExtractor(Class<?> integralType) {
+      if ((integralType == Short.class) || (integralType == short.class)) {
+        return SHORT_IDENTIFIER_EXTRACTOR;
+      }
       if ((integralType == Integer.class) || (integralType == int.class)) {
         return INTEGER_IDENTIFIER_EXTRACTOR;
       }

src/test/java/com/github/marschall/hibernate/batchsequencegenerator/configurations/SqlServerConfiguration.java

@@ -29,7 +29,7 @@ public DataSource dataSource() {
     SingleConnectionDataSource dataSource = new SingleConnectionDataSource();
     dataSource.setSuppressClose(true);
     // https://github.com/microsoft/mssql-jdbc/issues/1182
-    dataSource.setUrl("jdbc:sqlserver://localhost:1433;databaseName=master;sendTimeAsDatetime=false");
+    dataSource.setUrl("jdbc:sqlserver://localhost:1433;databaseName=master;sendTimeAsDatetime=false;encrypt=false");
     dataSource.setUsername("sa");
     dataSource.setPassword("Cent-Quick-Space-Bath-8");
     return dataSource;