Update Hibernate versions and fix test

Author: vladmihalcea

hypersistence-utils-hibernate-63/pom.xml

@@ -205,7 +205,7 @@
         <!--<hibernate.version>6.3.2.Final</hibernate.version>-->
         <!--<hibernate.version>6.4.10.Final</hibernate.version>-->
         <!--<hibernate.version>6.5.3.Final</hibernate.version>-->
-        <hibernate.version>6.6.9.Final</hibernate.version>
+        <hibernate.version>6.6.18.Final</hibernate.version>
 
         <jackson-module-jakarta-xmlbind-annotation>2.15.3</jackson-module-jakarta-xmlbind-annotation>
         <guava.version>32.1.3-jre</guava.version>

hypersistence-utils-hibernate-63/src/test/java/io/hypersistence/utils/hibernate/type/json/PostgreSQLJsonMapTest.java

@@ -8,6 +8,7 @@
 import org.junit.Test;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -60,8 +61,8 @@ public void test() {
             );
 
             assertEquals(
-                Set.of(FormatType.PAPERBACK),
-                book.getAdditionalProperties().get(PropertyType.FORMAT)
+                FormatType.PAPERBACK,
+                book.getAdditionalProperties().get(PropertyType.FORMAT).iterator().next()
             );
         });
 

hypersistence-utils-hibernate-70/pom.xml

@@ -209,7 +209,7 @@
         <maven.compiler.release>${jdk.version}</maven.compiler.release>
         <maven.compiler.testRelease>${jdk-test.version}</maven.compiler.testRelease>
 
-        <hibernate.version>7.0.0.Final</hibernate.version>
+        <hibernate.version>7.0.2.Final</hibernate.version>
 
         <jackson-module-jakarta-xmlbind-annotation>2.15.3</jackson-module-jakarta-xmlbind-annotation>
         <guava.version>32.1.3-jre</guava.version>

hypersistence-utils-hibernate-70/src/test/java/io/hypersistence/utils/hibernate/type/json/PostgreSQLJsonMapTest.java

@@ -7,9 +7,7 @@
 import org.hibernate.annotations.Type;
 import org.junit.Test;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import static org.junit.Assert.assertEquals;
 
@@ -37,7 +35,7 @@ public void test() {
                     .addProperty("publisher", "Amazon")
                     .addProperty("price", "$44.95")
                     .setAdditionalProperties(
-                        Map.of(PropertyType.FORMAT, Set.of(FormatType.PAPERBACK))
+                        Map.of(PropertyType.FORMAT, new BookEnumSet(Set.of(FormatType.PAPERBACK)))
                     )
             );
         });
@@ -60,8 +58,8 @@ public void test() {
             );
 
             assertEquals(
-                Set.of(FormatType.PAPERBACK),
-                book.getAdditionalProperties().get(PropertyType.FORMAT)
+                FormatType.PAPERBACK,
+                book.getAdditionalProperties().get(PropertyType.FORMAT).iterator().next()
             );
         });
 
@@ -127,7 +125,7 @@ public static class Book {
 
         @Type(JsonType.class)
         @Column(name = "additional_properties", columnDefinition = "jsonb")
-        private Map<PropertyType, Set<FormatType>> additionalProperties;
+        private Map<PropertyType, BookEnumSet> additionalProperties;
 
         public String getIsbn() {
             return isbn;
@@ -152,11 +150,11 @@ public Book addProperty(String key, String value) {
             return this;
         }
 
-        public Map<PropertyType, Set<FormatType>> getAdditionalProperties() {
+        public Map<PropertyType, BookEnumSet> getAdditionalProperties() {
             return additionalProperties;
         }
 
-        public Book setAdditionalProperties(Map<PropertyType, Set<FormatType>> additionalProperties) {
+        public Book setAdditionalProperties(Map<PropertyType, BookEnumSet> additionalProperties) {
             this.additionalProperties = additionalProperties;
             return this;
         }
@@ -170,4 +168,13 @@ public enum FormatType {
         EBOOK,
         PAPERBACK
     }
+
+    public static class BookEnumSet extends HashSet<FormatType> {
+        public BookEnumSet() {
+        }
+
+        public BookEnumSet(Collection<? extends FormatType> c) {
+            super(c);
+        }
+    }
 }