Add support for fetching entity link by scope, reference scope and type

filiphr · May 11, 2024 · 5a7f8ad · 5a7f8ad
1 parent 82337ee
commit 5a7f8ad
Show file tree

Hide file tree

Showing 16 changed files with 204 additions and 2 deletions.
diff --git a/...es/flowable-engine/src/test/java/org/flowable/engine/test/impl/EntityLinkServiceTest.java b/...es/flowable-engine/src/test/java/org/flowable/engine/test/impl/EntityLinkServiceTest.java
@@ -214,6 +214,54 @@ void testFindEntityLinksWithSameRootWithNullRootInSameContext() {
         });
     }
 
+    @Test
+    void testFindEntityByScopeAndReferenceScopeAndType() {
+        managementService.executeCommand(commandContext -> {
+            EntityLinkServiceConfiguration entityLinkServiceConfiguration = processEngineConfiguration.getEntityLinkServiceConfiguration();
+            EntityLinkService entityLinkService = entityLinkServiceConfiguration.getEntityLinkService();
+            HistoricEntityLinkService historicEntityLinkService = entityLinkServiceConfiguration.getHistoricEntityLinkService();
+            createEntityLinkWithScopeAndRefScopeAndType("1", ScopeTypes.BPMN, "1", ScopeTypes.CMMN, "test", entityLinkServiceConfiguration);
+            createEntityLinkWithScopeAndRefScopeAndType("1", ScopeTypes.BPMN, "1", ScopeTypes.CMMN, "other-test", entityLinkServiceConfiguration);
+            createEntityLinkWithScopeAndRefScopeAndType("1", ScopeTypes.BPMN, "2", ScopeTypes.CMMN, "test", entityLinkServiceConfiguration);
+            createEntityLinkWithScopeAndRefScopeAndType("2", ScopeTypes.BPMN, "1", ScopeTypes.CMMN, "test", entityLinkServiceConfiguration);
+            createEntityLinkWithScopeAndRefScopeAndType("1", ScopeTypes.CMMN, "1", ScopeTypes.BPMN, "some-test", entityLinkServiceConfiguration);
+
+            assertThat(entityLinkService.findEntityLinkByScopeAndReferenceScopeAndType("1", ScopeTypes.BPMN, "1", ScopeTypes.CMMN, "test")).isNotNull();
+            assertThat(historicEntityLinkService.findEntityLinkByScopeAndReferenceScopeAndType("1", ScopeTypes.BPMN, "1", ScopeTypes.CMMN, "test")).isNotNull();
+
+            assertThat(entityLinkService.findEntityLinkByScopeAndReferenceScopeAndType("1", ScopeTypes.BPMN, "1", ScopeTypes.CMMN, "dummy")).isNull();
+            assertThat(historicEntityLinkService.findEntityLinkByScopeAndReferenceScopeAndType("1", ScopeTypes.BPMN, "1", ScopeTypes.CMMN, "dummy")).isNull();
+            return null;
+        });
+
+        managementService.executeCommand(commandContext -> {
+            EntityLinkServiceConfiguration entityLinkServiceConfiguration = processEngineConfiguration.getEntityLinkServiceConfiguration();
+            EntityLinkService entityLinkService = entityLinkServiceConfiguration.getEntityLinkService();
+            HistoricEntityLinkService historicEntityLinkService = entityLinkServiceConfiguration.getHistoricEntityLinkService();
+            assertThat(entityLinkService.findEntityLinkByScopeAndReferenceScopeAndType("1", ScopeTypes.BPMN, "1", ScopeTypes.CMMN, "test")).isNotNull();
+            assertThat(historicEntityLinkService.findEntityLinkByScopeAndReferenceScopeAndType("1", ScopeTypes.BPMN, "1", ScopeTypes.CMMN, "test")).isNotNull();
+
+            assertThat(entityLinkService.findEntityLinkByScopeAndReferenceScopeAndType("1", ScopeTypes.BPMN, "1", ScopeTypes.CMMN, "dummy")).isNull();
+            assertThat(historicEntityLinkService.findEntityLinkByScopeAndReferenceScopeAndType("1", ScopeTypes.BPMN, "1", ScopeTypes.CMMN, "dummy")).isNull();
+
+            return null;
+        });
+
+        managementService.executeCommand(commandContext -> {
+            EntityLinkServiceConfiguration entityLinkServiceConfiguration = processEngineConfiguration.getEntityLinkServiceConfiguration();
+            EntityLinkService entityLinkService = entityLinkServiceConfiguration.getEntityLinkService();
+            entityLinkService.deleteEntityLinksByScopeIdAndType("1", ScopeTypes.BPMN);
+            entityLinkService.deleteEntityLinksByScopeIdAndType("2", ScopeTypes.BPMN);
+            entityLinkService.deleteEntityLinksByScopeIdAndType("1", ScopeTypes.CMMN);
+
+            HistoricEntityLinkService historicEntityLinkService = entityLinkServiceConfiguration.getHistoricEntityLinkService();
+            historicEntityLinkService.deleteHistoricEntityLinksByScopeIdAndScopeType("1", ScopeTypes.BPMN);
+            historicEntityLinkService.deleteHistoricEntityLinksByScopeIdAndScopeType("2", ScopeTypes.BPMN);
+            historicEntityLinkService.deleteHistoricEntityLinksByScopeIdAndScopeType("1", ScopeTypes.CMMN);
+            return null;
+        });
+    }
+
     protected List<EntityLink> findEntityLinksByScopeId(String scopeId) {
         return managementService.executeCommand(commandContext -> processEngineConfiguration.getEntityLinkServiceConfiguration().getEntityLinkService()
                 .findEntityLinksByScopeIdAndType(scopeId, ScopeTypes.BPMN, EntityLinkType.CHILD));
@@ -260,4 +308,26 @@ protected void createEntityLinkWithoutRootScope(String scopeId, String subScopeI
         historicEntityLink.setHierarchyType(hierarchyType);
         historicEntityLinkService.insertHistoricEntityLink(historicEntityLink, false);
     }
+
+    protected void createEntityLinkWithScopeAndRefScopeAndType(String scopeId, String scopeType, String referenceScopeId, String referenceScopeType,
+            String linkType, EntityLinkServiceConfiguration entityLinkServiceConfiguration) {
+
+        EntityLinkService entityLinkService = entityLinkServiceConfiguration.getEntityLinkService();
+        EntityLinkEntity entityLink = (EntityLinkEntity) entityLinkService.createEntityLink();
+        entityLink.setScopeId(scopeId);
+        entityLink.setScopeType(scopeType);
+        entityLink.setReferenceScopeId(referenceScopeId);
+        entityLink.setReferenceScopeType(referenceScopeType);
+        entityLink.setLinkType(linkType);
+        entityLinkService.insertEntityLink(entityLink);
+
+        HistoricEntityLinkService historicEntityLinkService = entityLinkServiceConfiguration.getHistoricEntityLinkService();
+        HistoricEntityLinkEntity historicEntityLink = (HistoricEntityLinkEntity) historicEntityLinkService.createHistoricEntityLink();
+        historicEntityLink.setScopeId(scopeId);
+        historicEntityLink.setScopeType(scopeType);
+        historicEntityLink.setReferenceScopeId(referenceScopeId);
+        historicEntityLink.setReferenceScopeType(referenceScopeType);
+        historicEntityLink.setLinkType(linkType);
+        historicEntityLinkService.insertHistoricEntityLink(historicEntityLink, false);
+    }
 }
