From 10ad9aba21ef80e362c930e71d85f6e4124935c6 Mon Sep 17 00:00:00 2001
From: Szymon Tarnowski <33316705+starnowski@users.noreply.github.com>
Date: Thu, 4 Jan 2024 01:10:47 +0100
Subject: [PATCH] #43 -  Upgrade the hibernate version to 6.4.0 (#44)

* #43 - Updated Hibernate version to 6.4.0

* #43 - Added org.checkerframework:checker-qual dependency to fix tests.
---
 hibernate6-functional-tests/pom.xml                       | 2 +-
 hibernate6/pom.xml                                        | 8 +++++++-
 .../hibernate6/CurrentTenantIdentifierResolverImpl.java   | 2 +-
 .../SharedSchemaMultiTenantConnectionProvider.java        | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/hibernate6-functional-tests/pom.xml b/hibernate6-functional-tests/pom.xml
index 8512226..263a7d4 100644
--- a/hibernate6-functional-tests/pom.xml
+++ b/hibernate6-functional-tests/pom.xml
@@ -15,7 +15,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.hibernate.hibernate.core.version>6.2.5.Final</org.hibernate.hibernate.core.version>
+        <org.hibernate.hibernate.core.version>6.4.0.Final</org.hibernate.hibernate.core.version>
     </properties>
 
     <dependencies>
diff --git a/hibernate6/pom.xml b/hibernate6/pom.xml
index 7087a21..24f37bd 100644
--- a/hibernate6/pom.xml
+++ b/hibernate6/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>hibernate6</artifactId>
 
     <properties>
-        <org.hibernate.hibernate.core.version>6.2.5.Final</org.hibernate.hibernate.core.version>
+        <org.hibernate.hibernate.core.version>6.4.0.Final</org.hibernate.hibernate.core.version>
         <java.version>11</java.version>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
@@ -47,6 +47,12 @@
             <version>5.4.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.checkerframework</groupId>
+            <artifactId>checker-qual</artifactId>
+            <version>3.42.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/hibernate6/src/main/java/com/github/starnowski/posmulten/hibernate/hibernate6/CurrentTenantIdentifierResolverImpl.java b/hibernate6/src/main/java/com/github/starnowski/posmulten/hibernate/hibernate6/CurrentTenantIdentifierResolverImpl.java
index 3fc441f..4735185 100644
--- a/hibernate6/src/main/java/com/github/starnowski/posmulten/hibernate/hibernate6/CurrentTenantIdentifierResolverImpl.java
+++ b/hibernate6/src/main/java/com/github/starnowski/posmulten/hibernate/hibernate6/CurrentTenantIdentifierResolverImpl.java
@@ -5,7 +5,7 @@
 
 import static com.github.starnowski.posmulten.hibernate.common.context.CurrentTenantContext.getCurrentTenant;
 
-public class CurrentTenantIdentifierResolverImpl implements CurrentTenantIdentifierResolver {
+public class CurrentTenantIdentifierResolverImpl implements CurrentTenantIdentifierResolver<String> {
 
     public String resolveCurrentTenantIdentifier() {
         return getCurrentTenant();
diff --git a/hibernate6/src/main/java/com/github/starnowski/posmulten/hibernate/hibernate6/connection/SharedSchemaMultiTenantConnectionProvider.java b/hibernate6/src/main/java/com/github/starnowski/posmulten/hibernate/hibernate6/connection/SharedSchemaMultiTenantConnectionProvider.java
index 1e5bd1f..1191443 100644
--- a/hibernate6/src/main/java/com/github/starnowski/posmulten/hibernate/hibernate6/connection/SharedSchemaMultiTenantConnectionProvider.java
+++ b/hibernate6/src/main/java/com/github/starnowski/posmulten/hibernate/hibernate6/connection/SharedSchemaMultiTenantConnectionProvider.java
@@ -17,7 +17,7 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-public class SharedSchemaMultiTenantConnectionProvider extends AbstractMultiTenantConnectionProvider implements ServiceRegistryAwareService {
+public class SharedSchemaMultiTenantConnectionProvider extends AbstractMultiTenantConnectionProvider<String> implements ServiceRegistryAwareService {
 
     private ConnectionProvider connectionProvider;
     private ISharedSchemaContext context;