Revert the sprint boot version changes and junit4 to junit5 test changes

Author: hchintamreddy

pom.xml

@@ -23,8 +23,8 @@
 		<java.version>1.8</java.version>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.7.18</spring-boot.version>
-		<spring-data.version>2021.2.18</spring-data.version>
+		<spring-boot.version>2.0.0.RELEASE</spring-boot.version>
+		<spring-data-releasetrain.version>Kay-RELEASE</spring-data-releasetrain.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-bom</artifactId>
-				<version>${spring-data.version}</version>
+				<artifactId>spring-data-releasetrain</artifactId>
+				<version>${spring-data-releasetrain.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

rsql-common/src/main/java/io/github/perplexhub/rsql/RSQLVisitorBase.java

@@ -13,7 +13,6 @@
 import javax.persistence.metamodel.PluralAttribute;
 
 import lombok.Getter;
-import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.orm.jpa.vendor.Database;
 import org.springframework.util.StringUtils;
@@ -29,7 +28,7 @@ public abstract class RSQLVisitorBase<R, A> implements RSQLVisitor<R, A> {
 
 	protected static volatile @Setter Map<Class, ManagedType> managedTypeMap;
 	protected static volatile @Setter Map<String, EntityManager> entityManagerMap;
-	protected static volatile @Setter @Getter Map<EntityManager, Database> entityManagerDatabase = Map.of();
+	protected static volatile @Setter @Getter Map<EntityManager, Database> entityManagerDatabase = new HashMap();
 	protected static final Map<Class, Class> primitiveToWrapper;
 	protected static volatile @Setter Map<Class<?>, Map<String, String>> propertyRemapping;
 	protected static volatile @Setter Map<Class<?>, List<String>> globalPropertyWhitelist;

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.jupiter.api.Test;
+import org.junit.Test;
 
 public class UnknownPropertyExceptionTest {
 

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

@@ -1,19 +1,14 @@
 package io.github.perplexhub.rsql;
 
-import static java.util.stream.Collectors.collectingAndThen;
-import static java.util.stream.Collectors.toMap;
 
 import io.github.perplexhub.rsql.RSQLJPAAutoConfiguration.HibernateEntityManagerDatabaseConfiguration;
 import javax.persistence.EntityManager;
-import java.util.IdentityHashMap;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Objects;
-import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.dialect.AbstractHANADialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.DerbyDialect;
 import org.hibernate.dialect.Dialect;
@@ -32,6 +27,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.orm.jpa.vendor.Database;
+import org.springframework.transaction.annotation.Transactional;
 
 @Slf4j
 @Configuration
@@ -43,7 +39,7 @@ public class RSQLJPAAutoConfiguration {
   public RSQLCommonSupport rsqlCommonSupport(Map<String, EntityManager> entityManagerMap,
       ObjectProvider<EntityManagerDatabase> entityManagerDatabaseProvider) {
     log.info("RSQLJPAAutoConfiguration.rsqlCommonSupport(entityManagerMap:{})", entityManagerMap.size());
-    EntityManagerDatabase entityManagerDatabase = entityManagerDatabaseProvider.getIfAvailable(() -> new EntityManagerDatabase(Map.of()));
+    EntityManagerDatabase entityManagerDatabase = entityManagerDatabaseProvider.getIfAvailable(() -> new EntityManagerDatabase(new HashMap()));
 
     return new RSQLJPASupport(entityManagerMap, entityManagerDatabase.value());
   }
@@ -53,22 +49,20 @@ public RSQLCommonSupport rsqlCommonSupport(Map<String, EntityManager> entityMana
   static
   class HibernateEntityManagerDatabaseConfiguration {
 
+    @Transactional
     @Bean
     public EntityManagerDatabase entityManagerDatabase(ObjectProvider<EntityManager> entityManagers) {
-      return entityManagers.stream()
-          .map(entityManager -> {
-            SessionFactory sessionFactory = entityManager.unwrap(Session.class).getSessionFactory();
-            Dialect dialect = ((SessionFactoryImpl) sessionFactory).getJdbcServices().getDialect();
-
-            return Optional.ofNullable(toDatabase(dialect))
-                .map(db -> Map.entry(entityManager, db))
-                .orElse(null);
-          })
-          .filter(Objects::nonNull)
-          .collect(collectingAndThen(
-              toMap(Entry::getKey, Entry::getValue, (db1, db2) -> db1, IdentityHashMap::new),
-              m -> new EntityManagerDatabase(m)
-          ));
+      Map<EntityManager, Database> value = new HashMap<>();
+      EntityManager entityManager = entityManagers.getIfAvailable();
+      SessionFactory sessionFactory = entityManager.unwrap(Session.class).getSessionFactory();
+      Dialect dialect = ((SessionFactoryImpl) sessionFactory).getJdbcServices().getDialect();
+
+      Database db = toDatabase(dialect);
+      if (db != null) {
+        value.put(entityManager, db);
+      }
+
+      return new EntityManagerDatabase(value);
     }
 
     private Database toDatabase(Dialect dialect) {
@@ -86,8 +80,6 @@ private Database toDatabase(Dialect dialect) {
         return Database.DB2;
       } else if (dialect instanceof H2Dialect) {
         return Database.H2;
-      } else if (dialect instanceof AbstractHANADialect) {
-        return Database.HANA;
       } else if (dialect instanceof HSQLDialect) {
         return Database.HSQL;
       } else if (dialect instanceof SybaseDialect) {

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

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

rsql-jpa/pom.xml

@@ -52,10 +52,21 @@
 			<version>1.19.0</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate.common</groupId>
+			<artifactId>hibernate-commons-annotations</artifactId>
+			<version>5.1.2.Final</version>
+		</dependency>
 		<dependency>
 			<groupId>io.hypersistence</groupId>
-			<artifactId>hypersistence-utils-hibernate-55</artifactId>
-			<version>3.9.5</version>
+			<artifactId>hypersistence-utils-hibernate-52</artifactId>
+			<version>3.7.6</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>net.java.dev.jna</groupId>
+			<artifactId>jna</artifactId>
+			<version>5.14.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

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

@@ -141,7 +141,7 @@ RSQLJPAContext findPropertyPath(String propertyPath, Path startRoot) {
 						log.debug("Create a element collection join between [{}] and [{}] using key [{}]", previousClass, classMetadata.getJavaType().getName(), keyJoin);
 						root = join(keyJoin, root, mappedProperty);
 					} else if (isJsonType(mappedProperty, classMetadata)) {
-            root = root.get(mappedProperty);
+						root = root.get(mappedProperty);
 						attribute = classMetadata.getAttribute(mappedProperty);
 						break;
 					} else {
@@ -338,7 +338,7 @@ private Expression<?> getJsonExpression(Path<?> path, Attribute attribute, Compa
 					.map(expr -> expr.as(String.class))
 					.forEach(args::add);
 
-			return builder.function("jsonb_extract_path_text", String.class, args.toArray(Expression[]::new));	
+			return builder.function("jsonb_extract_path_text", String.class, args.toArray(new Expression[0]));
 		}
 
 		return path;

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

@@ -32,7 +32,7 @@ public RSQLJPASupport() {
 	}
 
 	public RSQLJPASupport(Map<String, EntityManager> entityManagerMap) {
-		this(entityManagerMap, Map.of());
+		this(entityManagerMap, new HashMap<>());
 	}
 
 	public RSQLJPASupport(Map<String, EntityManager> entityManagerMap, Map<EntityManager, Database> entityManagerDatabase) {