Skip to content

Commit

Permalink
Add support for Hibernate 6 #401
Browse files Browse the repository at this point in the history
  • Loading branch information
vladmihalcea committed Apr 6, 2022
1 parent ed8fe8e commit 059fd07
Show file tree
Hide file tree
Showing 254 changed files with 24,870 additions and 49 deletions.
Expand Up @@ -5,6 +5,7 @@
import com.vladmihalcea.hibernate.util.transaction.JPATransactionFunction;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.annotations.Check;
import org.hibernate.annotations.NaturalId;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
Expand Down Expand Up @@ -140,7 +141,8 @@ public static class Book {
private String isbn;

@Type(type = "json")
@Column(columnDefinition = "VARCHAR2(1000) CONSTRAINT IS_VALID_JSON CHECK (properties IS JSON)")
@Column(columnDefinition = "VARCHAR2(1000)")
@Check(constraints = "properties IS JSON")
private String properties;

public String getIsbn() {
Expand Down
Expand Up @@ -4,6 +4,7 @@
import com.vladmihalcea.hibernate.util.AbstractOracleIntegrationTest;
import com.vladmihalcea.hibernate.util.transaction.JPATransactionFunction;
import org.hibernate.Session;
import org.hibernate.annotations.Check;
import org.hibernate.annotations.NaturalId;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
Expand Down Expand Up @@ -86,7 +87,8 @@ public static class Book {
private String isbn;

@Type(type = "json")
@Column(columnDefinition = "VARCHAR2(1000) CONSTRAINT IS_VALID_JSON CHECK (properties IS JSON)")
@Column(columnDefinition = "VARCHAR2(1000)")
@Check(constraints = "properties IS JSON")
private Map<String, String> properties = new HashMap<String, String>();

public String getIsbn() {
Expand Down
Expand Up @@ -5,6 +5,7 @@
import com.vladmihalcea.hibernate.util.transaction.JPATransactionFunction;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.annotations.Check;
import org.hibernate.annotations.NaturalId;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
Expand Down Expand Up @@ -136,7 +137,8 @@ public static class Book {
private String isbn;

@Type(type = "json")
@Column(columnDefinition = "VARCHAR2(1000) CONSTRAINT IS_VALID_JSON CHECK (properties IS JSON)")
@Column(columnDefinition = "VARCHAR2(1000)")
@Check(constraints = "properties IS JSON")
private String properties;

public String getIsbn() {
Expand Down
Expand Up @@ -4,6 +4,7 @@
import com.vladmihalcea.hibernate.util.AbstractOracleIntegrationTest;
import com.vladmihalcea.hibernate.util.transaction.JPATransactionFunction;
import org.hibernate.Session;
import org.hibernate.annotations.Check;
import org.hibernate.annotations.NaturalId;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
Expand Down Expand Up @@ -86,7 +87,8 @@ public static class Book {
private String isbn;

@Type(type = "json")
@Column(columnDefinition = "VARCHAR2(1000) CONSTRAINT IS_VALID_JSON CHECK (properties IS JSON)")
@Column(columnDefinition = "VARCHAR2(1000)")
@Check(constraints = "properties IS JSON")
private Map<String, String> properties = new HashMap<String, String>();

public String getIsbn() {
Expand Down
Expand Up @@ -5,6 +5,7 @@
import net.ttddyy.dsproxy.QueryCount;
import net.ttddyy.dsproxy.QueryCountHolder;
import org.hibernate.Session;
import org.hibernate.annotations.Check;
import org.hibernate.annotations.NaturalId;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
Expand Down Expand Up @@ -145,7 +146,8 @@ public static class Book {
private String isbn;

@Type(type = "json")
@Column(columnDefinition = "VARCHAR2(1000) CONSTRAINT IS_VALID_JSON CHECK (properties IS JSON)")
@Column(columnDefinition = "VARCHAR2(1000)")
@Check(constraints = "properties IS JSON")
private String properties;

public String getIsbn() {
Expand Down
Expand Up @@ -3,6 +3,7 @@
import com.vladmihalcea.hibernate.type.json.JsonType;
import com.vladmihalcea.hibernate.util.AbstractOracleIntegrationTest;
import org.hibernate.Session;
import org.hibernate.annotations.Check;
import org.hibernate.annotations.NaturalId;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
Expand Down Expand Up @@ -73,7 +74,8 @@ public static class Book {
private String isbn;

@Type(type = "json")
@Column(columnDefinition = "VARCHAR2(1000) CONSTRAINT IS_VALID_JSON CHECK (properties IS JSON)")
@Column(columnDefinition = "VARCHAR2(1000)")
@Check(constraints = "properties IS JSON")
private Map<String, String> properties = new HashMap<>();

public String getIsbn() {
Expand Down

This file was deleted.

Expand Up @@ -41,7 +41,6 @@ public void test() {

@Entity(name = "Post")
@Table(name = "post")
@TypeDef(typeClass = MySQLBinaryType.class, defaultForType = byte[].class)
public static class Post {

@Id
Expand Down
Expand Up @@ -5,6 +5,7 @@
import net.ttddyy.dsproxy.QueryCount;
import net.ttddyy.dsproxy.QueryCountHolder;
import org.hibernate.Session;
import org.hibernate.annotations.Check;
import org.hibernate.annotations.NaturalId;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
Expand Down Expand Up @@ -145,7 +146,8 @@ public static class Book {
private String isbn;

@Type(type = "json")
@Column(columnDefinition = "VARCHAR2(1000) CONSTRAINT IS_VALID_JSON CHECK (properties IS JSON)")
@Column(columnDefinition = "VARCHAR2(1000)")
@Check(constraints = "properties IS JSON")
private String properties;

public String getIsbn() {
Expand Down
Expand Up @@ -3,6 +3,7 @@
import com.vladmihalcea.hibernate.type.json.JsonType;
import com.vladmihalcea.hibernate.util.AbstractOracleIntegrationTest;
import org.hibernate.Session;
import org.hibernate.annotations.Check;
import org.hibernate.annotations.NaturalId;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
Expand Down Expand Up @@ -73,7 +74,8 @@ public static class Book {
private String isbn;

@Type(type = "json")
@Column(columnDefinition = "VARCHAR2(1000) CONSTRAINT IS_VALID_JSON CHECK (properties IS JSON)")
@Column(columnDefinition = "VARCHAR2(1000)")
@Check(constraints = "properties IS JSON")
private Map<String, String> properties = new HashMap<>();

public String getIsbn() {
Expand Down
137 changes: 137 additions & 0 deletions hibernate-types-60/pom.xml
@@ -0,0 +1,137 @@
<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.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>${ehcache.version}</version>
</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>

<ehcache.version>3.10.0</ehcache.version>

</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<release>${jdk.version}</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<jvm>${env.JAVA_HOME_11}/bin/java</jvm>
<excludes>
<exclude>**/*JvmForkTest.java</exclude>
</excludes>
</configuration>
</plugin>
<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>

0 comments on commit 059fd07

Please sign in to comment.