diff --git a/pom.xml b/pom.xml
index 2acf0b49c..dafde869c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,9 +17,9 @@
true
17
- 6.2.18
- 6.5.10
- 2.21.4
+ 7.0.7
+ 7.0.5
+ 2.21.4
2.21
3.1.4
@@ -50,7 +50,7 @@
4.5.14
4.4.16
- 6.6.44.Final
+ 7.3.4.Final
7.2.1.Final
@@ -516,6 +516,7 @@
pom
import
+
org.assertj
assertj-core
diff --git a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URIType.java b/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URIType.java
index 4ce519788..f61b54b26 100644
--- a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URIType.java
+++ b/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URIType.java
@@ -1,12 +1,15 @@
package nl.vpro.hibernate;
-import org.hibernate.metamodel.mapping.*;
+import java.io.Serial;
+import java.net.URI;
+
+import org.hibernate.metamodel.mapping.DiscriminatorConverter;
+import org.hibernate.metamodel.mapping.DiscriminatorType;
+import org.hibernate.metamodel.mapping.internal.UnifiedAnyDiscriminatorConverter;
import org.hibernate.type.AbstractSingleColumnStandardBasicType;
import org.hibernate.type.BasicType;
import org.hibernate.type.descriptor.jdbc.VarcharJdbcType;
-import java.net.URI;
-
/**
* A type that maps between {@link java.sql.Types#VARCHAR VARCHAR} and {@link java.net.URI}
*
@@ -14,6 +17,10 @@
*/
public class URIType extends AbstractSingleColumnStandardBasicType implements DiscriminatorType {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
public URIType() {
super(VarcharJdbcType.INSTANCE, URITypeDescriptor.INSTANCE);
}
@@ -25,7 +32,7 @@ public String getName() {
@Override
public DiscriminatorConverter getValueConverter() {
- return new MappedDiscriminatorConverter(null, null, null, null) {
+ return new UnifiedAnyDiscriminatorConverter(null, null, null, null, null, null) {
@Override
public URI toDomainValue(CharSequence relationalValue) {
return URI.create((String) relationalValue);
diff --git a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java b/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java
index 8e0cb936c..dd74f89e3 100644
--- a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java
+++ b/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java
@@ -1,12 +1,13 @@
package nl.vpro.hibernate;
+import java.io.Serial;
+import java.net.URI;
+import java.net.URISyntaxException;
+
import org.hibernate.HibernateException;
import org.hibernate.type.descriptor.WrapperOptions;
import org.hibernate.type.descriptor.java.AbstractClassJavaType;
-import java.net.URI;
-import java.net.URISyntaxException;
-
/**
* Descriptor for {@link java.net.URI} handling.
@@ -15,8 +16,10 @@
*/
class URITypeDescriptor extends AbstractClassJavaType {
public static final URITypeDescriptor INSTANCE = new URITypeDescriptor(URI.class);
+ @Serial
+ private static final long serialVersionUID = -8084874037847068699L;
- protected URITypeDescriptor(Class extends URI> type) {
+ protected URITypeDescriptor(Class type) {
super(type);
}