Remove EntityLinksWithSameRootScopeForScopeIdAndScopeTypeMatcher since we do not need a cache matcher for this particular call

Author: filiphr

modules/flowable-entitylink-service/src/main/java/org/flowable/entitylink/service/impl/persistence/entity/data/impl/MybatisEntityLinkDataManager.java

@@ -28,7 +28,6 @@
 import org.flowable.entitylink.service.impl.persistence.entity.data.EntityLinkDataManager;
 import org.flowable.entitylink.service.impl.persistence.entity.data.impl.cachematcher.EntityLinksByRootScopeIdAndTypeMatcher;
 import org.flowable.entitylink.service.impl.persistence.entity.data.impl.cachematcher.EntityLinksByScopeIdAndTypeMatcher;
-import org.flowable.entitylink.service.impl.persistence.entity.data.impl.cachematcher.EntityLinksWithSameRootScopeForScopeIdAndScopeTypeMatcher;
 
 /**
  * @author Tijs Rademakers
@@ -37,7 +36,6 @@ public class MybatisEntityLinkDataManager extends AbstractDataManager<EntityLink
 
     protected CachedEntityMatcher<EntityLinkEntity> entityLinksByScopeIdAndTypeMatcher = new EntityLinksByScopeIdAndTypeMatcher();
     protected CachedEntityMatcher<EntityLinkEntity> entityLinksByRootScopeIdAndScopeTypeMatcher = new EntityLinksByRootScopeIdAndTypeMatcher();
-    protected CachedEntityMatcher<EntityLinkEntity> entityLinksWithSameRootByScopeIdAndTypeMatcher = new EntityLinksWithSameRootScopeForScopeIdAndScopeTypeMatcher<>();
 
     protected EntityLinkServiceConfiguration entityLinkServiceConfiguration;
 
@@ -62,7 +60,7 @@ public List<EntityLink> findEntityLinksWithSameRootScopeForScopeIdAndScopeType(S
         parameters.put("scopeId", scopeId);
         parameters.put("scopeType", scopeType);
         parameters.put("linkType", linkType);
-        return (List) getList("selectEntityLinksWithSameRootScopeByScopeIdAndType", parameters, entityLinksWithSameRootByScopeIdAndTypeMatcher, true);
+        return (List) getList("selectEntityLinksWithSameRootScopeByScopeIdAndType", parameters);
     }
 
     @Override

modules/flowable-entitylink-service/src/main/java/org/flowable/entitylink/service/impl/persistence/entity/data/impl/MybatisHistoricEntityLinkDataManager.java

@@ -28,15 +28,12 @@
 import org.flowable.entitylink.service.impl.persistence.entity.HistoricEntityLinkEntity;
 import org.flowable.entitylink.service.impl.persistence.entity.HistoricEntityLinkEntityImpl;
 import org.flowable.entitylink.service.impl.persistence.entity.data.HistoricEntityLinkDataManager;
-import org.flowable.entitylink.service.impl.persistence.entity.data.impl.cachematcher.EntityLinksWithSameRootScopeForScopeIdAndScopeTypeMatcher;
 
 /**
  * @author Joram Barrez
  */
 public class MybatisHistoricEntityLinkDataManager extends AbstractDataManager<HistoricEntityLinkEntity> implements HistoricEntityLinkDataManager {
 
-    protected CachedEntityMatcher<HistoricEntityLinkEntity> entityLinksWithSameRootByScopeIdAndTypeMatcher = new EntityLinksWithSameRootScopeForScopeIdAndScopeTypeMatcher<>();
-
     protected EntityLinkServiceConfiguration entityLinkServiceConfiguration;
 
     public MybatisHistoricEntityLinkDataManager(EntityLinkServiceConfiguration entityLinkServiceConfiguration) {
@@ -61,7 +58,7 @@ public List<HistoricEntityLink> findHistoricEntityLinksWithSameRootScopeForScope
         parameters.put("scopeType", scopeType);
         parameters.put("linkType", linkType);
 
-        return (List) getList("selectHistoricEntityLinksWithSameRootScopeByScopeIdAndType", parameters, entityLinksWithSameRootByScopeIdAndTypeMatcher, true);
+        return (List) getList("selectHistoricEntityLinksWithSameRootScopeByScopeIdAndType", parameters);
     }
 
     @Override