Fix jsonb support to work with 5.x

Author: hchintamreddy

pom.xml

@@ -20,11 +20,11 @@
 		</developer>
 	</developers>
 	<properties>
-		<java.version>1.8</java.version>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<java.version>11</java.version>
+		<maven.compiler.target>11</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.0.0.RELEASE</spring-boot.version>
-		<spring-data-releasetrain.version>Kay-RELEASE</spring-data-releasetrain.version>
+		<spring-boot.version>2.7.18</spring-boot.version>
+		<spring-data.version>2021.2.18</spring-data.version>
 		<querydsl.version>4.1.4</querydsl.version>
 		<rsql-parser.version>2.1.0</rsql-parser.version>
 		<lombok.version>1.18.10</lombok.version>
@@ -54,8 +54,8 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-data-releasetrain</artifactId>
-				<version>${spring-data-releasetrain.version}</version>
+				<artifactId>spring-data-bom</artifactId>
+				<version>${spring-data.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

rsql-common/src/test/java/io/github/perplexhub/rsql/UnknownPropertyExceptionTest.java

@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.github.perplexhub.rsql.model.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class UnknownPropertyExceptionTest {
 

rsql-jpa-spring-boot-starter/src/main/java/io/github/perplexhub/rsql/RSQLJPAAutoConfiguration.java

@@ -4,7 +4,7 @@
 import static java.util.stream.Collectors.toMap;
 
 import io.github.perplexhub.rsql.RSQLJPAAutoConfiguration.HibernateEntityManagerDatabaseConfiguration;
-import jakarta.persistence.EntityManager;
+import javax.persistence.EntityManager;
 import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -13,7 +13,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.Session;
 import org.hibernate.dialect.AbstractHANADialect;
-import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.DerbyDialect;
 import org.hibernate.dialect.Dialect;
@@ -67,12 +66,12 @@ public EntityManagerDatabase entityManagerDatabase(ObjectProvider<EntityManager>
           .filter(Objects::nonNull)
           .collect(collectingAndThen(
               toMap(Entry::getKey, Entry::getValue, (db1, db2) -> db1, IdentityHashMap::new),
-              EntityManagerDatabase::new
+              m -> new EntityManagerDatabase(m)
           ));
     }
 
     private Database toDatabase(Dialect dialect) {
-      if (dialect instanceof PostgreSQLDialect || dialect instanceof CockroachDialect) {
+      if (dialect instanceof PostgreSQLDialect) {
         return Database.POSTGRESQL;
       } else if (dialect instanceof MySQLDialect) {
         return Database.MYSQL;
@@ -98,7 +97,33 @@ private Database toDatabase(Dialect dialect) {
     }
   }
 
-  record EntityManagerDatabase(Map<EntityManager, Database> value) {
+  public static final class EntityManagerDatabase {
+      private final Map<EntityManager, Database> value;
 
+      public EntityManagerDatabase(Map<EntityManager, Database> value) {
+          this.value = value;
+      }
+
+      public Map<EntityManager, Database> value() {
+          return value;
+      }
+
+      @Override
+      public boolean equals(Object obj) {
+          if (this == obj) return true;
+          if (obj == null || getClass() != obj.getClass()) return false;
+          EntityManagerDatabase that = (EntityManagerDatabase) obj;
+          return Objects.equals(value, that.value);
+      }
+
+      @Override
+      public int hashCode() {
+          return Objects.hash(value);
+      }
+
+      @Override
+      public String toString() {
+          return "EntityManagerDatabase[value=" + value + "]";
+      }
   }
 }

rsql-jpa-spring-boot-starter/src/test/java/io/github/perplexhub/rsql/RSQLSpecificationSupportTest.java

@@ -2,12 +2,11 @@
 
 import static io.github.perplexhub.rsql.RSQLJPASupport.*;
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.List;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -20,7 +19,6 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.NONE)
 public class RSQLSpecificationSupportTest {
 

rsql-jpa/pom.xml

@@ -54,8 +54,8 @@
 		</dependency>
 		<dependency>
 			<groupId>io.hypersistence</groupId>
-			<artifactId>hypersistence-utils-hibernate-60</artifactId>
-			<version>3.5.2</version>
+			<artifactId>hypersistence-utils-hibernate-55</artifactId>
+			<version>3.9.5</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

rsql-jpa/src/main/java/io/github/perplexhub/rsql/RSQLJPAPredicateConverter.java

@@ -2,7 +2,7 @@
 
 import static io.github.perplexhub.rsql.RSQLOperators.*;
 
-import jakarta.persistence.Column;
+import javax.persistence.Column;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.*;

rsql-jpa/src/test/java/io/github/perplexhub/rsql/RSQLJPASupportPostgresJsonTest.java

@@ -6,7 +6,7 @@
 
 import io.github.perplexhub.rsql.model.PostgresJsonEntity;
 import io.github.perplexhub.rsql.repository.jpa.postgres.PostgresJsonEntityRepository;
-import jakarta.persistence.EntityManager;
+import javax.persistence.EntityManager;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
@@ -26,9 +26,11 @@ class RSQLJPASupportPostgresJsonTest {
 
   @Autowired
   private PostgresJsonEntityRepository repository;
+  @Autowired 
+  private EntityManager em;
 
   @BeforeEach
-  void setup(@Autowired EntityManager em) {
+  void setup() {
     RSQLVisitorBase.setEntityManagerDatabase(Map.of(em, Database.POSTGRESQL));
   }
 
@@ -43,7 +45,8 @@ void tearDown() {
   @MethodSource("data")
   void testJson(List<PostgresJsonEntity> users, String rsql, List<PostgresJsonEntity> expected) {
     //given
-    repository.saveAllAndFlush(users);
+    repository.saveAll(users);
+    repository.flush();
 
     //when
     List<PostgresJsonEntity> result = repository.findAll(toSpecification(rsql));

rsql-jpa/src/test/java/io/github/perplexhub/rsql/model/PostgresJsonEntity.java

@@ -1,10 +1,10 @@
 package io.github.perplexhub.rsql.model;
 
 import io.hypersistence.utils.hibernate.type.json.JsonType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -17,20 +17,22 @@
 import lombok.Setter;
 import lombok.ToString;
 import org.hibernate.annotations.Type;
+import org.hibernate.annotations.TypeDef;
 
 @Getter
 @Setter
 @EqualsAndHashCode(of = "id")
 @ToString
 @Entity
 @NoArgsConstructor
+@TypeDef(name="jsonb", typeClass=JsonType.class)
 public class PostgresJsonEntity {
 
   @Id
   @GeneratedValue
   private UUID id;
 
-  @Type(JsonType.class)
+  @Type(type="jsonb")
   @Column(columnDefinition = "jsonb")
   private Map<String, Object> properties = new HashMap<>();
 

rsql-querydsl-spring-boot-starter/src/test/java/io/github/perplexhub/rsql/RSQLQueryDslSupportTest.java

@@ -3,12 +3,11 @@
 import static io.github.perplexhub.rsql.RSQLJPASupport.*;
 import static io.github.perplexhub.rsql.RSQLQueryDslSupport.*;
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.List;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -23,7 +22,6 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.NONE)
 public class RSQLQueryDslSupportTest {
 

rsql-querydsl/src/test/java/io/github/perplexhub/rsql/RSQLQueryDslSupportTest.java

@@ -4,14 +4,14 @@
 import static io.github.perplexhub.rsql.RSQLQueryDslSupport.*;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -25,7 +25,6 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.NONE)
 public class RSQLQueryDslSupportTest {