same join make multi join problem fixed

Author: talhadilber

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>io.github.tdilber</groupId>
     <artifactId>spring-jpa-dynamic-query</artifactId>
-    <version>0.2.1</version>
+    <version>0.2.4</version>
     <packaging>jar</packaging>
     <name>Spring Jpa Dynamic Query</name>
     <description>Spring Jpa Dynamic Query Project</description>

src/main/java/com/beyt/query/DynamicSpecification.java

@@ -8,6 +8,7 @@
 import com.beyt.util.SpecificationUtil;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.commons.lang3.tuple.Triple;
+import org.hibernate.query.criteria.internal.path.RootImpl;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.util.Pair;
 
@@ -22,10 +23,16 @@
 public class DynamicSpecification<Entity> implements Specification<Entity> {
 
     protected List<Criteria> criteriaList;
-    protected Map<Triple<From<?, ?>, String, JoinType>, Join<?, ?>> joinMap = new ConcurrentHashMap<>();
+    protected Map<Triple<String, String, JoinType>, Join<?, ?>> joinMap = new ConcurrentHashMap<>();
 
     public DynamicSpecification(List<Criteria> criteriaList) {
         this.criteriaList = criteriaList;
+        this.joinMap = new ConcurrentHashMap<>();
+    }
+
+    public DynamicSpecification(List<Criteria> criteriaList, Map<Triple<String, String, JoinType>, Join<?, ?>> joinMap) {
+        this.criteriaList = criteriaList;
+        this.joinMap = joinMap;
     }
 
     @Override
@@ -36,7 +43,7 @@ public Predicate toPredicate(Root<Entity> root, CriteriaQuery<?> query, Criteria
             if (criteriaList.get(i).operation == CriteriaType.PARENTHES) {
                 SpecificationUtil.checkHasFirstValue(criteriaList.get(i));
                 try {
-                    predicateAndList.add(new DynamicSpecification<Entity>(((List<Criteria>) (criteriaList.get(i).values.get(0)))).toPredicate(root, query, builder));
+                    predicateAndList.add(new DynamicSpecification<Entity>(((List<Criteria>) (criteriaList.get(i).values.get(0))), joinMap).toPredicate(root, query, builder));
                 } catch (Exception e) {
                     throw new DynamicQueryNoAvailableParenthesesOperationUsageException(
                             "There is No Available Paranthes Operation Usage in Criteria Key: " + criteriaList.get(i).key);
@@ -131,7 +138,7 @@ protected Predicate addPredicate(Path<?> root, CriteriaBuilder builder, Criteria
     }
 
     protected Join<?, ?> getJoin(From<?, ?> from, String key, JoinType joinType) {
-        Triple<From<?, ?>, String, JoinType> joinMapKey = new ImmutableTriple<>(from, key, joinType);
+        Triple<String, String, JoinType> joinMapKey = new ImmutableTriple<>(((RootImpl) from).getEntityType().getJavaType().getName(), key, joinType);
         if (joinMap.containsKey(joinMapKey)) {
             return joinMap.get(joinMapKey);
         }

src/test/resources/config/application.yml

@@ -15,7 +15,7 @@ spring:
   jpa:
     database-platform: org.hibernate.dialect.H2Dialect
     open-in-view: false
-    show-sql: false
+    show-sql: true
     hibernate:
       ddl-auto: create-drop
       naming: