From 4d8b552396a93ec1ed8c7ea35f9472279e8f331c Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 7 Feb 2018 15:49:10 +0000 Subject: [PATCH] CCM NG: Reload Methode in AbstractEntityRepository erstellen (#2807) and getIdOfEntity method including implementation in all repositories git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5256 8810af33-2d31-482b-a856-94f89814c4df Former-commit-id: 5667244716288e8618450172ff4d2da8ee6ccbb4 --- .../contentsection/AssetRepository.java | 5 +++++ .../contentsection/ContentItemRepository.java | 7 ++++++- .../ContentSectionRepository.java | 9 +++++++-- .../contentsection/ContentTypeRepository.java | 7 ++++++- .../contentsection/FolderRepository.java | 5 +++++ .../MultiPartArticleSectionRepository.java | 13 +++++++++---- .../LifecycleDefinitionRepository.java | 5 +++++ .../lifecycle/LifecycleRepository.java | 12 ++++++++---- .../lifecycle/PhaseDefinititionRepository.java | 11 +++++++---- .../librecms/lifecycle/PhaseRepository.java | 5 +++++ .../org/librecms/pages/PageRepository.java | 5 +++++ .../org/librecms/pages/PagesRepository.java | 5 +++++ .../categorization/CategoryRepository.java | 5 +++++ .../categorization/DomainRepository.java | 5 +++++ .../core/AbstractEntityRepository.java | 18 ++++++++++++++++++ .../org/libreccm/core/CcmObjectRepository.java | 5 +++++ .../org/libreccm/core/ResourceRepository.java | 5 +++++ .../libreccm/core/ResourceTypeRepository.java | 5 +++++ .../pagemodel/ComponentModelRepository.java | 5 +++++ .../pagemodel/PageModelRepository.java | 5 +++++ .../org/libreccm/security/GroupRepository.java | 7 ++++++- .../org/libreccm/security/PartyRepository.java | 5 +++++ .../security/PermissionRepository.java | 5 +++++ .../org/libreccm/security/RoleRepository.java | 5 +++++ .../org/libreccm/security/UserRepository.java | 5 +++++ .../org/libreccm/sites/SiteRepository.java | 5 +++++ .../libreccm/web/ApplicationRepository.java | 5 +++++ .../workflow/AssignableTaskRepository.java | 5 +++++ .../workflow/TaskCommentRepository.java | 5 +++++ .../org/libreccm/workflow/TaskRepository.java | 5 +++++ .../libreccm/workflow/WorkflowRepository.java | 5 +++++ .../libreccm/docrepo/BlobObjectRepository.java | 7 +++++++ .../org/libreccm/docrepo/FileRepository.java | 5 +++++ .../org/libreccm/docrepo/FolderRepository.java | 5 +++++ .../libreccm/docrepo/RepositoryRepository.java | 5 +++++ .../libreccm/shortcuts/ShortcutRepository.java | 5 +++++ 36 files changed, 209 insertions(+), 17 deletions(-) diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/AssetRepository.java b/ccm-cms/src/main/java/org/librecms/contentsection/AssetRepository.java index 71543bee8..74abde765 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/AssetRepository.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/AssetRepository.java @@ -104,6 +104,11 @@ public class AssetRepository return "objectId"; } + @Override + public Long getIdOfEntity(final Asset entity) { + return entity.getObjectId(); + } + @Override public boolean isNew(final Asset asset) { return asset.getObjectId() == 0; diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java index e154d2ba6..901a02793 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java @@ -115,12 +115,17 @@ public class ContentItemRepository public Class getEntityClass() { return ContentItem.class; } - + @Override public String getIdAttributeName() { return "objectId"; } + @Override + public Long getIdOfEntity(final ContentItem entity) { + return entity.getObjectId(); + } + @Override public boolean isNew(final ContentItem item) { return ccmObjectRepo.isNew(item); diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionRepository.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionRepository.java index a5eff8a0c..b099c70a8 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionRepository.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionRepository.java @@ -54,7 +54,7 @@ public class ContentSectionRepository try { return Optional.of(query.getSingleResult()); - } catch(NoResultException ex) { + } catch (NoResultException ex) { return Optional.empty(); } } @@ -63,12 +63,17 @@ public class ContentSectionRepository public Class getEntityClass() { return ContentSection.class; } - + @Override public String getIdAttributeName() { return "objectId"; } + @Override + public Long getIdOfEntity(final ContentSection entity) { + return entity.getObjectId(); + } + @Override public boolean isNew(final ContentSection section) { return section.getObjectId() == 0; diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentTypeRepository.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentTypeRepository.java index e5a0beab5..26ed3b2ef 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentTypeRepository.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentTypeRepository.java @@ -54,12 +54,17 @@ public class ContentTypeRepository public Class getEntityClass() { return ContentType.class; } - + @Override public String getIdAttributeName() { return "objectId"; } + @Override + public Long getIdOfEntity(final ContentType entity) { + return entity.getObjectId(); + } + @Override public boolean isNew(final ContentType type) { return type.getObjectId() == 0; diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/FolderRepository.java b/ccm-cms/src/main/java/org/librecms/contentsection/FolderRepository.java index b49866bfb..561e522e2 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/FolderRepository.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/FolderRepository.java @@ -61,6 +61,11 @@ public class FolderRepository extends AbstractEntityRepository { return "objectId"; } + @Override + public Long getIdOfEntity(final Folder entity) { + return entity.getObjectId(); + } + @Override public boolean isNew(final Folder folder) { return folder.getObjectId() == 0; diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleSectionRepository.java b/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleSectionRepository.java index 6fc8efae1..43c7647ea 100644 --- a/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleSectionRepository.java +++ b/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleSectionRepository.java @@ -46,7 +46,12 @@ public class MultiPartArticleSectionRepository public String getIdAttributeName() { return "sectionId"; } - + + @Override + public Long getIdOfEntity(final MultiPartArticleSection entity) { + return entity.getSectionId(); + } + @Override public Class getEntityClass() { return MultiPartArticleSection.class; @@ -78,10 +83,10 @@ public class MultiPartArticleSectionRepository final MultiPartArticleSection section) { final TypedQuery query = getEntityManager() - .createNamedQuery("MultiPartArticleSection.findArticleOfSection", - MultiPartArticle.class); + .createNamedQuery("MultiPartArticleSection.findArticleOfSection", + MultiPartArticle.class); query.setParameter("section", section); - + return query.getSingleResult(); } diff --git a/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleDefinitionRepository.java b/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleDefinitionRepository.java index cda4aedf0..1a491e484 100644 --- a/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleDefinitionRepository.java +++ b/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleDefinitionRepository.java @@ -42,6 +42,11 @@ public class LifecycleDefinitionRepository return "definitionId"; } + @Override + public Long getIdOfEntity(final LifecycleDefinition entity) { + return entity.getDefinitionId(); + } + @Override public boolean isNew(final LifecycleDefinition lifecycleDefinition) { return lifecycleDefinition.getDefinitionId() == 0; diff --git a/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleRepository.java b/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleRepository.java index f9e2927d8..8636f6dae 100644 --- a/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleRepository.java +++ b/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleRepository.java @@ -27,23 +27,27 @@ import javax.enterprise.context.RequestScoped; * @author Jens Pelzetter */ @RequestScoped -public class LifecycleRepository extends AbstractEntityRepository { +public class LifecycleRepository + extends AbstractEntityRepository { @Override public Class getEntityClass() { return Lifecycle.class; } - + @Override public String getIdAttributeName() { return "lifecycleId"; } + @Override + public Long getIdOfEntity(final Lifecycle entity) { + return entity.getLifecycleId(); + } + @Override public boolean isNew(final Lifecycle lifecycle) { return lifecycle.getLifecycleId() == 0; } - - } diff --git a/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseDefinititionRepository.java b/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseDefinititionRepository.java index cfb712783..50c9f34de 100644 --- a/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseDefinititionRepository.java +++ b/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseDefinititionRepository.java @@ -27,7 +27,7 @@ import javax.enterprise.context.RequestScoped; * @author Jens Pelzetter */ @RequestScoped -public class PhaseDefinititionRepository +public class PhaseDefinititionRepository extends AbstractEntityRepository { @Override @@ -39,12 +39,15 @@ public class PhaseDefinititionRepository public String getIdAttributeName() { return "definitionId"; } - + + @Override + public Long getIdOfEntity(final PhaseDefinition entity) { + return entity.getDefinitionId(); + } + @Override public boolean isNew(final PhaseDefinition phaseDefinition) { return phaseDefinition.getDefinitionId() == 0; } - - } diff --git a/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseRepository.java b/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseRepository.java index ed95e5f95..c63f21d4c 100644 --- a/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseRepository.java +++ b/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseRepository.java @@ -41,6 +41,11 @@ public class PhaseRepository extends AbstractEntityRepository { return "phaseId"; } + @Override + public Long getIdOfEntity(final Phase entity) { + return entity.getPhaseId(); + } + @Override public boolean isNew(final Phase phase) { return phase.getPhaseId() == 0; diff --git a/ccm-cms/src/main/java/org/librecms/pages/PageRepository.java b/ccm-cms/src/main/java/org/librecms/pages/PageRepository.java index 1457dfd4b..83ded0217 100644 --- a/ccm-cms/src/main/java/org/librecms/pages/PageRepository.java +++ b/ccm-cms/src/main/java/org/librecms/pages/PageRepository.java @@ -101,4 +101,9 @@ public class PageRepository extends AbstractEntityRepository { return page.getObjectId() == 0; } + @Override + public Long getIdOfEntity(final Page entity) { + return entity.getObjectId(); + } + } diff --git a/ccm-cms/src/main/java/org/librecms/pages/PagesRepository.java b/ccm-cms/src/main/java/org/librecms/pages/PagesRepository.java index e173da934..2215715c7 100644 --- a/ccm-cms/src/main/java/org/librecms/pages/PagesRepository.java +++ b/ccm-cms/src/main/java/org/librecms/pages/PagesRepository.java @@ -87,6 +87,11 @@ public class PagesRepository extends AbstractEntityRepository { return "objectId"; } + @Override + public Long getIdOfEntity(final Pages entity) { + return entity.getObjectId(); + } + @Override public boolean isNew(final Pages pages) { return pages.getObjectId() == 0; diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java index ec9f2f470..4210d315f 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java @@ -71,6 +71,11 @@ public class CategoryRepository extends AbstractEntityRepository return "objectId"; } + @Override + public Long getIdOfEntity(final Category entity) { + return entity.getObjectId(); + } + @Override public boolean isNew(final Category entity) { return entity.getObjectId() == 0; diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java index 657473ce6..17681c952 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java @@ -55,6 +55,11 @@ public class DomainRepository extends AbstractEntityRepository { public String getIdAttributeName() { return "objectId"; } + + @Override + public Long getIdOfEntity(final Domain entity) { + return entity.getObjectId(); + } @Override public boolean isNew(final Domain entity) { diff --git a/ccm-core/src/main/java/org/libreccm/core/AbstractEntityRepository.java b/ccm-core/src/main/java/org/libreccm/core/AbstractEntityRepository.java index 8b5291d45..148a86a97 100644 --- a/ccm-core/src/main/java/org/libreccm/core/AbstractEntityRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/AbstractEntityRepository.java @@ -133,6 +133,14 @@ public abstract class AbstractEntityRepository implements Serializable { */ public abstract String getIdAttributeName(); + /** + * Get the primary key/id of a entity. + * + * @param entity The entity + * @return The ID of the provided {@code entity}. + */ + public abstract K getIdOfEntity(E entity); + /** * Finds an entity by it ID. * @@ -215,6 +223,16 @@ public abstract class AbstractEntityRepository implements Serializable { return Optional.empty(); } } + + @Transactional(Transactional.TxType.REQUIRED) + public E reload(final E entity, final String... fetchJoins) { + + return findById(getIdOfEntity(entity), fetchJoins) + .orElseThrow(() -> new IllegalArgumentException(String + .format("No Entity of type \"%s\" with ID %s in the database.", + getEntityClass().getName(), + Objects.toString(getIdOfEntity(entity))))); + } /** * Finds all instances of the entity of the type this repository is diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java b/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java index 64be4de55..82130a45c 100644 --- a/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java @@ -55,6 +55,11 @@ public class CcmObjectRepository extends AbstractEntityRepository { public Class getEntityClass() { return Group.class; } - + @Override public String getIdAttributeName() { return "partyId"; } + @Override + public Long getIdOfEntity(final Group entity) { + return entity.getPartyId(); + } + @Override public boolean isNew(final Group entity) { if (entity == null) { diff --git a/ccm-core/src/main/java/org/libreccm/security/PartyRepository.java b/ccm-core/src/main/java/org/libreccm/security/PartyRepository.java index 5c9ddc8b1..33618a992 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PartyRepository.java +++ b/ccm-core/src/main/java/org/libreccm/security/PartyRepository.java @@ -47,6 +47,11 @@ public class PartyRepository extends AbstractEntityRepository { return "partyId"; } + @Override + public Long getIdOfEntity(final Party entity) { + return entity.getPartyId(); + } + @Override public boolean isNew(final Party entity) { if (entity == null) { diff --git a/ccm-core/src/main/java/org/libreccm/security/PermissionRepository.java b/ccm-core/src/main/java/org/libreccm/security/PermissionRepository.java index ad8bc3f82..e730eb59c 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PermissionRepository.java +++ b/ccm-core/src/main/java/org/libreccm/security/PermissionRepository.java @@ -47,6 +47,11 @@ public class PermissionRepository return "permissionId"; } + @Override + public Long getIdOfEntity(final Permission entity) { + return entity.getPermissionId(); + } + @Override public boolean isNew(Permission entity) { if (entity == null) { diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleRepository.java b/ccm-core/src/main/java/org/libreccm/security/RoleRepository.java index a32224705..9fd5a2e5e 100644 --- a/ccm-core/src/main/java/org/libreccm/security/RoleRepository.java +++ b/ccm-core/src/main/java/org/libreccm/security/RoleRepository.java @@ -49,6 +49,11 @@ public class RoleRepository extends AbstractEntityRepository { return "roleId"; } + @Override + public Long getIdOfEntity(final Role entity) { + return entity.getRoleId(); + } + @Override public boolean isNew(final Role entity) { if (entity == null) { diff --git a/ccm-core/src/main/java/org/libreccm/security/UserRepository.java b/ccm-core/src/main/java/org/libreccm/security/UserRepository.java index 238553a07..1fe96e205 100644 --- a/ccm-core/src/main/java/org/libreccm/security/UserRepository.java +++ b/ccm-core/src/main/java/org/libreccm/security/UserRepository.java @@ -47,6 +47,11 @@ public class UserRepository extends AbstractEntityRepository { public String getIdAttributeName() { return "partyId"; } + + @Override + public Long getIdOfEntity(final User entity) { + return entity.getPartyId(); + } @Override public boolean isNew(final User user) { diff --git a/ccm-core/src/main/java/org/libreccm/sites/SiteRepository.java b/ccm-core/src/main/java/org/libreccm/sites/SiteRepository.java index 80ce3da67..81389faa3 100644 --- a/ccm-core/src/main/java/org/libreccm/sites/SiteRepository.java +++ b/ccm-core/src/main/java/org/libreccm/sites/SiteRepository.java @@ -127,6 +127,11 @@ public class SiteRepository extends AbstractEntityRepository { public String getIdAttributeName() { return "objectId"; } + + @Override + public Long getIdOfEntity(final Site entity) { + return entity.getObjectId(); + } @Override public boolean isNew(final Site site) { diff --git a/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java index 71b1abfac..0174b4436 100644 --- a/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java +++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java @@ -51,6 +51,11 @@ public class ApplicationRepository public String getIdAttributeName() { return "objectId"; } + + @Override + public Long getIdOfEntity(final CcmApplication entity) { + return entity.getObjectId(); + } @Override public boolean isNew(final CcmApplication application) { diff --git a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskRepository.java b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskRepository.java index 4caca03b9..49abf2c62 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskRepository.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskRepository.java @@ -50,6 +50,11 @@ public class AssignableTaskRepository public String getIdAttributeName() { return "taskId"; } + + @Override + public Long getIdOfEntity(final AssignableTask entity) { + return entity.getTaskId(); + } @Override public boolean isNew(final AssignableTask task) { diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentRepository.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentRepository.java index bbdd7f738..5ffd76b8e 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentRepository.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentRepository.java @@ -44,6 +44,11 @@ public class TaskCommentRepository public String getIdAttributeName() { return "commentId"; } + + @Override + public Long getIdOfEntity(final TaskComment entity) { + return entity.getCommentId(); + } @Override public boolean isNew(TaskComment entity) { diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskRepository.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskRepository.java index 095f1887e..b7d986154 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskRepository.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskRepository.java @@ -46,6 +46,11 @@ public class TaskRepository extends AbstractEntityRepository { public String getIdAttributeName() { return "taskId"; } + + @Override + public Long getIdOfEntity(final Task entity) { + return entity.getTaskId(); + } @Override public boolean isNew(final Task task) { diff --git a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowRepository.java b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowRepository.java index 875ae6be1..db7f34d7b 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowRepository.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowRepository.java @@ -47,6 +47,11 @@ public class WorkflowRepository extends AbstractEntityRepository return "workflowId"; } + @Override + public Long getIdOfEntity(final Workflow entity) { + return entity.getWorkflowId(); + } + @Override public boolean isNew(final Workflow workflow) { return workflow.getWorkflowId() == 0; diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectRepository.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectRepository.java index 3bb9138a1..752d51a75 100644 --- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectRepository.java +++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectRepository.java @@ -34,6 +34,8 @@ import javax.persistence.EntityManager; public class BlobObjectRepository extends AbstractAuditedEntityRepository { + private static final long serialVersionUID = 35679591875538616L; + @Inject private EntityManager entityManager; @@ -47,6 +49,11 @@ public class BlobObjectRepository extends return "blobObjectId"; } + @Override + public Long getIdOfEntity(final BlobObject entity) { + return entity.getBlobObjectId(); + } + @Override public Class getEntityClass() { return BlobObject.class; diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileRepository.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileRepository.java index 1fc16d2f8..3df2fa3e2 100644 --- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileRepository.java +++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileRepository.java @@ -39,6 +39,11 @@ public class FileRepository extends AbstractResourceRepository { return "objectId"; } + @Override + public Long getIdOfEntity(final File entity) { + return entity.getObjectId(); + } + @Override public TypedQuery getFindByNameQuery() { return entityManager.createNamedQuery( diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderRepository.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderRepository.java index 88619906c..39a206f5d 100644 --- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderRepository.java +++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderRepository.java @@ -38,6 +38,11 @@ public class FolderRepository extends AbstractResourceRepository { public String getIdAttributeName() { return "objectId"; } + + @Override + public Long getIdOfEntity(final Folder entity) { + return entity.getObjectId(); + } @Override public TypedQuery getFindByNameQuery() { diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryRepository.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryRepository.java index 264c17b0d..559c94c1f 100644 --- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryRepository.java +++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryRepository.java @@ -47,6 +47,11 @@ public class RepositoryRepository return entity.getObjectId(); } + @Override + public Long getIdOfEntity(final Repository entity) { + return entity.getObjectId(); + } + @Override public String getIdAttributeName() { return "objectId"; diff --git a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutRepository.java b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutRepository.java index 7fcdfa8cd..3dda065c5 100644 --- a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutRepository.java +++ b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutRepository.java @@ -53,6 +53,11 @@ public class ShortcutRepository extends AbstractEntityRepository return "shortcutId"; } + @Override + public Long getIdOfEntity(final Shortcut entity) { + return entity.getShortcutId(); + } + @Override public boolean isNew(final Shortcut entity) { return entity.getShortcutId() == 0;