diff --git a/...e-entitylink-service-api/src/main/java/org/flowable/entitylink/api/EntityLinkService.java b/...e-entitylink-service-api/src/main/java/org/flowable/entitylink/api/EntityLinkService.java
@@ -28,6 +28,9 @@ public interface EntityLinkService {
     List<EntityLink> findEntityLinksWithSameRootScopeForScopeIdAndScopeType(String scopeId, String scopeType, String linkType);
 
     List<EntityLink> findEntityLinksByReferenceScopeIdAndType(String referenceScopeId, String scopeType, String linkType);
+
+    EntityLink findEntityLinkByScopeAndReferenceScopeAndType(String scopeId, String scopeType, String referenceScopeId, String referenceScopeType,
+            String linkType);
 
     EntityLink createEntityLink();
 

diff --git a/...vice-api/src/main/java/org/flowable/entitylink/api/history/HistoricEntityLinkService.java b/...vice-api/src/main/java/org/flowable/entitylink/api/history/HistoricEntityLinkService.java
@@ -34,6 +34,9 @@ public interface HistoricEntityLinkService {
 
     List<HistoricEntityLink> findHistoricEntityLinksByScopeDefinitionIdAndScopeType(String scopeDefinitionId, String scopeType, String linkType);
 
+    HistoricEntityLink findEntityLinkByScopeAndReferenceScopeAndType(String scopeId, String scopeType, String referenceScopeId, String referenceScopeType,
+            String linkType);
+
     HistoricEntityLink createHistoricEntityLink();
 
     void insertHistoricEntityLink(HistoricEntityLink entityLink, boolean fireCreateEvent);

diff --git a/...ink-service/src/main/java/org/flowable/entitylink/service/impl/EntityLinkServiceImpl.java b/...ink-service/src/main/java/org/flowable/entitylink/service/impl/EntityLinkServiceImpl.java
@@ -50,6 +50,12 @@ public List<EntityLink> findEntityLinksByReferenceScopeIdAndType(String referenc
         return getEntityLinkEntityManager().findEntityLinksByReferenceScopeIdAndType(referenceScopeId, referenceScopeType, linkType);
     }
 
+    @Override
+    public EntityLink findEntityLinkByScopeAndReferenceScopeAndType(String scopeId, String scopeType, String referenceScopeId, String referenceScopeType,
+            String linkType) {
+        return getEntityLinkEntityManager().findEntityLinkByScopeAndReferenceScopeAndType(scopeId, scopeType, referenceScopeId, referenceScopeType, linkType);
+    }
+
     @Override
     public EntityLinkEntity createEntityLink() {
         return getEntityLinkEntityManager().create();

diff --git a/...ice/src/main/java/org/flowable/entitylink/service/impl/HistoricEntityLinkServiceImpl.java b/...ice/src/main/java/org/flowable/entitylink/service/impl/HistoricEntityLinkServiceImpl.java
@@ -61,6 +61,12 @@ public List<HistoricEntityLink> findHistoricEntityLinksByScopeDefinitionIdAndSco
         return getHistoricEntityLinkEntityManager().findHistoricEntityLinksByScopeDefinitionIdAndScopeType(scopeDefinitionId, scopeType, linkType);
     }
 
+    @Override
+    public HistoricEntityLink findEntityLinkByScopeAndReferenceScopeAndType(String scopeId, String scopeType, String referenceScopeId,
+            String referenceScopeType, String linkType) {
+        return getHistoricEntityLinkEntityManager().findEntityLinkByScopeAndReferenceScopeAndType(scopeId, scopeType, referenceScopeId, referenceScopeType, linkType);
+    }
+
     @Override
     public HistoricEntityLink createHistoricEntityLink() {
         return getHistoricEntityLinkEntityManager().create();

diff --git a/...java/org/flowable/entitylink/service/impl/persistence/entity/EntityLinkEntityManager.java b/...java/org/flowable/entitylink/service/impl/persistence/entity/EntityLinkEntityManager.java
@@ -30,6 +30,9 @@ public interface EntityLinkEntityManager extends EntityManager<EntityLinkEntity>
 
     List<EntityLink> findEntityLinksByReferenceScopeIdAndType(String referenceScopeId, String scopeType, String linkType);
 
+    EntityLink findEntityLinkByScopeAndReferenceScopeAndType(String scopeId, String scopeType, String referenceScopeId, String referenceScopeType,
+            String linkType);
+
     void deleteEntityLinksByScopeIdAndScopeType(String scopeId, String scopeType);
 
     void deleteEntityLinksByRootScopeIdAndType(String scopeId, String scopeType);

diff --git a/.../org/flowable/entitylink/service/impl/persistence/entity/EntityLinkEntityManagerImpl.java b/.../org/flowable/entitylink/service/impl/persistence/entity/EntityLinkEntityManagerImpl.java
@@ -58,8 +58,10 @@ public List<EntityLink> findEntityLinksByReferenceScopeIdAndType(String referenc
         return dataManager.findEntityLinksByReferenceScopeIdAndType(referenceScopeId, referenceScopeType, linkType);
     }
 
-    public void deleteEntityLink(EntityLinkEntity identityLink) {
-        delete(identityLink);
+    @Override
+    public EntityLinkEntity findEntityLinkByScopeAndReferenceScopeAndType(String scopeId, String scopeType, String referenceScopeId, String referenceScopeType,
+            String linkType) {
+        return dataManager.findEntityLinkByScopeAndReferenceScopeAndType(scopeId, scopeType, referenceScopeId, referenceScopeType, linkType);
     }
 
     @Override

diff --git a/.../flowable/entitylink/service/impl/persistence/entity/HistoricEntityLinkEntityManager.java b/.../flowable/entitylink/service/impl/persistence/entity/HistoricEntityLinkEntityManager.java
@@ -33,6 +33,9 @@ public interface HistoricEntityLinkEntityManager extends EntityManager<HistoricE
 
     List<HistoricEntityLink> findHistoricEntityLinksByScopeDefinitionIdAndScopeType(String scopeDefinitionId, String scopeType, String linkType);
 
+    HistoricEntityLink findEntityLinkByScopeAndReferenceScopeAndType(String scopeId, String scopeType, String referenceScopeId,
+            String referenceScopeType, String linkType);
+
     void deleteHistoricEntityLinksByScopeIdAndScopeType(String scopeId, String scopeType);
 
     void deleteHistoricEntityLinksByScopeDefinitionIdAndScopeType(String scopeDefinitionId, String scopeType);

diff --git a/...wable/entitylink/service/impl/persistence/entity/HistoricEntityLinkEntityManagerImpl.java b/...wable/entitylink/service/impl/persistence/entity/HistoricEntityLinkEntityManagerImpl.java
@@ -64,6 +64,12 @@ public List<HistoricEntityLink> findHistoricEntityLinksByScopeDefinitionIdAndSco
         return dataManager.findHistoricEntityLinksByScopeDefinitionIdAndScopeType(scopeDefinitionId, scopeType, linkType);
     }
 
+    @Override
+    public HistoricEntityLink findEntityLinkByScopeAndReferenceScopeAndType(String scopeId, String scopeType, String referenceScopeId,
+            String referenceScopeType, String linkType) {
+        return dataManager.findEntityLinkByScopeAndReferenceScopeAndType(scopeId, scopeType, referenceScopeId, referenceScopeType, linkType);
+    }
+
     @Override
     public void deleteHistoricEntityLinksByScopeIdAndScopeType(String scopeId, String scopeType) {
         dataManager.deleteHistoricEntityLinksByScopeIdAndType(scopeId, scopeType);

diff --git a/...a/org/flowable/entitylink/service/impl/persistence/entity/data/EntityLinkDataManager.java b/...a/org/flowable/entitylink/service/impl/persistence/entity/data/EntityLinkDataManager.java
@@ -31,6 +31,9 @@ public interface EntityLinkDataManager extends DataManager<EntityLinkEntity> {
 
     List<EntityLink> findEntityLinksByReferenceScopeIdAndType(String referenceScopeId, String scopeType, String linkType);
 
+    EntityLinkEntity findEntityLinkByScopeAndReferenceScopeAndType(String scopeId, String scopeType, String referenceScopeId, String referenceScopeType,
+            String linkType);
+
     void deleteEntityLinksByScopeIdAndScopeType(String scopeId, String scopeType);
 
     void deleteEntityLinksByRootScopeIdAndType(String scopeId, String scopeType);

diff --git a/...owable/entitylink/service/impl/persistence/entity/data/HistoricEntityLinkDataManager.java b/...owable/entitylink/service/impl/persistence/entity/data/HistoricEntityLinkDataManager.java
@@ -33,6 +33,9 @@ public interface HistoricEntityLinkDataManager extends DataManager<HistoricEntit
     List<HistoricEntityLink> findHistoricEntityLinksByReferenceScopeIdAndType(String referenceScopeId, String scopeType, String linkType);
 
     List<HistoricEntityLink> findHistoricEntityLinksByScopeDefinitionIdAndScopeType(String scopeDefinitionId, String scopeType, String linkType);
+
+    HistoricEntityLink findEntityLinkByScopeAndReferenceScopeAndType(String scopeId, String scopeType, String referenceScopeId,
+            String referenceScopeType, String linkType);
 
     void deleteHistoricEntityLinksByScopeIdAndType(String scopeId, String scopeType);
 

diff --git a/...le/entitylink/service/impl/persistence/entity/data/impl/MybatisEntityLinkDataManager.java b/...le/entitylink/service/impl/persistence/entity/data/impl/MybatisEntityLinkDataManager.java
@@ -18,12 +18,14 @@
 
 import org.flowable.common.engine.impl.cfg.IdGenerator;
 import org.flowable.common.engine.impl.db.AbstractDataManager;
+import org.flowable.common.engine.impl.db.SingleCachedEntityMatcher;
 import org.flowable.common.engine.impl.persistence.cache.CachedEntityMatcher;
 import org.flowable.entitylink.api.EntityLink;
 import org.flowable.entitylink.service.EntityLinkServiceConfiguration;
 import org.flowable.entitylink.service.impl.persistence.entity.EntityLinkEntity;
 import org.flowable.entitylink.service.impl.persistence.entity.EntityLinkEntityImpl;
 import org.flowable.entitylink.service.impl.persistence.entity.data.EntityLinkDataManager;
+import org.flowable.entitylink.service.impl.persistence.entity.data.impl.cachematcher.EntityLinkByScopeAndReferenceScopeAndType;
 import org.flowable.entitylink.service.impl.persistence.entity.data.impl.cachematcher.EntityLinksByReferenceScopeIdAndTypeMatcher;
 import org.flowable.entitylink.service.impl.persistence.entity.data.impl.cachematcher.EntityLinksByRootScopeIdAndTypeMatcher;
 import org.flowable.entitylink.service.impl.persistence.entity.data.impl.cachematcher.EntityLinksByScopeIdAndTypeMatcher;
@@ -38,6 +40,7 @@ public class MybatisEntityLinkDataManager extends AbstractDataManager<EntityLink
     protected CachedEntityMatcher<EntityLinkEntity> entityLinksByRootScopeIdAndScopeTypeMatcher = new EntityLinksByRootScopeIdAndTypeMatcher();
     protected CachedEntityMatcher<EntityLinkEntity> entityLinksWithSameRootByScopeIdAndTypeMatcher = new EntityLinksWithSameRootScopeForScopeIdAndScopeTypeMatcher<>();
     protected CachedEntityMatcher<EntityLinkEntity> entityLinksByReferenceScopeIdAndTypeMatcher = new EntityLinksByReferenceScopeIdAndTypeMatcher();
+    protected SingleCachedEntityMatcher<EntityLinkEntity> entityLinkByScopeAndReferenceScopeAndType = new EntityLinkByScopeAndReferenceScopeAndType<>();
 
     protected EntityLinkServiceConfiguration entityLinkServiceConfiguration;
 
@@ -94,6 +97,18 @@ public List<EntityLink> findEntityLinksByReferenceScopeIdAndType(String referenc
         return (List) getList("selectEntityLinksByReferenceScopeIdAndType", parameters, entityLinksByReferenceScopeIdAndTypeMatcher, true);
     }
 
+    @Override
+    public EntityLinkEntity findEntityLinkByScopeAndReferenceScopeAndType(String scopeId, String scopeType, String referenceScopeId, String referenceScopeType,
+            String linkType) {
+        Map<String, String> parameters = new HashMap<>();
+        parameters.put("scopeId", scopeId);
+        parameters.put("scopeType", scopeType);
+        parameters.put("referenceScopeId", referenceScopeId);
+        parameters.put("referenceScopeType", referenceScopeType);
+        parameters.put("linkType", linkType);
+        return getEntity("selectEntityLinkByScopeAndReferenceScopeAndType", parameters, entityLinkByScopeAndReferenceScopeAndType, true);
+    }
+
     @Override
     public void deleteEntityLinksByScopeIdAndScopeType(String scopeId, String scopeType) {
         Map<String, String> parameters = new HashMap<>();

diff --git a/...ylink/service/impl/persistence/entity/data/impl/MybatisHistoricEntityLinkDataManager.java b/...ylink/service/impl/persistence/entity/data/impl/MybatisHistoricEntityLinkDataManager.java
@@ -20,12 +20,14 @@
 
 import org.flowable.common.engine.impl.cfg.IdGenerator;
 import org.flowable.common.engine.impl.db.AbstractDataManager;
+import org.flowable.common.engine.impl.db.SingleCachedEntityMatcher;
 import org.flowable.common.engine.impl.persistence.cache.CachedEntityMatcher;
 import org.flowable.entitylink.api.history.HistoricEntityLink;
 import org.flowable.entitylink.service.EntityLinkServiceConfiguration;
 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.EntityLinkByScopeAndReferenceScopeAndType;
 import org.flowable.entitylink.service.impl.persistence.entity.data.impl.cachematcher.EntityLinksWithSameRootScopeForScopeIdAndScopeTypeMatcher;
 import org.flowable.entitylink.service.impl.persistence.entity.data.impl.cachematcher.HistoricEntityLinksByScopeIdAndTypeMatcher;
 
@@ -36,6 +38,7 @@ public class MybatisHistoricEntityLinkDataManager extends AbstractDataManager<Hi
 
     protected CachedEntityMatcher<HistoricEntityLinkEntity> historicEntityLinksByScopeIdAndTypeMatcher = new HistoricEntityLinksByScopeIdAndTypeMatcher();
     protected CachedEntityMatcher<HistoricEntityLinkEntity> entityLinksWithSameRootByScopeIdAndTypeMatcher = new EntityLinksWithSameRootScopeForScopeIdAndScopeTypeMatcher<>();
+    protected SingleCachedEntityMatcher<HistoricEntityLinkEntity> entityLinkByScopeAndReferenceScopeAndType = new EntityLinkByScopeAndReferenceScopeAndType<>();
 
     protected EntityLinkServiceConfiguration entityLinkServiceConfiguration;
 
@@ -114,6 +117,18 @@ public List<HistoricEntityLink> findHistoricEntityLinksByScopeDefinitionIdAndSco
         return getDbSqlSession().selectList("selectHistoricEntityLinksByScopeDefinitionIdAndType", parameters);
     }
 
+    @Override
+    public HistoricEntityLink findEntityLinkByScopeAndReferenceScopeAndType(String scopeId, String scopeType, String referenceScopeId,
+            String referenceScopeType, String linkType) {
+        Map<String, String> parameters = new HashMap<>();
+        parameters.put("scopeId", scopeId);
+        parameters.put("scopeType", scopeType);
+        parameters.put("referenceScopeId", referenceScopeId);
+        parameters.put("referenceScopeType", referenceScopeType);
+        parameters.put("linkType", linkType);
+        return getEntity("selectHistoricEntityLinkByScopeAndReferenceScopeAndType", parameters, entityLinkByScopeAndReferenceScopeAndType, true);
+    }
+
     @Override
     public void deleteHistoricEntityLinksByScopeIdAndType(String scopeId, String scopeType) {
         Map<String, String> parameters = new HashMap<>();