Feature/update hibernate 6 (GoogleCloudPlatform#7381)

* update to hibernate 6

* change javax to jakarta

* change dialect package

* change org info for hibernate dependency

Author: JoeWang1127

spanner/hibernate/pom.xml

@@ -6,13 +6,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <properties>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
   </properties>
 
   <!--
     The parent pom defines common style checks and testing strategies for our samples.
-    Removing or replacing it should not affect the execution of the samples in anyway.
+    Removing or replacing it should not affect the execution of the samples in any way.
   -->
   <parent>
     <groupId>com.google.cloud.samples</groupId>
@@ -26,25 +26,18 @@
 
   <!-- [START spanner_hibernate_dependencies] -->
   <dependencies>
-    <!-- The Hibernate dialect for Spanner dependency -->
-    <dependency>
-      <groupId>com.google.cloud</groupId>
-      <artifactId>google-cloud-spanner-hibernate-dialect</artifactId>
-      <version>1.5.2</version>
-    </dependency>
-
     <!-- The Spanner JDBC driver dependency -->
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner-jdbc</artifactId>
-      <version>2.5.11</version>
+      <version>2.7.4</version>
     </dependency>
 
     <!-- Hibernate core dependency -->
     <dependency>
-      <groupId>org.hibernate</groupId>
+      <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>5.6.5.Final</version>
+      <version>6.1.5.Final</version>
     </dependency>
   </dependencies>
   <!-- [END spanner_hibernate_dependencies] -->

spanner/hibernate/src/main/java/com/example/spanner/CreditCardPayment.java

@@ -16,8 +16,8 @@
 
 package com.example.spanner;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
 
 @Entity
 class CreditCardPayment extends Payment {

spanner/hibernate/src/main/java/com/example/spanner/HibernateSampleApplication.java

@@ -70,14 +70,13 @@ public static void savePerson(Session session) {
     person.addPayment(payment1);
     person.addPayment(payment2);
 
-    session.save(person);
+    session.persist(person);
     session.getTransaction().commit();
 
     List<Person> personsInTable =
         session.createQuery("from Person", Person.class).list();
 
-    System.out.println(
-        String.format("There are %d persons saved in the table:", personsInTable.size()));
+    System.out.printf("There are %d persons saved in the table:%n", personsInTable.size());
 
     for (Person personInTable : personsInTable) {
       System.out.println(personInTable);

spanner/hibernate/src/main/java/com/example/spanner/Payment.java

@@ -17,14 +17,15 @@
 package com.example.spanner;
 
 // [START spanner_hibernate_inheritance]
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
 import java.util.UUID;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import org.hibernate.annotations.Type;
+import org.hibernate.annotations.JdbcTypeCode;
 
 /**
  * An example {@link Entity} which demonstrates usage of {@link Inheritance}.
@@ -35,7 +36,7 @@ public abstract class Payment {
 
   @Id
   @GeneratedValue(strategy = GenerationType.AUTO)
-  @Type(type = "uuid-char")
+  @JdbcTypeCode(java.sql.Types.VARCHAR)
   private UUID id;
 
   private Long amount;

spanner/hibernate/src/main/java/com/example/spanner/Person.java

@@ -16,17 +16,17 @@
 
 package com.example.spanner;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import org.hibernate.annotations.Type;
+import org.hibernate.annotations.JdbcTypeCode;
 
 /**
  * An example person entity.
@@ -40,7 +40,7 @@ public class Person {
   // [START spanner_hibernate_generated_ids]
   @Id
   @GeneratedValue(strategy = GenerationType.AUTO)
-  @Type(type = "uuid-char")
+  @JdbcTypeCode(java.sql.Types.VARCHAR)
   private UUID id;
   // [END spanner_hibernate_generated_ids]
 

spanner/hibernate/src/main/java/com/example/spanner/WireTransferPayment.java

@@ -16,8 +16,8 @@
 
 package com.example.spanner;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
 
 @Entity
 class WireTransferPayment extends Payment {

spanner/hibernate/src/main/resources/hibernate.cfg.xml

@@ -8,7 +8,7 @@
 
     <!-- [START spanner_hibernate_config] -->
     <!-- Connection settings -->
-    <property name="hibernate.dialect">com.google.cloud.spanner.hibernate.SpannerDialect</property>
+    <property name="hibernate.dialect">org.hibernate.dialect.SpannerDialect</property>
     <property name="hibernate.connection.driver_class">com.google.cloud.spanner.jdbc.JdbcDriver</property>
     <property name="hibernate.connection.url">jdbc:cloudspanner:/projects/{YOUR_PROJECT_ID}/instances/{YOUR_INSTANCE_ID}/databases/{YOUR_DATABASE_ID}</property>
     <!-- [END spanner_hibernate_config] -->