Add support for Hibernate 6 #401

vladmihalcea · Apr 4, 2022 · 28c179c · 28c179c
1 parent ed8fe8e
commit 28c179c
Show file tree

Hide file tree

Showing 254 changed files with 25,049 additions and 12 deletions.
diff --git a/.../src/main/java/com/vladmihalcea/hibernate/type/array/internal/ArraySqlTypeDescriptor.java b/.../src/main/java/com/vladmihalcea/hibernate/type/array/internal/ArraySqlTypeDescriptor.java
@@ -45,7 +45,7 @@ protected void doBind(PreparedStatement st, X value, int index, WrapperOptions o
     public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
         return new BasicExtractor<X>(javaTypeDescriptor, this) {
             @Override
-            protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+            protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
                 return javaTypeDescriptor.wrap(rs.getArray(name), options);
             }
         };

diff --git a/...ain/java/com/vladmihalcea/hibernate/type/json/internal/AbstractJsonSqlTypeDescriptor.java b/...ain/java/com/vladmihalcea/hibernate/type/json/internal/AbstractJsonSqlTypeDescriptor.java
@@ -30,7 +30,7 @@ public boolean canBeRemapped() {
     public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
         return new BasicExtractor<X>(javaTypeDescriptor, this) {
             @Override
-            protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+            protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
                 return javaTypeDescriptor.wrap(extractJson(rs, name), options);
             }
         };

diff --git a/.../src/main/java/com/vladmihalcea/hibernate/type/array/internal/ArraySqlTypeDescriptor.java b/.../src/main/java/com/vladmihalcea/hibernate/type/array/internal/ArraySqlTypeDescriptor.java
@@ -45,7 +45,7 @@ protected void doBind(PreparedStatement st, X value, int index, WrapperOptions o
     public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
         return new BasicExtractor<X>(javaTypeDescriptor, this) {
             @Override
-            protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+            protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
                 return javaTypeDescriptor.wrap(rs.getArray(name), options);
             }
 

diff --git a/...ain/java/com/vladmihalcea/hibernate/type/json/internal/AbstractJsonSqlTypeDescriptor.java b/...ain/java/com/vladmihalcea/hibernate/type/json/internal/AbstractJsonSqlTypeDescriptor.java
@@ -30,7 +30,7 @@ public boolean canBeRemapped() {
     public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
         return new BasicExtractor<X>(javaTypeDescriptor, this) {
             @Override
-            protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+            protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
                 return javaTypeDescriptor.wrap(extractJson(rs, name), options);
             }
 

diff --git a/.../src/main/java/com/vladmihalcea/hibernate/type/array/internal/ArraySqlTypeDescriptor.java b/.../src/main/java/com/vladmihalcea/hibernate/type/array/internal/ArraySqlTypeDescriptor.java
@@ -51,7 +51,7 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
     public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
         return new BasicExtractor<X>(javaTypeDescriptor, this) {
             @Override
-            protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+            protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
                 return javaTypeDescriptor.wrap(rs.getArray(name), options);
             }
 

diff --git a/...ain/java/com/vladmihalcea/hibernate/type/json/internal/AbstractJsonSqlTypeDescriptor.java b/...ain/java/com/vladmihalcea/hibernate/type/json/internal/AbstractJsonSqlTypeDescriptor.java
@@ -30,7 +30,7 @@ public boolean canBeRemapped() {
     public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
         return new BasicExtractor<X>(javaTypeDescriptor, this) {
             @Override
-            protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+            protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
                 return javaTypeDescriptor.wrap(extractJson(rs, name), options);
             }
 

diff --git a/.../src/main/java/com/vladmihalcea/hibernate/type/array/internal/ArraySqlTypeDescriptor.java b/.../src/main/java/com/vladmihalcea/hibernate/type/array/internal/ArraySqlTypeDescriptor.java
@@ -51,7 +51,7 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
     public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
         return new BasicExtractor<X>(javaTypeDescriptor, this) {
             @Override
-            protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+            protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
                 return javaTypeDescriptor.wrap(rs.getArray(name), options);
             }
 

diff --git a/...ain/java/com/vladmihalcea/hibernate/type/json/internal/AbstractJsonSqlTypeDescriptor.java b/...ain/java/com/vladmihalcea/hibernate/type/json/internal/AbstractJsonSqlTypeDescriptor.java
@@ -30,7 +30,7 @@ public boolean canBeRemapped() {
     public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
         return new BasicExtractor<X>(javaTypeDescriptor, this) {
             @Override
-            protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+            protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
                 return javaTypeDescriptor.wrap(extractJson(rs, name), options);
             }
 

diff --git a/.../com/vladmihalcea/hibernate/type/search/internal/PostgreSQLTSVectorSqlTypeDescriptor.java b/.../com/vladmihalcea/hibernate/type/search/internal/PostgreSQLTSVectorSqlTypeDescriptor.java
@@ -52,7 +52,7 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
     public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
         return new BasicExtractor<X>(javaTypeDescriptor, this) {
             @Override
-            protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+            protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
                 return javaTypeDescriptor.wrap(rs.getString( name ), options);
             }
 

diff --git a/.../src/main/java/com/vladmihalcea/hibernate/type/array/internal/ArraySqlTypeDescriptor.java b/.../src/main/java/com/vladmihalcea/hibernate/type/array/internal/ArraySqlTypeDescriptor.java
@@ -51,7 +51,7 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
     public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
         return new BasicExtractor<X>(javaTypeDescriptor, this) {
             @Override
-            protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+            protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
                 return javaTypeDescriptor.wrap(rs.getArray(name), options);
             }
 

diff --git a/...ain/java/com/vladmihalcea/hibernate/type/json/internal/AbstractJsonSqlTypeDescriptor.java b/...ain/java/com/vladmihalcea/hibernate/type/json/internal/AbstractJsonSqlTypeDescriptor.java
@@ -30,7 +30,7 @@ public boolean canBeRemapped() {
     public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
         return new BasicExtractor<X>(javaTypeDescriptor, this) {
             @Override
-            protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+            protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
                 return javaTypeDescriptor.wrap(extractJson(rs, name), options);
             }
 

diff --git a/.../com/vladmihalcea/hibernate/type/search/internal/PostgreSQLTSVectorSqlTypeDescriptor.java b/.../com/vladmihalcea/hibernate/type/search/internal/PostgreSQLTSVectorSqlTypeDescriptor.java
@@ -52,7 +52,7 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
     public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
         return new BasicExtractor<X>(javaTypeDescriptor, this) {
             @Override
-            protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+            protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
                 return javaTypeDescriptor.wrap(rs.getString( name ), options);
             }
 

diff --git a/hibernate-types-60/pom.xml b/hibernate-types-60/pom.xml
@@ -0,0 +1,110 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>com.vladmihalcea</groupId>
+        <artifactId>hibernate-types-parent</artifactId>
+        <version>2.14.2-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>hibernate-types-60</artifactId>
+    <version>2.14.2-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>hibernate-types-60</name>
+    <description>Hibernate ORM 6.0 extra Types</description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-jcache</artifactId>
+            <version>${hibernate.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgresql.version}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+    </dependencies>
+
+    <properties>
+        <jdk.version>11</jdk.version>
+
+        <hibernate.version>6.0.0.Final</hibernate.version>
+        <postgresql.version>42.3.3</postgresql.version>
+
+        <mysql.version>8.0.28</mysql.version>
+        <jackson.version>2.11.0</jackson.version>
+        <guava.version>29.0-jre</guava.version>
+
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>${maven-jar-plugin.version}</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>com.vladmihalcea.hibernate.type</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>