add support for Hibernate ORM 7.0

README.md

@@ -14,6 +14,7 @@ For seamless type support in Hibernate ORM, you should pick one of the following
 
 | Hibernate Version             | Artifact                                                                                                             |
 |-------------------------------|----------------------------------------------------------------------------------------------------------------------|
+| 7.0                           | [org.framefork:typed-ids-hibernate-70](https://central.sonatype.com/artifact/org.framefork/typed-ids-hibernate-70)   |
 | 6.6, 6.5, 6.4, and 6.3        | [org.framefork:typed-ids-hibernate-63](https://central.sonatype.com/artifact/org.framefork/typed-ids-hibernate-63)   |
 | 6.2                           | [org.framefork:typed-ids-hibernate-62](https://central.sonatype.com/artifact/org.framefork/typed-ids-hibernate-62)   |
 | 6.1                           | [org.framefork:typed-ids-hibernate-61](https://central.sonatype.com/artifact/org.framefork/typed-ids-hibernate-61)   |

gradle/libs.versions.toml

@@ -28,13 +28,16 @@ postgresql = { module = "org.postgresql:postgresql", version = "42.7.4" }
 mysql = { module = "com.mysql:mysql-connector-j", version = "8.3.0" }
 logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.12" }
 hibernate-orm-v61 = { group = "org.hibernate.orm", name = "hibernate-core", version = "6.1.7.Final" }
-hibernate-orm-v62 = { group = "org.hibernate.orm", name = "hibernate-core", version = "6.2.36.Final" }
+hibernate-orm-v62 = { group = "org.hibernate.orm", name = "hibernate-core", version = "6.2.41.Final" }
 hibernate-orm-v63 = { group = "org.hibernate.orm", name = "hibernate-core", version = "6.3.2.Final" }
 hibernate-orm-v64 = { group = "org.hibernate.orm", name = "hibernate-core", version = "6.4.10.Final" }
 hibernate-orm-v65 = { group = "org.hibernate.orm", name = "hibernate-core", version = "6.5.3.Final" }
-hibernate-orm-v66 = { group = "org.hibernate.orm", name = "hibernate-core", version = "6.6.12.Final" }
+hibernate-orm-v66 = { group = "org.hibernate.orm", name = "hibernate-core", version = "6.6.22.Final" }
+hibernate-orm-v70 = { group = "org.hibernate.orm", name = "hibernate-core", version = "7.0.7.Final" }
+hibernate-models-v70 = { group = "org.hibernate.models", name = "hibernate-models", version = "1.0.0" }
 hypersistence-utils-hibernate61 = { group = "io.hypersistence", name = "hypersistence-utils-hibernate-60", version = "3.9.4" }
 hypersistence-utils-hibernate62 = { group = "io.hypersistence", name = "hypersistence-utils-hibernate-62", version = "3.9.4" }
-hypersistence-utils-hibernate63 = { group = "io.hypersistence", name = "hypersistence-utils-hibernate-63", version = "3.9.9" }
+hypersistence-utils-hibernate63 = { group = "io.hypersistence", name = "hypersistence-utils-hibernate-63", version = "3.10.3" }
+hypersistence-utils-hibernate70 = { group = "io.hypersistence", name = "hypersistence-utils-hibernate-70", version = "3.10.3" }
 hypersistence-tsid = { module = "io.hypersistence:hypersistence-tsid", version = "2.1.4" }
 kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.7.0" }

modules/typed-ids-hibernate-61/src/test/java/org/framefork/typedIds/bigint/hibernate/ObjectBigIntIdTypeMySQLTest.java

@@ -34,18 +34,26 @@ public void testSchema()
             var table1 = getIdColumnInfo(em, BigIntAppGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table1.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
             assertThat(table1.get("column_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table1.get("column_default", String.class)).isNull();
+            assertThat(table1.get("extra", String.class)).isEmpty();
 
             var table2 = getIdColumnInfo(em, BigIntDbAutoGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table2.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
             assertThat(table2.get("column_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table2.get("column_default", String.class)).isNull();
+            assertThat(table2.get("extra", String.class)).isEmpty();
 
             var table3 = getIdColumnInfo(em, BigIntDbIdentityGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table3.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
             assertThat(table3.get("column_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table3.get("column_default", String.class)).isNull();
+            assertThat(table3.get("extra", String.class)).isEqualToIgnoringCase("auto_increment");
 
             var table4 = getIdColumnInfo(em, BigIntDbSequenceGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table4.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
             assertThat(table4.get("column_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table4.get("column_default", String.class)).isNull();
+            assertThat(table4.get("extra", String.class)).isEmpty();
         });
     }
 

modules/typed-ids-hibernate-61/src/test/java/org/framefork/typedIds/bigint/hibernate/ObjectBigIntIdTypePostgreSQLTest.java

@@ -33,15 +33,27 @@ public void testSchema()
         doInJPA(em -> {
             var table1 = getIdColumnInfo(em, BigIntAppGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table1.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table1.get("column_default", String.class)).isNull();
+            assertThat(table1.get("is_identity", String.class)).isEqualTo("NO");
+            assertThat(table1.get("identity_generation", String.class)).isNull();
 
             var table2 = getIdColumnInfo(em, BigIntDbAutoGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table2.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table2.get("column_default", String.class)).isNull();
+            assertThat(table2.get("is_identity", String.class)).isEqualTo("NO");
+            assertThat(table2.get("identity_generation", String.class)).isNull();
 
             var table3 = getIdColumnInfo(em, BigIntDbIdentityGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table3.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table3.get("column_default", String.class)).startsWith("nextval('");
+            assertThat(table3.get("is_identity", String.class)).isEqualTo("NO");
+            assertThat(table3.get("identity_generation", String.class)).isNull();
 
             var table4 = getIdColumnInfo(em, BigIntDbSequenceGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table4.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table4.get("column_default", String.class)).isNull();
+            assertThat(table4.get("is_identity", String.class)).isEqualTo("NO");
+            assertThat(table4.get("identity_generation", String.class)).isNull();
         });
     }
 

modules/typed-ids-hibernate-62/src/test/java/org/framefork/typedIds/bigint/hibernate/ObjectBigIntIdTypeMySQLTest.java

@@ -34,18 +34,26 @@ public void testSchema()
             var table1 = getIdColumnInfo(em, BigIntAppGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table1.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
             assertThat(table1.get("column_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table1.get("column_default", String.class)).isNull();
+            assertThat(table1.get("extra", String.class)).isEmpty();
 
             var table2 = getIdColumnInfo(em, BigIntDbAutoGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table2.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
             assertThat(table2.get("column_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table2.get("column_default", String.class)).isNull();
+            assertThat(table2.get("extra", String.class)).isEmpty();
 
             var table3 = getIdColumnInfo(em, BigIntDbIdentityGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table3.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
             assertThat(table3.get("column_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table3.get("column_default", String.class)).isNull();
+            assertThat(table3.get("extra", String.class)).isEqualToIgnoringCase("auto_increment");
 
             var table4 = getIdColumnInfo(em, BigIntDbSequenceGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table4.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
             assertThat(table4.get("column_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table4.get("column_default", String.class)).isNull();
+            assertThat(table4.get("extra", String.class)).isEmpty();
         });
     }
 

modules/typed-ids-hibernate-62/src/test/java/org/framefork/typedIds/bigint/hibernate/ObjectBigIntIdTypePostgreSQLTest.java

@@ -33,15 +33,27 @@ public void testSchema()
         doInJPA(em -> {
             var table1 = getIdColumnInfo(em, BigIntAppGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table1.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table1.get("column_default", String.class)).isNull();
+            assertThat(table1.get("is_identity", String.class)).isEqualTo("NO");
+            assertThat(table1.get("identity_generation", String.class)).isNull();
 
             var table2 = getIdColumnInfo(em, BigIntDbAutoGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table2.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table2.get("column_default", String.class)).isNull();
+            assertThat(table2.get("is_identity", String.class)).isEqualTo("NO");
+            assertThat(table2.get("identity_generation", String.class)).isNull();
 
             var table3 = getIdColumnInfo(em, BigIntDbIdentityGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table3.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table3.get("column_default", String.class)).startsWith("nextval('");
+            assertThat(table3.get("is_identity", String.class)).isEqualTo("NO");
+            assertThat(table3.get("identity_generation", String.class)).isNull();
 
             var table4 = getIdColumnInfo(em, BigIntDbSequenceGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table4.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table4.get("column_default", String.class)).isNull();
+            assertThat(table4.get("is_identity", String.class)).isEqualTo("NO");
+            assertThat(table4.get("identity_generation", String.class)).isNull();
         });
     }
 

modules/typed-ids-hibernate-63/src/test/java/org/framefork/typedIds/bigint/hibernate/ObjectBigIntIdTypeMySQLTest.java

@@ -34,18 +34,26 @@ public void testSchema()
             var table1 = getIdColumnInfo(em, BigIntAppGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table1.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
             assertThat(table1.get("column_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table1.get("column_default", String.class)).isNull();
+            assertThat(table1.get("extra", String.class)).isEmpty();
 
             var table2 = getIdColumnInfo(em, BigIntDbAutoGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table2.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
             assertThat(table2.get("column_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table2.get("column_default", String.class)).isNull();
+            assertThat(table2.get("extra", String.class)).isEmpty();
 
             var table3 = getIdColumnInfo(em, BigIntDbIdentityGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table3.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
             assertThat(table3.get("column_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table3.get("column_default", String.class)).isNull();
+            assertThat(table3.get("extra", String.class)).isEqualToIgnoringCase("auto_increment");
 
             var table4 = getIdColumnInfo(em, BigIntDbSequenceGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table4.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
             assertThat(table4.get("column_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table4.get("column_default", String.class)).isNull();
+            assertThat(table4.get("extra", String.class)).isEmpty();
         });
     }
 

modules/typed-ids-hibernate-63/src/test/java/org/framefork/typedIds/bigint/hibernate/ObjectBigIntIdTypePostgreSQLTest.java

@@ -33,15 +33,27 @@ public void testSchema()
         doInJPA(em -> {
             var table1 = getIdColumnInfo(em, BigIntAppGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table1.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table1.get("column_default", String.class)).isNull();
+            assertThat(table1.get("is_identity", String.class)).isEqualTo("NO");
+            assertThat(table1.get("identity_generation", String.class)).isNull();
 
             var table2 = getIdColumnInfo(em, BigIntDbAutoGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table2.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table2.get("column_default", String.class)).isNull();
+            assertThat(table2.get("is_identity", String.class)).isEqualTo("NO");
+            assertThat(table2.get("identity_generation", String.class)).isNull();
 
             var table3 = getIdColumnInfo(em, BigIntDbIdentityGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table3.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table3.get("column_default", String.class)).startsWith("nextval('");
+            assertThat(table3.get("is_identity", String.class)).isEqualTo("NO");
+            assertThat(table3.get("identity_generation", String.class)).isNull();
 
             var table4 = getIdColumnInfo(em, BigIntDbSequenceGeneratedExplicitMappingEntity.TABLE_NAME);
             assertThat(table4.get("data_type", String.class)).isEqualToIgnoringCase("bigint");
+            assertThat(table4.get("column_default", String.class)).isNull();
+            assertThat(table4.get("is_identity", String.class)).isEqualTo("NO");
+            assertThat(table4.get("identity_generation", String.class)).isNull();
         });
     }
 

modules/typed-ids-hibernate-70-testing/build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+    id("framefork.java")
+}
+
+dependencies {
+    api(project(":typed-ids-testing"))
+
+    api(libs.hibernate.orm.v70)
+    api(libs.hypersistence.utils.hibernate70)
+}

modules/typed-ids-hibernate-70-testing/src/main/java/org/framefork/typedIds/hibernate/tests/AbstractContainerDataSourceProvider.java

@@ -0,0 +1,64 @@
+package org.framefork.typedIds.hibernate.tests;
+
+import io.hypersistence.utils.test.providers.DataSourceProvider;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+
+import javax.sql.DataSource;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+
+public abstract class AbstractContainerDataSourceProvider implements DataSourceProvider
+{
+
+    private final AtomicReference<JdbcDatabaseContainer<?>> container = new AtomicReference<>();
+
+    public JdbcDatabaseContainer<?> getContainer()
+    {
+        if (container.get() == null) {
+            synchronized (container) {
+                if (container.get() == null) {
+                    container.set(initContainer());
+                }
+            }
+        }
+
+        return Objects.requireNonNull(container.get(), "database container must not be null");
+    }
+
+    private JdbcDatabaseContainer<?> initContainer()
+    {
+        var newContainer = (JdbcDatabaseContainer<?>) newJdbcDatabaseContainer();
+
+        if (supportsDatabaseName()) {
+            newContainer.withDatabaseName(databaseName());
+        }
+        if (supportsCredentials()) {
+            newContainer.withUsername(username()).withPassword(password());
+        }
+
+        newContainer.withReuse(true).start();
+
+        return newContainer;
+    }
+
+    @Override
+    public final DataSource dataSource()
+    {
+        getContainer(); // force init
+        return newDataSource();
+    }
+
+    @Override
+    public final String url()
+    {
+        return getContainer().getJdbcUrl();
+    }
+
+    public String databaseName()
+    {
+        return "framefork";
+    }
+
+    protected abstract DataSource newDataSource();
+
+}

modules/typed-ids-hibernate-70-testing/src/main/java/org/framefork/typedIds/hibernate/tests/AbstractMySQLIntegrationTest.java

@@ -0,0 +1,31 @@
+package org.framefork.typedIds.hibernate.tests;
+
+import io.hypersistence.utils.test.AbstractHibernateTest;
+import io.hypersistence.utils.test.providers.DataSourceProvider;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
+public abstract class AbstractMySQLIntegrationTest extends AbstractHibernateTest
+{
+
+    @BeforeEach
+    @Override
+    public void init()
+    {
+        super.init();
+    }
+
+    @AfterEach
+    @Override
+    public void destroy()
+    {
+        super.destroy();
+    }
+
+    @Override
+    protected DataSourceProvider dataSourceProvider()
+    {
+        return MySQLDataSourceProvider.V8;
+    }
+
+}

modules/typed-ids-hibernate-70-testing/src/main/java/org/framefork/typedIds/hibernate/tests/AbstractPostgreSQLIntegrationTest.java

@@ -0,0 +1,31 @@
+package org.framefork.typedIds.hibernate.tests;
+
+import io.hypersistence.utils.test.AbstractHibernateTest;
+import io.hypersistence.utils.test.providers.DataSourceProvider;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
+public abstract class AbstractPostgreSQLIntegrationTest extends AbstractHibernateTest
+{
+
+    @BeforeEach
+    @Override
+    public void init()
+    {
+        super.init();
+    }
+
+    @AfterEach
+    @Override
+    public void destroy()
+    {
+        super.destroy();
+    }
+
+    @Override
+    protected DataSourceProvider dataSourceProvider()
+    {
+        return PostgreSQLDataSourceProvider.V16;
+    }
+
+}