build(deps): bump org.springframework.boot:spring-boot-starter-parent from 3.5.9 to 4.0.1 in /samples/java/spring-data-jpa

samples/java/spring-data-jpa/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.5.9</version>
+    <version>4.0.1</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
   <groupId>com.google.cloud.spanner</groupId>
@@ -37,8 +37,8 @@
     </dependency>
     <!-- Add Liquibase for schema management -->
     <dependency>
-      <groupId>org.liquibase</groupId>
-      <artifactId>liquibase-core</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-liquibase</artifactId>
     </dependency>
     <!-- Add the PostgreSQL JDBC driver -->
     <dependency>
@@ -55,18 +55,18 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner-pgadapter</artifactId>
-      <version>0.52.1</version>
+      <version>0.52.2-SNAPSHOT</version>
     </dependency>
     <!-- Add Spanner Hibernate tools for access to the batch compatible bit-reversed sequence generator. -->
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner-hibernate-tools</artifactId>
-      <version>3.9.7</version>
+      <version>4.1.1</version>
     </dependency>
     <!-- Add Hypersistence Utils for access to additional data type mappings, for example for arrays. -->
     <dependency>
       <groupId>io.hypersistence</groupId>
-      <artifactId>hypersistence-utils-hibernate-63</artifactId>
+      <artifactId>hypersistence-utils-hibernate-71</artifactId>
       <version>3.14.1</version>
     </dependency>
     <dependency>

samples/java/spring-data-jpa/src/main/java/com/google/cloud/spanner/pgadapter/sample/model/TicketSale.java

@@ -14,22 +14,17 @@
 
 package com.google.cloud.spanner.pgadapter.sample.model;
 
-import com.google.cloud.spanner.hibernate.PooledBitReversedSequenceStyleGenerator;
+import com.google.cloud.spanner.hibernate.annotations.PooledBitReversedSequenceGenerator;
 import io.hypersistence.utils.hibernate.type.array.ListArrayType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import java.math.BigDecimal;
 import java.util.List;
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Parameter;
 import org.hibernate.annotations.Type;
-import org.hibernate.id.enhanced.SequenceStyleGenerator;
 
 /**
  * This entity uses a bit-reversed sequence to generate a primary key. The strategy it uses is
@@ -57,30 +52,18 @@ public class TicketSale extends AbstractBaseEntity {
   // options that Hibernate has to batch and optimize insert statements. When using a sequence,
   // Hibernate can pre-fetch a batch of primary key values and include these in the insert
   // statement. This again allows Hibernate to send those insert statements as one batch to the
-  // database and reduce the overall number of roundtrips.
-  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ticketSaleId")
-  @GenericGenerator(
-      // This is the name of the generator, not the name of the sequence. This name must correspond
-      // with the name given in the @GeneratedValue above.
-      name = "ticketSaleId",
-      // Use this custom strategy to ensure the use of a bit-reversed sequence that is compatible
-      // with batching multiple inserts. See also
-      // https://docs.jboss.org/hibernate/orm/5.4/userguide/html_single/Hibernate_User_Guide.html#batch.
-      type = PooledBitReversedSequenceStyleGenerator.class,
-      parameters = {
-        // Use a separate sequence name for each entity.
-        // See resources/db.changelog-v1.1.sql file for the sequence definition in the database.
-        @Parameter(name = SequenceStyleGenerator.SEQUENCE_PARAM, value = "ticket_sale_seq"),
-        // The increment_size is not actually set on the sequence that is created, but is used to
-        // generate a SELECT query that fetches this number of identifiers at once.
-        @Parameter(name = SequenceStyleGenerator.INCREMENT_PARAM, value = "200"),
-        @Parameter(name = SequenceStyleGenerator.INITIAL_PARAM, value = "50000"),
-        // Add any range that should be excluded by the generator if your table already
-        // contains existing values that have been generated by other generators.
-        @Parameter(
-            name = PooledBitReversedSequenceStyleGenerator.EXCLUDE_RANGE_PARAM,
-            value = "[1,1000]"),
-      })
+  // database and reduce the overall number of round-trips.
+  @PooledBitReversedSequenceGenerator(
+      // Use a separate sequence name for each entity.
+      sequenceName = "ticket_sale_seq",
+      // The initial_value is used a starting counter used by spanner for producing bit-reversed ids
+      startWithCounter = 50000,
+      // The increment_size is not set on the sequence that is created on the spanner instance
+      // but is used to generate a SELECT query that fetches this number of identifiers at once.
+      poolSize = 200,
+      // Add any range that should be excluded by the generator if your table already
+      // contains existing values that have been generated by other generators.
+      excludeRange = "[1,1000]")
   public Long id;
 
   @ManyToOne(optional = false, fetch = FetchType.LAZY)
@@ -92,13 +75,13 @@ public class TicketSale extends AbstractBaseEntity {
 
   /**
    * This column is mapped to a text[] column in the database. The {@link ListArrayType} is defined
-   * in the hypersistence-utils-hibernate-63 library. Add the following to your pom.xml to use it:
+   * in the hypersistence-utils-hibernate-71 library. Add the following to your pom.xml to use it:
    *
    * <pre>{@code
    * <dependency>
    *   <groupId>io.hypersistence</groupId>
-   *   <artifactId>hypersistence-utils-hibernate-63</artifactId>
-   *   <version>3.7.2</version>
+   *   <artifactId>hypersistence-utils-hibernate-71</artifactId>
+   *   <version>3.14.1</version>
    * </dependency>
    * }</pre>
    */

samples/java/spring-data-jpa/src/main/resources/application.properties

@@ -4,7 +4,7 @@ spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
 
 # This sample by default runs on the Spanner emulator. Disable this to run on a real Spanner
 # instance.
-spanner.use_emulator=true
+spanner.use_emulator=false
 
 # Defining these properties here makes it a bit easier to build the connection string.
 # Change these to match your Cloud Spanner PostgreSQL-dialect database.

src/main/java/com/google/cloud/spanner/pgadapter/statements/SimpleParser.java

@@ -252,6 +252,13 @@ static Statement replaceForUpdate(
       return statement;
     }
     int startPos = parser.pos;
+    if (!replaceWithHint
+        && parser.eatKeyword("for", "no", "key", "update")
+        && !parser.hasMoreTokens()) {
+      // Replace FOR NO KEY UPDATE with FOR UPDATE.
+      return statement.withReplacedSql(statement.getSql().substring(0, startPos) + " for update");
+    }
+    parser.pos = startPos;
     if (parser.eatKeyword("for") && parser.eatKeyword("update")) {
       if (!replaceWithHint) {
         startPos = parser.pos;
@@ -278,12 +285,12 @@ static Statement replaceForUpdate(
       // This is a simple 'for update' clause. Replace it with a 'LOCK_SCANNED_RANGES=exclusive'
       // hint and/or remove the 'of table' clause.
       if (replaceWithHint) {
-        return Statement.of(
+        return statement.withReplacedSql(
             "/*@ LOCK_SCANNED_RANGES=exclusive */"
                 + statement.getSql().substring(0, startPos)
                 + statement.getSql().substring(endPos));
       } else {
-        return Statement.of(
+        return statement.withReplacedSql(
             statement.getSql().substring(0, startPos) + statement.getSql().substring(endPos));
       }
     }